rspec-core 2.0.1 → 2.1.0

data/lib/rspec/core/example.rb

@@ -23,11 +23,6 @@ module RSpec
         @example_group_class
       end
 
-      def behaviour
-        RSpec.deprecate("behaviour", "example_group")
-        example_group
-      end
-
       def pending?
         !!pending
       end

data/lib/rspec/core/example_group.rb

@@ -4,14 +4,15 @@ module RSpec
       extend  Extensions::ModuleEvalWithArgs
       include Extensions::InstanceEvalWithArgs
       extend  Hooks
-      include Subject
+      extend  Subject::ClassMethods
+      include Subject::InstanceMethods
       include Let
       include Pending
 
       attr_accessor :example
 
       def running_example
-        RSpec.deprecate('running_example', 'example')
+        RSpec.deprecate("running_example", "example")
         example
       end
 
@@ -19,9 +20,9 @@ module RSpec
         RSpec.world
       end
 
-      def self.inherited(klass)
+      def self.register
         RSpec::Core::Runner.autorun
-        world.example_groups << klass if klass.top_level?
+        world.register(self)
       end
 
       class << self
@@ -68,8 +69,8 @@ module RSpec
             raise "Could not find shared example group named \#{name.inspect}" unless shared_block
 
             group = describe("#{report_label || "it should behave like"} \#{name}") do
-              module_eval_with_args *args, &shared_block
-              module_eval &customization_block if customization_block
+              module_eval_with_args(*args, &shared_block)
+              module_eval(&customization_block) if customization_block
             end
             group.metadata[:shared_group_name] = name
             group
@@ -267,8 +268,8 @@ An error occurred in an after(:all) hook.
         end.all?
       end
 
-      def self.all_apply?(filters)
-        metadata.all_apply?(filters)
+      def self.apply?(predicate, filters)
+        metadata.apply?(predicate, filters)
       end
 
       def self.declaration_line_numbers

data/lib/rspec/core/expecting/with_rspec.rb

@@ -0,0 +1,11 @@
+require 'rspec/expectations'
+
+module RSpec
+  module Core
+    module ExpectationFrameworkAdapter
+
+      include RSpec::Matchers
+
+    end
+  end
+end

data/lib/rspec/core/extensions/object.rb

@@ -3,7 +3,7 @@ module RSpec
     module ObjectExtensions
       def describe(*args, &example_group_block)
         args << {} unless args.last.is_a?(Hash)
-        RSpec::Core::ExampleGroup.describe(*args, &example_group_block)
+        RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
       end
     end
   end

data/lib/rspec/core/formatters/base_formatter.rb

@@ -12,7 +12,7 @@ module RSpec
         attr_reader :failed_examples, :pending_examples
 
         def initialize(output)
-          @output = output
+          @output = output || StringIO.new
           @example_count = @pending_count = @failure_count = 0
           @examples = []
           @failed_examples = []
@@ -45,11 +45,6 @@ module RSpec
         def example_group_finished(example_group)
         end
 
-        def add_example_group(example_group)
-          RSpec.deprecate("add_example_group", "example_group_started")
-          example_group_started(example_group)
-        end
-
         def example_started(example)
           examples << example
         end

data/lib/rspec/core/hooks.rb

@@ -11,7 +11,7 @@ module RSpec
         end
 
         def options_apply?(group)
-          !group || group.all_apply?(options)
+          !group || group.apply?(:all?, options)
         end
 
         def to_proc

data/lib/rspec/core/metadata.rb

@@ -32,7 +32,7 @@ module RSpec
         self[:example_group][:full_description] = full_description_from(*args)
 
         self[:example_group][:block] = user_metadata.delete(:example_group_block)
-        self[:example_group][:file_path], self[:example_group][:line_number] = file_and_line_number_from(caller)
+        self[:example_group][:file_path], self[:example_group][:line_number] = file_and_line_number_from(user_metadata.delete(:caller) || caller)
         self[:example_group][:location] = location_from(self[:example_group])
 
         update(user_metadata)
@@ -68,13 +68,13 @@ EOM
         store(:description, description.to_s)
         store(:full_description, "#{self[:example_group][:full_description]} #{self[:description]}")
         store(:execution_result, {})
-        self[:file_path], self[:line_number] = file_and_line_number_from(caller)
+        self[:file_path], self[:line_number] = file_and_line_number_from(options.delete(:caller) || caller)
         self[:location] = location_from(self)
         update(options)
       end
 
-      def all_apply?(filters)
-        filters.all? do |key, value|
+      def apply?(predicate, filters)
+        filters.send(predicate) do |key, value|
           apply_condition(key, value)
         end
       end
@@ -96,7 +96,17 @@ EOM
         when Regexp
           metadata[key] =~ value
         when Proc
-          value.call(metadata[key]) rescue false
+          if value.arity == 2
+            # Pass the metadata hash to allow the proc to check if it even has the key.
+            # This is necessary for the implicit :if exclusion filter:
+            #   {            } # => run the example
+            #   { :if => nil } # => exclude the example
+            # The value of metadata[:if] is the same in these two cases but
+            # they need to be treated differently.
+            value.call(metadata[key], metadata) rescue false
+          else
+            value.call(metadata[key]) rescue false
+          end
         when Fixnum
           if key == :line_number
             relevant_line_numbers(metadata).include?(world.preceding_declaration_line(value))

data/lib/rspec/core/option_parser.rb

@@ -99,6 +99,23 @@ module RSpec::Core
         parser.on('--autotest') do |o|
           options[:autotest] = true
         end
+
+        parser.on('--fail-fast', 'Use the fail_fast option to tell RSpec to abort the run on first failure.') do |o|
+          options[:fail_fast] = true
+        end
+
+        parser.on('-t', '--tag TAG[:VALUE]', 'Run examples with the specified tag',
+                'To exclude examples, add ~ before the tag (e.g. ~slow)',
+                '(TAG is always converted to a symbol)') do |tag|
+          filter_type = tag =~ /^~/ ? :exclusion_filter : :filter
+
+          name,value = tag.gsub(/^(~@|~|@)/, '').split(':')
+          name = name.to_sym
+          value = true if value.nil?
+
+          options[filter_type] ||= {}
+          options[filter_type][name] = value
+        end
       end
     end
   end

data/lib/rspec/core/pending.rb

@@ -1,7 +1,16 @@
 module RSpec
   module Core
     module Pending
-      def pending(message = 'No reason given')
+      DEFAULT_MESSAGE = 'No reason given'
+
+      def pending(*args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        message = args.first || DEFAULT_MESSAGE
+
+        if options[:unless] || (options.has_key?(:if) && !options[:if])
+          return block_given? ? yield : nil
+        end
+
         example.metadata[:pending] = true
         example.metadata[:execution_result][:pending_message] = message
         if block_given?

data/lib/rspec/core/rake_task.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'rspec/core'
 require 'rspec/core/deprecation'
 require 'rake'
 require 'rake/tasklib'
@@ -20,7 +21,22 @@ module RSpec
       #   'spec/**/*_spec.rb'
       attr_accessor :pattern
 
+      # By default, if there is a Gemfile, the generated command will include
+      # 'bundle exec'. Set this to true to ignore the presence of a Gemfile, and
+      # not add 'bundle exec' to the command.
+      #
+      # default:
+      #   false
+      attr_accessor :skip_bundler
+
+      # Name of Gemfile to use
+      #
+      # default:
+      #   Gemfile
+      attr_accessor :gemfile
+
       # Deprecated. Use ruby_opts="-w" instead.
+      #
       # When true, requests that the specs be run with the warning flag set.
       # e.g. "ruby -w"
       #
@@ -29,7 +45,7 @@ module RSpec
       attr_reader :warning
 
       def warning=(true_or_false)
-        RSpec.deprecate("warning", 'ruby_opts="-w"')
+        RSpec.deprecate("RSpec::Core::RakeTask#warning=", 'ruby_opts="-w"')
         @warning = true_or_false
       end
 
@@ -57,7 +73,7 @@ module RSpec
 
       # Path to rcov.
       #
-      # defaults:
+      # default:
       #   'rcov'
       attr_accessor :rcov_path
 
@@ -86,16 +102,22 @@ module RSpec
       attr_accessor :rspec_opts
 
       # Deprecated. Use rspec_opts instead.
+      #
+      # Command line options to pass to rspec.
+      #
+      # default:
+      #   nil
       def spec_opts=(opts)
-        RSpec.deprecate("spec_opts","rspec_opts")
+        RSpec.deprecate('RSpec::Core::RakeTask#spec_opts=', 'rspec_opts=')
         @rspec_opts = opts
       end
 
       def initialize(*args)
         @name = args.shift || :spec
         @pattern, @rcov_path, @rcov_opts, @ruby_opts, @rspec_opts = nil, nil, nil, nil, nil
-        @warning, @rcov = false, false
+        @warning, @rcov, @skip_bundler = false, false, false
         @verbose, @fail_on_error = true, true
+        @gemfile = 'Gemfile'
 
         yield self if block_given?
 
@@ -136,10 +158,10 @@ module RSpec
                             cmd_parts = [ruby_opts]
                             cmd_parts << "-w" if warning?
                             cmd_parts << "-S"
-                            cmd_parts << "bundle exec" if bundler?
+                            cmd_parts << "bundle exec" if gemfile? unless skip_bundler
                             cmd_parts << runner
                             if rcov
-                              cmd_parts << ["-Ispec", rcov_opts]
+                              cmd_parts << ["-Ispec", "-Ilib", rcov_opts]
                             else
                               cmd_parts << rspec_opts
                             end
@@ -157,10 +179,6 @@ module RSpec
         rcov ? rcov_path : rspec_path
       end
 
-      def bundler?
-        File.exist?("./Gemfile")
-      end
-
       def warning?
         warning
       end
@@ -169,6 +187,10 @@ module RSpec
         lambda {|s| s == ""}
       end
 
+      def gemfile?
+        File.exist?(gemfile)
+      end
+
     end
   end
 end

data/lib/rspec/core/reporter.rb

@@ -3,6 +3,7 @@ module RSpec::Core
     def initialize(*formatters)
       @formatters = formatters
       @example_count = @failure_count = @pending_count = 0
+      @duration = @start = nil
     end
 
     def report(count)

data/lib/rspec/core/subject.rb

@@ -1,69 +1,68 @@
-require 'ostruct'
-
 module RSpec
   module Core
     module Subject
+      module InstanceMethods
 
-      def self.included(kls)
-        kls.class_eval do
-          extend ClassMethods
-          alias_method :__should_for_example_group__,     :should
-          alias_method :__should_not_for_example_group__, :should_not
+        # Returns the subject defined by the example group. The subject block is
+        # only executed once per example, the result of which is cached and
+        # returned by any subsequent calls to +subject+.
+        #
+        # If a class is passed to +describe+ and no subject is explicitly
+        # declared in the example group, then +subject+ will return a new
+        # instance of that class.
+        #
+        # == Examples
+        #
+        #   # explicit subject defined by the subject method
+        #   describe Person do
+        #     subject { Person.new(:birthdate => 19.years.ago) }
+        #     it "should be eligible to vote" do
+        #       subject.should be_eligible_to_vote
+        #     end
+        #   end
+        #
+        #   # implicit subject => { Person.new }
+        #   describe Person do
+        #     it "should be eligible to vote" do
+        #       subject.should be_eligible_to_vote
+        #     end
+        #   end
+        def subject
+          @original_subject ||= instance_eval(&self.class.subject)
         end
-      end
 
-      # Returns the subject defined by the example group. The subject block is
-      # only executed once per example, the result of which is cached and
-      # returned by any subsequent calls to +subject+.
-      #
-      # If a class is passed to +describe+ and no subject is explicitly
-      # declared in the example group, then +subject+ will return a new
-      # instance of that class.
-      #
-      # == Examples
-      #
-      #   # explicit subject defined by the subject method
-      #   describe Person do
-      #     subject { Person.new(:birthdate => 19.years.ago) }
-      #     it "should be eligible to vote" do
-      #       subject.should be_eligible_to_vote
-      #     end
-      #   end
-      #
-      #   # implicit subject => { Person.new }
-      #   describe Person do
-      #     it "should be eligible to vote" do
-      #       subject.should be_eligible_to_vote
-      #     end
-      #   end
-      def subject
-        @original_subject ||= instance_eval(&self.class.subject)
-      end
+        begin
+          require 'rspec/expectations/extensions/kernel'
+          alias_method :__should_for_example_group__,     :should
+          alias_method :__should_not_for_example_group__, :should_not
 
-      # When +should+ is called with no explicit receiver, the call is
-      # delegated to the object returned by +subject+. Combined with
-      # an implicit subject (see +subject+), this supports very concise
-      # expressions.
-      #
-      # == Examples
-      #
-      #   describe Person do
-      #     it { should be_eligible_to_vote }
-      #   end
-      def should(matcher=nil, message=nil)
-        self == subject ? self.__should_for_example_group__(matcher) : subject.should(matcher,message)
-      end
+          # When +should+ is called with no explicit receiver, the call is
+          # delegated to the object returned by +subject+. Combined with
+          # an implicit subject (see +subject+), this supports very concise
+          # expressions.
+          #
+          # == Examples
+          #
+          #   describe Person do
+          #     it { should be_eligible_to_vote }
+          #   end
+          def should(matcher=nil, message=nil)
+            self == subject ? self.__should_for_example_group__(matcher) : subject.should(matcher,message)
+          end
 
-      # Just like +should+, +should_not+ delegates to the subject (implicit or
-      # explicit) of the example group.
-      #
-      # == Examples
-      #
-      #   describe Person do
-      #     it { should_not be_eligible_to_vote }
-      #   end
-      def should_not(matcher=nil, message=nil)
-        self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher,message)
+          # Just like +should+, +should_not+ delegates to the subject (implicit or
+          # explicit) of the example group.
+          #
+          # == Examples
+          #
+          #   describe Person do
+          #     it { should_not be_eligible_to_vote }
+          #   end
+          def should_not(matcher=nil, message=nil)
+            self == subject ? self.__should_not_for_example_group__(matcher) : subject.should_not(matcher,message)
+          end
+        rescue LoadError
+        end
       end
 
       module ClassMethods
@@ -150,7 +149,7 @@ module RSpec
 
         attr_reader :explicit_subject_block # :nodoc:
 
-      private
+        private
 
         def explicit_subject
           group = self