[DRE-commits] [SCM] ruby-net-irc.git branch, master, updated. upstream/0.0.9-5-g4d12cf8

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit ca0f665476ac64b3708d4dd25e326b4e29805c57
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Feb 2 16:45:03 2012 +0900

    New patch 0001-Update-for-newest-RSpec-2.patch
    
    Update for newest RSpec >= 2
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0001-Update-for-newest-RSpec-2.patch b/debian/patches/0001-Update-for-newest-RSpec-2.patch
new file mode 100644
index 0000000..66d496b
--- /dev/null
+++ b/debian/patches/0001-Update-for-newest-RSpec-2.patch
@@ -0,0 +1,93 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Thu, 2 Feb 2012 16:25:39 +0900
+Subject: Update for newest RSpec >= 2
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ Rakefile                     |   37 +++++++++++++++++++++++++++++++------
+ spec/channel_manager_spec.rb |    2 +-
+ spec/net-irc_spec.rb         |    2 +-
+ 3 files changed, 33 insertions(+), 8 deletions(-)
+
+diff --git a/Rakefile b/Rakefile
+index e390a06..f4a65a1 100644
+--- a/Rakefile
++++ b/Rakefile
+@@ -7,7 +7,21 @@ require 'rake/gempackagetask'
+ require 'rake/rdoctask'
+ require 'rake/contrib/sshpublisher'
+ require 'fileutils'
+-require 'spec/rake/spectask'
++# Adaptable to both RSpec 1 and 2
++rspec_version = nil
++begin
++  # for RSpec 2
++  require 'rspec/core/rake_task'
++  rspec_version = 2
++rescue LoadError
++  begin
++    # for RSpec 1
++    require 'spec/rake/spectask'
++    rspec_version = 1
++  rescue LoadError
++    puts "RSpec is not available."
++  end
++end
+ 
+ include FileUtils
+ 
+@@ -35,11 +49,22 @@ RDOC_OPTS = [
+ 
+ task :default => [:spec]
+ task :package => [:clean]
+-
+-Spec::Rake::SpecTask.new do |t|
+-	t.spec_opts = ['--options', "spec/spec.opts"]
+-	t.spec_files = FileList['spec/*_spec.rb']
+-	#t.rcov = true
++if rspec_version then
++  case rspec_version
++  when 1
++    Spec::Rake::SpecTask.new do |t|
++      t.spec_opts = ['--options', "spec/spec.opts"]
++      t.spec_files = FileList['spec/*_spec.rb']
++      # t.rcov = true
++    end
++  when 2
++    RSpec::Core::RakeTask.new do |t|
++      t.rspec_opts = ['--options', "spec/spec.opts"]
++      # t.rcov = true
++    end 
++  else
++    raise "RSpec is not available."
++  end
+ end
+ 
+ spec = Gem::Specification.new do |s|
+diff --git a/spec/channel_manager_spec.rb b/spec/channel_manager_spec.rb
+index d16fbf7..1b80e65 100755
+--- a/spec/channel_manager_spec.rb
++++ b/spec/channel_manager_spec.rb
+@@ -4,7 +4,7 @@ $LOAD_PATH << "lib"
+ $LOAD_PATH << "../lib"
+ 
+ require "rubygems"
+-require "spec"
++require "rspec"
+ require "thread"
+ require "net/irc"
+ require "net/irc/client/channel_manager"
+diff --git a/spec/net-irc_spec.rb b/spec/net-irc_spec.rb
+index ec4e493..5fdb001 100755
+--- a/spec/net-irc_spec.rb
++++ b/spec/net-irc_spec.rb
+@@ -6,7 +6,7 @@ $LOAD_PATH << "lib"
+ $LOAD_PATH << "../lib"
+ 
+ require "rubygems"
+-require "spec"
++require "rspec"
+ require "net/irc"
+ include Net::IRC
+ include Constants
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d93010b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Update-for-newest-RSpec-2.patch

-- 
ruby-net-irc.git