iron_worker 2.3.9 → 2.3.10

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 3
-:patch: 9
-:build: 
+:patch: 10
+:build: !!null 

data/lib/iron_worker/base.rb

@@ -215,7 +215,7 @@ module IronWorker
     def queue(options={})
 #            puts 'in queue'
 
-      IronWorker.service.config.force_upload = IronWorker.service.config.force_upload && is_local?
+      IronWorker.config.force_upload = IronWorker.config.force_upload && is_local?
       set_auto_attributes
       upload_if_needed(options)
       response = IronWorker.service.queue(self.class.name, sw_get_data, options)

data/lib/iron_worker/service.rb

@@ -94,8 +94,8 @@ module IronWorker
 
 
     def self.get_gem_path(gem_info)
-#      gem_name =(gem_info[:require] || gem_info[:name].match(/^[a-zA-Z0-9\-_]+/)[0])
-      gem_name =(gem_info[:name].match(/^[a-zA-Z0-9\-_]+/)[0])
+#      gem_name =(gem_info[:require] || gem_info[:name].match(/^[a-zA-Z0-9\-_\.]+/)[0])
+      gem_name =(gem_info[:name].match(/^[a-zA-Z0-9\-_\.]+/)[0])
       IronWorker.logger.debug "Searching for gem #{gem_name}..."
       gems= Gem::Specification.respond_to?(:each) ? Gem::Specification.find_all_by_name(gem_name) : Gem::GemPathSearcher.new.find_all(gem_name)
       if (Service.heroku?) && (!gems || gems.empty?)
@@ -171,10 +171,10 @@ module IronWorker
         gems_dependencies.each_pair do |k, gem|
           IronWorker.logger.debug "Bundling dependent gem #{gem[:name]}..."
           gem[:bypass_require] = true
-          merged_gems[k] ||= gem
+#          merged_gems[k] ||= gem
         end
       end
-
+      merged_gems = gems_dependencies.merge merged_gems
       # Now remove unmerged gems
       unmerged_gems = unmerged_gems.merge(IronWorker.config.unmerged_gems)
       unmerged_gems.each_pair do |k, v|

metadata

@@ -1,104 +1,134 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.9
-  prerelease: 
+  version: 2.3.10
+  segments:
+  - 2
+  - 3
+  - 10
+  prerelease: false
+  segments_generated: true
 platform: ruby
 authors:
 - Travis Reeder
-autorequire: 
+autorequire: !!null 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 -08:00
+default_executable: !!null 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &9463360 !ruby/object:Gem::Requirement
+  requirement: &9162320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9463360
+  version_requirements: *9162320
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &9462400 !ruby/object:Gem::Requirement
+  requirement: &9159980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9462400
+  version_requirements: *9159980
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &9461380 !ruby/object:Gem::Requirement
+  requirement: &9158300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9461380
+  version_requirements: *9158300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9460360 !ruby/object:Gem::Requirement
+  requirement: &9155480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9460360
+  version_requirements: *9155480
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &9476300 !ruby/object:Gem::Requirement
+  requirement: &9153220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9476300
+  version_requirements: *9153220
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &9475320 !ruby/object:Gem::Requirement
+  requirement: &9150760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9475320
+  version_requirements: *9150760
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &9474580 !ruby/object:Gem::Requirement
+  requirement: &9148520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9474580
+  version_requirements: *9148520
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9473360 !ruby/object:Gem::Requirement
+  requirement: &9145840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+        segments:
+        - 0
+        segments_generated: true
   type: :runtime
   prerelease: false
-  version_requirements: *9473360
+  version_requirements: *9145840
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []
@@ -121,9 +151,10 @@ files:
 - lib/iron_worker/utils.rb
 - rails/init.rb
 - README.markdown
+has_rdoc: true
 homepage: http://www.iron.io
 licenses: []
-post_install_message: 
+post_install_message: !!null 
 rdoc_options: []
 require_paths:
 - lib
@@ -133,16 +164,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.9'
+      segments:
+      - 1
+      - 9
+      segments_generated: true
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      segments_generated: true
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
-signing_key: 
+rubyforge_project: !!null 
+rubygems_version: 1.3.7
+signing_key: !!null 
 specification_version: 3
 summary: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 test_files: []