rspec-core 2.0.0.beta.20 → 2.0.0.beta.22

data/lib/rspec/core/shared_example_group.rb

@@ -22,7 +22,8 @@ module RSpec
           end
 
           def self.included(kls)
-            kls.module_eval(&@shared_block)
+            kls.describe(&@shared_block)
+            kls.children.first.metadata[:shared_group_name] = name
           end
         end
 

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = File.readlines(File.expand_path('../../../../VERSION', __FILE__)).first
+      STRING = '2.0.0.beta.22'
     end
   end
 end

data/rspec-core.gemspec

@@ -1,245 +1,45 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "rspec/core/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.20"
-
-  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-08-24}
-  s.default_executable = %q{rspec}
-  s.description = %q{RSpec runner and example groups}
-  s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
-  s.executables = ["rspec"]
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rspec",
-     ".treasure_map.rb",
-     "Gemfile",
-     "License.txt",
-     "README.markdown",
-     "Rakefile",
-     "Upgrade.markdown",
-     "VERSION",
-     "autotest/discover.rb",
-     "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",
-     "features/command_line/line_number_option.feature",
-     "features/configuration/custom_settings.feature",
-     "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/exclusion_filters.feature",
-     "features/filtering/inclusion_filters.feature",
-     "features/formatters/custom_formatter.feature",
-     "features/hooks/around_hooks.feature",
-     "features/hooks/before_and_after_hooks.feature",
-     "features/hooks/described_class.feature",
-     "features/hooks/halt.feature",
-     "features/mock_framework_integration/use_flexmock.feature",
-     "features/mock_framework_integration/use_mocha.feature",
-     "features/mock_framework_integration/use_rr.feature",
-     "features/mock_framework_integration/use_rspec.feature",
-     "features/pending/pending_examples.feature",
-     "features/spec_files/arbitrary_file_suffix.feature",
-     "features/subject/attribute_of_subject.feature",
-     "features/subject/explicit_subject.feature",
-     "features/subject/implicit_subject.feature",
-     "features/support/env.rb",
-     "lib/autotest/rspec2.rb",
-     "lib/rspec/autorun.rb",
-     "lib/rspec/core.rb",
-     "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",
-     "lib/rspec/core/drb_command_line.rb",
-     "lib/rspec/core/errors.rb",
-     "lib/rspec/core/example.rb",
-     "lib/rspec/core/example_group.rb",
-     "lib/rspec/core/extensions.rb",
-     "lib/rspec/core/extensions/instance_eval_with_args.rb",
-     "lib/rspec/core/extensions/kernel.rb",
-     "lib/rspec/core/extensions/module_eval_with_args.rb",
-     "lib/rspec/core/extensions/object.rb",
-     "lib/rspec/core/formatters.rb",
-     "lib/rspec/core/formatters/base_formatter.rb",
-     "lib/rspec/core/formatters/base_text_formatter.rb",
-     "lib/rspec/core/formatters/documentation_formatter.rb",
-     "lib/rspec/core/formatters/helpers.rb",
-     "lib/rspec/core/formatters/html_formatter.rb",
-     "lib/rspec/core/formatters/progress_formatter.rb",
-     "lib/rspec/core/formatters/snippet_extractor.rb",
-     "lib/rspec/core/formatters/text_mate_formatter.rb",
-     "lib/rspec/core/hooks.rb",
-     "lib/rspec/core/let.rb",
-     "lib/rspec/core/load_path.rb",
-     "lib/rspec/core/metadata.rb",
-     "lib/rspec/core/mocking/with_absolutely_nothing.rb",
-     "lib/rspec/core/mocking/with_flexmock.rb",
-     "lib/rspec/core/mocking/with_mocha.rb",
-     "lib/rspec/core/mocking/with_rr.rb",
-     "lib/rspec/core/mocking/with_rspec.rb",
-     "lib/rspec/core/option_parser.rb",
-     "lib/rspec/core/pending.rb",
-     "lib/rspec/core/rake_task.rb",
-     "lib/rspec/core/reporter.rb",
-     "lib/rspec/core/ruby_project.rb",
-     "lib/rspec/core/runner.rb",
-     "lib/rspec/core/shared_example_group.rb",
-     "lib/rspec/core/subject.rb",
-     "lib/rspec/core/version.rb",
-     "lib/rspec/core/world.rb",
-     "lib/rspec/monkey.rb",
-     "lib/rspec/monkey/spork/test_framework/rspec.rb",
-     "rspec-core.gemspec",
-     "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",
-     "spec/rspec/core/configuration_spec.rb",
-     "spec/rspec/core/deprecations_spec.rb",
-     "spec/rspec/core/drb_command_line_spec.rb",
-     "spec/rspec/core/example_group_spec.rb",
-     "spec/rspec/core/example_spec.rb",
-     "spec/rspec/core/formatters/base_formatter_spec.rb",
-     "spec/rspec/core/formatters/base_text_formatter_spec.rb",
-     "spec/rspec/core/formatters/documentation_formatter_spec.rb",
-     "spec/rspec/core/formatters/helpers_spec.rb",
-     "spec/rspec/core/formatters/html_formatted-1.8.6.html",
-     "spec/rspec/core/formatters/html_formatted-1.8.7.html",
-     "spec/rspec/core/formatters/html_formatted-1.9.1.html",
-     "spec/rspec/core/formatters/html_formatted-1.9.2.html",
-     "spec/rspec/core/formatters/html_formatter_spec.rb",
-     "spec/rspec/core/formatters/progress_formatter_spec.rb",
-     "spec/rspec/core/formatters/snippet_extractor_spec.rb",
-     "spec/rspec/core/formatters/text_mate_formatted-1.8.6.html",
-     "spec/rspec/core/formatters/text_mate_formatted-1.8.7.html",
-     "spec/rspec/core/formatters/text_mate_formatted-1.9.2.html",
-     "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
-     "spec/rspec/core/hooks_filtering_spec.rb",
-     "spec/rspec/core/hooks_spec.rb",
-     "spec/rspec/core/kernel_extensions_spec.rb",
-     "spec/rspec/core/let_spec.rb",
-     "spec/rspec/core/metadata_spec.rb",
-     "spec/rspec/core/option_parser_spec.rb",
-     "spec/rspec/core/pending_example_spec.rb",
-     "spec/rspec/core/reporter_spec.rb",
-     "spec/rspec/core/resources/a_bar.rb",
-     "spec/rspec/core/resources/a_foo.rb",
-     "spec/rspec/core/resources/a_spec.rb",
-     "spec/rspec/core/resources/custom_example_group_runner.rb",
-     "spec/rspec/core/resources/formatter_specs.rb",
-     "spec/rspec/core/resources/utf8_encoded.rb",
-     "spec/rspec/core/ruby_project_spec.rb",
-     "spec/rspec/core/runner_spec.rb",
-     "spec/rspec/core/shared_example_group_spec.rb",
-     "spec/rspec/core/subject_spec.rb",
-     "spec/rspec/core/world_spec.rb",
-     "spec/rspec/core_spec.rb",
-     "spec/ruby_forker.rb",
-     "spec/spec_helper.rb",
-     "spec/support/matchers.rb",
-     "specs.watchr"
-  ]
-  s.homepage = %q{http://github.com/rspec/rspec-core}
-  s.post_install_message = %q{**************************************************
-
-  Thank you for installing rspec-core-2.0.0.beta.20
+  s.name        = "rspec-core"
+  s.version     = RSpec::Core::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Chad Humphries", "David Chelimsky"]
+  s.email       = "dchelimsky@gmail.com;chad.humphries@gmail.com"
+  s.homepage    = "http://github.com/rspec/rspec-core"
+  s.summary     = "rspec-core-#{RSpec::Core::Version::STRING}"
+  s.description = "RSpec runner and example groups"
+
+  s.rubygems_version   = "1.3.7"
+  s.rubyforge_project  = "rspec"
+  s.default_executable = "rspec"
+
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.extra_rdoc_files = [ "README.markdown" ]
+  s.rdoc_options     = ["--charset=UTF-8"]
+  s.require_path     = "lib"
+
+  s.post_install_message = %Q{**************************************************
+
+  Thank you for installing #{s.summary}
 
   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.20}
-  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",
-     "spec/rspec/core/deprecations_spec.rb",
-     "spec/rspec/core/drb_command_line_spec.rb",
-     "spec/rspec/core/example_group_spec.rb",
-     "spec/rspec/core/example_spec.rb",
-     "spec/rspec/core/formatters/base_formatter_spec.rb",
-     "spec/rspec/core/formatters/base_text_formatter_spec.rb",
-     "spec/rspec/core/formatters/documentation_formatter_spec.rb",
-     "spec/rspec/core/formatters/helpers_spec.rb",
-     "spec/rspec/core/formatters/html_formatter_spec.rb",
-     "spec/rspec/core/formatters/progress_formatter_spec.rb",
-     "spec/rspec/core/formatters/snippet_extractor_spec.rb",
-     "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
-     "spec/rspec/core/hooks_filtering_spec.rb",
-     "spec/rspec/core/hooks_spec.rb",
-     "spec/rspec/core/kernel_extensions_spec.rb",
-     "spec/rspec/core/let_spec.rb",
-     "spec/rspec/core/metadata_spec.rb",
-     "spec/rspec/core/option_parser_spec.rb",
-     "spec/rspec/core/pending_example_spec.rb",
-     "spec/rspec/core/reporter_spec.rb",
-     "spec/rspec/core/resources/a_bar.rb",
-     "spec/rspec/core/resources/a_foo.rb",
-     "spec/rspec/core/resources/a_spec.rb",
-     "spec/rspec/core/resources/custom_example_group_runner.rb",
-     "spec/rspec/core/resources/formatter_specs.rb",
-     "spec/rspec/core/resources/utf8_encoded.rb",
-     "spec/rspec/core/ruby_project_spec.rb",
-     "spec/rspec/core/runner_spec.rb",
-     "spec/rspec/core/shared_example_group_spec.rb",
-     "spec/rspec/core/subject_spec.rb",
-     "spec/rspec/core/world_spec.rb",
-     "spec/rspec/core_spec.rb",
-     "spec/ruby_forker.rb",
-     "spec/spec_helper.rb",
-     "spec/support/matchers.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    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.20"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
-      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.20"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
-      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.20"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
-    s.add_dependency(%q<cucumber>, [">= 0.5.3"])
-    s.add_dependency(%q<autotest>, [">= 4.2.9"])
-  end
+  s.add_development_dependency "rspec-expectations", ">= #{RSpec::Core::Version::STRING}"
+  s.add_development_dependency "rspec-mocks",        ">= #{RSpec::Core::Version::STRING}"
+  s.add_development_dependency "cucumber",           ">= 0.5.3"
+  s.add_development_dependency "autotest",           ">= 4.2.9"
+  s.add_development_dependency "syntax",             ">= 1.0.0"
+  s.add_development_dependency "flexmock"
+  s.add_development_dependency "mocha"
+  s.add_development_dependency "rr"
 end
 

data/spec/autotest/failed_results_re_spec.rb

@@ -16,7 +16,6 @@ describe "failed_results_re for autotest" do
     re = Autotest::Rspec2.new.failed_results_re
     re =~ example_output
     $1.should == "group name example name\n     Failure/Error: example = group.example(\"example name\") { \"this\".should eq(\"that\") }"
-    $2.should == "./spec/autotest/failed_results_re_spec.rb"
+    $2.should == __FILE__.sub(File.expand_path('.'),'.')
   end
-
 end

data/spec/autotest/rspec_spec.rb

@@ -1,112 +1,132 @@
 require "spec_helper"
 
 describe Autotest::Rspec2 do
-  describe "commands" do
-    before(:each) do
-      @rspec_autotest = Autotest::Rspec2.new
-      @rspec_autotest.stub!(:ruby).and_return "ruby"
+  let(:rspec_autotest) { Autotest::Rspec2.new }
+  let(:spec_cmd) { File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec')) }
+  let(:ruby_cmd) { "ruby" }
 
-      @ruby = @rspec_autotest.ruby
-      @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
+  describe "commands" do
+    before do
+      rspec_autotest.stub(:ruby => ruby_cmd)
       files = %w[file_one file_two]
       @files_to_test = {
         files[0] => [],
         files[1] => []
       }
       # this is not the inner representation of Autotest!
-      @rspec_autotest.files_to_test = @files_to_test
+      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} (.*)/
+    it "makes the appropriate test command" do
+      actual_command = rspec_autotest.make_test_cmd(@files_to_test)
+      expected_command = /#{ruby_cmd}.*#{spec_cmd} (.*)/
 
-      actual.should match(expected)
+      actual_command.should match(expected_command)
 
-      actual =~ expected
+      actual_command =~ expected_command
       $1.should =~ /#{File.expand_path('file_one')}/
       $1.should =~ /#{File.expand_path('file_two')}/
     end
 
-    it "should return a blank command for no files" do
-      @rspec_autotest.make_test_cmd({}).should == ''
+    it "returns a blank command for no files" do
+      rspec_autotest.make_test_cmd({}).should eq('')
+    end
+
+    it "quotes the paths of files to test" do
+      cmd = rspec_autotest.make_test_cmd(@files_to_test)
+      @files_to_test.keys.each do |file_to_test|
+        cmd.should match(/'#{File.expand_path(file_to_test)}'/)
+      end
     end
   end
 
   describe "mappings" do
-
-    before(:each) do
+    before do
       @lib_file = "lib/something.rb"
       @spec_file = "spec/something_spec.rb"
-      @rspec_autotest = Autotest::Rspec2.new
-      @rspec_autotest.hook :initialize
+      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)
+    it "finds 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)
+    it "finds 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")
+    it "ignores 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")
+    it "ignores untracked files (in @file)"  do
+      rspec_autotest.should map_specs([]).to("lib/untracked_file")
     end
   end
 
   describe "consolidating failures" do
-    before(:each) do
-      @rspec_autotest = Autotest::Rspec2.new
-
+    before do
       @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
+      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 == {}
+    it "returns 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"
+    it "returns 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",
           "#{@spec_file}"
         ]
       ]
-      @rspec_autotest.consolidate_failures(failures).should == {
+      rspec_autotest.consolidate_failures(failures).should == {
         @spec_file => ["false should be false"]
       }
     end
 
-    it "should not include the subject file" do
+    it "does 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"
+      rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
       failures = [
         [
           "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)
+      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
+    it "ensures that a single file appears in files_to_test only once" do
       @files_to_test = {}
       ['filename.rb', './filename.rb', File.expand_path('filename.rb')].each do |file|
         @files_to_test[file] = []
       end
-      @rspec_autotest.normalize(@files_to_test).should have(1).file
+      rspec_autotest.normalize(@files_to_test).should have(1).file
+    end
+  end
+
+  describe "ruby command" do
+    context "using bundler" do
+      it "returns 'bundle exec'" do
+        File.stub(:exists?).with("./Gemfile") { true }
+        rspec_autotest.ruby.should eq("bundle exec")
+      end
+    end
+
+    context "not using bundler" do
+      it "returns the ruby command generated by Autotest" do
+        autotest = Autotest.new
+        autotest_ruby_command = autotest.ruby
+        File.stub(:exists?).with("./Gemfile") { false }
+        rspec_autotest.ruby.should eq(autotest_ruby_command)
+      end
     end
   end
 end