rspec-core 2.5.1 → 2.6.0

data/lib/rspec/core/metadata_hash_builder.rb

@@ -0,0 +1,93 @@
+module RSpec
+  module Core
+    module MetadataHashBuilder
+      module Common
+        def build_metadata_hash_from(args)
+          metadata = args.last.is_a?(Hash) ? args.pop : {}
+
+          if RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values?
+            add_symbols_to_hash(metadata, args)
+          else
+            warn_about_symbol_usage(args)
+          end
+
+          metadata
+        end
+
+        private
+
+          def add_symbols_to_hash(hash, args)
+            while args.last.is_a?(Symbol)
+              hash[args.pop] = true
+            end
+          end
+
+          def warn_about_symbol_usage(args)
+            symbols = args.select { |a| a.is_a?(Symbol) }
+            return if symbols.empty?
+            Kernel.warn symbol_metadata_warning(symbols)
+          end
+      end
+
+      module WithConfigWarning
+        include Common
+
+        private
+
+          def symbol_metadata_warning(symbols)
+            <<-NOTICE
+
+*****************************************************************
+WARNING: You have passed symbols (#{symbols.inspect}) as metadata
+arguments to a configuration option.
+
+In RSpec 3, these symbols will be treated as metadata keys with
+a value of `true`.  To get this behavior now (and prevent this
+warning), you can set a configuration option:
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+Note that this config setting should go before your other config
+settings so that they can use symbols as metadata.
+*****************************************************************
+
+NOTICE
+          end
+      end
+
+      module WithDeprecationWarning
+        include Common
+
+        private
+
+          def symbol_metadata_warning(symbols)
+            <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from RSpec 3.
+
+You have passed symbols (#{symbols.inspect}) as additional
+arguments for a doc string.
+
+In RSpec 3, these symbols will be treated as metadata keys with
+a value of `true`.  To get this behavior now (and prevent this
+warning), you can set a configuration option:
+
+RSpec.configure do |c|
+  c.treat_symbols_as_metadata_keys_with_true_values = true
+end
+
+Alternately, if your intention is to use the symbol as part of the
+doc string (i.e. to specify a method name), you can change it to
+a string such as "#method_name" to remove this warning.
+*****************************************************************
+
+NOTICE
+          end
+        end
+      end
+  end
+end

data/lib/rspec/core/mocking/with_flexmock.rb

@@ -8,6 +8,8 @@ require 'flexmock/rspec'
 module RSpec
   module Core
     module MockFrameworkAdapter
+      
+      def self.framework_name; :flexmock end
 
       include FlexMock::MockContainer
       def setup_mocks_for_rspec

data/lib/rspec/core/mocking/with_mocha.rb

@@ -4,6 +4,8 @@ require 'mocha/object'
 module RSpec
   module Core
     module MockFrameworkAdapter
+      
+      def self.framework_name; :mocha end
 
       # Mocha::Standalone was deprecated as of Mocha 0.9.7.
       begin

data/lib/rspec/core/mocking/with_rr.rb

@@ -5,6 +5,8 @@ RSpec.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFI
 module RSpec
   module Core
     module MockFrameworkAdapter
+      
+      def self.framework_name; :rr end
 
       include RR::Extensions::InstanceMethods
 

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

@@ -3,7 +3,9 @@ require 'rspec/mocks'
 module RSpec
   module Core
     module MockFrameworkAdapter
-
+      
+      def self.framework_name; :rspec end
+      
       def setup_mocks_for_rspec
         RSpec::Mocks::setup(self)
       end

data/lib/rspec/core/option_parser.rb

@@ -1,3 +1,6 @@
+# http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html
+require 'optparse'
+
 module RSpec::Core
   class Parser
     def self.parse!(args)
@@ -33,13 +36,13 @@ module RSpec::Core
           options[:color_enabled] = o
         end
 
-        parser.on('-d', '--debug', 'Enable debugging') do |o|
+        parser.on('-d', '--debugger', 'Enable debugging') do |o|
           options[:debug] = true
         end
 
         parser.on('-e', '--example PATTERN', "Run examples whose full descriptions match this pattern",
                 "(PATTERN is compiled into a Ruby regular expression)") do |o|
-          options[:full_description] = /#{o}/
+          options[:full_description] = Regexp.compile(Regexp.escape(o))
         end
 
         parser.on('-f', '--format FORMATTER', 'Choose a formatter',
@@ -83,6 +86,10 @@ module RSpec::Core
           options[:profile_examples] = o
         end
 
+        parser.on('-P', '--pattern PATTERN', 'Load files those matching this pattern. Default is "spec/**/*_spec.rb"') do |o|
+          options[:pattern] = o
+        end
+
         parser.on('-r', '--require PATH', 'Require a file') do |path|
           options[:requires] ||= []
           options[:requires] << path

data/lib/rspec/core/pending.rb

@@ -1,6 +1,8 @@
 module RSpec
   module Core
     module Pending
+      class PendingDeclaredInExample < StandardError; end
+
       DEFAULT_MESSAGE = 'No reason given'
 
       def pending(*args)
@@ -17,13 +19,18 @@ module RSpec
         example.metadata[:execution_result][:pending_message] = message
         if block_given?
           begin
-            result = yield
+            result = begin
+                       yield
+                       example.example_group_instance.instance_eval { verify_mocks_for_rspec }
+                     end
             example.metadata[:pending] = false
-          rescue Exception => e
+          rescue Exception
+          ensure
+            teardown_mocks_for_rspec
           end
           raise RSpec::Core::PendingExampleFixedError.new if result
         end
-        throw :pending_declared_in_example, message
+        raise PendingDeclaredInExample.new(message)
       end
     end
   end

data/lib/rspec/core/reporter.rb

@@ -39,11 +39,11 @@ module RSpec::Core
     end
 
     def example_group_started(group)
-      notify :example_group_started, group
+      notify :example_group_started, group unless group.descendant_filtered_examples.empty?
     end
 
     def example_group_finished(group)
-      notify :example_group_finished, group
+      notify :example_group_finished, group unless group.descendant_filtered_examples.empty?
     end
 
     def example_started(example)

data/lib/rspec/core/runner.rb

@@ -4,30 +4,32 @@ module RSpec
   module Core
     class Runner
 
+      # Register an at_exit hook that runs the suite.
       def self.autorun
         return if autorun_disabled? || installed_at_exit? || running_in_drb?
         @installed_at_exit = true
-        at_exit { run(ARGV, $stderr, $stdout) ? exit(0) : exit(1) }
-      end
-
-      def self.autorun_disabled?
-        @autorun_disabled ||= false
+        at_exit { exit(run(ARGV, $stderr, $stdout)) }
       end
+      AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
 
       def self.disable_autorun!
         @autorun_disabled = true
       end
 
-      def self.installed_at_exit?
+      def self.autorun_disabled? # :nodoc:
+        @autorun_disabled ||= false
+      end
+
+      def self.installed_at_exit? # :nodoc:
         @installed_at_exit ||= false
       end
 
-      def self.running_in_drb?
-        (DRb.current_server rescue false) && 
+      def self.running_in_drb? # :nodoc:
+        (DRb.current_server rescue false) &&
          DRb.current_server.uri =~ /druby\:\/\/127.0.0.1\:/
       end
 
-      def self.trap_interrupt
+      def self.trap_interrupt # :nodoc:
         trap('INT') do
           exit!(1) if RSpec.wants_to_quit
           RSpec.wants_to_quit = true
@@ -35,23 +37,46 @@ module RSpec
         end
       end
 
-      def self.run(args, err, out)
+      # Run a suite of RSpec examples.
+      #
+      # This is used internally by RSpec to run a suite, but is available
+      # for use by any other automation tool.
+      #
+      # If you want to run this multiple times in the same process, and you
+      # want files like spec_helper.rb to be reloaded, be sure to load `load`
+      # instead of `require`.
+      #
+      # ==== Parameters
+      # * +args+ - an array of command-line-supported arguments
+      # * +err+ - error stream (Default: $stderr)
+      # * +out+ - output stream (Default: $stdout)
+      #
+      # ==== Returns
+      # * +Fixnum+ - exit status code (0/1)
+      def self.run(args, err=$stderr, out=$stdout)
         trap_interrupt
         options = ConfigurationOptions.new(args)
         options.parse_options
 
         if options.options[:drb]
-          run_over_drb(options, err, out) || run_in_process(options, err, out)
+          begin
+            run_over_drb(options, err, out)
+          rescue DRb::DRbConnError
+            err.puts "No DRb server is running. Running in local process instead ..."
+            run_in_process(options, err, out)
+          end
         else
           run_in_process(options, err, out)
         end
+      ensure
+        RSpec.reset
       end
 
-      def self.run_over_drb(options, err, out)
+      def self.run_over_drb(options, err, out) # :nodoc:
         DRbCommandLine.new(options).run(err, out)
       end
 
-      def self.run_in_process(options, err, out)
+      def self.run_in_process(options, err, out) # :nodoc:
         CommandLine.new(options, RSpec::configuration, RSpec::world).run(err, out)
       end
 

data/lib/rspec/core/shared_example_group.rb

@@ -2,12 +2,26 @@ module RSpec
   module Core
     module SharedExampleGroup
 
-      def share_examples_for(name, &block)
-        ensure_shared_example_group_name_not_taken(name)
-        RSpec.world.shared_example_groups[name] = block
+      def shared_context(*args, &block)
+        if String === args.first || Symbol === args.first
+          name = args.shift
+          ensure_shared_example_group_name_not_taken(name)
+          RSpec.world.shared_example_groups[name] = block
+        end
+
+        unless args.empty?
+          mod = Module.new
+          (class << mod; self; end).send(:define_method, :extended) do |host|
+            host.class_eval(&block)
+          end
+          RSpec.configuration.extend(mod, *args)
+        else
+        end
       end
 
-      alias :shared_examples_for :share_examples_for
+      alias :shared_examples     :shared_context
+      alias :share_examples_for  :shared_context
+      alias :shared_examples_for :shared_context
 
       def share_as(name, &block)
         if Object.const_defined?(name)

data/lib/rspec/core/subject.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 module RSpec
   module Core
     module Subject
@@ -108,14 +106,14 @@ module RSpec
         #
         #   describe "a configuration Hash" do
         #     subject do
-        #       { :max_users => 3,
+        #       { :max_users => 3,
         #         'admin' => :all_permissions }
         #     end
         #
         #     its([:max_users]) { should == 3 }
         #     its(['admin']) { should == :all_permissions }
         #
-        #     # You can still access to its regular methods this way:
+        #     # You can still access to its regular methods this way:
         #     its(:keys) { should include(:max_users) }
         #     its(:count) { should == 2 }
         #   end
@@ -124,8 +122,8 @@ module RSpec
             example do
               self.class.class_eval do
                 define_method(:subject) do
-                  @_subject ||= if super().is_a?(Hash) && attribute.is_a?(Array)
-                                  OpenStruct.new(super()).send(attribute.first)
+                  @_subject ||= if attribute.is_a?(Array)
+                                  super()[*attribute]
                                 else
                                   attribute.to_s.split('.').inject(super()) do |target, method|
                                     target.send(method)

data/lib/rspec/core/version.rb

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

data/lib/rspec/core/world.rb

@@ -2,6 +2,29 @@ module RSpec
   module Core
     class World
 
+      module Describable
+        PROC_HEX_NUMBER = /0x[0-9a-f]+@/
+        PROJECT_DIR = File.expand_path('.')
+
+        def description
+          reject { |k, v| RSpec::Core::Configuration::CONDITIONAL_FILTERS[k] == v }.inspect.gsub(PROC_HEX_NUMBER, '').gsub(PROJECT_DIR, '.').gsub(' (lambda)','')
+        end
+
+        def empty_without_conditional_filters?
+          reject { |k, v| RSpec::Core::Configuration::CONDITIONAL_FILTERS[k] == v }.empty?
+        end
+
+        def reject
+          super rescue {}
+        end
+
+        def empty?
+          super rescue false
+        end
+      end
+
+      include RSpec::Core::Hooks
+
       attr_reader :example_groups, :filtered_examples, :wants_to_quit
       attr_writer :wants_to_quit
 
@@ -18,17 +41,21 @@ module RSpec
         }
       end
 
+      def reset
+        example_groups.clear
+      end
+
       def register(example_group)
         example_groups << example_group
         example_group
       end
 
       def inclusion_filter
-        @configuration.filter
+        @configuration.inclusion_filter.extend(Describable)
       end
 
       def exclusion_filter
-        @configuration.exclusion_filter
+        @configuration.exclusion_filter.extend(Describable)
       end
 
       def configure_group(group)
@@ -54,32 +81,57 @@ module RSpec
       end
 
       def preceding_declaration_line(filter_line)
-        declaration_line_numbers.inject(nil) do |highest_prior_declaration_line, line|
+        declaration_line_numbers.sort.inject(nil) do |highest_prior_declaration_line, line|
           line <= filter_line ? line : highest_prior_declaration_line
         end
       end
 
-      def announce_inclusion_filter
-        if inclusion_filter
-          if @configuration.run_all_when_everything_filtered? && RSpec.world.example_count.zero?
-            @configuration.reporter.message "No examples were matched by #{inclusion_filter.inspect}, running all"
-            @configuration.clear_inclusion_filter
-            filtered_examples.clear
-          else
-            @configuration.reporter.message "Run filtered using #{inclusion_filter.inspect}"
+      def reporter
+        @configuration.reporter
+      end
+
+      def announce_filters
+        filter_announcements = []
+
+        if @configuration.run_all_when_everything_filtered? && example_count.zero?
+          reporter.message( "No examples matched #{inclusion_filter.description}. Running all.")
+          filtered_examples.clear
+          @configuration.clear_inclusion_filter
+        end
+
+        announce_inclusion_filter filter_announcements
+        announce_exclusion_filter filter_announcements
+
+        if example_count.zero?
+          example_groups.clear
+          if filter_announcements.empty?
+            reporter.message("No examples found.")
+          elsif inclusion_filter
+            message = "No examples matched #{inclusion_filter.description}."
+            if @configuration.run_all_when_everything_filtered?
+              message << " Running all."
+            end
+            reporter.message(message)
+          elsif exclusion_filter
+            reporter.message(
+              "No examples were matched. Perhaps #{exclusion_filter.description} is excluding everything?")
           end
+        elsif !filter_announcements.empty?
+          reporter.message("Run filtered #{filter_announcements.join(', ')}")
         end
       end
-      
-      def announce_exclusion_filter
-        if exclusion_filter && RSpec.world.example_count.zero?
-          @configuration.reporter.message(
-            "No examples were matched. Perhaps #{exclusion_filter.inspect} is excluding everything?")
-          example_groups.clear
+
+      def announce_inclusion_filter(announcements)
+        if inclusion_filter
+          announcements << "including #{inclusion_filter.description}"
         end
       end
 
-      include RSpec::Core::Hooks
+      def announce_exclusion_filter(announcements)
+        unless exclusion_filter.empty_without_conditional_filters?
+          announcements << "excluding #{exclusion_filter.description}"
+        end
+      end
 
       def find_hook(hook, scope, group, example = nil)
         @configuration.find_hook(hook, scope, group, example)

data/lib/rspec/core.rb

@@ -4,6 +4,7 @@ require 'rspec/core/deprecation'
 require 'rspec/core/backward_compatibility'
 require 'rspec/core/reporter'
 
+require 'rspec/core/metadata_hash_builder'
 require 'rspec/core/hooks'
 require 'rspec/core/subject'
 require 'rspec/core/let'
@@ -48,17 +49,45 @@ module RSpec
     @world ||= RSpec::Core::World.new
   end
 
+  # Used internally to ensure examples get reloaded between multiple runs in
+  # the same process.
+  def self.reset
+    world.reset
+    configuration.reset
+  end
+
   def self.configuration
     @configuration ||= RSpec::Core::Configuration.new
   end
 
   def self.configure
+    warn_about_deprecated_configure if RSpec.world.example_groups.any?
     yield configuration if block_given?
   end
 
   def self.clear_remaining_example_groups
     world.example_groups.clear
   end
+
+  private
+
+    def self.warn_about_deprecated_configure
+      warn <<-NOTICE
+
+*****************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will
+be removed from RSpec 3.
+
+You have set some configuration options after an example group has
+already been defined.  In RSpec 3, this will not be allowed.  All
+configuration should happen before the first example group is
+defined.  The configuration is happening at:
+
+  #{caller[1]}
+*****************************************************************
+
+NOTICE
+    end
 end
 
 require 'rspec/core/backward_compatibility'

data/lib/rspec/monkey/spork/test_framework/rspec.rb

@@ -1,3 +1,4 @@
+# TODO (2011-05-08) - remove this as soon as spork 0.9.0 is released
 if defined?(Spork::TestFramework::RSpec)
   class Spork::TestFramework::RSpec < Spork::TestFramework
     def run_tests(argv, err, out)

data/rspec-core.gemspec

@@ -7,14 +7,12 @@ Gem::Specification.new do |s|
   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.email       = "rspec-users@rubyforge.org;"
+  s.homepage    = "http://github.com/rspec"
   s.summary     = "rspec-core-#{RSpec::Core::Version::STRING}"
-  s.description = "RSpec runner and example groups"
+  s.description = "BDD for Ruby. 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")

data/spec/autotest/failed_results_re_spec.rb

@@ -19,7 +19,7 @@ describe "failed_results_re for autotest" do
     it "matches a failure" do
       re = Autotest::Rspec2.new.failed_results_re
       example_output.should =~ re
-      example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 
@@ -31,7 +31,7 @@ describe "failed_results_re for autotest" do
     it "matches a failure" do
       re = Autotest::Rspec2.new.failed_results_re
       example_output.should =~ re
-      example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -4,6 +4,42 @@ require 'tmpdir'
 
 module RSpec::Core
   describe CommandLine do
+
+    describe "#run" do
+      include_context "spec files"
+
+      let(:out)    { StringIO.new }
+      let(:err)    { StringIO.new }
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      def command_line(args)
+        RSpec::Core::CommandLine.new(config_options(args))
+      end
+
+      def config_options(argv=[])
+        options = RSpec::Core::ConfigurationOptions.new(argv)
+        options.parse_options
+        options
+      end
+
+      it "returns 0 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([passing_spec_filename]).run(err, out)
+        result.should be(0)
+      end
+
+      it "returns 1 if spec passes" do
+        err, out = StringIO.new, StringIO.new
+        result = command_line([failing_spec_filename]).run(err, out)
+        result.should be(1)
+      end
+    end
+
     context "given an Array of options" do
       it "assigns ConfigurationOptions built from Array to @options" do
         config_options = ConfigurationOptions.new(%w[--color])
@@ -50,8 +86,6 @@ module RSpec::Core
         config.stub(:run_hook)
 
         config.should_receive(:load_spec_files)
-        config.should_receive(:configure_mock_framework)
-        config.should_receive(:configure_expectation_framework)
 
         world.should_receive(:announce_inclusion_filter)
         world.should_receive(:announce_exclusion_filter)