iron_worker 2.3.5 → 2.3.6

data/VERSION.yml

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

data/lib/iron_worker/base.rb

@@ -388,6 +388,7 @@ module IronWorker
       if !uploaded?
         unmerged = self.class.instance_variable_get(:@unmerged)
         merged_gems = self.class.instance_variable_get(:@merged_gems)
+        unmerged_gems = self.class.instance_variable_get(:@unmerged_gems)
         merged_mailers = self.class.instance_variable_get(:@merged_mailers)
         merged_folders = self.class.instance_variable_get(:@merged_folders)
         merged, rfile, subclass = IronWorker::Base.extract_superclasses_merges(self, merged)
@@ -396,7 +397,7 @@ module IronWorker
           merged_gems = gems_to_merge(merged_gems)
         end
 
-        options_for_upload = {:merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems, :merged_mailers=>merged_mailers, :merged_folders=>merged_folders}
+        options_for_upload = {:merge=>merged, :unmerge=>unmerged, :merged_gems=>merged_gems, :unmerged_gems=>unmerged_gems, :merged_mailers=>merged_mailers, :merged_folders=>merged_folders}
         options_for_upload.merge!(options)
         IronWorker.service.upload(rfile, subclass.name, options_for_upload)
         self.class.instance_variable_set(:@uploaded, true)

data/lib/iron_worker/service.rb

@@ -51,11 +51,11 @@ module IronWorker
 
       begin
 
-        zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:merged_mailers], options[:merged_folders])
+        zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:unmerged_gems], options[:merged_mailers], options[:merged_folders])
 
-           # Check for code changes.
-        zipfile =  Zip::ZipFile.open(zip_filename, Zip::ZipFile::CREATE)
-        crc =  zipfile.entries.collect{|x|x.crc}.inject(:+)
+        # Check for code changes.
+        zipfile = Zip::ZipFile.open(zip_filename, Zip::ZipFile::CREATE)
+        crc = zipfile.entries.collect { |x| x.crc }.inject(:+)
         new_code = false
         if self.config.force_upload || crc.to_s != existing_md5
           IronWorker.logger.info "Uploading #{class_name}, code modified."
@@ -99,9 +99,9 @@ module IronWorker
       gems = gems.select { |g| g.version.version==gem_info[:version] } if gem_info[:version]
       if !gems.empty?
         gem = gems.last
-        return gem,gem.full_gem_path
+        return gem, gem.full_gem_path
       else
-        return nil,nil
+        return nil, nil
       end
     end
 
@@ -121,12 +121,15 @@ module IronWorker
       list = Bundler::Resolver.resolve(filtered_deps, index)
       list.each do |gemspec|
         next if list_of_gems.keys.include?(gemspec.name)
-        dependendent_gems[gemspec.name] = IronWorker::MergeHelper.create_gem_info(gemspec.name, gemspec.version.version)
+        gi = IronWorker::MergeHelper.create_gem_info(gemspec.name, gemspec.version.version)
+        dependendent_gems[gemspec.name] = gi
       end
       dependendent_gems
     end
 
-    def build_merged_file(filename, merged, unmerge, merged_gems, merged_mailers, merged_folders)
+    def build_merged_file(filename, merged, unmerge, merged_gems, unmerged_gems, merged_mailers, merged_folders)
+
+      unmerged_gems ||= {}
 
       merge = IronWorker.config.merged.dup
       merge.merge!(merged) if merged
@@ -141,13 +144,25 @@ module IronWorker
 
       merged_gems = merged_gems.merge(IronWorker.config.merged_gems)
       IronWorker.logger.debug 'merged_gems=' + merged_gems.inspect
-      IronWorker.config.unmerged_gems.each_pair do |k, v|
+
+      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
+
+      # Now remove unmerged gems
+      unmerged_gems = unmerged_gems.merge(IronWorker.config.unmerged_gems)
+      unmerged_gems.each_pair do |k, v|
         IronWorker.logger.debug 'unmerging gem=' + k.inspect
         merged_gems.delete(k)
       end
       IronWorker.logger.debug 'merged_gems_after=' + merged_gems.inspect
-      gems_dependencies = gem_dependencies(merged_gems)
-      IronWorker.logger.debug 'gem_dependencies=' + gems_dependencies.inspect
+
       merged_mailers ||= {}
       merged_mailers = merged_mailers.merge(IronWorker.config.mailers) if IronWorker.config.mailers
 
@@ -179,11 +194,7 @@ ARGV.each do |arg|
 end
 require 'json'
 ")
-        #require gems dependencies
-        gems_dependencies.each_pair do |k, gem|
-          IronWorker.logger.debug "Bundling dependent gem #{gem[:name]}..."
-          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]}..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &18837620 !ruby/object:Gem::Requirement
+  requirement: &21515140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18837620
+  version_requirements: *21515140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &18837080 !ruby/object:Gem::Requirement
+  requirement: &21605480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18837080
+  version_requirements: *21605480
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &18836460 !ruby/object:Gem::Requirement
+  requirement: &21604620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18836460
+  version_requirements: *21604620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18834940 !ruby/object:Gem::Requirement
+  requirement: &21603720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,164 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18834940
+  version_requirements: *21603720
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &21603020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21603020
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &21602380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21602380
+- !ruby/object:Gem::Dependency
+  name: jeweler2
+  requirement: &21601760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21601760
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: &21600920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21600920
+- !ruby/object:Gem::Dependency
+  name: rest
+  requirement: &21600280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21600280
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &21599440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21599440
+- !ruby/object:Gem::Dependency
+  name: simple_record
+  requirement: &21598120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21598120
+- !ruby/object:Gem::Dependency
+  name: dropbox
+  requirement: &21743080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *21743080
+- !ruby/object:Gem::Dependency
+  name: mongoid_i18n
+  requirement: &21742480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21742480
+- !ruby/object:Gem::Dependency
+  name: signature
+  requirement: &21741760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21741760
+- !ruby/object:Gem::Dependency
+  name: pusher
+  requirement: &21740720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21740720
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &21739840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21739840
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &21738060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21738060
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: &21736780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *21736780
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &18869820 !ruby/object:Gem::Requirement
+  requirement: &21770720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18869820
+  version_requirements: *21770720
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &18869020 !ruby/object:Gem::Requirement
+  requirement: &21770080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18869020
+  version_requirements: *21770080
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &18868220 !ruby/object:Gem::Requirement
+  requirement: &21769340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18868220
+  version_requirements: *21769340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18867180 !ruby/object:Gem::Requirement
+  requirement: &21768620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +252,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18867180
+  version_requirements: *21768620
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []