testbot 0.5.7 → 0.5.8

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.5.8
+
+Now only running tests from one build on a runner at a time.
+
+This is mostly usability. Testbot should behave like when you're running your tests locally.
+
 0.5.7
 
 Added @meeiw's patch to support ERB in config. Added test result summarization for RSpec and Cucumber.

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.5.7'
+    ruby script/plugin install git://github.com/joakimk/testbot.git -r 'refs/tags/v0.5.8'
     script/generate testbot --connect 192.168.0.100
 
     rake testbot:spec (or :rspec, :test, :features)

data/lib/requester/requester.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'httparty'
-require 'macaddr'
 require 'ostruct'
 require 'erb'
 require File.dirname(__FILE__) + '/../shared/ssh_tunnel'
@@ -49,7 +48,6 @@ module Testbot::Requester
       build_id = HTTParty.post("#{server_uri}/builds", :body => { :root => root,
                                :type => adapter.type.to_s,
                                :project => config.project,
-                               :requester_mac => Mac.addr,
                                :available_runner_usage => config.available_runner_usage,
                                :files => files.join(' '),
                                :sizes => sizes.join(' '),

data/lib/runner/job.rb

@@ -2,11 +2,11 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'runner.rb'))
 
 module Testbot::Runner
   class Job
-    attr_reader :root, :project, :requester_mac
+    attr_reader :root, :project, :build_id
 
-    def initialize(runner, id, requester_mac, project, root, type, ruby_interpreter, files)
-      @runner, @id, @requester_mac, @project, @root, @type, @ruby_interpreter, @files =
-        runner, id, requester_mac, project, root, type, ruby_interpreter, files
+    def initialize(runner, id, build_id, project, root, type, ruby_interpreter, files)
+      @runner, @id, @build_id, @project, @root, @type, @ruby_interpreter, @files =
+        runner, id, build_id, project, root, type, ruby_interpreter, files
     end
 
     def jruby?
@@ -14,7 +14,7 @@ module Testbot::Runner
     end
 
     def run(instance)
-      puts "Running job #{@id} from #{@requester_mac}... "
+      puts "Running job #{@id} (build #{@build_id})... "
       test_env_number = (instance == 0) ? '' : instance + 1
       result = "\n#{`hostname`.chomp}:#{Dir.pwd}\n"
       base_environment = "export RAILS_ENV=test; export TEST_ENV_NUMBER=#{test_env_number}; cd #{@project};"

data/lib/runner/runner.rb

@@ -33,7 +33,7 @@ module Testbot::Runner
 
     def initialize(config)
       @instances = []
-      @last_requester_mac = nil
+      @last_build_id = nil
       @last_version_check = Time.now - TIME_BETWEEN_VERSION_CHECKS - 1
       @config = OpenStruct.new(config)
       @config.max_instances = @config.max_instances ? @config.max_instances.to_i : CPU.count 
@@ -85,13 +85,13 @@ module Testbot::Runner
 
         check_for_update if !last_check_found_a_job && time_for_update?
 
-        # Only get jobs from one requester at a time
+        # Only get jobs from one build at a time
         next_params = base_params
         if @instances.size > 0
-          next_params.merge!({ :requester_mac => @last_requester_mac })
+          next_params.merge!({ :build_id => @last_build_id })
           next_params.merge!({ :no_jruby => true }) if max_jruby_instances?
         else
-          @last_requester_mac = nil
+          @last_build_id = nil
         end
 
         # Makes sure all instances are listed as available after a run
@@ -102,14 +102,14 @@ module Testbot::Runner
         next unless last_check_found_a_job
 
         job = Job.new(*([ self, next_job.split(',') ].flatten))
-        if first_job_from_requester?
+        if first_job_from_build?
           fetch_code(job)
           before_run(job) if File.exists?("#{job.project}/lib/tasks/testbot.rake")
         end
 
         @instances << [ Thread.new { job.run(free_instance_number) },
           free_instance_number, job ]
-        @last_requester_mac = job.requester_mac
+        @last_build_id = job.build_id
         loop do
           clear_completed_instances
           break unless max_instances_running?
@@ -131,8 +131,8 @@ module Testbot::Runner
       system "export RAILS_ENV=test; export TEST_INSTANCES=#{@config.max_instances}; cd #{job.project}; #{bundler_cmd} rake testbot:before_run"
     end
 
-    def first_job_from_requester?
-      @last_requester_mac == nil
+    def first_job_from_build?
+      @last_build_id == nil
     end
 
     def time_for_update?

data/lib/server/build.rb

@@ -21,7 +21,6 @@ module Testbot::Server
                    :root => self.root,
                    :project => self.project,
                    :type => self.type,
-                   :requester_mac => self.requester_mac,
                    :build => self,
                    :jruby => self.jruby)
       end

data/lib/server/job.rb

@@ -15,19 +15,19 @@ module Testbot::Server
     end
 
     def self.next(params, remove_addr)
-      clean_params = params.reject { |k, v| [ "requester_mac", "no_jruby" ].include?(k) }
+      clean_params = params.reject { |k, v| k == "no_jruby" }
       runner = Runner.record! clean_params.merge({ :ip => remove_addr, :last_seen_at => Time.now })
       return unless Server.valid_version?(params[:version])
-      [ next_job(params["requester_mac"], params["no_jruby"]), runner ]
+      [ next_job(params["build_id"], params["no_jruby"]), runner ]
     end
 
     private
 
-    def self.next_job(requester_mac, no_jruby)
+    def self.next_job(build_id, no_jruby)
       release_jobs_taken_by_missing_runners!
       jobs = Job.all.find_all { |j|
         !j.taken_at &&
-          (requester_mac ? j.requester_mac == requester_mac : true) &&
+          (build_id ? j.build.id.to_s == build_id : true) &&
           (no_jruby ? j.jruby != 1 : true)
       }
 

data/lib/server/server.rb

@@ -37,7 +37,7 @@ module Testbot::Server
     next_job, runner = Job.next(params, @env['REMOTE_ADDR'])
     if next_job
       next_job.update(:taken_at => Time.now, :taken_by => runner)
-      [ next_job.id, next_job.requester_mac, next_job.project, next_job.root, next_job.type, (next_job.jruby == 1 ? 'jruby' : 'ruby'), next_job.files ].join(',')
+      [ next_job.id, next_job.build.id, next_job.project, next_job.root, next_job.type, (next_job.jruby == 1 ? 'jruby' : 'ruby'), next_job.files ].join(',')
     end
   end
 

data/lib/shared/version.rb

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

data/test/requester/requester_test.rb

@@ -82,7 +82,6 @@ module Testbot::Requester
     context "run_tests" do
 
       should "should be able to create a build" do
-        flexmock(Mac).should_receive(:addr).and_return('aa:aa:aa:aa:aa:aa')
         requester = Requester.new(:server_host => "192.168.1.100", :rsync_path => '/path', :available_runner_usage => '60%', :project => 'things', :server_user => "cruise")
         flexmock(RspecAdapter).should_receive(:test_files).with('spec').once.and_return([ 'spec/models/house_spec.rb', 'spec/models/car_spec.rb' ])
 
@@ -94,7 +93,6 @@ module Testbot::Requester
                                                              :root => "cruise@192.168.1.100:/path",
                                                              :project => "things",
                                                              :available_runner_usage => "60%",
-                                                             :requester_mac => 'aa:aa:aa:aa:aa:aa',
                                                              :files => "spec/models/house_spec.rb" +
                                                              " spec/models/car_spec.rb",
                                                              :sizes => "10 20",
@@ -346,12 +344,11 @@ module Testbot::Requester
         ENV['USE_JRUBY'] = "true"
         requester = Requester.new
         flexmock(requester).should_receive(:system)
