rspec-core 2.6.0 → 2.6.2.rc

data/Rakefile

@@ -2,6 +2,20 @@ require "bundler"
 Bundler.setup
 Bundler::GemHelper.install_tasks
 
+task :build => :raise_if_psych_is_defined
+
+task :raise_if_psych_is_defined do
+  if defined?(Psych)
+    raise <<-MSG
+===============================================================================
+Gems compiled in Ruby environments with Psych loaded are incompatible with Ruby
+environments that don't have Psych loaded. Try building this gem in Ruby 1.8.7
+instead.
+===============================================================================
+MSG
+  end
+end
+
 require "rake"
 require "yaml"
 
@@ -10,6 +24,7 @@ require "rspec/core/rake_task"
 require "rspec/core/version"
 
 cucumber_loaded = false
+
 begin
   require "cucumber/rake/task"
 

data/features/Changelog.md

@@ -1,3 +1,19 @@
+### 2.6.2 / 2011-05-20
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.1...v2.6.2)
+
+* Bug fixes
+  * Warn rather than raise when HOME env var is not defined
+  * Properly merge command-line exclusions with default :if and :unless (joshcooper)
+
+### 2.6.1 / 2011-05-19
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0...v2.6.1)
+
+* Bug fixes
+  * Don't extend nil when filters are nil
+  * `require 'rspec/autorun'` when running rcov.
+
 ### 2.6.0 / 2011-05-12
 
 [full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0)

data/lib/rspec/core.rb

@@ -26,6 +26,8 @@ require 'rspec/core/example_group'
 require 'rspec/core/version'
 require 'rspec/core/errors'
 
+require 'rspec/autorun' if $0.split(File::SEPARATOR).last == 'rcov'
+
 module RSpec
   autoload :Matchers, 'rspec/matchers'
 
@@ -60,6 +62,13 @@ module RSpec
     @configuration ||= RSpec::Core::Configuration.new
   end
 
+  # Yields the global configuration object
+  #
+  # == Examples
+  #
+  # RSpec.configure do |config|
+  #   config.format = 'documentation'
+  # end
   def self.configure
     warn_about_deprecated_configure if RSpec.world.example_groups.any?
     yield configuration if block_given?

data/lib/rspec/core/backward_compatibility.rb

@@ -13,7 +13,7 @@ be removed from a future version of RSpec.
 
 * #{name} is deprecated.
 * RSpec is the new top-level module in RSpec-2
-***************************************************************
+*****************************************************************
 WARNING
           RSpec
         else

data/lib/rspec/core/configuration.rb

@@ -349,10 +349,17 @@ EOM
         settings[:exclusion_filter] = filter
       end
 
+      def exclusion_filter
+        settings[:exclusion_filter] || {}
+      end
+
       def inclusion_filter=(filter)
         settings[:inclusion_filter] = filter
       end
 
+      def inclusion_filter
+        settings[:inclusion_filter] || {}
+      end
       def filter_run_including(*args)
         force_overwrite = if args.last.is_a?(Hash) || args.last.is_a?(Symbol)
           false
@@ -362,7 +369,7 @@ EOM
 
         options = build_metadata_hash_from(args)
 
-        if inclusion_filter and inclusion_filter[:line_number] || inclusion_filter[:full_description]
+        if inclusion_filter[:line_number] || inclusion_filter[:full_description]
           warn "Filtering by #{options.inspect} is not possible since " \
                "you are already filtering by #{inclusion_filter.inspect}"
         else

data/lib/rspec/core/configuration_options.rb

@@ -2,9 +2,6 @@ module RSpec
   module Core
 
     class ConfigurationOptions
-      LOCAL_OPTIONS_FILE  = ".rspec"
-      GLOBAL_OPTIONS_FILE = File.join(File.expand_path("~"), ".rspec")
-
       attr_reader :options
 
       def initialize(args)
@@ -15,15 +12,16 @@ module RSpec
         keys = options.keys
         keys.unshift(:requires) if keys.delete(:requires)
         keys.unshift(:libs)     if keys.delete(:libs)
+        
         formatters = options[:formatters] if keys.delete(:formatters)
+        
+        config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
+        
         keys.each do |key|
           config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
         end
-        if formatters
-          formatters.each do |pair|
-            config.add_formatter(*pair)
-          end
-        end
+        
+        formatters.each {|pair| config.add_formatter(*pair) } if formatters
       end
 
       def drb_argv
@@ -79,11 +77,11 @@ module RSpec
       end
 
       def local_options
-        @local_options ||= options_from(LOCAL_OPTIONS_FILE)
+        @local_options ||= options_from(local_options_file)
       end
 
       def global_options
-        @global_options ||= options_from(GLOBAL_OPTIONS_FILE)
+        @global_options ||= options_from(global_options_file)
       end
 
       def options_from(path)
@@ -91,7 +89,7 @@ module RSpec
       end
 
       def args_from_options_file(path)
-        return [] unless File.exist?(path)
+        return [] unless path && File.exist?(path)
         config_string = options_file_as_erb_string(path)
         config_string.split(/\n+/).map {|l| l.split}.flatten
       end
@@ -104,6 +102,20 @@ module RSpec
       def custom_options_file
         command_line_options[:custom_options_file]
       end
+
+      def local_options_file
+        ".rspec"
+      end
+
+      def global_options_file
+        begin
+          File.join(File.expand_path("~"), ".rspec")
+        rescue ArgumentError
+          warn "Unable to find ~/.rspec because the HOME environment variable is not set"
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/rspec/core/reporter.rb

@@ -11,11 +11,11 @@ module RSpec::Core
       begin
         yield self
       ensure
-        conclude
+        finish
       end
     end
 
-    def conclude
+    def finish
       begin
         stop
         notify :start_dump
@@ -27,7 +27,7 @@ module RSpec::Core
       end
     end
 
-    alias_method :abort, :conclude
+    alias_method :abort, :finish
 
     def start(expected_example_count)
       @start = Time.now

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0'
+      STRING = '2.6.2.rc'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -34,8 +34,8 @@ module RSpec
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
-            examples = apply_exclusion_filters(examples, exclusion_filter) if exclusion_filter
-            examples = apply_inclusion_filters(examples, inclusion_filter) if inclusion_filter
+            examples = apply_exclusion_filters(examples, exclusion_filter)
+            examples = apply_inclusion_filters(examples, inclusion_filter)
             examples.uniq
           end
         }
@@ -106,13 +106,13 @@ module RSpec
           example_groups.clear
           if filter_announcements.empty?
             reporter.message("No examples found.")
-          elsif inclusion_filter
+          elsif !inclusion_filter.empty?
             message = "No examples matched #{inclusion_filter.description}."
             if @configuration.run_all_when_everything_filtered?
               message << " Running all."
             end
             reporter.message(message)
-          elsif exclusion_filter
+          elsif !exclusion_filter.empty?
             reporter.message(
               "No examples were matched. Perhaps #{exclusion_filter.description} is excluding everything?")
           end
@@ -122,7 +122,7 @@ module RSpec
       end
 
       def announce_inclusion_filter(announcements)
-        if inclusion_filter
+        unless inclusion_filter.empty?
           announcements << "including #{inclusion_filter.description}"
         end
       end
@@ -139,8 +139,8 @@ module RSpec
 
     private
 
-      def apply?(predicate, conditions)
-        lambda {|example| example.metadata.apply?(predicate, conditions)}
+      def apply?(predicate, filter)
+        lambda {|example| filter.empty? || example.metadata.apply?(predicate, filter)}
       end
 
       def declaration_line_numbers

data/spec/rspec/core/configuration_options_spec.rb

@@ -14,6 +14,17 @@ describe RSpec::Core::ConfigurationOptions do
     config_options_object(*args).options
   end
 
+  it "warns when HOME env var is not set" do
+    begin
+      orig_home = ENV.delete("HOME")
+      coo = RSpec::Core::ConfigurationOptions.new([])
+      coo.should_receive(:warn)
+      coo.parse_options
+    ensure
+      ENV["HOME"] = orig_home
+    end
+  end
+
   describe "#configure" do
     it "sends libs before requires" do
       opts = config_options_object(*%w[--require a/path -I a/lib])
@@ -30,6 +41,13 @@ describe RSpec::Core::ConfigurationOptions do
       config.should_receive(:add_formatter).ordered
       opts.configure(config)
     end
+    
+    it "merges the :exclusion_filter option with the default exclusion_filter" do
+      opts = config_options_object(*%w[--tag ~slow])
+      config = RSpec::Core::Configuration.new
+      opts.configure(config)
+      config.exclusion_filter.should have_key(:slow)
+    end
   end
 
   describe "-c, --color, and --colour" do
@@ -279,23 +297,16 @@ describe RSpec::Core::ConfigurationOptions do
 
     before do
       @orig_spec_opts = ENV["SPEC_OPTS"]
-      @orig_global_options_file = RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE
-      @orig_local_options_file  = RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = global_options_file
-      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = local_options_file
-      FileUtils.rm local_options_file if File.exist? local_options_file
-      FileUtils.rm global_options_file if File.exist? global_options_file
-      FileUtils.rm custom_options_file if File.exist? custom_options_file
+      RSpec::Core::ConfigurationOptions::send :public, :global_options_file
+      RSpec::Core::ConfigurationOptions::send :public, :local_options_file
+      RSpec::Core::ConfigurationOptions::any_instance.stub(:global_options_file) { global_options_file }
+      RSpec::Core::ConfigurationOptions::any_instance.stub(:local_options_file) { local_options_file }
     end
 
     after do
       ENV["SPEC_OPTS"] = @orig_spec_opts
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :GLOBAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::__send__ :remove_const, :LOCAL_OPTIONS_FILE
-      RSpec::Core::ConfigurationOptions::GLOBAL_OPTIONS_FILE = @orig_global_options_file
-      RSpec::Core::ConfigurationOptions::LOCAL_OPTIONS_FILE  = @orig_local_options_file
+      RSpec::Core::ConfigurationOptions::send :private, :global_options_file
+      RSpec::Core::ConfigurationOptions::send :private, :local_options_file
     end
 
     def write_options(scope, options)

data/spec/rspec/core/configuration_spec.rb

@@ -527,7 +527,20 @@ module RSpec::Core
       end
     end
 
+    describe "#inclusion_filter" do
+      it "returns {} even if set to nil" do
+        config.inclusion_filter = nil
+        config.inclusion_filter.should eq({})
+      end
+    end
+
+
     describe "#exclusion_filter" do
+      it "returns {} even if set to nil" do
+        config.exclusion_filter = nil
+        config.exclusion_filter.should eq({})
+      end
+
       describe "the default :if filter" do
         it "does not exclude a spec with no :if metadata" do
           config.exclusion_filter[:if].call(nil, {}).should be_false

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 7712002
+  prerelease: 6
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 2
+  - rc
+  version: 2.6.2.rc
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
+date: 2011-05-20 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -229,19 +230,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.6.0
+summary: rspec-core-2.6.2.rc
 test_files: 
 - features/Autotest.md
 - features/Changelog.md