require 'rubygems' in script/spec

dchelimsky · Oct 4, 2008 · 931f370 · 931f370
1 parent 4adeb8d
commit 931f370
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/History.txt b/History.txt
@@ -1,9 +1,11 @@
 === Version 1.1.8 / 2008-10-03
 
-* 2 bug fixes
+* 3 bug fixes
 
   * correctly handle assigns that are false. Fixes #552.
   * ensure that NotYetImplemented examples report as pending (fixed in rspec, not rspec-rails). Fixes #553.
+  * require 'rubygems' in script/spec
+
 
 === Version 1.1.7 / 2008-10-02
 

diff --git a/generators/rspec/templates/script/autospec b/generators/rspec/templates/script/autospec
@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-ENV['RSPEC'] = 'true'
-system 'autotest'
+ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
+ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
+system (RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV
diff --git a/generators/rspec/templates/script/spec b/generators/rspec/templates/script/spec
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'rubygems'
 require 'spec'
 exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))