testbot 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.6.2
+
+Fixed "invalid byte sequence in UTF-8" errors cased by test output in some cases.
+
 0.6.1
 
 Fixed CPU core check for OSX Lion.

data/README.markdown

@@ -64,7 +64,7 @@ Using testbot with Rails 2:
 
     # Add testbot to your Gemfile if you use bundler. You also need the plugin because
     # Rails 2 does not load raketasks from gems.
-    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.1'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.6.2'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)

data/Rakefile

@@ -1,12 +1,8 @@
 require 'bundler'
-# TODO: Add when possible. Currently "rake features" fails.
-# require 'bundler/setup'
-require 'cucumber'
-require 'cucumber/rake/task'
 
 Bundler::GemHelper.install_tasks
 
-task :default => [ :test, :features ] do
+task :default => [ :test ] do
 end
 
 desc "Run Test::Unit tests"
@@ -37,17 +33,3 @@ task :restart do
   config = YAML.load_file(".deploy_config.yml")
   system(config["restart_server"]) || fail
 end
-
-Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format progress"
-end
-
-# HACK: As we use RVM to install gems while running cucumber we don't want bundler
-# to raise an error like "rails is not part of the bundle. Add it to Gemfile.".
-module Cucumber::Rake
-  class Task::ForkedCucumberRunner
-    def runner
-      [ RUBY ]
-    end
-  end
-end

data/lib/runner/job.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'runner.rb'))
+require 'iconv'
 
 module Testbot::Runner
   class Job
@@ -25,7 +26,7 @@ module Testbot::Runner
         result += run_and_return_result("#{base_environment} #{adapter.command(@project, ruby_cmd, @files)}")
       end
 
-      Server.put("/jobs/#{@id}", :body => { :result => result, :success => success?, :time => run_time })
+      Server.put("/jobs/#{@id}", :body => { :result => strip_invalid_utf8(result), :success => success?, :time => run_time })
       puts "Job #{@id} finished."
     end
 
@@ -39,6 +40,12 @@ module Testbot::Runner
 
     private
 
+    def strip_invalid_utf8(text)
+      # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
+      ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+      ic.iconv(text + ' ')[0..-2]
+    end
+
     def measure_run_time
       start_time = Time.now
       yield

data/lib/shared/version.rb

@@ -1,7 +1,7 @@
 module Testbot
   # Don't forget to update readme and changelog
   def self.version
-    version = "0.6.1"
+    version = "0.6.2"
     dev_version_file = File.join(File.dirname(__FILE__), '..', '..', 'DEV_VERSION')
     if File.exists?(dev_version_file)
       version += File.read(dev_version_file)

data/testbot.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("shoulda")
   s.add_development_dependency("rack-test")
   s.add_development_dependency("flexmock")
-  s.add_development_dependency("cucumber")
   s.add_development_dependency("rvm")
   s.add_development_dependency("rake", "0.8.7")
   s.add_development_dependency("bundler")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 +01:00
+date: 2012-04-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -171,7 +171,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: rvm
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -184,24 +184,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rvm
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -213,11 +199,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -227,11 +213,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id014
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -241,11 +227,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id015
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: guard-test
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -255,7 +241,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id016
+  version_requirements: *id015
 description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com