rspec 1.1.11 → 1.1.12

data/{stories/example_groups/autogenerated_docstrings → features/example_groups/autogenerated_docstrings.feature}

@@ -1,11 +1,11 @@
-Story: autogenerated docstrings
+Feature: autogenerated docstrings
 
   As an RSpec user
   I want examples to generate their own names
   So that I can reduce duplication between example names and example code
 
   Scenario: run passing examples with ruby
-    Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+    Given the file ../../examples/passing/autogenerated_docstrings_example.rb
 
     When I run it with the ruby interpreter -fs
 
@@ -15,7 +15,7 @@ Story: autogenerated docstrings
     And the stdout should match /should respond to #size/
 
   Scenario: run failing examples with ruby
-    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
+    Given the file ../../examples/failing/failing_autogenerated_docstrings_example.rb
 
     When I run it with the ruby interpreter -fs
 
@@ -25,7 +25,7 @@ Story: autogenerated docstrings
     And the stdout should match /should not respond to #size/
 
   Scenario: run passing examples with spec
-    Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+    Given the file ../../examples/passing/autogenerated_docstrings_example.rb
 
     When I run it with the spec script -fs
 
@@ -35,7 +35,7 @@ Story: autogenerated docstrings
     And the stdout should match /should respond to #size/
 
   Scenario: run failing examples with spec
-    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
+    Given the file ../../examples/failing/failing_autogenerated_docstrings_example.rb
 
     When I run it with the spec script -fs
 

data/{stories/example_groups/example_group_with_should_methods → features/example_groups/example_group_with_should_methods.feature}

@@ -1,17 +1,17 @@
-Story: Spec::ExampleGroup with should methods
+Feature: Spec::ExampleGroup with should methods
 
   As an RSpec adopter accustomed to classes and methods
   I want to use should_* methods in an ExampleGroup
   So that I use RSpec with classes and methods that look more like RSpec examples
 
   Scenario: Run with ruby
-    Given the file spec/example_group_with_should_methods.rb
+    Given the file ../../resources/spec/example_group_with_should_methods.rb
     When I run it with the ruby interpreter
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"
 
   Scenario: Run with spec
-  Given the file spec/example_group_with_should_methods.rb
+  Given the file ../../resources/spec/example_group_with_should_methods.rb
     When I run it with the spec script
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"

data/{stories/example_groups/nested_groups → features/example_groups/nested_groups.feature}

@@ -1,17 +1,17 @@
-Story: Nested example groups
+Feature: Nested example groups
 
   As an RSpec user
   I want to nest examples groups
   So that I can better organize my examples
 
   Scenario: Run with ruby
-    Given the file ../../examples/pure/stack_spec_with_nested_example_groups.rb
+    Given the file ../../examples/passing/stack_spec_with_nested_example_groups.rb
     When I run it with the ruby interpreter -fs
     Then the stdout should match /Stack \(empty\)/
     And the stdout should match /Stack \(full\)/
 
-  Scenario: Run with ruby
-    Given the file ../../examples/pure/stack_spec_with_nested_example_groups.rb
+  Scenario: Run with spec
+    Given the file ../../examples/passing/stack_spec_with_nested_example_groups.rb
     When I run it with the spec script -fs
     Then the stdout should match /Stack \(empty\)/
     And the stdout should match /Stack \(full\)/

data/{stories/example_groups/output → features/example_groups/output.feature}

@@ -1,25 +1,20 @@
-Story: Getting correct output
+Feature: Getting correct output
 
   As an RSpec user
   I want to see output only once
   So that I don't get confused
 
   Scenario: Run with ruby
-    Given the file spec/simple_spec.rb
+    Given the file ../../resources/spec/simple_spec.rb
     When I run it with the ruby interpreter
     Then the exit code should be 0
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
 
   Scenario: Run with CommandLine object
-    Given the file spec/simple_spec.rb
+    Given the file ../../resources/spec/simple_spec.rb
     When I run it with the CommandLine object
     Then the exit code should be 0
     And the stdout should not match "Loaded suite"
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
-
-  Scenario: Tweak backtrace
-    Given the file stories/failing_story.rb
-    When I run it with the ruby interpreter
-    Then the stdout should not match /\/lib\/spec\//

data/{stories/interop/examples_and_tests_together → features/interop/examples_and_tests_together.feature}

@@ -1,11 +1,11 @@
-Story: Spec and test together
+Feature: Spec and test together
 
   As an RSpec adopter with existing Test::Unit tests
   I want to run a few specs alongside my existing Test::Unit tests
   So that I can experience a smooth, gradual migration path
 
   Scenario: Run with ruby
-    Given the file test/spec_and_test_together.rb
+    Given the file ../../resources/test/spec_and_test_together.rb
 
     When I run it with the ruby interpreter -fs
 
@@ -16,13 +16,14 @@ Story: Spec and test together
     And the stdout should match "10 examples, 6 failures"
     And the stdout should match /expected: 40,\s*got: 4/m
     And the stdout should match /expected: 50,\s*got: 5/m
+    
   Scenario: Run with spec
-    Given the file test/spec_and_test_together.rb
+    Given the file ../../resources/test/spec_and_test_together.rb
 
     When I run it with the spec script -fs
 
     Then the exit code should be 256
-    Ands the stdout should match "ATest"
+    And the stdout should match "ATest"
     And the stdout should match "Test::Unit::AssertionFailedError in 'An Example should fail with assert'"
     And the stdout should match "'An Example should fail with should' FAILED"
     And the stdout should match "10 examples, 6 failures"

data/features/interop/test_but_not_test_unit.feature

@@ -0,0 +1,14 @@
+Story: Test is defined, but not Test::Unit
+
+  As an RSpec user who has my own library named Test (but not Test::Unit)
+  I want to run examples without getting Test::Unit NameErrors
+
+  Scenario: Run with ruby
+    Given the file ../../resources/test/spec_including_test_but_not_unit.rb
+    When I run it with the ruby interpreter
+    Then the stderr should not match "Test::Unit"
+
+  Scenario: Run with spec
+    Given the file ../../resources/test/spec_including_test_but_not_unit.rb
+    When I run it with the spec script
+    Then the stderr should not match "Test::Unit"

data/{stories/interop/test_case_with_should_methods → features/interop/test_case_with_should_methods.feature}

@@ -5,13 +5,13 @@ Story: Test::Unit::TestCase extended by rspec with should methods
   So that I use RSpec with classes and methods that look more like RSpec examples
 
   Scenario: Run with ruby
-    Given the file test/test_case_with_should_methods.rb
+    Given the file ../../resources/test/test_case_with_should_methods.rb
     When I run it with the ruby interpreter
     Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"
 
   Scenario: Run with spec
-    Given the file test/test_case_with_should_methods.rb
+    Given the file ../../resources/test/test_case_with_should_methods.rb
     When I run it with the spec script
     Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"

data/{stories/mock_framework_integration/use_flexmock.story → features/mock_framework_integration/use_flexmock.feature}

@@ -4,6 +4,6 @@ Story: Getting correct output with flexmock
   I want to be able to use flexmock without rspec mocks interfering
 
   Scenario: Mock with flexmock
-    Given the file spec/spec_with_flexmock.rb
+    Given the file ../../resources/spec/spec_with_flexmock.rb
     When I run it with the ruby interpreter
     Then the exit code should be 0

data/features/step_definitions/running_rspec.rb

