rspec 1.0.0 → 1.0.1

data/CHANGES

@@ -1,5 +1,17 @@
 = RSpec Changelog
 
+== Version 1.0.1
+This is a maintenance release with mostly cleaning up, and one minor enhancement -
+Modules are automatically included when described directly.
+
+* Renamed Spec::Rails' rspec_resource generator to rspec_scaffold.
+* Removed Spec::Rails' be_feed matcher since it's based on assert_select_feed which is not part of Rails (despite that docs for assert_select_encoded says it is).
+* describe(SomeModule) will include that module in the examples. Like for Spec::Rails helpers, but now also in core.
+* Header in HTML report will be yellow instead of red if there is one failed example
+* Applied [#10951] Odd instance variable name in rspec_model template (patch from Kyle Hargraves)
+* Improved integration with autotest (Patches from Ryan Davis and David Goodland)
+* Some small fixes to make all specs run on JRuby.
+
 == Version 1.0.0
 The stake in the ground release. This represents a commitment to the API as it is. No significant
 backwards compatibility changes in the API are expected after this release.
@@ -7,7 +19,7 @@ backwards compatibility changes in the API are expected after this release.
 * Fixed [#10923] have_text matcher does not support should_not
 * Fixed [#10673] should > and should >= broken
 * Applied [#10921] Allow verify_rcov to accept greater than threshold coverage %'s via configuration
-* Applied [#10920] Added support for not implemented examples (Patch from Chad Humphries)
+* Applied [#10920] Added support for not implemented examples (Patch from Chad Humphries and Ken Barker)
 * Patch to allow not implemented examples.  This works by not providing a block to the example. (Patch from Chad Humphries, Ken Barker)
 * Yanked support for Rails 1.1.6 in Spec::Rails
 * RSpec.tmbundle uses CMD-SHIFT-R to run focused examples now.
@@ -128,7 +140,7 @@ See Spec::DSL::Behaviour for more on predicate_matchers
 * Added [#9735] support flexmock (thanks to Jim Weirich for his modifications to flexmock to support this)
 * Spec::Rails controller specs will no longer let mock exception ripple through to the response.
 * Fixed [#9260] IvarProxy does not act like a hash.
-* Applied [#9458] The rspec_resource generator does not take into account class nesting (Patch from Steve Tendon)
+* Applied [#9458] The rspec_scaffold generator does not take into account class nesting (Patch from Steve Tendon)
 * Applied [#9132] Rakefile spec:doc can fail without preparing database (Patch from Steve Ross)
 * Applied [#9678] Custom runner command line switch, and multi-threaded runner (Patch from Bob Cotton)
 * Applied [#9926] Rakefile - RSPEC_DEPS constant as an Array of Hashes instead of an Array of Arrays (Patch from Scott Taylor)
@@ -164,7 +176,7 @@ See Spec::DSL::Behaviour for more on predicate_matchers
 * Added --loadby option, allowing better control over load order for spec files. mtime and file.txt supported.
 * Implemented [#8696] --order option (see --reverse and --loadby)
 * Added describe/it as aliases for context/specify - suggestion from Dan North.
-* Applied [#7637] [PATCH] add skip-migration option to rspec_resource generator
+* Applied [#7637] [PATCH] add skip-migration option to rspec_scaffold generator
 * Added [#9167] string.should have_tag
 * Changed script/rails_spec_server to script/spec_server and added script/spec (w/ path to vendor/plugins/rspec)
 * Fixed [#8897] Error when mixing controller spec with/without integrated views and using template system other than rhtml
@@ -219,7 +231,7 @@ It also sports myriad new features, bug fixes, patches and general goodness:
 * Fixed [#7754] Command-R fails to run spec in TextMate (added instruction from Luke Redpath to the website)
 * Fixed [#7826] RSpect.tmbundle web page out of date.
 * RSpec on Rails specs are now running against RoR 1.2.1 and 1.2.2
-* rspec_resource now generates specs for views
+* rspec_scaffold now generates specs for views
 * In a Rails app, RSpec core is only loaded when RAILS_ENV==test (init.rb)
 * Added support for target.should arbitrary_expectation_handler and target.should_not arbitrary_expectation_handler
 * Fixed [#7533] Spec suite fails and the process exits with a code 0
@@ -260,7 +272,7 @@ There are also several bug fixes to the RSpec core and the RSpec on Rails plugin
 * Added [#7250] stubs should support throwing
 * Added [#7249] stubs should support yielding
 * Fixed [#6760] fatal error when accessing nested finders in rspec
-* Fixed [#7179] script/generate rspec_resource generates incorrect helper name
+* Fixed [#7179] script/generate rspec_scaffold generates incorrect helper name
 * Added preliminary support for assert_select (response.should_have)
 * Fixed [#6971] and_yield does not work when the arity is -1
 * Fixed [#6898] Can we separate rspec from the plugins?

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.025956 seconds
+Finished in 0.036723 seconds
 
 77 examples, 0 failures, 2 not implemented

data/lib/autotest.rb

@@ -0,0 +1 @@
+require File.dirname(__FILE__) + "/autotest/rspec"

data/lib/autotest/discover.rb

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

data/lib/autotest/rspec.rb

@@ -0,0 +1,68 @@
+require 'autotest'
+
+class Autotest::Rspec < Autotest
+
+  def initialize # :nodoc:
+    super
+    @spec_command = "spec"
+    @test_mappings = {
+      %r%^spec/.*rb$% => proc { |filename, _|
+        filename
+      },
+      %r%^lib/(.*)\.rb$% => proc { |_, m|
+        ["spec/#{m[1]}_spec.rb"]
+      },
+    }
+  end
+  
+  def tests_for_file(filename)
+    super.select { |f| @files.has_key? f }
+  end
+
+  def handle_results(results)
+    failed = results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+    @files_to_test = consolidate_failures failed
+    unless @files_to_test.empty? then
+      hook :red
+    else
+      hook :green
+    end unless $TESTING
+    @tainted = true unless @files_to_test.empty?
+  end
+
+  def consolidate_failures(failed)
+    filters = Hash.new { |h,k| h[k] = [] }
+    failed.each do |spec, failed_trace|
+      @files.keys.select{|f| f =~ /spec\//}.each do |f|
+        if failed_trace =~ Regexp.new(f)
+          filters[f] << spec
+          break
+        end
+      end
+    end
+    return filters
+  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('; ')
+  end
+  
+  def add_options_if_present
+    File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
+  end
+
+end

data/lib/spec/dsl/behaviour.rb

@@ -40,6 +40,7 @@ module Spec
         @eval_module = EvalModule.new
         @eval_module.extend BehaviourEval::ModuleMethods
         @eval_module.include BehaviourEval::InstanceMethods
+        @eval_module.include described_type if described_type.class == Module
         @eval_module.behaviour = self
         @eval_module.description = @description
       end

data/lib/spec/dsl/behaviour_eval.rb

@@ -170,6 +170,10 @@ module Spec
           raise Spec::Expectations::ExpectationNotMetError.new(message)
         end
 
+        def inspect
+          "[Dynamically generated class for RSpec example]"
+        end
+
       end
 
     end

data/lib/spec/matchers/throw_symbol.rb

@@ -10,7 +10,7 @@ module Spec
         begin
           proc.call
         rescue NameError => e
-          @actual = extract_sym_from_name_error(e)
+          @actual = e.name.to_sym
         ensure
           if @expected.nil?
             return @actual.nil? ? false : true
@@ -46,9 +46,6 @@ module Spec
           @expected.nil? ? "a Symbol" : @expected.inspect
         end
       
-        def extract_sym_from_name_error(error)
-          return "#{error.message.split("`").last.split("'").first}".to_sym
-        end
     end
  
     # :call-seq:

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

@@ -16,9 +16,9 @@ module Spec
         def start(example_count)
         end
 
-        # This method is invoked at the beginning of the execution of each context.
-        # +name+ is the name of the context and +first+ is true if it is the
-        # first context - otherwise it's false.
+        # This method is invoked at the beginning of the execution of each behaviour.
+        # +name+ is the name of the behaviour and +first+ is true if it is the
+        # first behaviour - otherwise it's false.
         #
         # The next method to be invoked after this is #example_failed or #example_finished
         def add_behaviour(name)

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

@@ -28,6 +28,8 @@ module Spec
         end
 
         def add_behaviour(name)
+          @behaviour_red = false
+          @behaviour_red = false
           @current_behaviour_number += 1
           unless current_behaviour_number == 1
             @output.puts "  </dl>"
@@ -56,8 +58,10 @@ module Spec
           extra = extra_failure_content(failure)
           
           @current_example_number += 1
-          @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>"
-          @output.puts "    <script type=\"text/javascript\">makeRed('behaviour_#{current_behaviour_number}');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('rspec-header');</script>" unless @header_red
+          @header_red = true
+          @output.puts "    <script type=\"text/javascript\">makeRed('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red
+          @behaviour_red = true
           move_progress
           @output.puts "    <dd class=\"spec failed\">"
           @output.puts "      <span class=\"failed_spec_name\">#{escape(name)}</span>"
@@ -72,8 +76,8 @@ module Spec
 
         def example_not_implemented(name)
           @current_example_number += 1
-          @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>"
-          @output.puts "    <script type=\"text/javascript\">makeYellow('behaviour_#{current_behaviour_number}');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeYellow('rspec-header');</script>" unless @header_red
+          @output.puts "    <script type=\"text/javascript\">makeYellow('behaviour_#{current_behaviour_number}');</script>" unless @behaviour_red
           move_progress
           @output.puts "    <dd class=\"spec not_implemented\"><span class=\"not_implemented_spec_name\">#{escape(name)}</span></dd>"
           @output.flush
@@ -156,8 +160,8 @@ EOF
   <h1>RSpec Results</h1>
 
   <div id="summary">
-    <p id="duration">&nbsp;</p>
     <p id="totals">&nbsp;</p>
+    <p id="duration">&nbsp;</p>
   </div>
 </div>
 

data/lib/spec/runner/options.rb

@@ -125,7 +125,7 @@ module Spec
       end
 
       def parse_heckle(heckle)
-        heckle_require = PLATFORM == 'i386-mswin32' ? 'spec/runner/heckle_runner_win' : 'spec/runner/heckle_runner'
+        heckle_require = [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} ? 'spec/runner/heckle_runner_unsupported' : 'spec/runner/heckle_runner'
         require heckle_require
         @heckle_runner = HeckleRunner.new(heckle)
       end

data/lib/spec/version.rb

@@ -3,11 +3,11 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 0
-      TINY   = 0
+      TINY   = 1
       RELEASE_CANDIDATE = nil
       
-      # RANDOM_TOKEN: 0.805184248412641
-      REV = "$LastChangedRevision: 1986 $".match(/LastChangedRevision: (\d+)/)[1]
+      # RANDOM_TOKEN: 0.304684116789143
+      REV = "$LastChangedRevision: 2004 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/dsl/behaviour_spec.rb

@@ -600,5 +600,21 @@ module Spec
       
       # TODO - add an example about shared behaviours
     end
+    
+    describe Enumerable do
+      def each(&block)
+        ["4", "2", "1"].each(&block)
+      end
+      
+      it "should be included in examples because it is a module" do
+        map{|e| e.to_i}.should == [4,2,1]
+      end
+    end
+    
+    describe String do
+      it "should not be included in examples because it is not a module" do
+        lambda{self.map}.should raise_error(NoMethodError, /undefined method `map' for/)
+      end
+    end
   end
 end

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -30,7 +30,7 @@ describe "HtmlFormatter" do
         if opt == '--diff'
           # Uncomment this line temporarily in order to overwrite the expected with actual.
           # Use with care!!!
-          File.open(expected_file, 'w') {|io| io.write(html)}
+          # File.open(expected_file, 'w') {|io| io.write(html)}
 
           doc = Hpricot(html)
           backtraces = doc.search("div.backtrace").collect {|e| e.at("/pre").inner_html}

data/spec/spec/runner/heckle_runner_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
-unless ['i386-mswin32', 'java'].index(PLATFORM)
+unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
   require 'spec/runner/heckle_runner'
 
   module Foo

data/spec/spec/runner/heckler_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
-unless ['i386-mswin32', 'java'].index(PLATFORM)
+unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
   require 'spec/runner/heckle_runner'
 
   describe "Heckler" do

data/spec/spec/runner/option_parser_spec.rb

@@ -133,7 +133,7 @@ describe "OptionParser" do
     options = parse(["--format", "html:test.html"])
     File.should be_exist('test.html')
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
-    FileUtils.rm 'test.html' rescue nil # Help windows
+    FileUtils.rm 'test.html' #rescue nil # Help windows
   end
 
   it "should use noisy backtrace tweaker with b option" do
@@ -262,17 +262,17 @@ describe "OptionParser" do
     @err.string.should match(/You cannot use both --line and --example/n)
   end
 
-  if(PLATFORM != "i386-mswin32")
-    it "should heckle when --heckle is specified (and platform is not windows)" do
-      options = parse(["--heckle", "Spec"])
-      options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner)
-    end
-  else
+  if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     it "should barf when --heckle is specified (and platform is windows)" do
       lambda do
         options = parse(["--heckle", "Spec"])
       end.should raise_error(StandardError, "Heckle not supported on Windows")
     end
+  else
+    it "should heckle when --heckle is specified (and platform is not windows)" do
+      options = parse(["--heckle", "Spec"])
+      options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner)
+    end
   end
 
   it "should read options from file when --options is specified" do
@@ -291,10 +291,10 @@ describe "OptionParser" do
   end
    
   it "should save config to file when --generate-options is specified" do
-    FileUtils.rm 'test.spec.opts' rescue nil
+    FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
     options = parse(["--colour", "--generate-options", "test.spec.opts", "--diff"])
     File.open('test.spec.opts').read.should == "--colour\n--diff\n"
-    FileUtils.rm 'test.spec.opts' rescue nil
+    FileUtils.rm 'test.spec.opts' #rescue nil # Help windows
   end
 
   it "should call DrbCommandLine when --drb is specified" do

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-05-18 00:00:00 -07:00
-summary: RSpec-1.0.0 (r1986) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 1.0.1
+date: 2007-05-24 00:00:00 +02:00
+summary: RSpec-1.0.1 (r2004) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -35,6 +35,19 @@ files:
 - Rakefile
 - README
 - UPGRADE
+- lib/autotest.rb
+- lib/spec.rb
+- lib/autotest/discover.rb
+- lib/autotest/rspec.rb
+- lib/spec/dsl.rb
+- lib/spec/expectations.rb
+- lib/spec/extensions.rb
+- lib/spec/matchers.rb
+- lib/spec/mocks.rb
+- lib/spec/runner.rb
+- lib/spec/test_case_adapter.rb
+- lib/spec/translator.rb
+- lib/spec/version.rb
 - lib/spec/dsl/behaviour.rb
 - lib/spec/dsl/behaviour_callbacks.rb
 - lib/spec/dsl/behaviour_eval.rb
@@ -45,16 +58,13 @@ files:
 - lib/spec/dsl/example.rb
 - lib/spec/dsl/example_matcher.rb
 - lib/spec/dsl/example_should_raise_handler.rb
-- lib/spec/dsl.rb
-- lib/spec/expectations/differs/default.rb
 - lib/spec/expectations/errors.rb
-- lib/spec/expectations/extensions/object.rb
-- lib/spec/expectations/extensions/string_and_symbol.rb
 - lib/spec/expectations/extensions.rb
 - lib/spec/expectations/handler.rb
-- lib/spec/expectations.rb
+- lib/spec/expectations/differs/default.rb
+- lib/spec/expectations/extensions/object.rb
+- lib/spec/expectations/extensions/string_and_symbol.rb
 - lib/spec/extensions/object.rb
-- lib/spec/extensions.rb
 - lib/spec/matchers/be.rb
 - lib/spec/matchers/be_close.rb
 - lib/spec/matchers/change.rb
@@ -69,12 +79,10 @@ files:
 - lib/spec/matchers/respond_to.rb
 - lib/spec/matchers/satisfy.rb
 - lib/spec/matchers/throw_symbol.rb
-- lib/spec/matchers.rb
 - lib/spec/mocks/argument_constraint_matchers.rb
 - lib/spec/mocks/argument_expectation.rb
 - lib/spec/mocks/error_generator.rb
 - lib/spec/mocks/errors.rb
-- lib/spec/mocks/extensions/object.rb
 - lib/spec/mocks/message_expectation.rb
 - lib/spec/mocks/methods.rb
 - lib/spec/mocks/mock.rb
@@ -82,13 +90,20 @@ files:
 - lib/spec/mocks/proxy.rb
 - lib/spec/mocks/space.rb
 - lib/spec/mocks/spec_methods.rb
-- lib/spec/mocks.rb
+- lib/spec/mocks/extensions/object.rb
 - lib/spec/rake/spectask.rb
 - lib/spec/rake/verify_rcov.rb
 - lib/spec/runner/backtrace_tweaker.rb
 - lib/spec/runner/behaviour_runner.rb
 - lib/spec/runner/command_line.rb
 - lib/spec/runner/drb_command_line.rb
+- lib/spec/runner/formatter.rb
+- lib/spec/runner/heckle_runner.rb
+- lib/spec/runner/heckle_runner_unsupported.rb
+- lib/spec/runner/option_parser.rb
+- lib/spec/runner/options.rb
+- lib/spec/runner/reporter.rb
+- lib/spec/runner/spec_parser.rb
 - lib/spec/runner/extensions/kernel.rb
 - lib/spec/runner/extensions/object.rb
 - lib/spec/runner/formatter/base_formatter.rb
@@ -100,18 +115,9 @@ files:
 - lib/spec/runner/formatter/rdoc_formatter.rb
 - lib/spec/runner/formatter/snippet_extractor.rb
 - lib/spec/runner/formatter/specdoc_formatter.rb
-- lib/spec/runner/formatter.rb
-- lib/spec/runner/heckle_runner.rb
-- lib/spec/runner/heckle_runner_win.rb
-- lib/spec/runner/option_parser.rb
-- lib/spec/runner/options.rb
-- lib/spec/runner/reporter.rb
-- lib/spec/runner/spec_parser.rb
-- lib/spec/runner.rb
-- lib/spec/test_case_adapter.rb
-- lib/spec/translator.rb
-- lib/spec/version.rb
-- lib/spec.rb
+- spec/spec_helper.rb
+- spec/spec/spec_classes.rb
+- spec/spec/translator_spec.rb
 - spec/spec/dsl/behaviour_eval_spec.rb
 - spec/spec/dsl/behaviour_factory_spec.rb
 - spec/spec/dsl/behaviour_spec.rb
@@ -123,9 +129,9 @@ files:
 - spec/spec/dsl/example_should_raise_spec.rb
 - spec/spec/dsl/predicate_matcher_spec.rb
 - spec/spec/dsl/shared_behaviour_spec.rb
+- spec/spec/expectations/fail_with_spec.rb
 - spec/spec/expectations/differs/default_spec.rb
 - spec/spec/expectations/extensions/object_spec.rb
-- spec/spec/expectations/fail_with_spec.rb
 - spec/spec/matchers/be_close_spec.rb
 - spec/spec/matchers/be_spec.rb
 - spec/spec/matchers/change_spec.rb
@@ -174,6 +180,16 @@ files:
 - spec/spec/runner/context_matching_spec.rb
 - spec/spec/runner/drb_command_line_spec.rb
 - spec/spec/runner/execution_context_spec.rb
+- spec/spec/runner/heckle_runner_spec.rb
+- spec/spec/runner/heckler_spec.rb
+- spec/spec/runner/noisy_backtrace_tweaker_spec.rb
+- spec/spec/runner/object_ext_spec.rb
+- spec/spec/runner/option_parser_spec.rb
+- spec/spec/runner/options_spec.rb
+- spec/spec/runner/quiet_backtrace_tweaker_spec.rb
+- spec/spec/runner/reporter_spec.rb
+- spec/spec/runner/spec_matcher_spec.rb
+- spec/spec/runner/spec_parser_spec.rb
 - spec/spec/runner/extensions/kernel_spec.rb
 - spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb
 - spec/spec/runner/formatter/failing_examples_formatter_spec.rb
@@ -186,19 +202,6 @@ files:
 - spec/spec/runner/formatter/snippet_extractor_spec.rb
 - spec/spec/runner/formatter/specdoc_formatter_dry_run_spec.rb
 - spec/spec/runner/formatter/specdoc_formatter_spec.rb
-- spec/spec/runner/heckle_runner_spec.rb
-- spec/spec/runner/heckler_spec.rb
-- spec/spec/runner/noisy_backtrace_tweaker_spec.rb
-- spec/spec/runner/object_ext_spec.rb
-- spec/spec/runner/option_parser_spec.rb
-- spec/spec/runner/options_spec.rb
-- spec/spec/runner/quiet_backtrace_tweaker_spec.rb
-- spec/spec/runner/reporter_spec.rb
-- spec/spec/runner/spec_matcher_spec.rb
-- spec/spec/runner/spec_parser_spec.rb
-- spec/spec/spec_classes.rb
-- spec/spec/translator_spec.rb
-- spec/spec_helper.rb
 - examples/auto_spec_description_example.rb
 - examples/before_and_after_example.rb
 - examples/behave_as_example.rb