testbot 0.3.9 → 0.4.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.4.0
+
+Fixed RSpec 2 compability issue.
+
 0.3.9
 
 Added support for running tests with bundler exec.

data/README.markdown

@@ -68,7 +68,7 @@ Using testbot with Rails 3:
 
 Using testbot with Rails 2:
 
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.3.9'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.4.0'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :test, :features)

data/lib/adapters/rspec_adapter.rb

@@ -5,7 +5,11 @@ class RSpecAdapter
   def self.command(project_path, ruby_interpreter, files)
     spec_command = RubyEnv.ruby_command(project_path, :script => "script/spec", :bin => "rspec",
                                                       :ruby_interpreter => ruby_interpreter)
-    "export RSPEC_COLOR=true; #{spec_command} -O spec/spec.opts #{files}"
+    if File.exists?("#{project_path}/spec/spec.opts")
+      spec_command += " -O spec/spec.opts"
+    end
+
+    "export RSPEC_COLOR=true; #{spec_command} #{files}"
   end
   
   def self.test_files(dir)

data/lib/testbot.rb

@@ -8,10 +8,16 @@ unless defined?(Testbot)
     require 'railtie' if defined?(Rails)
 
     # Don't forget to update readme and changelog
-    VERSION = "0.3.9"
+    VERSION = "0.4.0"
+
+    if ENV['INTEGRATION_TEST']
+      SERVER_PID = "/tmp/integration_test_testbot_server.pid"
+      RUNNER_PID = "/tmp/integration_test_testbot_runner.pid"
+    else
+      SERVER_PID = "/tmp/testbot_server.pid"
+      RUNNER_PID = "/tmp/testbot_runner.pid"
+    end
 
-    SERVER_PID = "/tmp/testbot_server.pid"
-    RUNNER_PID = "/tmp/testbot_runner.pid"
     DEFAULT_WORKING_DIR = "/tmp/testbot"
     DEFAULT_SERVER_PATH = "/tmp/testbot/#{ENV['USER']}"
     DEFAULT_USER = "testbot"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +01:00
+date: 2010-12-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency