rpms/rubygem-xmpp4r/devel import.log, NONE, 1.1 rubygem-xmpp4r-examples.patch, NONE, 1.1 rubygem-xmpp4r-tests.patch, NONE, 1.1 rubygem-xmpp4r.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
tremble
tremble at fedoraproject.org
Tue Feb 2 13:38:48 UTC 2010
Author: tremble
Update of /cvs/pkgs/rpms/rubygem-xmpp4r/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16291/devel
Modified Files:
.cvsignore sources
Added Files:
import.log rubygem-xmpp4r-examples.patch
rubygem-xmpp4r-tests.patch rubygem-xmpp4r.spec
Log Message:
rubygem-xmpp4r: devel initial import
--- NEW FILE import.log ---
rubygem-xmpp4r-0_5-2_fc12:HEAD:rubygem-xmpp4r-0.5-2.fc12.src.rpm:1265117878
rubygem-xmpp4r-examples.patch:
advanced/adventure/adventuremuc.rb | 2 ++
advanced/adventure/world.rb | 2 ++
advanced/sendfile.rb | 2 ++
advanced/shellmgr/shellmgr.rb | 2 ++
basic/muc_owner_config.rb | 2 ++
5 files changed, 10 insertions(+)
--- NEW FILE rubygem-xmpp4r-examples.patch ---
diff -rau examples.orig/advanced/adventure/adventuremuc.rb examples/advanced/adventure/adventuremuc.rb
--- examples.orig/advanced/adventure/adventuremuc.rb 2010-01-26 13:48:13.000000000 +0000
+++ examples/advanced/adventure/adventuremuc.rb 2010-01-26 13:49:18.000000000 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'world'
class AdventureMUC
diff -rau examples.orig/advanced/adventure/world.rb examples/advanced/adventure/world.rb
--- examples.orig/advanced/adventure/world.rb 2010-01-26 13:48:13.000000000 +0000
+++ examples/advanced/adventure/world.rb 2010-01-26 13:48:52.000000000 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'rexml/document'
class World < REXML::Element
diff -rau examples.orig/advanced/sendfile.rb examples/advanced/sendfile.rb
--- examples.orig/advanced/sendfile.rb 2010-01-26 13:48:13.000000000 +0000
+++ examples/advanced/sendfile.rb 2010-01-26 13:48:58.000000000 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'xmpp4r'
require 'xmpp4r/bytestreams'
require 'yaml'
diff -rau examples.orig/advanced/shellmgr/shellmgr.rb examples/advanced/shellmgr/shellmgr.rb
--- examples.orig/advanced/shellmgr/shellmgr.rb 2010-01-26 13:48:13.000000000 +0000
+++ examples/advanced/shellmgr/shellmgr.rb 2010-01-26 13:49:04.000000000 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'thread'
class Shell
diff -rau examples.orig/basic/muc_owner_config.rb examples/basic/muc_owner_config.rb
--- examples.orig/basic/muc_owner_config.rb 2010-01-26 13:48:13.000000000 +0000
+++ examples/basic/muc_owner_config.rb 2010-01-26 13:49:12.000000000 +0000
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
require 'xmpp4r'
require 'xmpp4r/muc'
rubygem-xmpp4r-tests.patch:
lib/xmpp4r/test/listener_mocker.rb | 4 +---
test/muc/tc_muc_mucclient.rb | 5 +----
test/tc_stream.rb | 3 ++-
3 files changed, 4 insertions(+), 8 deletions(-)
--- NEW FILE rubygem-xmpp4r-tests.patch ---
diff --git a/lib/xmpp4r/test/listener_mocker.rb b/lib/xmpp4r/test/listener_mocker.rb
index 21e1706..b37fcdd 100644
--- a/lib/xmpp4r/test/listener_mocker.rb
+++ b/lib/xmpp4r/test/listener_mocker.rb
@@ -17,9 +17,7 @@ module Jabber
yield
ensure
TCPSocket.class_eval do
- if method_defined?(:initialize_old)
- alias_method :initialize, :initialize_old
- end
+ alias_method :initialize, :initialize_old
end
end
diff --git a/test/muc/tc_muc_mucclient.rb b/test/muc/tc_muc_mucclient.rb
index 1035239..bed2a6b 100755
--- a/test/muc/tc_muc_mucclient.rb
+++ b/test/muc/tc_muc_mucclient.rb
@@ -87,10 +87,7 @@ class MUCClientTest < Test::Unit::TestCase
"<x xmlns='http://jabber.org/protocol/muc#user'><item affiliation='none' jid='hag66 at shakespeare.lit/pda' role='participant'/></x>" +
"</presence>")
n = 0
- while m.roster.size != 3 and n < 1000
- Thread::pass
- n += 1
- end
+ sleep 1
assert_equal(3, m.roster.size)
assert_equal(:none, m.roster['thirdwitch'].x.items[0].affiliation)
assert_equal(:participant, m.roster['thirdwitch'].x.items[0].role)
diff --git a/test/tc_stream.rb b/test/tc_stream.rb
index 092ca45..60d75bb 100755
--- a/test/tc_stream.rb
+++ b/test/tc_stream.rb
@@ -18,10 +18,11 @@
def busywait(&block)
n = 0
- while not block.yield and n < 1000
+ while not block.call and n < 1000
Thread::pass
n += 1
end
+ sleep 1
end
##
1.5.5.6
--- NEW FILE rubygem-xmpp4r.spec ---
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname xmpp4r
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global rubyabi 1.8
Summary: An XMPP/Jabber library for Ruby
Name: rubygem-%{gemname}
Version: 0.5
Release: 2%{?dist}
Group: Development/Languages
License: GPL+ or Ruby
URL: http://home.gna.org/xmpp4r/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: rubygems
Requires: ruby(abi) = %{rubyabi}
Patch0: rubygem-xmpp4r-examples.patch
Patch1: rubygem-xmpp4r-tests.patch
BuildRequires: rubygems
# So we can run rake test
BuildRequires: rubygem(rake)
BuildArch: noarch
Provides: rubygem(%{gemname}) = %{version}
%description
XMPP4R is an XMPP/Jabber library for Ruby.
%package doc
Summary: Documentation for %{name}
Group: Documentation
# Directory ownership issue
Requires: %{name} = %{version}-%{release}
Requires: ruby(rubygems)
%description doc
This package contains documentation and examples for %{name}.
%prep
%build
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{gemdir}
gem install --local --install-dir %{buildroot}%{gemdir} \
--force --rdoc %{SOURCE0}
# Files Erroniously installed by the gem.
# They're used in the build process
rm -rf %{buildroot}%{geminstdir}/%{gemname}.gemspec
rm -rf %{buildroot}%{geminstdir}/setup.rb
rm -rf %{buildroot}%{geminstdir}/tools
# Tidy up the file permissions
# Libraries shouldn't be executable, and the tests aren't run directly ...
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
xargs chmod 0644
# ... the examples are valid scripts ...
find %{buildroot}%{geminstdir}/data/doc/%{gemname}/examples \
-type f -name '*.rb' | xargs chmod 0755
# ... and it's perfectly acceptable for users have read access to the
# source gem
chmod 644 %{buildroot}%{gemdir}/cache/%{gemname}-%{version}.gem
# Find the ruby example scripts where they didn't include a schbang line
pushd %{buildroot}%{geminstdir}/data/doc/xmpp4r/examples
patch -p1 < %{PATCH0}
popd
# Fix their test cases so they run on fast machines
# and can all be run from simply rake test rather than 1 at a time
pushd %{buildroot}%{geminstdir}
patch -p1 < %{PATCH1}
popd
# Drop the standalone mode for tests
# We can't run them way due to missing rubygems required for the tests.
find %{buildroot}%{geminstdir}/{test,lib} -type f | \
xargs -n 1 sed -i -e '/^#!\/usr\/.*\/ruby.*/d'
%clean
rm -rf %{buildroot}
%check
pushd %{buildroot}%{geminstdir}/test
rake test
popd
%files
%defattr(-, root, root, -)
%dir %{geminstdir}
%dir %{geminstdir}/data
%{geminstdir}/lib
%doc %{geminstdir}/CHANGELOG
%doc %{geminstdir}/COPYING
%doc %{geminstdir}/LICENSE
%doc %{geminstdir}/README.rdoc
%doc %{geminstdir}/README_ruby19.txt
%{gemdir}/cache/%{gemname}-%{version}.gem
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%files doc
%defattr(-, root, root, -)
%{geminstdir}/test
%{geminstdir}/data/doc
%{geminstdir}/Rakefile
%{gemdir}/doc/%{gemname}-%{version}
%changelog
* Fri Jan 29 2010 M D Chappell <m.d.chappell at bath.ac.uk> - 0.5-2
- Formatting clean ups
- Fix the test cases
- Replace define with global
- Remove unused macro
- Run the test cases in a check stanza
* Mon Jan 25 2010 M Chappell <m.d.chappell at bath.ac.uk> - 0.5-1
- Initial package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-xmpp4r/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 31 Jan 2010 19:11:31 -0000 1.1
+++ .cvsignore 2 Feb 2010 13:38:47 -0000 1.2
@@ -0,0 +1 @@
+xmpp4r-0.5.gem
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-xmpp4r/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 31 Jan 2010 19:11:31 -0000 1.1
+++ sources 2 Feb 2010 13:38:48 -0000 1.2
@@ -0,0 +1 @@
+867bab9d9cf23154dede14b3a16f0d9c xmpp4r-0.5.gem
More information about the scm-commits
mailing list