Update to work with (probably only) RSpec 2.6

Author: nyarly

.rspec

@@ -1,6 +1,5 @@
 --format documentation
---out last_run
 -I /home/judson/ruby/gems/rspec-steps/spec_help/interpose
 -I /home/judson/ruby/gems/rspec-steps/lib
 -I /home/judson/ruby/gems/rspec-steps/spec_help
---require spec_helper
+--require spec_helper

Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     rspec-steps (0.0.3)
-      rspec (>= 2.0)
+      rspec (>= 2.6)
 
 GEM
   remote: http://judson:[email protected]/
@@ -23,14 +23,14 @@ GEM
       rake (>= 0.8.7)
     rcov (0.9.9)
     rdoc (2.3.0)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby

lib/rspec-steps.rb

@@ -1,3 +1,2 @@
 require 'rspec-steps/duckpunch/object-extensions'
 require 'rspec-steps/duckpunch/example-group'
-

lib/rspec-steps/duckpunch/example-group.rb

@@ -1,3 +1,4 @@
+require 'rspec/core/example_group'
 require 'rspec-steps/stepwise'
 
 module RSpec::Steps
@@ -14,5 +15,6 @@ def steps(*args, &block)
 end
 
 RSpec::Core::ExampleGroup.extend RSpec::Steps::ClassMethods
+include RSpec::Steps::ClassMethods
 
 RSpec::configuration.include(RSpecStepwise, :stepwise => true)

lib/rspec-steps/duckpunch/object-extensions.rb

@@ -1,12 +1,9 @@
 require 'rspec-steps/duckpunch/example-group'
 require 'rspec-steps/stepwise'
+require 'rspec/core/shared_example_group'
 
-module RSpec::Steps
-  module ObjectExtensions
-    alias :shared_steps :shared_context
-    alias :steps_shared_as :share_as
-  end
+module RSpec::Core::SharedExampleGroup
+  alias :shared_steps :share_examples_for
+  alias :steps_shared_as :share_as
 end
-
-include RSpec::Steps::ObjectExtensions
 extend RSpec::Steps::ClassMethods

lib/rspec-steps/stepwise.rb

@@ -39,7 +39,7 @@ def around(*args, &block)
     def eval_before_alls(example_group_instance)
       super
       example_group_instance.example = whole_list_example
-      world.run_hook_filtered(:before, :each, self, example_group_instance, example)
+      world.run_hook_filtered(:before, :each, self, example_group_instance, whole_list_example)
       ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example_group_instance) }
     end
 
@@ -55,12 +55,14 @@ def eval_after_eachs(example)
     def eval_after_alls(example_group_instance)
       example_group_instance.example = whole_list_example
       ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example_group_instance) }
-      world.run_hook_filtered(:after, :each, self, example_group_instance, example)
+      world.run_hook_filtered(:after, :each, self, example_group_instance, whole_list_example)
       super
     end
 
     def whole_list_example
-      RSpec::Core::Example.new(self, "step list", {})
+      @whole_list_example ||= begin
+                                RSpec::Core::Example.new(self, "step list", {})
+                              end
     end
 
     def with_around_hooks(instance, &block)

rspec-steps.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name		= "rspec-steps"
-  spec.version		= "0.0.3"
+  spec.version		= "0.0.4"
   author_list = {
     "Judson Lester" => "[email protected]"
   }
@@ -73,7 +73,7 @@ Gem::Specification.new do |spec|
   spec.rdoc_options	+= %w{--main doc/README }
   spec.rdoc_options	+= ["--title", "#{spec.name}-#{spec.version} RDoc"]
 
-  spec.add_dependency("rspec", ">= 2.0")
+  spec.add_dependency("rspec", ">= 2.6")
 
   spec.post_install_message = "Another tidy package brought to you by Judson"
 end

spec/example_group.rb

@@ -9,7 +9,7 @@
         group = steps "Test Steps" do
         end
       end
-      (class << group; self; end).included_modules.should include(RSpecStepwise)
+      (class << group; self; end).included_modules.should include(RSpecStepwise::ClassMethods)
     end
   end
 
@@ -18,8 +18,8 @@
       group = nil
       sandboxed do
         group = steps "Test Steps" do
-          it { @a = 1 }
-          it { @a.should == 1}
+          it("sets @a"){ @a = 1 }
+          it("reads @a"){ @a.should == 1}
         end
         group.run
       end
@@ -42,7 +42,7 @@
       group.examples[1].metadata[:pending].should be_true
     end
 
-    it "should allow nested steps" do
+    it "should allow nested steps", :pending => "Not really" do
       group = nil
       sandboxed do
         group = steps "Test Steps" do
@@ -59,7 +59,7 @@
       end
       group.children[0].should have(2).examples
     end
-    
+
     it "should not allow nested normal contexts" do
       pending "A correct approach - in the meantime, this behavior is undefined"
       expect {

spec_help/rspec-sandbox.rb

@@ -1,3 +1,5 @@
+require 'rspec/core'
+
 class NullObject
   private
   def method_missing(method, *args, &block)
@@ -6,39 +8,39 @@ def method_missing(method, *args, &block)
 end
 
 def sandboxed(&block)
-  begin
-    @orig_config = RSpec.configuration
-    @orig_world  = RSpec.world
-    new_config = RSpec::Core::Configuration.new
-    new_world  = RSpec::Core::World.new(new_config)
-    RSpec.instance_variable_set(:@configuration, new_config)
-    RSpec.instance_variable_set(:@world, new_world)
-    object = Object.new
-    object.extend(RSpec::Core::ObjectExtensions)
-    object.extend(RSpec::Core::SharedExampleGroup)
+  @orig_config = RSpec.configuration
+  @orig_world  = RSpec.world
+  new_config = RSpec::Core::Configuration.new
+  new_world  = RSpec::Core::World.new(new_config)
+  RSpec.instance_variable_set(:@configuration, new_config)
+  RSpec.instance_variable_set(:@world, new_world)
 
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      alias_method :orig_run, :run
-      def run(reporter=nil)
-        @orig_mock_space = RSpec::Mocks::space
-        RSpec::Mocks::space = RSpec::Mocks::Space.new
-        orig_run(reporter || NullObject.new)
-      ensure
-        RSpec::Mocks::space = @orig_mock_space
-      end
-    end
+  load 'rspec-steps/duckpunch/example-group.rb'
 
-    object.instance_eval(&block)
-  ensure
-    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
-      remove_method :run
-      alias_method :run, :orig_run
-      remove_method :orig_run
+  object = Object.new
+  object.extend(RSpec::Core::SharedExampleGroup)
+
+  (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+    alias_method :orig_run, :run
+    def run(reporter=nil)
+      @orig_mock_space = RSpec::Mocks::space
+      RSpec::Mocks::space = RSpec::Mocks::Space.new
+      orig_run(reporter || NullObject.new)
+    ensure
+      RSpec::Mocks::space = @orig_mock_space
     end
+  end
 
-    RSpec.instance_variable_set(:@configuration, @orig_config)
-    RSpec.instance_variable_set(:@world, @orig_world)
+  object.instance_eval(&block)
+ensure
+  (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+    remove_method :run
+    alias_method :run, :orig_run
+    remove_method :orig_run
   end
+
+  RSpec.instance_variable_set(:@configuration, @orig_config)
+  RSpec.instance_variable_set(:@world, @orig_world)
 end
 
 #Original from rspec-core