rspec 1.0.4 → 1.0.5

data/lib/spec/mocks/error_generator.rb

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

data/lib/spec/mocks/methods.rb

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

data/lib/spec/mocks/mock.rb

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

data/lib/spec/mocks/proxy.rb

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

data/lib/spec/mocks/space.rb

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

data/lib/spec/mocks/spec_methods.rb

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

data/lib/spec/rake/verify_rcov.rb

@@ -49,4 +49,4 @@ module RCov
       end
     end
   end
-end
+end

data/lib/spec/runner/backtrace_tweaker.rb

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

data/lib/spec/runner/behaviour_runner.rb

@@ -82,7 +82,7 @@ module Spec
       
       def load_specs(paths)
         paths.each do |path|
-          require path
+          load path
         end
       end
       

data/lib/spec/runner/command_line.rb

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

data/lib/spec/runner/drb_command_line.rb

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

data/lib/spec/runner/formatter/failing_behaviours_formatter.rb

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

data/lib/spec/runner/formatter/failing_examples_formatter.rb

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

data/lib/spec/runner/formatter/progress_bar_formatter.rb

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

data/lib/spec/runner/formatter/rdoc_formatter.rb

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

data/lib/spec/runner/formatter/snippet_extractor.rb

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

data/lib/spec/runner/heckle_runner_unsupported.rb

@@ -1,10 +1,10 @@
-module Spec
-  module Runner
-    # Dummy implementation for Windows that just fails (Heckle is not supported on Windows)
-    class HeckleRunner
-      def initialize(filter)
-        raise "Heckle not supported on Windows"
-      end
-    end
-  end
-end
+module Spec
+  module Runner
+    # Dummy implementation for Windows that just fails (Heckle is not supported on Windows)
+    class HeckleRunner
+      def initialize(filter)
+        raise "Heckle not supported on Windows"
+      end
+    end
+  end
+end

data/lib/spec/runner/spec_parser.rb

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

data/lib/spec/test_case_adapter.rb

@@ -7,4 +7,4 @@ module Test
       include Spec::Matchers
     end
   end
-end
+end

data/lib/spec/translator.rb

