rspec 1.1.4 → 1.1.5

data/bin/autospec

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+ENV['RSPEC'] = 'true'
+ENV['AUTOTEST'] = 'true'
+system("autotest", *ARGV)

data/bin/spec

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'spec'
-exit ::Spec::Runner::CommandLine.run(rspec_options)
+exit ::Spec::Runner::CommandLine.run

data/examples/pure/yielding_example.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class MessageAppender
+  
+  def initialize(appendage)
+    @appendage = appendage
+  end
+  
+  def append_to(message)
+    if_told_to_yield do
+      message << @appendage
+    end
+  end
+    
+end
+
+describe "a message expectation yielding to a block" do
+  it "should yield if told to" do
+    appender = MessageAppender.new("appended to")
+    appender.should_receive(:if_told_to_yield).and_yield
+    message = ""
+    appender.append_to(message)
+    message.should == "appended to"
+  end
+
+  it "should not yield if not told to" do
+    appender = MessageAppender.new("appended to")
+    appender.should_receive(:if_told_to_yield)
+    message = ""
+    appender.append_to(message)
+    message.should == ""
+  end
+end

data/examples/stories/game-of-life/.loadpath

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<loadpath>
+	<pathentry path="" type="src"/>
+	<pathentry path="org.rubypeople.rdt.launching.RUBY_CONTAINER" type="con"/>
+</loadpath>

data/examples/stories/game-of-life/behaviour/everything.rb

@@ -1,4 +1,4 @@
-$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
 $:.unshift File.join(File.dirname(__FILE__), '..')
 
 require 'spec'

data/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story

@@ -1,21 +1,21 @@
 Story: cells with more than three neighbours die
 
-As a game producer
-I want cells with more than three neighbours to die
-So that I can show the people with money how we are getting on
+	As a game producer
+	I want cells with more than three neighbours to die
+	So that I can show the people with money how we are getting on
 
-Scenario: blink
+	Scenario: blink
 
-Given the grid looks like
-.....
-...XX
-...XX
-.XX..
-.XX..
-When the next step occurs
-Then the grid should look like
-.....
-...XX
-....X
-.X...
-.XX..
+		Given the grid looks like
+			.....
+			...XX
+			...XX
+			.XX..
+			.XX..
+		When the next step occurs
+		Then the grid should look like
+			.....
+			...XX
+			....X
+			.X...
+			.XX..

data/init.rb

@@ -0,0 +1,9 @@
+# Placeholder to satisfy Rails.
+#
+# Do NOT add any require statements to this file. Doing
+# so will cause Rails to load this plugin all of the time.
+#
+# Running 'ruby script/generate rspec' will
+# generate spec/spec_helper.rb, which includes the necessary
+# require statements and configuration. This file should
+# be required by all of your spec files.

data/lib/autotest/discover.rb

@@ -1,3 +1,3 @@
 Autotest.add_discovery do
-  "rspec" if File.exist?('spec')
+  "rspec" if File.exist?('spec') && ENV['RSPEC']
 end

data/lib/autotest/rspec.rb

@@ -28,7 +28,7 @@ class Autotest::Rspec < Autotest
   def consolidate_failures(failed)
     filters = new_hash_of_arrays
     failed.each do |spec, trace|
-      if trace =~ /\n(\.\/)?(.*\.rb):[\d]+:\Z?/
+      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:\Z?/
         filters[$2] << spec
       end
     end
@@ -36,37 +36,11 @@ class Autotest::Rspec < Autotest
   end
 
   def make_test_cmd(files_to_test)
-    return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
+    return '' if files_to_test.empty?
+    return "#{ruby} -S #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
   end
   
   def add_options_if_present # :nodoc:
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end
-
-  # Finds the proper spec command to use.  Precendence is set in the
-  # lazily-evaluated method spec_commands.  Alias + Override that in
-  # ~/.autotest to provide a different spec command then the default
-  # paths provided.
-  def spec_command(separator=File::ALT_SEPARATOR)
-    unless defined? @spec_command then
-      @spec_command = spec_commands.find { |cmd| File.exists? cmd }
-
-      raise RspecCommandError, "No spec command could be found!" unless @spec_command
-
-      @spec_command.gsub! File::SEPARATOR, separator if separator
-    end
-    @spec_command
-  end
-
-  # Autotest will look for spec commands in the following
-  # locations, in this order:
-  #
-  #   * bin/spec
-  #   * default spec bin/loader installed in Rubygems
-  def spec_commands
-    [
-      File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec')),
-      File.join(Config::CONFIG['bindir'], 'spec')
-    ]
-  end
 end

