rspec-core 2.14.3 → 2.14.4

data/Changelog.md

@@ -1,3 +1,26 @@
+### 2.14.4 / 2013-07-21
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.14.3...v2.14.4)
+
+Bug fixes
+
+* Fix regression in 2.14: ensure configured requires (via `-r` option)
+  are loaded before spec files are loaded. This allows the spec files
+  to programatically change the file pattern (Jon Rowe).
+* Autoload `RSpec::Mocks` and `RSpec::Expectations` when referenced if
+  they are not already loaded (`RSpec::Matches` has been autoloaded
+  for a while). In the `rspec` gem, we changed it recently to stop
+  loading `rspec/mocks` and `rspec/expectations` by default, as some
+  users reported problems where they were intending to use mocha,
+  not rspec-mocks, but rspec-mocks was loaded and causing a conflict.
+  rspec-core loads mocks and expectations at the appropriate time, so
+  it seemed like a safe change -- but caused a problem for some authors
+  of libraries that integrate with RSpec. This fixes that problem.
+  (Myron Marston)
+* Gracefully handle a command like `rspec --profile path/to/spec.rb`:
+  the `path/to/spec.rb` arg was being wrongly treated as the `profile`
+  integer arg, which got cast `0` using `to_i`, causing no profiled
+  examples to be printed. (Jon Rowe)
+
 ### 2.14.3 / 2013-07-13
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.14.2...v2.14.3)
 

data/features/command_line/pattern_option.feature

@@ -29,3 +29,21 @@ Feature: pattern option
       """
     When I run `rspec --pattern "spec/**/*.spec"`
     Then the output should contain "1 example, 0 failures"
+
+  Scenario: override the default pattern in configuration
+    Given a file named "spec/spec_helper.rb" with:
+      """ruby
+        RSpec.configure do |config|
+          config.pattern << ',**/*.spec'
+        end
+      """
+    And a file named "spec/example.spec" with:
+      """ruby
+      describe "addition" do
+        it "adds things" do
+          (1 + 2).should eq(3)
+        end
+      end
+      """
+    When I run `rspec -rspec_helper`
+    Then the output should contain "1 example, 0 failures"

data/lib/rspec/core.rb

@@ -143,20 +143,26 @@ WARNING
     end
   end
 
+  MODULES_TO_AUTOLOAD = {
+    :Matchers     => "rspec/expectations",
+    :Expectations => "rspec/expectations",
+    :Mocks        => "rspec/mocks"
+  }
+
   def self.const_missing(name)
-    case name
-      when :Matchers
-        # Load rspec-expectations when RSpec::Matchers is referenced. This allows
-        # people to define custom matchers (using `RSpec::Matchers.define`) before
-        # rspec-core has loaded rspec-expectations (since it delays the loading of
-        # it to allow users to configure a different assertion/expectation
-        # framework). `autoload` can't be used since it works with ruby's built-in
-        # require (e.g. for files that are available relative to a load path dir),
-        # but not with rubygems' extended require.
-        require 'rspec/expectations'
-        ::RSpec::Matchers
-      else super
-    end
+    # Load rspec-expectations when RSpec::Matchers is referenced. This allows
+    # people to define custom matchers (using `RSpec::Matchers.define`) before
+    # rspec-core has loaded rspec-expectations (since it delays the loading of
+    # it to allow users to configure a different assertion/expectation
+    # framework). `autoload` can't be used since it works with ruby's built-in
+    # require (e.g. for files that are available relative to a load path dir),
+    # but not with rubygems' extended require.
+    #
+    # As of rspec 2.14.1, we no longer require `rspec/mocks` and
+    # `rspec/expectations` when `rspec` is required, so we want
+    # to make them available as an autoload. For more info, see:
+    require MODULES_TO_AUTOLOAD.fetch(name) { return super }
+    ::RSpec.const_get(name)
   end
 end
 

data/lib/rspec/core/configuration_options.rb

@@ -20,10 +20,11 @@ module RSpec
 
       def configure(config)
         config.filter_manager = filter_manager
-        process_options_into config
 
+        config.libs = options[:libs] || []
         config.setup_load_path_and_require(options[:requires] || [])
 
+        process_options_into config
         load_formatters_into config
       end
 
@@ -46,13 +47,13 @@ module RSpec
     private
 
       NON_FORCED_OPTIONS = [
-        :debug, :requires, :libs, :profile, :drb, :files_or_directories_to_run,
+        :debug, :requires, :profile, :drb, :libs, :files_or_directories_to_run,
         :line_numbers, :full_description, :full_backtrace, :tty
       ].to_set
 
       MERGED_OPTIONS = [:requires, :libs].to_set
 
-      UNPROCESSABLE_OPTIONS = [:formatters, :requires].to_set
+      UNPROCESSABLE_OPTIONS = [:libs, :formatters, :requires].to_set
 
       def force?(key)
         !NON_FORCED_OPTIONS.include?(key)
@@ -68,7 +69,7 @@ module RSpec
       def process_options_into(config)
         opts = options.reject { |k, _| UNPROCESSABLE_OPTIONS.include? k }
 
-        order(opts.keys, :libs, :default_path, :pattern).each do |key|
+        order(opts.keys, :default_path, :pattern).each do |key|
           force?(key) ? config.force(key => opts[key]) : config.send("#{key}=", opts[key])
         end
       end

data/lib/rspec/core/deprecation.rb

@@ -8,10 +8,12 @@ module RSpec
         # Temporarily support old and new APIs while we transition the other
         # rspec libs to use a hash for the 2nd arg and no version arg
         data = Hash === replacement_or_hash ? replacement_or_hash : { :replacement => replacement_or_hash }
+        call_site = caller.find { |line| line !~ %r{/lib/rspec/(core|mocks|expectations|matchers|rails)/} }
+
         RSpec.configuration.reporter.deprecation(
           {
             :deprecated => deprecated,
-            :call_site => caller(0)[2]
+            :call_site => call_site
           }.merge(data)
         )
       end

data/lib/rspec/core/option_parser.rb

@@ -141,7 +141,14 @@ module RSpec::Core
                                        elsif argument == false
                                          false
                                        else
-                                         argument.to_i
+                                         begin
+                                           Integer(argument)
+                                         rescue ArgumentError
+                                           Kernel.warn "Non integer specified as profile count, seperate " +
+                                                       "your path from options with -- e.g. " +
+                                                       "`rspec --profile -- #{argument}`"
+                                           true
+                                         end
                                        end
         end
 

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.14.3'
+      STRING = '2.14.4'
     end
   end
 end

data/spec/rspec/core/configuration_options_spec.rb

@@ -29,6 +29,14 @@ describe RSpec::Core::ConfigurationOptions, :isolated_directory => true, :isolat
       opts.configure(config)
     end
 
+    it "sends loads requires before loading specs" do
+      opts = config_options_object(*%w[-rspec_helper])
+      config = double("config").as_null_object
+      expect(config).to receive(:setup_load_path_and_require).ordered
+      expect(config).to receive(:files_or_directories_to_run=).ordered
+      opts.configure(config)
+    end
+
     it "sets up load path and requires before formatter" do
       opts = config_options_object(*%w[--require a/path -f a/formatter])
       config = double("config").as_null_object

data/spec/rspec/core/deprecation_spec.rb

@@ -14,7 +14,7 @@ describe RSpec::Core::Deprecation do
       end
 
       it "adds the call site" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :call_site => caller(0)[1])
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
         RSpec.deprecate("deprecated_method")
       end
 
@@ -31,7 +31,7 @@ describe RSpec::Core::Deprecation do
       end
 
       it "adds the call site" do
-        expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :call_site => caller(0)[1])
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
         RSpec.deprecate("deprecated_method")
       end
     end

data/spec/rspec/core/option_parser_spec.rb

@@ -205,6 +205,32 @@ module RSpec::Core
       end
     end
 
+    describe '--profile' do
+      it 'sets profile_examples to true by default' do
+        options = Parser.parse!(%w[--profile])
+        expect(options[:profile_examples]).to eq true
+      end
+
+      it 'sets profile_examples to supplied int' do
+        options = Parser.parse!(%w[--profile 10])
+        expect(options[:profile_examples]).to eq 10
+      end
+
+      it 'sets profile_examples to true when accidentally combined with path' do
+        allow(Kernel).to receive(:warn)
+        options = Parser.parse!(%w[--profile some/path])
+        expect(options[:profile_examples]).to eq true
+      end
+
+      it 'warns when accidentally combined with path' do
+        expect(Kernel).to receive(:warn) do |msg|
+          expect(msg).to match "Non integer specified as profile count"
+        end
+        options = Parser.parse!(%w[--profile some/path])
+        expect(options[:profile_examples]).to eq true
+      end
+    end
+
     describe '--warning' do
       it 'enables warnings' do
         options = Parser.parse!(%w[--warnings])

data/spec/rspec/core_spec.rb

@@ -52,4 +52,23 @@ describe RSpec do
       expect(RSpec.world).not_to equal(world_before_reset)
     end
   end
+
+  # This is hard to test :(. Best way I could come up with was starting
+  # fresh ruby process w/o this stuff already loaded.
+  it "loads mocks and expectations when the constants are referenced" do
+    code = "$LOAD_PATH.replace(#{$LOAD_PATH.inspect}); " +
+           'require "rspec"; ' +
+           "puts RSpec::Mocks.name; " +
+           "puts RSpec::Expectations.name"
+
+    result = `ruby -e '#{code}'`.chomp
+    expect(result.split("\n")).to eq(%w[ RSpec::Mocks RSpec::Expectations ])
+  end
+
+  it 'correctly raises an error when an invalid const is referenced' do
+    expect {
+      RSpec::NotAConst
+    }.to raise_error(NameError, /uninitialized constant RSpec::NotAConst/)
+  end
 end
+

data/spec/support/helper_methods.rb

@@ -23,4 +23,14 @@ module RSpecHelpers
     end
   end
 
+  def expect_deprecation_with_call_site(file, line)
+    expect(RSpec.configuration.reporter).to receive(:deprecation) do |options|
+      expect(options[:call_site]).to include([file, line].join(':'))
+    end
+  end
+
+  def allow_deprecation
+    allow(RSpec.configuration.reporter).to receive(:deprecation)
+  end
+
 end

metadata

@@ -2,7 +2,7 @@
 name: rspec-core
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.3
+  version: 2.14.4
 platform: ruby
 authors:
 - Steven Baker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -383,7 +383,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -605318191614617076
+      hash: 409767049060748500
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -392,14 +392,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -605318191614617076
+      hash: 409767049060748500
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.14.3
+summary: rspec-core-2.14.4
 test_files:
 - features/Autotest.md
 - features/README.md