@@ -1,106 +1,106 @@
-require 'fileutils'
-
-module Spec
-  class Translator
-    def translate(from, to)
-      from = File.expand_path(from)
-      to = File.expand_path(to)
-      if File.directory?(from)
-        translate_dir(from, to)
-      elsif(from =~ /\.rb$/)
-        translate_file(from, to)
-      end
-    end
-    
-    def translate_dir(from, to)
-      FileUtils.mkdir_p(to) unless File.directory?(to)
-      Dir["#{from}/*"].each do |sub_from|
-        path = sub_from[from.length+1..-1]
-        sub_to = File.join(to, path)
-        translate(sub_from, sub_to)
-      end
-    end
-
-    def translate_file(from, to)
-      translation = ""
-      File.open(from) do |io|
-        io.each_line do |line|
-          translation << translate_line(line)
-        end
-      end
-      File.open(to, "w") do |io|
-        io.write(translation)
-      end
-    end
-
-    def translate_line(line)
-      return line if line =~ /(should_not|should)_receive/
-      
-      line.gsub!(/(^\s*)context([\s*|\(]['|"|A-Z])/, '\1describe\2')
-      line.gsub!(/(^\s*)specify([\s*|\(]['|"|A-Z])/, '\1it\2')
-      line.gsub!(/(^\s*)context_setup(\s*[do|\{])/, '\1before(:all)\2')
-      line.gsub!(/(^\s*)context_teardown(\s*[do|\{])/, '\1after(:all)\2')
-      line.gsub!(/(^\s*)setup(\s*[do|\{])/, '\1before(:each)\2')
-      line.gsub!(/(^\s*)teardown(\s*[do|\{])/, '\1after(:each)\2')
-      
-      if line =~ /(.*\.)(should_not|should)(?:_be)(?!_)(.*)/m
-        pre = $1
-        should = $2
-        post = $3
-        be_or_equal = post =~ /(<|>)/ ? "be" : "equal"
-        
-        return "#{pre}#{should} #{be_or_equal}#{post}"
-      end
-      
-      if line =~ /(.*\.)(should_not|should)_(?!not)\s*(.*)/m
-        pre = $1
-        should = $2
-        post = $3
-        
-        post.gsub!(/^raise/, 'raise_error')
-        post.gsub!(/^throw/, 'throw_symbol')
-        
-        unless standard_matcher?(post)
-          post = "be_#{post}"
-        end
-        
-        # Add parenthesis
-        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\'|\"|\:|@| ]+)(\})/, '\1(\2)\3') # inside a block
-        post.gsub!(/^(redirect_to)\s+(.*)/, '\1(\2)') # redirect_to, which often has http:
-        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\{.*\}|\'|\"|\:|@| ]+)/, '\1(\2)')
-        post.gsub!(/(\s+\))/, ')')
-        post.gsub!(/\)\}/, ') }')
-        post.gsub!(/^(\w+)\s+(\/.*\/)/, '\1(\2)') #regexps
-        line = "#{pre}#{should} #{post}"
-      end
-
-      line
-    end
-    
-    def standard_matcher?(matcher)
-      patterns = [
-        /^be/, 
-        /^be_close/,
-        /^eql/, 
-        /^equal/, 
-        /^has/, 
-        /^have/, 
-        /^change/, 
-        /^include/,
-        /^match/, 
-        /^raise_error/, 
-        /^respond_to/, 
-        /^redirect_to/, 
-        /^satisfy/, 
-        /^throw_symbol/,
-        # Extra ones that we use in spec_helper
-        /^pass/,
-        /^fail/,
-        /^fail_with/,
-      ]
-      matched = patterns.detect{ |p| matcher =~ p }
-      !matched.nil?
-    end
-    
-  end
-end
+require 'fileutils'
+
+module Spec
+  class Translator
+    def translate(from, to)
+      from = File.expand_path(from)
+      to = File.expand_path(to)
+      if File.directory?(from)
+        translate_dir(from, to)
+      elsif(from =~ /\.rb$/)
+        translate_file(from, to)
+      end
+    end
+    
+    def translate_dir(from, to)
+      FileUtils.mkdir_p(to) unless File.directory?(to)
+      Dir["#{from}/*"].each do |sub_from|
+        path = sub_from[from.length+1..-1]
+        sub_to = File.join(to, path)
+        translate(sub_from, sub_to)
+      end
+    end
+
+    def translate_file(from, to)
+      translation = ""
+      File.open(from) do |io|
+        io.each_line do |line|
+          translation << translate_line(line)
+        end
+      end
+      File.open(to, "w") do |io|
+        io.write(translation)
+      end
+    end
+
+    def translate_line(line)
+      return line if line =~ /(should_not|should)_receive/
+      
+      line.gsub!(/(^\s*)context([\s*|\(]['|"|A-Z])/, '\1describe\2')
+      line.gsub!(/(^\s*)specify([\s*|\(]['|"|A-Z])/, '\1it\2')
+      line.gsub!(/(^\s*)context_setup(\s*[do|\{])/, '\1before(:all)\2')
+      line.gsub!(/(^\s*)context_teardown(\s*[do|\{])/, '\1after(:all)\2')
+      line.gsub!(/(^\s*)setup(\s*[do|\{])/, '\1before(:each)\2')
+      line.gsub!(/(^\s*)teardown(\s*[do|\{])/, '\1after(:each)\2')
+      
+      if line =~ /(.*\.)(should_not|should)(?:_be)(?!_)(.*)/m
+        pre = $1
+        should = $2
+        post = $3
+        be_or_equal = post =~ /(<|>)/ ? "be" : "equal"
+        
+        return "#{pre}#{should} #{be_or_equal}#{post}"
+      end
+      
+      if line =~ /(.*\.)(should_not|should)_(?!not)\s*(.*)/m
+        pre = $1
+        should = $2
+        post = $3
+        
+        post.gsub!(/^raise/, 'raise_error')
+        post.gsub!(/^throw/, 'throw_symbol')
+        
+        unless standard_matcher?(post)
+          post = "be_#{post}"
+        end
+        
+        # Add parenthesis
+        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\'|\"|\:|@| ]+)(\})/, '\1(\2)\3') # inside a block
+        post.gsub!(/^(redirect_to)\s+(.*)/, '\1(\2)') # redirect_to, which often has http:
+        post.gsub!(/^(\w+)\s+([\w|\.|\,|\(.*\)|\{.*\}|\'|\"|\:|@| ]+)/, '\1(\2)')
+        post.gsub!(/(\s+\))/, ')')
+        post.gsub!(/\)\}/, ') }')
+        post.gsub!(/^(\w+)\s+(\/.*\/)/, '\1(\2)') #regexps
+        line = "#{pre}#{should} #{post}"
+      end
+
+      line
+    end
+    
+    def standard_matcher?(matcher)
+      patterns = [
+        /^be/, 
+        /^be_close/,
+        /^eql/, 
+        /^equal/, 
+        /^has/, 
+        /^have/, 
+        /^change/, 
+        /^include/,
+        /^match/, 
+        /^raise_error/, 
+        /^respond_to/, 
+        /^redirect_to/, 
+        /^satisfy/, 
+        /^throw_symbol/,
+        # Extra ones that we use in spec_helper
+        /^pass/,
+        /^fail/,
+        /^fail_with/,
+      ]
+      matched = patterns.detect{ |p| matcher =~ p }
+      !matched.nil?
+    end
+    
+  end
+end

data/lib/spec/version.rb

@@ -1,22 +1,22 @@
-module Spec
-  module VERSION
-    unless defined? MAJOR
-      MAJOR  = 1
-      MINOR  = 0
-      TINY   = 4
-      RELEASE_CANDIDATE = nil
-
-      # RANDOM_TOKEN: 0.691783562403103
-      REV = "$LastChangedRevision: 2054 $".match(/LastChangedRevision: (\d+)/)[1]
-
-      STRING = [MAJOR, MINOR, TINY].join('.')
-      TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')
-      FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (r#{REV})"
-
-      NAME   = "RSpec"
-      URL    = "http://rspec.rubyforge.org/"  
-    
-      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}"
-    end
-  end
-end
+module Spec
+  module VERSION
+    unless defined? MAJOR
+      MAJOR  = 1
+      MINOR  = 0
+      TINY   = 5
+      RELEASE_CANDIDATE = nil
+
+      # RANDOM_TOKEN: 0.956731547671535
+      REV = "$LastChangedRevision: 2081 $".match(/LastChangedRevision: (\d+)/)[1]
+
+      STRING = [MAJOR, MINOR, TINY].join('.')
+      TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')
+      FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')} (r#{REV})"
+
+      NAME   = "RSpec"
+      URL    = "http://rspec.rubyforge.org/"  
+    
+      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - BDD for Ruby\n#{URL}"
+    end
+  end
+end

data/spec/spec/dsl/behaviour_factory_spec.rb

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

data/spec/spec/dsl/configuration_spec.rb

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

data/spec/spec/dsl/description_spec.rb

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

data/spec/spec/dsl/predicate_matcher_spec.rb

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

data/spec/spec/dsl/shared_behaviour_spec.rb

@@ -74,16 +74,29 @@ module Spec
       end
 
       it "should complain when adding a second shared behaviour with the same description" do
-        make_shared_behaviour("shared behaviour") {}
-        lambda { make_shared_behaviour("shared behaviour") {} }.should raise_error(ArgumentError)
+        describe "shared behaviour", :shared => true do
+        end
+        lambda do
+          describe "shared behaviour", :shared => true do
+          end
+        end.should raise_error(ArgumentError)
       end
 
-      it "should NOT complain when adding a the same shared behaviour again (i.e. file gets reloaded)" do
-        behaviour = behaviour_class.new("shared behaviour") {}
-        behaviour_class.add_shared_behaviour(behaviour)
-        behaviour_class.add_shared_behaviour(behaviour)
+      it "should NOT complain when adding the same shared behaviour instance again" do
+        shared_behaviour = behaviour_class.new("shared behaviour", :shared => true) {}
+        behaviour_class.add_shared_behaviour(shared_behaviour)
+        behaviour_class.add_shared_behaviour(shared_behaviour)
       end
 
+      it "should NOT complain when adding the same shared behaviour again (i.e. file gets reloaded)" do
+        lambda do 
+          2.times do 
+            describe "shared behaviour which gets loaded twice", :shared => true do
+            end 
+          end
+        end.should_not raise_error(ArgumentError)
+      end
+        
       it "should add examples to current behaviour when calling it_should_behave_like" do
         shared_behaviour = make_shared_behaviour("shared behaviour") {}
         shared_behaviour.it("shared example") {}