iron_worker 2.3.8 → 2.3.9

data/VERSION.yml

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

data/lib/iron_worker/config.rb

@@ -29,10 +29,11 @@ module IronWorker
                   :merged_gems,
                   :unmerged_gems,
                   :force_upload,
-                  :beta # for setting beta feature flags
+                  :beta, # for setting beta feature flags
+                  :skip_auto_dependencies
 
     def self.system_gems
-       ['bson_ext','curb','em-http-request','eventmachine','mysql2','net-scp','net-sftp','net-ssh','nokogiri','rmagick','sqlite3','typhoeus']
+      ['bson_ext', 'curb', 'em-http-request', 'eventmachine', 'mysql2', 'net-scp', 'net-sftp', 'net-ssh', 'nokogiri', 'rmagick', 'sqlite3', 'typhoeus']
     end
 
     def initialize
@@ -50,6 +51,7 @@ module IronWorker
     def access_key=(x)
       raise "IronWorker Config Error: access_key and secret_key are no longer used. The new IronWorker gem requires a couple of small configuration changes, please see: http://docs.IronWorker.com/ruby/new-gem-v2-update-guide for information."
     end
+
     def secret_key=(x)
       raise "IronWorker Config Error: access_key and secret_key are no longer used. The new IronWorker gem requires a couple of small configuration changes, please see: http://docs.IronWorker.com/ruby/new-gem-v2-update-guide for information."
     end
@@ -67,13 +69,13 @@ module IronWorker
     #end
 
     def bundle=(activate)
-     if activate
-       IronWorker.logger.info "Initializing IronWorker for Bundler..."
-       IronWorker.configure do |c2|
-         c2.merged_gems.merge!(get_required_gems)
-         IronWorker.logger.debug "List of gems from bundler:#{c2.merged_gems.inspect}"
-       end
-     end
+      if activate
+        IronWorker.logger.info "Initializing IronWorker for Bundler..."
+        IronWorker.configure do |c2|
+          c2.merged_gems.merge!(get_required_gems)
+          IronWorker.logger.debug "List of gems from bundler:#{c2.merged_gems.inspect}"
+        end
+      end
     end
 
     def auto_merge=(b)
@@ -127,12 +129,12 @@ module IronWorker
         #  IronWorker.logger.debug "Skipping #{spec.name}"
         #  next
         #end
-#        next if dep.name=='rails' #monkey patch
+        #        next if dep.name=='rails' #monkey patch
         gem_info = {:name=>spec.name, :version=>spec.version}
         gem_info[:auto_merged] = true
         gem_info[:merge] = spec.extensions.length == 0 #merging only non binary gems
         gem_info[:bypass_require] = true #don't require gem'
-# Now find dependency in gemfile in case user set the require
+        # Now find dependency in gemfile in case user set the require
         dep = gems_in_gemfile.find { |g| g.name == gem_info[:name] }
         if dep
           IronWorker.logger.debug 'dep found in gemfile: ' + dep.inspect
@@ -142,7 +144,7 @@ module IronWorker
         end
         gem_info[:version] = spec.version.to_s
         gems[gem_info[:name]] = gem_info
-        gemspec,path = IronWorker::Service.get_gem_path(gem_info)
+        gemspec, path = IronWorker::Service.get_gem_path(gem_info)
         if path
           gem_info[:gemspec] = gemspec
           gem_info[:path] = path

data/lib/iron_worker/service.rb

@@ -96,7 +96,7 @@ 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])
-      #puts "Searching for #{gem_name}..."
+      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?)
         gems = Gem::GemPathSearcher.new.init_gemspecs.select { |gem| gem.name==gem_name }
@@ -136,6 +136,7 @@ module IronWorker
       list = Bundler::Resolver.resolve(filtered_deps, index)
       list.each do |gemspec|
         next if list_of_gems.keys.include?(gemspec.name) || Config.system_gems.include?(gemspec.name)
+        IronWorker.logger.debug "gemspec from bundler " + gemspec.inspect
         gi = IronWorker::MergeHelper.create_gem_info(gemspec.name, gemspec.version.version)
         dependendent_gems[gemspec.name] = gi
       end
@@ -160,14 +161,18 @@ module IronWorker
       merged_gems = merged_gems.merge(IronWorker.config.merged_gems)
       IronWorker.logger.debug 'merged_gems=' + merged_gems.inspect
 
-      gems_dependencies = gem_dependencies(merged_gems)
-      IronWorker.logger.debug 'gem_dependencies=' + gems_dependencies.inspect
-      # add dependencies to merged_gems
-      #require gems dependencies
-      gems_dependencies.each_pair do |k, gem|
-        IronWorker.logger.debug "Bundling dependent gem #{gem[:name]}..."
-        gem[:bypass_require] = true
-        merged_gems[k] ||= gem
+      if config.skip_auto_dependencies
+        gems_dependencies = {}
+      else
+        gems_dependencies = gem_dependencies(merged_gems)
+        IronWorker.logger.debug 'gem_dependencies=' + gems_dependencies.inspect
+        # add dependencies to merged_gems
+        #require gems dependencies
+        gems_dependencies.each_pair do |k, gem|
+          IronWorker.logger.debug "Bundling dependent gem #{gem[:name]}..."
+          gem[:bypass_require] = true
+          merged_gems[k] ||= gem
+        end
       end
 
       # Now remove unmerged gems

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-20 00:00:00.000000000 Z
+date: 2012-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &27271720 !ruby/object:Gem::Requirement
+  requirement: &9463360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27271720
+  version_requirements: *9463360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &27271200 !ruby/object:Gem::Requirement
+  requirement: &9462400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27271200
+  version_requirements: *9462400
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &27270720 !ruby/object:Gem::Requirement
+  requirement: &9461380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27270720
+  version_requirements: *9461380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27270160 !ruby/object:Gem::Requirement
+  requirement: &9460360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27270160
+  version_requirements: *9460360
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &27269600 !ruby/object:Gem::Requirement
+  requirement: &9476300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27269600
+  version_requirements: *9476300
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &27269080 !ruby/object:Gem::Requirement
+  requirement: &9475320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27269080
+  version_requirements: *9475320
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &27268580 !ruby/object:Gem::Requirement
+  requirement: &9474580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27268580
+  version_requirements: *9474580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &27268080 !ruby/object:Gem::Requirement
+  requirement: &9473360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *27268080
+  version_requirements: *9473360
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []