From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Thu, 2 Feb 2012 16:25:39 +0900
Subject: Update for newest RSpec >= 2
Origin: upstream, https://github.com/cho45/net-irc/commit/296596fc8bb65f9ab880751d01273a0f23fd4cc9

Signed-off-by: Youhei SASAKI <uwabami@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
--