rspec-core 2.0.0.beta.17 → 2.0.0.beta.18

data/lib/rspec/core/world.rb

@@ -38,16 +38,16 @@ module RSpec
       end
 
       def apply_inclusion_filters(examples, conditions={})
-        examples.select &all_apply?(conditions)
+        examples.select(&all_apply?(conditions))
       end
 
       alias_method :find, :apply_inclusion_filters
 
       def apply_exclusion_filters(examples, conditions={})
-        examples.reject &all_apply?(conditions)
+        examples.reject(&all_apply?(conditions))
       end
 
-      def preceding_declaration_line(filter_line) 
+      def preceding_declaration_line(filter_line)
         declaration_line_numbers.inject(nil) do |highest_prior_declaration_line, line|
           line <= filter_line ? line : highest_prior_declaration_line
         end
@@ -62,7 +62,7 @@ module RSpec
           else
             @configuration.reporter.message "Run filtered using #{inclusion_filter.inspect}"
           end
-        end      
+        end
       end
 
       include RSpec::Core::Hooks
@@ -82,7 +82,7 @@ module RSpec
           lines + g.declaration_line_numbers
         end
       end
-      
+
     end
   end
 end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.17"
+  s.version = "2.0.0.beta.18"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-07-11}
+  s.date = %q{2010-07-21}
   s.default_executable = %q{rspec}
   s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
      "bin/rspec",
      "cucumber.yml",
      "features/README.markdown",
+     "features/command_line/configure.feature",
      "features/command_line/example_name_option.feature",
      "features/command_line/exit_status.feature",
      "features/command_line/line_number_appended_to_path.feature",
@@ -40,6 +41,7 @@ Gem::Specification.new do |s|
      "features/configuration/options_file.feature",
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
+     "features/example_groups/shared_example_group.feature",
      "features/filtering/inclusion_filters.feature",
      "features/formatters/custom_formatter.feature",
      "features/hooks/around_hooks.feature",
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
      "lib/rspec/core/around_proxy.rb",
      "lib/rspec/core/backward_compatibility.rb",
      "lib/rspec/core/command_line.rb",
+     "lib/rspec/core/command_line_configuration.rb",
      "lib/rspec/core/configuration.rb",
      "lib/rspec/core/configuration_options.rb",
      "lib/rspec/core/deprecation.rb",
@@ -102,6 +105,7 @@ Gem::Specification.new do |s|
      "script/console",
      "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
+     "spec/rspec/core/command_line_configuration_spec.rb",
      "spec/rspec/core/command_line_spec.rb",
      "spec/rspec/core/command_line_spec_output.txt",
      "spec/rspec/core/configuration_options_spec.rb",
@@ -149,18 +153,22 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.17
-  
+  Thank you for installing rspec-core-2.0.0.beta.18
+
+  Please be sure to look at Upgrade.markdown to see what might have changed
+  since the last release.
+
 **************************************************
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-core-2.0.0.beta.17}
+  s.summary = %q{rspec-core-2.0.0.beta.18}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
+     "spec/rspec/core/command_line_configuration_spec.rb",
      "spec/rspec/core/command_line_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
@@ -204,19 +212,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.17"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.17"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.17"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.17"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.18"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.18"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/autotest/rspec_spec.rb

@@ -5,7 +5,7 @@ describe Autotest::Rspec2 do
     before(:each) do
       @rspec_autotest = Autotest::Rspec2.new
       @rspec_autotest.stub!(:ruby).and_return "ruby"
-    
+
       @ruby = @rspec_autotest.ruby
       @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
       files = %w[file_one file_two]
@@ -17,7 +17,7 @@ describe Autotest::Rspec2 do
       @rspec_autotest.files_to_test = @files_to_test
       @to_test = files.map { |f| File.expand_path(f) }.join ' '
     end
-  
+
     it "should make the appropriate test command" do
       actual = @rspec_autotest.make_test_cmd(@files_to_test)
       expected = /#{@ruby}.*#{@spec_cmd} (.*)/
@@ -35,26 +35,26 @@ describe Autotest::Rspec2 do
   end
 
   describe "mappings" do
-  
+
     before(:each) do
       @lib_file = "lib/something.rb"
       @spec_file = "spec/something_spec.rb"
       @rspec_autotest = Autotest::Rspec2.new
       @rspec_autotest.hook :initialize
     end
-  
+
     it "should find the spec file for a given lib file" do
       @rspec_autotest.should map_specs([@spec_file]).to(@lib_file)
     end
-  
+
     it "should find the spec file if given a spec file" do
       @rspec_autotest.should map_specs([@spec_file]).to(@spec_file)
     end
-  
+
     it "should ignore files in spec dir that aren't specs" do
       @rspec_autotest.should map_specs([]).to("spec/spec_helper.rb")
     end
-  
+
     it "should ignore untracked files (in @file)"  do
       @rspec_autotest.should map_specs([]).to("lib/untracked_file")
     end
@@ -63,21 +63,21 @@ describe Autotest::Rspec2 do
   describe "consolidating failures" do
     before(:each) do
       @rspec_autotest = Autotest::Rspec2.new
-    
+
       @spec_file = "spec/autotest/some_spec.rb"
       @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
       @rspec_autotest.stub!(:find_files_to_test).and_return true
     end
-  
+
     it "should return no failures if no failures were given in the output" do
       @rspec_autotest.consolidate_failures([[]]).should == {}
     end
-  
+
     it "should return a hash with the spec filename => spec name for each failure or error" do
       @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
       failures = [
         [
-          "false should be false", 
+          "false should be false",
           "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
         ]
       ]
@@ -85,20 +85,20 @@ describe Autotest::Rspec2 do
         @spec_file => ["false should be false"]
       }
     end
-  
+
     it "should not include the subject file" do
       subject_file = "lib/autotest/some.rb"
       @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
       failures = [
         [
-          "false should be false", 
+          "false should be false",
           "expected: true,\n     got: false (using ==)\n#{subject_file}:143:\n#{@spec_file}:203:"
         ]
       ]
       @rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
     end
   end
-  
+
   describe "normalizing file names" do
     it "should ensure that a single file appears in files_to_test only once" do
       @rspec_autotest = Autotest::Rspec2.new

data/spec/rspec/core/command_line_configuration_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module RSpec::Core
+  describe CommandLineConfiguration do
+    describe '#run' do
+      context 'given autotest command' do
+        let(:config) { CommandLineConfiguration.new('autotest') }
+
+        it 'calls Autotest.generate' do
+          CommandLineConfiguration::Autotest.should_receive(:generate)
+          config.run
+        end
+      end
+
+      context 'given unsupported command' do
+        let(:config) { CommandLineConfiguration.new('unsupported') }
+
+        it 'raises ArgumentError' do
+          lambda { config.run }.should(
+            raise_error(ArgumentError, /"unsupported" is not valid/)
+          )
+        end
+      end
+    end
+  end
+end

data/spec/rspec/core/command_line_spec.rb

@@ -71,7 +71,7 @@ module RSpec::Core
         after_suite_called.should be_true
       end
     end
-    
+
     describe "#run with custom output" do
       let(:config_options) do
         config_options = ConfigurationOptions.new(%w[--color])
@@ -86,11 +86,11 @@ module RSpec::Core
       let(:output_file_path) do
         Dir.tmpdir + "/command_line_spec_output.txt"
       end
-      
+
       let(:output_file) do
         File.new(output_file_path, 'w')
       end
-      
+
       let(:config) do
         config = RSpec::Core::Configuration.new
         config.output_stream = output_file
@@ -102,12 +102,12 @@ module RSpec::Core
       before do
         config.stub(:run_hook)
       end
-      
+
       it "doesn't override output_stream" do
         command_line.run(out, out)
         command_line.instance_eval { @configuration.output_stream }.should eql(output_file)
       end
     end
-    
+
   end
 end

data/spec/rspec/core/configuration_options_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'ostruct'
 
 describe RSpec::Core::ConfigurationOptions do
-  
+
   def config_options_object(*args)
     coo = RSpec::Core::ConfigurationOptions.new(args)
     coo.parse_options
@@ -22,7 +22,7 @@ describe RSpec::Core::ConfigurationOptions do
       config.should_receive(:requires=).ordered
       opts.configure(config)
     end
-    
+
     it "sends requires before formatter" do
       opts = config_options_object(*%w[--require a/path -f a/formatter])
       config = double("config").as_null_object
@@ -122,7 +122,7 @@ describe RSpec::Core::ConfigurationOptions do
 
     it "parses dir and files from 'spec/file1_spec.rb, spec/file2_spec.rb'" do
       options_from_args("dir", "spec/file1_spec.rb", "spec/file2_spec.rb").should include(:files_or_directories_to_run => ["dir", "spec/file1_spec.rb", "spec/file2_spec.rb"])
-      
+
     end
 
   end
@@ -140,7 +140,7 @@ describe RSpec::Core::ConfigurationOptions do
       options_from_args("-d").should include(:debug => true)
     end
   end
-  
+
   describe "--drb (-X)" do
     context "combined with --debug" do
       it "turns off the debugger if --drb is specified first" do
@@ -149,35 +149,35 @@ describe RSpec::Core::ConfigurationOptions do
         config_options_object("-X",    "--debug").drb_argv.should_not include("--debug")
         config_options_object("-X",    "-d"     ).drb_argv.should_not include("--debug")
       end
-      
-      it "turns off the debugger option if --drb is specified later" do      
+
+      it "turns off the debugger option if --drb is specified later" do
         config_options_object("--debug", "--drb").drb_argv.should_not include("--debug")
         config_options_object("-d",      "--drb").drb_argv.should_not include("--debug")
         config_options_object("--debug", "-X"   ).drb_argv.should_not include("--debug")
         config_options_object("-d",      "-X"   ).drb_argv.should_not include("--debug")
       end
-      
+
       it "turns off the debugger option if --drb is specified in the options file" do
         File.stub(:exist?) { true }
         File.stub(:readlines) { %w[ --drb  ] }
         config_options_object("--debug").drb_argv.should_not include("--debug")
-        config_options_object("-d"     ).drb_argv.should_not include("--debug")        
+        config_options_object("-d"     ).drb_argv.should_not include("--debug")
       end
-      
+
       it "turns off the debugger option if --debug is specified in the options file" do
         File.stub(:exist?) { true }
         File.stub(:readlines) { %w[ --debug  ] }
         config_options_object("--drb").drb_argv.should_not include("--debug")
-        config_options_object("-X"   ).drb_argv.should_not include("--debug")        
+        config_options_object("-X"   ).drb_argv.should_not include("--debug")
       end
     end
-        
+
     it "sends all the arguments other than --drb back to the parser after parsing options" do
       config_options_object("--drb", "--color").drb_argv.should_not include("--drb")
     end
   end
-  
-  
+
+
   # TODO #drb_argv may not be the best name
   # TODO ensure all options are output
   # TODO check if we need to spec that the short options are "expanded" ("-v" becomes "--version" currently)
@@ -186,7 +186,7 @@ describe RSpec::Core::ConfigurationOptions do
       File.stub(:exist?) { false }
       config_options_object(*%w[ a --drb b --color c ]).drb_argv.should =~ %w[ --color a b c ]
     end
-    
+
     context "--drb specified in ARGV" do
       it "renders all the original arguments except --drb" do
         config_options_object(*%w[ --drb --color --format s --line_number 1 --example pattern --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
@@ -234,7 +234,7 @@ describe RSpec::Core::ConfigurationOptions do
       config_options.configure(config)
       config.formatter.should == 'doc'
     end
-    
+
     it "allows options on one line" do
       File.stub(:exist?) { true }
       File.stub(:readlines) { ["--format doc"] }
@@ -244,13 +244,13 @@ describe RSpec::Core::ConfigurationOptions do
       config_options.configure(config)
       config.formatter.should == 'doc'
     end
-    
+
     it "merges options from the global and local .rspec and the command line" do
       File.stub(:exist?){ true }
       File.stub(:readlines) do |path|
         case path
         when ".rspec"
-          ["--format", "documentation"] 
+          ["--format", "documentation"]
         when /\.rspec/
           ["--line", "37"]
         else
@@ -266,15 +266,15 @@ describe RSpec::Core::ConfigurationOptions do
       config.line_number.should == "37"
       config.color_enabled.should be_false
     end
-    
+
     it "prefers local options over global" do
       File.stub(:exist?){ true }
       File.stub(:readlines) do |path|
         case path
         when ".rspec"
-          ["--format", "local"] 
+          ["--format", "local"]
         when /\.rspec/
-          ["--format", "global"] 
+          ["--format", "global"]
         else
           raise "Unexpected path: #{path}"
         end

data/spec/rspec/core/configuration_spec.rb

@@ -35,9 +35,9 @@ module RSpec::Core
         config.mock_with :rspec
         config.require_mock_framework_adapter
       end
-      
-    end  
-   
+
+    end
+
     context "setting the files to run" do
 
       it "loads files not following pattern if named explicitly" do
@@ -85,7 +85,7 @@ module RSpec::Core
           config.files_or_directories_to_run = dir
           config.files_to_run.should_not include("#{dir}/a_bar.rb")
         end
-        
+
       end
 
       context "with explicit pattern (comma,separated,values)" do
@@ -129,7 +129,7 @@ module RSpec::Core
       end
 
     end
-    
+
     describe "include" do
 
       module InstanceLevelMethods
@@ -173,7 +173,7 @@ module RSpec::Core
 
       it "should extend the given module into each matching example group" do
         RSpec.configure do |c|
-          c.extend(ThatThingISentYou, :magic_key => :extend)      
+          c.extend(ThatThingISentYou, :magic_key => :extend)
         end
 
         group = ExampleGroup.describe(ThatThingISentYou, :magic_key => :extend) { }
@@ -229,7 +229,7 @@ module RSpec::Core
             it "warns to install win32console" do
               config.stub(:require) { raise LoadError }
               config.should_receive(:warn).
-                with /You must 'gem install win32console'/
+                with(/You must 'gem install win32console'/)
               config.color_enabled = true
             end
 
@@ -242,7 +242,7 @@ module RSpec::Core
         end
       end
     end
-    
+
     describe 'formatter=' do
 
       it "sets formatter_to_use based on name" do
@@ -257,7 +257,7 @@ module RSpec::Core
         config.formatter = formatter_class
         config.formatter.should be_an_instance_of(formatter_class)
       end
-      
+
       it "sets a formatter based on its class name" do
         Object.const_set("CustomFormatter", Class.new(Formatters::BaseFormatter))
         config.formatter = "CustomFormatter"
@@ -273,7 +273,7 @@ module RSpec::Core
       it "raises ArgumentError if formatter is unknown" do
         lambda { config.formatter = :progresss }.should raise_error(ArgumentError)
       end
-      
+
     end
 
     describe "#filter_run" do