@@ -0,0 +1,54 @@
+Given /^the file (.*)$/ do |relative_path|
+  @path = File.expand_path(File.join(File.dirname(__FILE__), "..", "support", relative_path))
+  unless File.exist?(@path)
+    raise "could not find file at #{@path}"
+  end
+end
+
+Given /^the following spec:$/ do |spec|
+  @path = "/tmp/example_spec.rb"
+  File.open(@path, "w") do |f|
+    f.write spec
+  end
+end
+
+When /^I run it with the (.*)$/ do |interpreter|
+  stderr_file = Tempfile.new('rspec')
+  stderr_file.close
+  @stdout = case(interpreter)
+    when /^ruby interpreter/
+      args = interpreter.gsub('ruby interpreter','')
+      ruby("#{@path}#{args}", stderr_file.path)
+    when /^spec script/
+      args = interpreter.gsub('spec script','')
+      spec("#{@path}#{args}", stderr_file.path)
+    when 'CommandLine object' then cmdline(@path, stderr_file.path)
+    else raise "Unknown interpreter: #{interpreter}"
+  end
+  @stderr = IO.read(stderr_file.path)
+  @exit_code = $?.to_i
+end
+
+Then /^the (.*) should match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then @stdout
+    when 'stderr' then @stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should smart_match(string_or_regex)
+end
+
+Then /^the (.*) should not match (.*)$/ do |stream, string_or_regex|
+  written = case(stream)
+    when 'stdout' then @stdout
+    when 'stderr' then @stderr
+    else raise "Unknown stream: #{stream}"
+  end
+  written.should_not smart_match(string_or_regex)
+end
+
+Then /^the exit code should be (\d+)$/ do |exit_code|
+  if @exit_code != exit_code.to_i
+    raise "Did not exit with #{exit_code}, but with #{@exit_code}. Standard error:\n#{@stderr}"
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,26 @@
+require 'tempfile'
+require File.dirname(__FILE__) + '/../../spec/ruby_forker'
+require File.dirname(__FILE__) + '/matchers/smart_match'
+
+$:.push File.join(File.dirname(__FILE__), "/../../lib")
+require 'spec/expectations'
+require 'spec/matchers'
+
+module RspecWorld
+  include Spec::Expectations
+  include Spec::Matchers
+  include RubyForker
+
+  def spec(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/../../bin/spec'} #{args}", stderr)
+  end
+
+  def cmdline(args, stderr)
+    ruby("#{File.dirname(__FILE__) + '/helpers/cmdline.rb'} #{args}", stderr)
+  end
+end
+
+World do |world|
+  world.extend(RspecWorld)
+  world
+end

data/{stories/resources → features/support}/helpers/story_helper.rb

@@ -12,5 +12,5 @@ module StoryHelper
     ruby("#{File.dirname(__FILE__) + '/../../resources/helpers/cmdline.rb'} #{args}", stderr)
   end
   
-  Spec::Story::World.send :include, self
+  Spec::Story::World.__send__ :include, self
 end

data/{plugins → lib/adapters}/mock_frameworks/flexmock.rb

@@ -6,7 +6,7 @@
 require 'flexmock/rspec'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include FlexMock::MockContainer
       def setup_mocks_for_rspec

data/{plugins → lib/adapters}/mock_frameworks/mocha.rb

@@ -2,7 +2,7 @@ require 'mocha/standalone'
 require 'mocha/object'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include Mocha::Standalone
       def setup_mocks_for_rspec

data/{plugins → lib/adapters}/mock_frameworks/rr.rb

@@ -4,7 +4,7 @@ patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
 patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include RR::Extensions::InstanceMethods
       def setup_mocks_for_rspec

data/{plugins → lib/adapters}/mock_frameworks/rspec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "spec", "mocks"))
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec", "mocks"))
 require 'spec/mocks/framework'
 require 'spec/mocks/extensions'
 
 module Spec
-  module Plugins
+  module Adapters
     module MockFramework
       include Spec::Mocks::ExampleMethods
       def setup_mocks_for_rspec

data/lib/autotest/rspec.rb

@@ -21,14 +21,14 @@ class Autotest::Rspec < Autotest
 
   def initialize
     super
-    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m
+    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
   
   def consolidate_failures(failed)
     filters = new_hash_of_arrays
     failed.each do |spec, trace|
-      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:\Z?/
+      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/
         filters[$2] << spec
       end
     end
@@ -37,7 +37,8 @@ class Autotest::Rspec < Autotest
 
   def make_test_cmd(files_to_test)
     return '' if files_to_test.empty?
-    return "#{ruby} -S #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
+    spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
+    return "#{ruby} #{spec_program} #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
   end
   
   def add_options_if_present # :nodoc:

data/lib/spec.rb

@@ -1,32 +1,7 @@
 require 'spec/matchers'
 require 'spec/expectations'
 require 'spec/example'
-require 'spec/extensions'
 require 'spec/runner'
-require 'spec/adapters'
 require 'spec/version'
-
-if Object.const_defined?(:Test)
-  require 'spec/interop/test'
-end
-
-module Spec
-  class << self
-    def run?
-      Runner.options.examples_run?
-    end
-
-    def run
-      return true if run?
-      Runner.options.run_examples
-    end
-    
-    def exit?
-      !Object.const_defined?(:Test) || Test::Unit.run?
-    end
-
-    def spec_command?
-      $0.split('/').last == 'spec'
-    end
-  end
-end
+require 'spec/dsl'
+require 'spec/ruby'

data/lib/spec/dsl.rb

@@ -0,0 +1 @@
+require 'spec/dsl/main'

data/lib/spec/{extensions → dsl}/main.rb

@@ -1,5 +1,5 @@
 module Spec
-  module Extensions
+  module DSL
     module Main
       # Creates and returns a class that includes the ExampleGroupMethods
       # module. Which ExampleGroup type is created depends on the directory of the file
@@ -20,10 +20,8 @@ module Spec
       # register special implementations.
       #
       def describe(*args, &block)
-        raise ArgumentError if args.empty?
-        raise ArgumentError unless block
-        args << {} unless Hash === args.last
-        args.last[:spec_path] = File.expand_path(caller(0)[1])
+        Spec::Example::add_spec_path_to(args)
+        Spec::Example::ExampleGroupFactory.assign_scope(self, args)
         Spec::Example::ExampleGroupFactory.create_example_group(*args, &block)
       end
       alias :context :describe
@@ -43,10 +41,10 @@ module Spec
       #      ...
       #    end
       #  end
-      def share_examples_for(name, &block)
-        describe(name, :shared => true, &block)
+      def share_examples_for(*args, &block)
+        Spec::Example::add_spec_path_to(args)
+        Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block)
       end
-      
       alias :shared_examples_for :share_examples_for
       
       # Creates a Shared Example Group and assigns it to a constant
@@ -75,7 +73,9 @@ module Spec
       #  end
       def share_as(name, &block)
         begin
-          Object.const_set(name, share_examples_for(name, &block))
+          args = [name]
+          Spec::Example::add_spec_path_to(args)
+          Object.const_set(name, Spec::Example::ExampleGroupFactory.create_shared_example_group(*args, &block))
         rescue NameError => e
           raise NameError.new(e.message + "\nThe first argument to share_as must be a legal name for a constant\n")
         end
@@ -84,4 +84,4 @@ module Spec
   end
 end
 
-include Spec::Extensions::Main
+include Spec::DSL::Main

data/lib/spec/example.rb

@@ -1,3 +1,177 @@
+module Spec
+  # == Example Groups and Code Examples
+  #
+  # A Code Example is an executable example of how a bit of code is expected
+  # to behave.
+  #
+  # An Example Group is a group of code examples.
+  #
+  # RSpec exposes a DSL to describe groups of examples.
+  #  
+  #   describe Account do
+  #     it "should have a balance of $0" do
+  #       account = Account.new
+  #       account.balance.should == Money.new(0, :dollars)
+  #     end
+  #   end
+  #  
+  # == Before and After
+  #  
+  # You can use the <tt>before()</tt> and <tt>after()</tt> methods to extract
+  # common code within an Example Group. Both methods take an optional scope
+  # argument so you can run the block before :each example or before :all
+  # examples
+  #  
+  #   describe "..." do
+  #     before :all do
+  #       ...
+  #     end
+  #  
+  #     before :each do
+  #       ...
+  #     end
+  #  
+  #     it "should do something" do
+  #       ...
+  #     end
+  #  
+  #     it "should do something else" do
+  #       ...
+  #     end
+  #  
+  #     after :each do
+  #       ...
+  #     end
+  #  
+  #     after :all do
+  #       ...
+  #     end
+  #  
+  #   end
+  #  
+  # The <tt>before :each</tt> block will run before each of the examples, once
+  # for each example. Likewise, the <tt>after :each</tt> block will run after
+  # each of the examples.
+  #  
+  # It is also possible to specify a <tt>before :all</tt> and <tt>after
+  # :all</tt> block that will run only once for each example group, before the
+  # first <code>before :each</code> and after the last <code>after
+  # :each</code> respectively. The use of these is generally discouraged,
+  # because it introduces dependencies between the examples. Still, it might
+  # prove useful for very expensive operations if you know what you are doing.
+  #  
+  # == Local helper methods
+  #  
+  # You can include local helper methods by simply expressing them within an
+  # example group:
+  #  
+  #   describe "..." do
+  #    
+  #     it "..." do
+  #       helper_method
+  #     end
+  #  
+  #     def helper_method
+  #       ...
+  #     end
+  #  
+  #   end
+  #  
+  # == Included helper methods
+  #  
+  # You can include helper methods in multiple example groups by expressing
+  # them within a module, and then including that module in your example
+  # groups:
+  #  
+  #   module AccountExampleHelperMethods
+  #     def helper_method
+  #       ...
+  #     end
+  #   end
+  #  
+  #   describe "A new account" do
+  #     include AccountExampleHelperMethods
+  #     before do
+  #       @account = Account.new
+  #     end
+  #  
+  #     it "should have a balance of $0" do
+  #       helper_method
+  #       @account.balance.should eql(Money.new(0, :dollars))
+  #     end
+  #   end
+  #  
+  # == Shared Example Groups
+  #  
+  # You can define a shared example group, that may be used on other groups
+  #
+  #  share_examples_for "All Editions" do
+  #    it "all editions behaviour" ...
+  #  end
+  #
+  #  describe SmallEdition do
+  #    it_should_behave_like "All Editions"
+  #   
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  #
+  # You can also assign the shared group to a module and include that
+  #
+  #  share_as :AllEditions do
+  #    it "should do all editions stuff" ...
+  #  end
+  #
+  #  describe SmallEdition do
+  #    it_should_behave_like AllEditions
+  #   
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  #
+  # And, for those of you who prefer to use something more like Ruby, you can
+  # just include the module directly
+  #
+  #  describe SmallEdition do
+  #    include AllEditions
+  #   
+  #    it "should do small edition stuff" do
+  #      ...
+  #    end
+  #  end
+  module Example
+    class << self
+      def args_and_options(*args) # :nodoc:
+        with_options_from(args) do |options|
+          return args, options
+        end
+      end
+
+      def scope_from(*args) # :nodoc:
+        args[0] || :each
+      end
+
+      def scope_and_options(*args) # :nodoc:
+        args, options = args_and_options(*args)
+        return scope_from(*args), options
+      end
+
+      def add_spec_path_to(args) # :nodoc:
+        args << {} unless Hash === args.last
+        args.last[:spec_path] ||= caller(0)[2]
+      end
+
+    private
+    
+      def with_options_from(args)
+        yield Hash === args.last ? args.pop : {} if block_given?
+      end
+    end
+  end
+end
+
 require 'timeout'
 require 'spec/example/before_and_after_hooks'
 require 'spec/example/pending'
@@ -8,5 +182,5 @@ require 'spec/example/example_group'
 require 'spec/example/shared_example_group'
 require 'spec/example/example_group_factory'
 require 'spec/example/errors'
-require 'spec/example/configuration'
 require 'spec/example/example_matcher'
+