iron_worker 2.3.0 → 2.3.1

data/VERSION.yml

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

data/lib/iron_worker/config.rb

@@ -62,6 +62,16 @@ module IronWorker
       @gems_to_skip
     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
+    end
+
     def auto_merge=(b)
       if b
         IronWorker.logger.info "Initializing IronWorker for Rails 3..."
@@ -85,7 +95,7 @@ module IronWorker
           if defined?(ActionMailer) && ActionMailer::Base.smtp_settings
             c2.mailer = ActionMailer::Base.smtp_settings
           end
-          c2.merged_gems.merge!(get_required_gems) if defined?(Bundler)
+          c2.merged_gems.merge!(get_required_gems)
           IronWorker.logger.debug "MODELS " + c2.models.inspect
           IronWorker.logger.debug "MAILERS " + c2.mailers.inspect
           IronWorker.logger.debug "DATABASE " + c2.database.inspect
@@ -98,6 +108,8 @@ module IronWorker
 
 
     def get_required_gems
+      #skipping if bundler not defined or not initialized
+      return {} unless defined?(Bundler) && Bundler.instance_variables.include?(:@setup)
       gems_in_gemfile = Bundler.environment.dependencies.select { |d| d.groups.include?(:default) }
       IronWorker.logger.debug 'gems in gemfile=' + gems_in_gemfile.inspect
       gems = {}
@@ -114,7 +126,8 @@ module IronWorker
 #        next if dep.name=='rails' #monkey patch
         gem_info = {:name=>spec.name, :version=>spec.version}
         gem_info[:auto_merged] = true
-        gem_info[:merge] = 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
         dep = gems_in_gemfile.find { |g| g.name == gem_info[:name] }
         if dep
@@ -125,8 +138,9 @@ module IronWorker
         end
         gem_info[:version] = spec.version.to_s
         gems[gem_info[:name]] = gem_info
-        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
           if gem_info[:require].nil? && dep
             # see if we should try to require this in our worker

data/lib/iron_worker/service.rb

@@ -182,12 +182,13 @@ require 'json'
         #require gems dependencies
         gems_dependencies.each_pair do |k, gem|
           IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
-          f.write "$LOAD_PATH << File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib')\n"
+          f.write "$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib'))\n"
         end
         # require merged gems
         merged_gems.each_pair do |k, gem|
           IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
-          f.write "$LOAD_PATH << File.join(File.dirname(__FILE__), '/gems/#{gem[:name]}/lib')\n"
+          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?
             gem[:require] = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-04 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &24684180 !ruby/object:Gem::Requirement
+  requirement: &17798880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24684180
+  version_requirements: *17798880
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &24682880 !ruby/object:Gem::Requirement
+  requirement: &17798160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24682880
+  version_requirements: *17798160
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &24681840 !ruby/object:Gem::Requirement
+  requirement: &17797560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24681840
+  version_requirements: *17797560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24681260 !ruby/object:Gem::Requirement
+  requirement: &17797060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24681260
+  version_requirements: *17797060
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &24680760 !ruby/object:Gem::Requirement
+  requirement: &17796420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24680760
+  version_requirements: *17796420
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &24680260 !ruby/object:Gem::Requirement
+  requirement: &17795820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24680260
+  version_requirements: *17795820
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &24679760 !ruby/object:Gem::Requirement
+  requirement: &17795320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24679760
+  version_requirements: *17795320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24762060 !ruby/object:Gem::Requirement
+  requirement: &17794460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24762060
+  version_requirements: *17794460
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io