iron_worker 2.3.7 → 2.3.8

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 2
 :minor: 3
-:patch: 7
+:patch: 8
 :build: 

data/lib/iron_worker/base.rb

@@ -215,9 +215,9 @@ module IronWorker
     def queue(options={})
 #            puts 'in queue'
 
+      IronWorker.service.config.force_upload = IronWorker.service.config.force_upload && is_local?
       set_auto_attributes
       upload_if_needed(options)
-      IronWorker.service.config.force_upload = IronWorker.service.config.force_upload && is_local?
       response = IronWorker.service.queue(self.class.name, sw_get_data, options)
       IronWorker.service.logger.debug 'queue response=' + response.inspect
       @response = response
@@ -363,6 +363,7 @@ module IronWorker
     end
 
     def upload_if_needed(options={})
+      return if is_remote?
       check_service
       IronWorker.service.check_config
 

data/lib/iron_worker/config.rb

@@ -31,6 +31,9 @@ module IronWorker
                   :force_upload,
                   :beta # for setting beta feature flags
 
+    def self.system_gems
+       ['bson_ext','curb','em-http-request','eventmachine','mysql2','net-scp','net-sftp','net-ssh','nokogiri','rmagick','sqlite3','typhoeus']
+    end
 
     def initialize
       @global_attributes = {}

data/lib/iron_worker/service.rb

@@ -87,12 +87,18 @@ module IronWorker
       IronWorker.logger
     end
 
+
+    def self.heroku?
+      !Gem::GemPathSearcher.private_instance_methods.include?(:_deprecated_initialize)
+    end
+
+
     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])
       #puts "Searching for #{gem_name}..."
       gems= Gem::Specification.respond_to?(:each) ? Gem::Specification.find_all_by_name(gem_name) : Gem::GemPathSearcher.new.find_all(gem_name)
-      if (!Gem::GemPathSearcher.private_instance_methods.include?(:_deprecated_initialize)) && (!gems || gems.empty?)
+      if (Service.heroku?) && (!gems || gems.empty?)
         gems = Gem::GemPathSearcher.new.init_gemspecs.select { |gem| gem.name==gem_name }
       end
       IronWorker.logger.debug 'gems found=' + gems.inspect
@@ -105,8 +111,13 @@ module IronWorker
       end
     end
 
-
     def gem_dependencies(list_of_gems)
+      if Service.heroku?
+        gem_specs = Gem::GemPathSearcher.new.init_gemspecs
+      else
+        gem_specs = Gem::Specification.all
+      end
+
       IronWorker.logger.debug "Getting gem_dependencies.."
       deps = []
       dependendent_gems ={}
@@ -121,10 +132,10 @@ module IronWorker
       filtered_deps = deps.select { |d| d.type != :development }
       IronWorker.logger.debug "filtered_deps=#{filtered_deps}"
       index = Bundler::Index.new
-      Gem::Specification.all.collect { |s| index<<s }
+      gem_specs.collect { |s| index<<s }
       list = Bundler::Resolver.resolve(filtered_deps, index)
       list.each do |gemspec|
-        next if list_of_gems.keys.include?(gemspec.name)
+        next if list_of_gems.keys.include?(gemspec.name) || Config.system_gems.include?(gemspec.name)
         gi = IronWorker::MergeHelper.create_gem_info(gemspec.name, gemspec.version.version)
         dependendent_gems[gemspec.name] = gi
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &26666020 !ruby/object:Gem::Requirement
+  requirement: &27271720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26666020
+  version_requirements: *27271720
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &26665500 !ruby/object:Gem::Requirement
+  requirement: &27271200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26665500
+  version_requirements: *27271200
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &26665020 !ruby/object:Gem::Requirement
+  requirement: &27270720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26665020
+  version_requirements: *27270720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26664460 !ruby/object:Gem::Requirement
+  requirement: &27270160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26664460
+  version_requirements: *27270160
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &26663900 !ruby/object:Gem::Requirement
+  requirement: &27269600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26663900
+  version_requirements: *27269600
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &26663380 !ruby/object:Gem::Requirement
+  requirement: &27269080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26663380
+  version_requirements: *27269080
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &26662880 !ruby/object:Gem::Requirement
+  requirement: &27268580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26662880
+  version_requirements: *27268580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26662380 !ruby/object:Gem::Requirement
+  requirement: &27268080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26662380
+  version_requirements: *27268080
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []