Mailing-List: contact commits-help@buildr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@buildr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1030503 - in /buildr/trunk: lib/buildr.rb
 spec/core/shell_spec.rb spec/spec_helpers.rb
Date: Wed, 03 Nov 2010 15:46:39 -0000
To: commits@buildr.apache.org
From: boisvert@apache.org
Message-Id: <20101103154639.400E823888BD@eris.apache.org>

Author: boisvert
Date: Wed Nov  3 15:46:38 2010
New Revision: 1030503

URL: http://svn.apache.org/viewvc?rev=1030503&view=rev
Log:
More RSpec-related tweaks; specs now run on Ruby 1.9

Modified:
    buildr/trunk/lib/buildr.rb
    buildr/trunk/spec/core/shell_spec.rb
    buildr/trunk/spec/spec_helpers.rb

Modified: buildr/trunk/lib/buildr.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1030503&r1=1030502&r2=1030503&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Wed Nov  3 15:46:38 2010
@@ -32,6 +32,6 @@ class << self ; include Buildr ; end
 class Object #:nodoc:
   Buildr.constants.each do |name|
     const = Buildr.const_get(name)
-    const_set name, const if const.is_a?(Module) && name != "RSpec"
+    const_set name, const if const.is_a?(Module) && name.to_s != "RSpec"
   end
 end

Modified: buildr/trunk/spec/core/shell_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/core/shell_spec.rb?rev=1030503&r1=1030502&r2=1030503&view=diff
==============================================================================
--- buildr/trunk/spec/core/shell_spec.rb (original)
+++ buildr/trunk/spec/core/shell_spec.rb Wed Nov  3 15:46:38 2010
@@ -102,7 +102,7 @@ describe Project, '.shell' do
   end
 end
 
-describe "shell provider", :shared=>true do
+shared_examples_for "shell provider" do
 
   it 'should have launch method accepting shell task' do
     @instance.method(:launch).should_not be_nil

Modified: buildr/trunk/spec/spec_helpers.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/spec_helpers.rb?rev=1030503&r1=1030502&r2=1030503&view=diff
==============================================================================
--- buildr/trunk/spec/spec_helpers.rb (original)
+++ buildr/trunk/spec/spec_helpers.rb Wed Nov  3 15:46:38 2010
@@ -357,7 +357,7 @@ unless defined?(SpecHelpers)
   end
 
 
-  RSpec.configure do |config|
+  ::RSpec.configure do |config|
     # Make all Buildr methods accessible from test cases, and add various helper methods.
     config.include Buildr
     config.include SpecHelpers