rspec 1.1.7 → 1.1.8

data/History.txt

@@ -1,3 +1,10 @@
+=== Version 1.1.8 / 2008-10-03
+
+* 2 bug fixes
+
+  * restore colorized output in linux and windows w/ autotest (Tim Pope). Fixes #413.
+  * autospec no longer hangs on windows. Fixes #554.
+
 === Version 1.1.7 / 2008-10-02
 
 * no changes since 1.1.6, but releasing rspec-1.1.7 to align versions with rspec-rails-1.1.7

data/bin/autospec

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-ENV['RSPEC'] = 'true'
-system("autotest", *ARGV)
+ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
+ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
+system (RUBY_PLATFORM =~ /mswin/ ? 'autotest.bat' : 'autotest'), *ARGV

data/lib/spec/interop/test/unit/testcase.rb

@@ -45,7 +45,10 @@ module Test
 
       def initialize(defined_description, &implementation)
         @_defined_description = defined_description
-        @_implementation = implementation
+        
+        # TODO - examples fail in rspec-rails if we remove "|| pending_implementation"
+        #      - find a way to fail without it in rspec's code examples
+        @_implementation = implementation || pending_implementation
 
         @_result = ::Test::Unit::TestResult.new
         # @method_name is important to set here because it "complies" with Test::Unit's interface.
@@ -56,6 +59,13 @@ module Test
       def run(ignore_this_argument=nil)
         super()
       end
+
+    private
+
+      def pending_implementation
+        error = Spec::Example::NotYetImplementedError.new(caller)
+        lambda { raise(error) }
+      end
     end
   end
 end

data/lib/spec/rake/spectask.rb

@@ -107,7 +107,7 @@ module Spec
       # A message to print to stderr when there are failures.
       attr_accessor :failure_message
 
-      # Where RSpec's output is written. Defaults to STDOUT.
+      # Where RSpec's output is written. Defaults to $stdout.
       # DEPRECATED. Use --format FORMAT:WHERE in spec_opts.
       attr_accessor :out
 

data/lib/spec/runner.rb

@@ -199,7 +199,7 @@ module Spec
 
       def options # :nodoc:
         @options ||= begin
-          parser = ::Spec::Runner::OptionParser.new(STDERR, STDOUT)
+          parser = ::Spec::Runner::OptionParser.new($stderr, $stdout)
           parser.order!(ARGV)
           parser.options
         end

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

@@ -77,7 +77,7 @@ module Spec
         end
         
         def close
-          if IO === @output && @output != STDOUT
+          if IO === @output && @output != $stdout
             @output.close 
           end
         end

data/lib/spec/runner/option_parser.rb

@@ -38,7 +38,7 @@ module Spec
                                                        "(does not work for dynamically generated specs)"],
         :format => ["-f", "--format FORMAT[:WHERE]","Specifies what format to use for output. Specify WHERE to tell",
                                                     "the formatter where to write the output. All built-in formats",
-                                                    "expect WHERE to be a file name, and will write to STDOUT if it's",
+                                                    "expect WHERE to be a file name, and will write to $stdout if it's",
                                                     "not specified. The --format option may be specified several times",
                                                     "if you want several outputs",
                                                     " ",

data/lib/spec/runner/options.rb

@@ -136,8 +136,10 @@ module Spec
         @colour = colour
         if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
           begin ;\
+            replace_output = @output_stream.equal?($stdout) ;\
             require 'rubygems' ;\
             require 'Win32/Console/ANSI' ;\
+            @output_stream = $stdout if replace_output ;\
           rescue LoadError ;\
             warn "You must 'gem install win32console' to use colour on Windows" ;\
             @colour = false ;\

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 7
+      TINY   = 8
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/rspec.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{rspec}
-  s.version = "1.1.6"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-10-02}
+  s.date = %q{2008-10-03}
   s.description = %q{Behaviour Driven Development for Ruby.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.executables = ["autospec", "spec"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.0}
-  s.summary = %q{rspec 1.1.6}
+  s.summary = %q{rspec 1.1.8}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/spec/spec/interop/test/unit/testcase_spec.rb

@@ -42,4 +42,8 @@ describe "Test::Unit::TestCase" do
       $?.should == 256
     end
   end
+  
+  describe "not yet implemented examples:" do
+    it "this example should be reported as pending (not an error)"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 -05:00
+date: 2008-10-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -472,6 +472,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: rspec 1.1.7
+summary: rspec 1.1.8
 test_files: []