-        flexmock(Mac).should_receive(:addr).and_return("00:01:..") 
 
         # This is quite ugly. I want something like hash_including instead...
         other_args = { :type=>"test", :available_runner_usage=>"100%",
           :root=>"testbot@:/tmp/testbot/#{ENV['USER']}", :files=>"test/some_test.rb",
-        :requester_mac=>"00:01:..", :sizes=>"0", :project=>"project" }
+          :sizes=>"0", :project=>"project" }
 
         flexmock(TestUnitAdapter).should_receive(:test_files).and_return([ 'test/some_test.rb' ])
         flexmock(HTTParty).should_receive(:post).with(any, :body => other_args.merge({ :jruby => true })).and_return('5')

data/test/server/server_test.rb

@@ -25,7 +25,7 @@ module Testbot::Server
 
       should "create a build and return its id" do
         flexmock(Runner).should_receive(:total_instances).and_return(2)
-        post '/builds', :files => 'spec/models/car_spec.rb spec/models/house_spec.rb', :root => 'server:/path/to/project', :type => 'spec', :available_runner_usage => "100%", :requester_mac => "bb:bb:bb:bb:bb:bb", :project => 'things', :sizes => "10 20", :jruby => false
+        post '/builds', :files => 'spec/models/car_spec.rb spec/models/house_spec.rb', :root => 'server:/path/to/project', :type => 'spec', :available_runner_usage => "100%", :project => 'things', :sizes => "10 20", :jruby => false
 
         first_build = Build.all.first
         assert last_response.ok?
@@ -35,7 +35,6 @@ module Testbot::Server
         assert_equal '10 20', first_build.sizes
         assert_equal 'server:/path/to/project', first_build.root
         assert_equal 'spec', first_build.type
-        assert_equal 'bb:bb:bb:bb:bb:bb', first_build.requester_mac
         assert_equal 'things', first_build.project
         assert_equal 0, first_build.jruby
         assert_equal '', first_build.results
@@ -49,7 +48,7 @@ module Testbot::Server
                                                                                                                                                                                                                    ["spec/models/house_spec.rb", "spec/models/house2_spec.rb"]
         ])
 
-        post '/builds', :files => 'spec/models/car_spec.rb spec/models/car2_spec.rb spec/models/house_spec.rb spec/models/house2_spec.rb', :root => 'server:/path/to/project', :type => 'spec', :available_runner_usage => "100%", :requester_mac => "bb:bb:bb:bb:bb:bb", :project => 'things', :sizes => "1 1 1 1", :jruby => true
+        post '/builds', :files => 'spec/models/car_spec.rb spec/models/car2_spec.rb spec/models/house_spec.rb spec/models/house2_spec.rb', :root => 'server:/path/to/project', :type => 'spec', :available_runner_usage => "100%", :project => 'things', :sizes => "1 1 1 1", :jruby => true
 
         assert_equal 2, Job.count
         first_job, last_job = Job.all
@@ -58,7 +57,6 @@ module Testbot::Server
 
         assert_equal 'server:/path/to/project', first_job.root
         assert_equal 'spec', first_job.type
-        assert_equal 'bb:bb:bb:bb:bb:bb', first_job.requester_mac
         assert_equal 'things', first_job.project
         assert_equal 1, first_job.jruby
         assert_equal Build.all.first, first_job.build
@@ -103,21 +101,23 @@ module Testbot::Server
     context "GET /jobs/next" do
 
       should "be able to return a job and mark it as taken" do
-        job1 = Job.create :files => 'spec/models/car_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb", :project => 'things', :jruby => 1
+        build = Build.create
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :root => 'server:/project', :type => 'spec', :build => build, :project => 'things', :jruby => 1
 
         get '/jobs/next', :version => Testbot.version
         assert last_response.ok?      
 
-        assert_equal [ job1.id, "bb:bb:bb:bb:bb:bb", "things", "server:/project", "spec", "jruby", "spec/models/car_spec.rb" ].join(','), last_response.body
+        assert_equal [ job1.id, build.id, "things", "server:/project", "spec", "jruby", "spec/models/car_spec.rb" ].join(','), last_response.body
         assert job1.taken_at != nil
       end
 
       should "not return a job that has already been taken" do
-        job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now, :type => 'spec'
-        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "aa:aa:aa:aa:aa:aa", :project => 'things', :jruby => 0
+        build = Build.create
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :taken_at => Time.now, :type => 'spec', :build => build
+        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build, :project => 'things', :jruby => 0
         get '/jobs/next', :version => Testbot.version
         assert last_response.ok?
-        assert_equal [ job2.id, "aa:aa:aa:aa:aa:aa", "things", "server:/project", "spec", "ruby", "spec/models/house_spec.rb" ].join(','), last_response.body
+        assert_equal [ job2.id, build.id, "things", "server:/project", "spec", "ruby", "spec/models/house_spec.rb" ].join(','), last_response.body
         assert job2.taken_at != nil
       end
 
@@ -128,7 +128,7 @@ module Testbot::Server
       end
 
       should "save which runner takes a job" do
-        job = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "aa:aa:aa:aa:aa:aa"
+        job = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => Build.create
         get '/jobs/next', :version => Testbot.version
         assert_equal Runner.first, job.taken_by
       end
@@ -160,23 +160,25 @@ module Testbot::Server
       end
 
       should "only give jobs from the same source to a runner" do
-        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb"
-        get '/jobs/next', :version => Testbot.version, :uid => "00:..."
+        build = Build.create
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :build => build
+        get '/jobs/next', :version => Testbot.version, :uid => "00:...", :build_id => build.id
 
         # Creating the second job here because of the random lookup.
-        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "aa:aa:aa:aa:aa:aa"
-        get '/jobs/next', :version => Testbot.version, :uid => "00:...", :requester_mac => "bb:bb:bb:bb:bb:bb"
+        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build
+        get '/jobs/next', :version => Testbot.version, :uid => "00:...", :build_id => build.id + 1
 
         assert last_response.ok?
         assert_equal '', last_response.body
       end
 
       should "not give more jruby jobs to an instance that can't take more" do
-        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb", :jruby => 1
+        build = Build.create
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :jruby => 1, :build => build
         get '/jobs/next', :version => Testbot.version, :uid => "00:..."
 
         # Creating the second job here because of the random lookup.
-        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :jruby => 1
+        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :jruby => 1, :build => build
         get '/jobs/next', :version => Testbot.version, :uid => "00:...", :no_jruby => "true"
 
         assert last_response.ok?
@@ -184,38 +186,40 @@ module Testbot::Server
       end
 
       should "still return other jobs when the runner cant take more jruby jobs" do
-        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb", :jruby => 1
+        job1 = Job.create :files => 'spec/models/car_spec.rb', :type => 'spec', :jruby => 1, :build => Build.create
         get '/jobs/next', :version => Testbot.version, :uid => "00:..."
 
         # Creating the second job here because of the random lookup.
-        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :jruby => 0
+        job2 = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :jruby => 0, :build => Build.create
         get '/jobs/next', :version => Testbot.version, :uid => "00:...", :no_jruby => "true"
 
         assert last_response.ok?
         assert_equal job2.id.to_s, last_response.body.split(',')[0]
       end
 
-      should "return the jobs in random order in order to start working for a new requester right away" do
-        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb" }
+      should "return the jobs in random order in order to start working for a new build right away" do
+        build1, build2 = Build.create, Build.create
+        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build1 }
 
-        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "aa:aa:aa:aa:aa:aa" }
+        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build2 }
 