data/lib/spec.rb

@@ -1,30 +1,28 @@
-require 'spec/version'
 require 'spec/matchers'
 require 'spec/expectations'
 require 'spec/example'
 require 'spec/extensions'
 require 'spec/runner'
+require 'spec/adapters'
+require 'spec/version'
 
-if Object.const_defined?(:Test); \
-  require 'spec/interop/test'; \
+if Object.const_defined?(:Test)
+  require 'spec/interop/test'
 end
 
 module Spec
   class << self
     def run?
-      @run || rspec_options.examples_run?
+      Runner.options.examples_run?
     end
 
-    def run; \
-      return true if run?; \
-      result = rspec_options.run_examples; \
-      @run = true; \
-      result; \
+    def run
+      return true if run?
+      Runner.options.run_examples
     end
-    attr_writer :run
     
-    def exit?; \
-      !Object.const_defined?(:Test) || Test::Unit.run?; \
+    def exit?
+      !Object.const_defined?(:Test) || Test::Unit.run?
     end
   end
 end

data/lib/spec/adapters.rb

@@ -0,0 +1 @@
+require 'spec/adapters/ruby_engine'

data/lib/spec/adapters/ruby_engine.rb

@@ -0,0 +1,26 @@
+require 'spec/adapters/ruby_engine/mri'
+require 'spec/adapters/ruby_engine/rubinius'
+
+module Spec
+  module Adapters
+    module RubyEngine
+    
+      ENGINES = {
+        'mri' => MRI.new,
+        'rbx' => Rubinius.new
+      }
+    
+      def self.engine
+        if Object.const_defined?('RUBY_ENGINE')
+          return Object.const_get('RUBY_ENGINE')
+        else
+          return 'mri'
+        end
+      end
+    
+      def self.adapter
+        return ENGINES[engine]
+      end
+    end
+  end
+end

data/lib/spec/adapters/ruby_engine/mri.rb

@@ -0,0 +1,8 @@
+module Spec
+  module Adapters
+    module RubyEngine
+      class MRI
+      end
+    end
+  end
+end

data/lib/spec/adapters/ruby_engine/rubinius.rb

@@ -0,0 +1,8 @@
+module Spec
+  module Adapters
+    module RubyEngine
+      class Rubinius
+      end
+    end
+  end
+end

data/lib/spec/example/errors.rb

@@ -1,6 +1,12 @@
 module Spec
   module Example
     class ExamplePendingError < StandardError
+      def initialize(a_message=nil)
+        super
+        @pending_caller = caller[2]
+      end
+      
+      attr_reader :pending_caller
     end
 
     class PendingExampleFixedError < StandardError

data/lib/spec/example/example_group_methods.rb

@@ -3,6 +3,8 @@ module Spec
 
     module ExampleGroupMethods
       class << self
+        attr_accessor :matcher_class
+
         def description_text(*args)
           args.inject("") do |result, arg|
             result << " " unless (result == "" || arg.to_s =~ /^(\s|\.|#)/)
@@ -119,7 +121,7 @@ module Spec
 
       def run
         examples = examples_to_run
-        reporter.add_example_group(self)
+        reporter.add_example_group(self) unless examples_to_run.empty?
         return true if examples.empty?
         return dry_run(examples) if dry_run?
 
@@ -169,7 +171,7 @@ module Spec
       def examples #:nodoc:
         examples = example_objects.dup
         add_method_examples(examples)
-        rspec_options.reverse ? examples.reverse : examples
+        Spec::Runner.options.reverse ? examples.reverse : examples
       end
 
       def number_of_examples #:nodoc:
@@ -250,15 +252,15 @@ module Spec
 
       def register(&registration_binding_block)
         @registration_binding_block = registration_binding_block
-        rspec_options.add_example_group self
+        Spec::Runner.options.add_example_group self
       end
 
       def unregister #:nodoc:
-        rspec_options.remove_example_group self
+        Spec::Runner.options.remove_example_group self
       end
 
       def registration_backtrace
-        eval("caller", registration_binding_block.binding)
+        eval("caller", registration_binding_block)
       end
 
       def run_before_each(example)
@@ -276,8 +278,8 @@ module Spec
     private
       def dry_run(examples)
         examples.each do |example|
-          rspec_options.reporter.example_started(example)
-          rspec_options.reporter.example_finished(example)
+          Spec::Runner.options.reporter.example_started(example)
+          Spec::Runner.options.reporter.example_finished(example)
         end
         return true
       end
@@ -300,7 +302,7 @@ module Spec
 
         after_all_instance_variables = instance_variables
         examples.each do |example_group_instance|
-          success &= example_group_instance.execute(rspec_options, instance_variables)
+          success &= example_group_instance.execute(Spec::Runner.options, instance_variables)
           after_all_instance_variables = example_group_instance.instance_variable_hash
         end
         return [success, after_all_instance_variables]
@@ -322,7 +324,8 @@ module Spec
         all_examples = examples
         return all_examples unless specified_examples?
         all_examples.reject do |example|
-          matcher = ExampleMatcher.new(description.to_s, example.description)
+          matcher = ExampleGroupMethods.matcher_class.
+            new(description.to_s, example.description)
           !matcher.matches?(specified_examples)
         end
       end
@@ -332,15 +335,15 @@ module Spec
       end
 
       def specified_examples
-        rspec_options.examples
+        Spec::Runner.options.examples
       end
 
       def reporter
-        rspec_options.reporter
+        Spec::Runner.options.reporter
       end
 
       def dry_run?
-        rspec_options.dry_run
+        Spec::Runner.options.dry_run
       end
 
       def example_objects
@@ -395,7 +398,7 @@ module Spec
         case scope
         when :each; before_each_parts
         when :all; before_all_parts
-        when :suite; rspec_options.before_suite_parts
+        when :suite; Spec::Runner.options.before_suite_parts
         end
       end
 
@@ -403,7 +406,7 @@ module Spec
         case scope
         when :each; after_each_parts
         when :all; after_all_parts
-        when :suite; rspec_options.after_suite_parts
+        when :suite; Spec::Runner.options.after_suite_parts
         end
       end
 

data/lib/spec/example/example_matcher.rb

@@ -38,5 +38,7 @@ module Spec
         Regexp.escape(@example_name)
       end
     end
+
+    ExampleGroupMethods.matcher_class = ExampleMatcher
   end
 end

data/lib/spec/example/example_methods.rb

@@ -18,7 +18,7 @@ module Spec
         Timeout.timeout(options.timeout) do
           begin
             before_example
-            run_with_description_capturing
+            eval_block
           rescue Exception => e
             execution_error ||= e
           end
@@ -63,7 +63,7 @@ module Spec
       end
 
       def description
-        @_defined_description || @_matcher_description || "NO NAME"
+        @_defined_description || ::Spec::Matchers.generated_description || "NO NAME"
       end
 
       def __full_description
@@ -79,13 +79,8 @@ module Spec
         end
       end
 
-      def run_with_description_capturing
-        begin
-          return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
-        ensure
-          @_matcher_description = Spec::Matchers.generated_description
-          Spec::Matchers.clear_generated_description
-        end
+      def eval_block
+        return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
       end
 
       def implementation_backtrace

data/lib/spec/example/module_inclusion_warnings.rb

@@ -22,7 +22,8 @@ module Spec
         end
       end
       
-      def respond_to?(sym)
+      # NOTE - we don't need the second arg, but extenders do: http://www.ruby-doc.org/core/classes/Object.html#M000604
+      def respond_to?(sym, include_private_data=false)
         MethodDispatcher.new(self.class.described_module).respond_to?(sym) ? true : super
       end
       

data/lib/spec/expectations/extensions/object.rb

@@ -27,7 +27,7 @@ module Spec
       #
       # NOTE that this does NOT support receiver.should != expected.
       # Instead, use receiver.should_not == expected
-      def should(matcher=:use_operator_matcher, &block)
+      def should(matcher=nil, &block)
         ExpectationMatcherHandler.handle_matcher(self, matcher, &block)
       end
 
@@ -50,7 +50,7 @@ module Spec
       #     => Passes unless (receiver =~ regexp)
       #
       # See Spec::Matchers for more information about matchers
-      def should_not(matcher=:use_operator_matcher, &block)
+      def should_not(matcher=nil, &block)
         NegativeExpectationMatcherHandler.handle_matcher(self, matcher, &block)
       end