testbot 0.3.8 → 0.3.9.pre

data/lib/adapters/cucumber_adapter.rb

@@ -1,7 +1,11 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
+
 class CucumberAdapter
   
-  def self.command(ruby_interpreter, files)
-    "export AUTOTEST=1; #{ruby_interpreter} script/cucumber -f progress --backtrace -r features/support -r features/step_definitions #{files} -t ~@disabled_in_cruise"
+  def self.command(project_path, ruby_interpreter, files)
+    cucumber_command = RubyEnv.ruby_command(project_path, :script => "script/cucumber", :bin => "cucumber",
+                                                          :ruby_interpreter => ruby_interpreter)
+    "export AUTOTEST=1; #{ruby_interpreter} #{cucumber_command} -f progress --backtrace -r features/support -r features/step_definitions #{files} -t ~@disabled"
   end
  
   def self.test_files(dir)

data/lib/adapters/helpers/ruby_env.rb

@@ -0,0 +1,25 @@
+class RubyEnv
+
+  def self.bundler?(project_path)
+    Gem.available?("bundler") && File.exists?("#{project_path}/Gemfile")
+  end
+
+  def self.ruby_command(project_path, opts = {})
+    ruby_interpeter = opts[:ruby_interpeter] || "ruby"
+    
+    if File.exists?("#{project_path}/#{opts[:script]}")
+      command = opts[:script]
+    elsif opts[:bin]
+      command = opts[:bin]
+    else
+      command = ruby_interpeter
+    end 
+
+    if bundler?(project_path)
+      "#{ruby_interpeter} -S bundle exec #{command}"
+    else
+      "#{ruby_interpeter} -S #{command}"
+    end
+  end
+
+end

data/lib/adapters/rspec_adapter.rb

@@ -1,7 +1,11 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
+
 class RSpecAdapter
   
-  def self.command(ruby_interpreter, files)
-    "export RSPEC_COLOR=true; #{ruby_interpreter} script/spec -O spec/spec.opts #{files}"
+  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}"
   end
   
   def self.test_files(dir)

data/lib/adapters/test_unit_adapter.rb

@@ -1,7 +1,10 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/helpers/ruby_env"))
+
 class TestUnitAdapter
   
-  def self.command(ruby_interpreter, files)
-    "#{ruby_interpreter} -Itest -e '%w(#{files}).each { |file| require(file) }'"
+  def self.command(project_path, ruby_interpreter, files)
+    ruby_command = RubyEnv.ruby_command(project_path, :ruby_interpreter => ruby_interpreter)
+    "#{ruby_command} -Itest -e '%w(#{files}).each { |file| require(file) }'"
   end
   
   def self.test_files(dir)

data/lib/runner.rb

@@ -49,7 +49,7 @@ class Job
     base_environment = "export RAILS_ENV=test; export TEST_ENV_NUMBER=#{test_env_number}; cd #{@project};"
     
     adapter = Adapter.find(@type)
-    result += `#{base_environment} #{adapter.command(ruby_cmd, @files)} 2>&1`
+    result += `#{base_environment} #{adapter.command(@project, ruby_cmd, @files)} 2>&1`
 
     Server.put("/jobs/#{@id}", :body => { :result => result, :success => ($?.exitstatus == 0) })
     puts "Job #{@id} finished."
@@ -169,8 +169,7 @@ class Runner
   end
   
   def before_run(job)
-    use_bundler = File.exists?("#{job.project}/Gemfile") && system("which bundle > /dev/null")
-    bundler_cmd = use_bundler ? "bundle; " : ""
+    bundler_cmd = RubyEnv.bundler?(job.project) ? "bundle; " : ""
     system "export RAILS_ENV=test; export TEST_INSTANCES=#{@config.max_instances}; cd #{job.project}; #{bundler_cmd} rake testbot:before_run"
   end
   

data/lib/testbot.rb

@@ -8,7 +8,7 @@ unless defined?(Testbot)
     require 'railtie' if defined?(Rails)
 
     # Don't forget to update readme and changelog
-    VERSION = "0.3.8"
+    VERSION = "0.3.9.pre"
 
     SERVER_PID = "/tmp/testbot_server.pid"
     RUNNER_PID = "/tmp/testbot_runner.pid"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 961916024
+  prerelease: true
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  - pre
+  version: 0.3.9.pre
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +01:00
+date: 2010-12-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,6 +174,7 @@ extra_rdoc_files: []
 files: 
 - lib/adapters/adapter.rb
 - lib/adapters/cucumber_adapter.rb
+- lib/adapters/helpers/ruby_env.rb
 - lib/adapters/rspec_adapter.rb
 - lib/adapters/test_unit_adapter.rb
 - lib/generators/testbot/templates/testbot.rake.erb
@@ -218,12 +220,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: