Merge branch 'master' of https://github.com/iron-io/iron_worker_ruby

VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 3
-:patch: 14
+:patch: 15
 :build: !!null 

iron_worker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "iron_worker"
-  s.version = "2.3.14"
+  s.version = "2.3.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2012-04-25"
+  s.date = "2012-07-13"
   s.description = "The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.iron.io"
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io"
 
   if s.respond_to? :specification_version then

lib/iron_worker/service.rb

@@ -223,8 +223,12 @@ def build_merged_file(filename, merged, unmerge, merged_gems, unmerged_gems, mer
 
         # require merged gems
         merged_gems.each_pair do |k, gem|
-          IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
           f.write "$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib'))\n"
+        end
+
+        merged_gems.each_pair do |k, gem|
+          IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
+          #f.write "$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib'))\n"
           next if gem[:bypass_require]
           IronWorker.logger.debug 'writing requires: ' + gem[:require].inspect
           if gem[:require].nil?

test/Gemfile.lock

@@ -134,7 +134,7 @@ GEM
       multi_json (~> 1.0)
       signature (~> 0.1.2)
     rack (1.4.1)
-    rest (2.0.1)
+    rest (2.0.0)
       net-http-persistent
       rest-client (>= 0.3.0)
     rest-client (1.6.7)

test/batch_run.rb

@@ -34,7 +34,9 @@ def test_concur_batch
           response_hash = worker2.queue(:priority=>(@config[:priority] || 0))
           puts "response_hash #{i} = " + response_hash.inspect
           assert response_hash["msg"]
+          assert response_hash["status_code"]
           assert response_hash["tasks"]
+          assert response_hash["status_code"] == 200
           assert response_hash["tasks"][0]["id"].length == 24, "length is #{response_hash["tasks"][0]["id"].length}"
           assert response_hash["tasks"][0]["id"] == worker2.task_id, "id in hash: #{response_hash["tasks"][0]["id"]}, task_id: #{worker2.task_id}. response was #{worker2.response.inspect}"
           worker2

test/quick_run.rb

@@ -7,7 +7,7 @@ class QuickRun < TestBase
 
   def test_worker
     tasks = []
-    50.times do |i|
+    1.times do |i|
       puts "Queuing #{i}"
       worker = OneLineWorker.new
       worker.x = i

test/workers/one_line_worker.rb

@@ -1,6 +1,7 @@
 # bump......
 class OneLineWorker < IronWorker::Base
 
+
   attr_accessor :x
 
   def run