-        macs = (0...10).map {
+        build_ids = (0...10).map {
           get '/jobs/next', :version => Testbot.version, :uid => "00:..."
           last_response.body.split(',')[1]
         }
 
-        assert macs.find { |mac| mac == 'bb:bb:bb:bb:bb:bb' }
-        assert macs.find { |mac| mac == 'aa:aa:aa:aa:aa:aa' }
+        assert build_ids.find { |build_id| build_id == build1.id.to_s }
+        assert build_ids.find { |build_id| build_id == build2.id.to_s }
       end
 
-      should "return the jobs randomly when passing requester" do
-        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb" }
+      should "return the jobs randomly when passing build_id" do
+        build = Build.create
+        20.times { Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build }
 
-        20.times { Job.create :files => 'spec/models/car_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "bb:bb:bb:bb:bb:bb" }
+        20.times { Job.create :files => 'spec/models/car_spec.rb', :root => 'server:/project', :type => 'spec', :build => build }
 
         files = (0...10).map {
-          get '/jobs/next', :version => Testbot.version, :uid => "00:...", :requester_mac => "bb:bb:bb:bb:bb:bb"
+          get '/jobs/next', :version => Testbot.version, :uid => "00:...", :build_id => build.id
           last_response.body.split(',').last
         }
 
@@ -225,14 +229,15 @@ module Testbot::Server
 
       should "return taken jobs to other runners if the runner hasn't been seen for 10 seconds or more" do
         missing_runner = Runner.create(:last_seen_at => Time.now - 15)
-        old_taken_job = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :requester_mac => "aa:aa:aa:aa:aa:aa", :taken_by => missing_runner, :taken_at => Time.now - 30, :project => 'things'
+        build = Build.create
+        old_taken_job = Job.create :files => 'spec/models/house_spec.rb', :root => 'server:/project', :type => 'spec', :build => build, :taken_by => missing_runner, :taken_at => Time.now - 30, :project => 'things'
 
         new_runner = Runner.create(:uid => "00:01")
         get '/jobs/next', :version => Testbot.version, :uid => "00:01"
         assert_equal new_runner, old_taken_job.taken_by
 
         assert last_response.ok?
-        assert_equal [ old_taken_job.id, "aa:aa:aa:aa:aa:aa", "things", "server:/project", "spec", "ruby", "spec/models/house_spec.rb" ].join(','), last_response.body
+        assert_equal [ old_taken_job.id, build.id.to_s, "things", "server:/project", "spec", "ruby", "spec/models/house_spec.rb" ].join(','), last_response.body
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testbot
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -15,13 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 +02:00
+date: 2011-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -32,12 +30,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
+  name: sinatra
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: httparty
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +46,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
+  prerelease: false
+  name: httparty
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: macaddr
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -64,12 +62,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
+  name: macaddr
   type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,12 +78,12 @@ dependencies:
         - 0
         - 23
         version: 2.0.23
+  prerelease: false
+  name: net-ssh
   type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +94,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
+  prerelease: false
+  name: json_pure
   type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: daemons
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,12 +110,12 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
+  prerelease: false
+  name: daemons
   type: :runtime
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: acts_as_rails3_generator
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,12 +124,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: acts_as_rails3_generator
   type: :runtime
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,12 +138,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: shoulda
   type: :development
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -154,12 +152,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: rack-test
   type: :development
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: flexmock
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -168,12 +166,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: flexmock
   type: :development
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -182,12 +180,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: cucumber
   type: :development
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: rvm
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -196,12 +194,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: rvm
   type: :development
-  version_requirements: *id012
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,12 +208,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: rake
   type: :development
-  version_requirements: *id013
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -224,12 +222,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: bundler
   type: :development
-  version_requirements: *id014
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: guard
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -238,12 +236,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: guard
   type: :development
-  version_requirements: *id015
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: guard-test
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -252,8 +250,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  name: guard-test
   type: :development
-  version_requirements: *id016
+  requirement: *id016
 description: Testbot is a test distribution tool that works with Rails, RSpec, RSpec2, Test::Unit and Cucumber.
 email: 
 - joakim.kolsjo@gmail.com