rspec 1.0.4 → 1.0.5

data/CHANGES

@@ -1,3 +1,15 @@
+== Version 1.0.5
+Bug fixes. Autotest plugin tweaks.
+
+* Fixed [#11378] fix to 10814 broke drb
+* Fixed [#11223] Unable to access flash from rails helper specs
+* Fixed [#11337] autotest runs specs redundantly
+* Fixed [#11258] windows: autotest won't run
+* Applied [#11253] Tweaks to autotest file mappings (Patch from Wincent Colaiuta)
+* Applied [#11252] Should be able to re-load file containing shared behaviours without raising an exception (Patch from Wincent Colaiuta)
+* Fixed [#11247] standalone autotest doesn't work because of unneeded autotest.rb
+* Applied [#11221] Autotest support does not work w/o Rails Gem installed (Patch from Josh Knowles)
+
 == Version 1.0.4
 The getting ready for JRuby release.
 

data/EXAMPLES.rd

@@ -103,6 +103,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.026702 seconds
+Finished in 0.024612 seconds
 
 77 examples, 0 failures, 2 not implemented

data/Rakefile

@@ -245,6 +245,7 @@ task :publish_packages => [:verify_user, :package] do
   release_files = FileList[
     "pkg/#{PKG_FILE_NAME}.gem",
     "pkg/#{PKG_FILE_NAME}.tgz",
+    "pkg/rspec_on_rails-#{PKG_VERSION}.tgz",
     "pkg/#{PKG_FILE_NAME}.zip",
     "pkg/RSpec-#{PKG_VERSION}.tmbundle.tgz",
     "../spec_ui/pkg/spec_ui-#{Spec::Ui::VERSION::STRING}.gem"

data/examples/auto_spec_description_example.rb

@@ -16,4 +16,4 @@ describe "Examples with no descriptions" do
   
   it { [1,2,3].should respond_to(:size) }
   
-end
+end

data/examples/before_and_after_example.rb

@@ -36,4 +36,4 @@ describe "State created in before(:all)" do
     $global.should == 3
     $global = 0
   end
-end
+end

data/examples/behave_as_example.rb

@@ -42,4 +42,4 @@ module BehaveAsExample
     end
   end
   
-end
+end

data/examples/dynamic_spec.rb

@@ -6,4 +6,4 @@ describe "Some integers" do
       Math.sqrt(n*n).should == n
     end
   end
-end
+end

data/examples/file_accessor.rb

@@ -1,18 +1,18 @@
-class FileAccessor
-  def open_and_handle_with(pathname, processor)
-    pathname.open do |io|
-      processor.process(io)
-    end
-  end
-end
-
-if __FILE__ == $0
-  require File.dirname(__FILE__) + '/io_processor'
-  require 'pathname'
-  
-  accessor = FileAccessor.new
-  io_processor = IoProcessor.new
-  file = Pathname.new ARGV[0]
-
-  accessor.open_and_handle_with(file, io_processor)
-end
+class FileAccessor
+  def open_and_handle_with(pathname, processor)
+    pathname.open do |io|
+      processor.process(io)
+    end
+  end
+end
+
+if __FILE__ == $0
+  require File.dirname(__FILE__) + '/io_processor'
+  require 'pathname'
+  
+  accessor = FileAccessor.new
+  io_processor = IoProcessor.new
+  file = Pathname.new ARGV[0]
+
+  accessor.open_and_handle_with(file, io_processor)
+end

data/examples/file_accessor_spec.rb

@@ -1,38 +1,38 @@
-require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + '/file_accessor'
-require 'stringio'
-
-describe "A FileAccessor" do
-  # This sequence diagram illustrates what this spec specifies.
-  #
-  #                  +--------------+     +----------+     +-------------+
-  #                  | FileAccessor |     | Pathname |     | IoProcessor |
-  #                  +--------------+     +----------+     +-------------+
-  #                         |                  |                  |
-  #   open_and_handle_with  |                  |                  |
-  #   -------------------->| |           open  |                  |
-  #                        | |--------------->| |                 |
-  #                        | | io             | |                 |
-  #                        | |<...............| |                 |
-  #                        | |                 |     process(io)  |
-  #                        | |---------------------------------->| |
-  #                        | |                 |                 | |
-  #                        | |<..................................| |
-  #                         |                  |                  |
-  #
-  it "should open a file and pass it to the processor's process method" do
-    # This is the primary actor
-    accessor = FileAccessor.new
-
-    # These are the primary actor's neighbours, which we mock.
-    file = mock "Pathname"
-    io_processor = mock "IoProcessor"
-    
-    io = StringIO.new "whatever"
-    file.should_receive(:open).and_yield io
-    io_processor.should_receive(:process).with(io)
-    
-    accessor.open_and_handle_with(file, io_processor)
-  end
-
-end
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/file_accessor'
+require 'stringio'
+
+describe "A FileAccessor" do
+  # This sequence diagram illustrates what this spec specifies.
+  #
+  #                  +--------------+     +----------+     +-------------+
+  #                  | FileAccessor |     | Pathname |     | IoProcessor |
+  #                  +--------------+     +----------+     +-------------+
+  #                         |                  |                  |
+  #   open_and_handle_with  |                  |                  |
+  #   -------------------->| |           open  |                  |
+  #                        | |--------------->| |                 |
+  #                        | | io             | |                 |
+  #                        | |<...............| |                 |
+  #                        | |                 |     process(io)  |
+  #                        | |---------------------------------->| |
+  #                        | |                 |                 | |
+  #                        | |<..................................| |
+  #                         |                  |                  |
+  #
+  it "should open a file and pass it to the processor's process method" do
+    # This is the primary actor
+    accessor = FileAccessor.new
+
+    # These are the primary actor's neighbours, which we mock.
+    file = mock "Pathname"
+    io_processor = mock "IoProcessor"
+    
+    io = StringIO.new "whatever"
+    file.should_receive(:open).and_yield io
+    io_processor.should_receive(:process).with(io)
+    
+    accessor.open_and_handle_with(file, io_processor)
+  end
+
+end

data/examples/greeter_spec.rb

@@ -27,4 +27,4 @@ describe "Greeter" do
     # Uncomment the next line to make Heckle happy
     #greeter.greet.should == "Hi there!"
   end
-end
+end

data/examples/helper_method_example.rb

@@ -8,4 +8,4 @@ describe "a context with helper a method" do
   it "should make that method available to specs" do
     helper_method.should == "received call"
   end
-end
+end

data/examples/io_processor.rb

@@ -1,8 +1,8 @@
-class DataTooShort < StandardError; end
-
-class IoProcessor
-  # Does some fancy stuff unless the length of +io+ is shorter than 32
-  def process(io)
-    raise DataTooShort if io.read.length < 32
-  end
-end
+class DataTooShort < StandardError; end
+
+class IoProcessor
+  # Does some fancy stuff unless the length of +io+ is shorter than 32
+  def process(io)
+    raise DataTooShort if io.read.length < 32
+  end
+end

data/examples/io_processor_spec.rb

@@ -18,4 +18,4 @@ describe "An IoProcessor" do
       @processor.process(StringIO.new("z"*31))
     }.should raise_error(DataTooShort)
   end
-end
+end

data/examples/legacy_spec.rb

@@ -7,4 +7,4 @@ context "A legacy spec" do
   
   teardown do
   end
-end
+end

data/examples/not_yet_implemented_spec.rb

@@ -9,4 +9,4 @@ describe Stack, ' (not implemented features)'  do
   it "should transform to xml using #to_xml"
   
   it "should convert from xml using #from_xml"
-end
+end

data/examples/partial_mock_example.rb

@@ -25,4 +25,4 @@ describe "A partial mock" do
     MockableClass.msg_2
     MockableClass.msg_3
   end
-end
+end

data/examples/predicate_example.rb

@@ -24,4 +24,4 @@ describe "BDD framework" do
     @bdd_framework.should be_intuitive
   end
 
-end
+end

data/examples/stack.rb

@@ -33,4 +33,4 @@ class Stack
     @items.length == 10
   end
   
-end
+end

data/examples/stack_spec.rb

@@ -94,4 +94,4 @@ describe Stack, " (full)" do
     lambda { @stack.push Object.new }.should raise_error(StackOverflowError)
   end
   
-end
+end

data/examples/stubbing_example.rb

@@ -66,4 +66,4 @@ describe "A mock" do
   end
 end
 
-    
+    

data/examples/test_case_adapter_example.rb

@@ -23,4 +23,4 @@ class IntegratingRSpecExpectationsIntoTestCaseTest < Test::Unit::TestCase
   def test_should_support_rspecs_collection_expectations
     Band.new.should have(4).players
   end
-end
+end

data/lib/autotest/discover.rb

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

data/lib/autotest/rspec.rb

@@ -6,12 +6,15 @@ class Autotest::Rspec < Autotest
     super
     @spec_command = "spec"
     @test_mappings = {
-      %r%^spec/.*rb$% => proc { |filename, _|
+      %r%^spec/.*\.rb$% => proc { |filename, _|
         filename
       },
       %r%^lib/(.*)\.rb$% => proc { |_, m|
         ["spec/#{m[1]}_spec.rb"]
       },
+      %r%^spec/(spec_helper|shared/.*)\.rb$% => proc {
+        files_matching %r%^spec/.*_spec\.rb$%
+      },
     }
   end
   
@@ -44,25 +47,21 @@ class Autotest::Rspec < Autotest
   end
 
   def make_test_cmd(files_to_test)
-    cmds = []
-    full, partial = files_to_test.partition { |k,v| v.empty? }
-  
-    unless full.empty? then
-      files = full.map {|k,v| k}.flatten.join(' ')
-      cmds << "#{@spec_command} #{add_options_if_present}#{files}"
-    end
-  
-    partial.each do |f, methods|
-      cmds.push(*methods.map { |meth|
-        "#{@spec_command} #{add_options_if_present} #{f}"
-      })
-    end
-  
-    return cmds.join('; ')
+    return "#{ruby} -S #{@spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
   end
   
   def add_options_if_present
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end
 
+  def spec_command
+    spec = File.join(Config::CONFIG['bindir'], 'spec')
+
+    unless File::ALT_SEPARATOR.nil? then
+      spec.gsub! File::SEPARATOR, File::ALT_SEPARATOR
+    end
+
+    return spec
+  end
+
 end

data/lib/spec.rb

@@ -10,4 +10,4 @@ class Object
   def metaclass
     class << self; self; end
   end
-end
+end

data/lib/spec/dsl/behaviour.rb

@@ -7,6 +7,7 @@ module Spec
       class << self
         def add_shared_behaviour(behaviour)
           return if behaviour.equal?(found_behaviour = find_shared_behaviour(behaviour.description))
+          return if found_behaviour and behaviour.description[:spec_path] == found_behaviour.description[:spec_path]
           raise ArgumentError.new("Shared Behaviour '#{behaviour.description}' already exists") if found_behaviour
           shared_behaviours << behaviour
         end

data/lib/spec/dsl/configuration.rb

@@ -116,4 +116,4 @@ module Spec
       
     end
   end
-end
+end

data/lib/spec/dsl/description.rb

@@ -66,4 +66,4 @@ module Spec
 
     end
   end
-end
+end

data/lib/spec/expectations.rb

@@ -53,4 +53,4 @@ module Spec
       end
     end
   end
-end
+end

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

@@ -14,4 +14,4 @@ end
 
 class Symbol
   include Spec::Expectations::StringHelpers
-end
+end

data/lib/spec/extensions/object.rb

@@ -3,4 +3,4 @@ class Object
     options = Hash === args.last ? args.pop : {}
     return args, options
   end
-end  
+end  

data/lib/spec/matchers.rb

@@ -163,4 +163,4 @@ module Spec
     end
     
   end
-end
+end

data/lib/spec/matchers/be_close.rb

@@ -34,4 +34,4 @@ module Spec
       Matchers::BeClose.new(expected, delta)
     end
   end
-end
+end

data/lib/spec/matchers/eql.rb

@@ -40,4 +40,4 @@ module Spec
       Matchers::Eql.new(expected)
     end
   end
-end
+end

data/lib/spec/matchers/equal.rb

@@ -40,4 +40,4 @@ module Spec
       Matchers::Equal.new(expected)
     end
   end
-end
+end

data/lib/spec/matchers/have.rb

@@ -30,12 +30,17 @@ module Spec
         else
           collection_owner.send(collection_name, *@args, &@block)
         end
-        @actual = collection.length if collection.respond_to?(:length)
         @actual = collection.size if collection.respond_to?(:size)
+        @actual = collection.length if collection.respond_to?(:length)
+        raise not_a_collection if @actual.nil?
         return @actual >= @expected if @relativity == :at_least
         return @actual <= @expected if @relativity == :at_most
         return @actual == @expected
       end
+      
+      def not_a_collection
+        "expected #{@collection_name} to be a collection but it does not respond to #length or #size"
+      end
     
       def failure_message
         "expected #{relative_expectation} #{collection_name}, got #{@actual}"
@@ -137,4 +142,4 @@ EOF
       Matchers::Have.new(n, :at_most)
     end
   end
-end
+end

data/lib/spec/mocks.rb

@@ -205,4 +205,4 @@ module Spec
   #   my_mock.should_receive(:<<).with("illegal value").once.and_raise(ArgumentError)
   module Mocks
   end
-end
+end

data/lib/spec/mocks/argument_constraint_matchers.rb

@@ -24,4 +24,4 @@ module Spec
       end
     end
   end
-end
+end