iron_worker 2.2.0 → 2.3.0

data/VERSION.yml

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

data/lib/iron_worker/base.rb

@@ -214,9 +214,10 @@ module IronWorker
     #                 running worker, it will be rejected unless you set this explicitly so we know you meant to do it.
     def queue(options={})
 #            puts 'in queue'
+
       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
@@ -287,7 +288,7 @@ module IronWorker
 
     # Retrieves the log for this worker from the IronWorker service.
     def get_log(options={})
-      IronWorker.service.get_log(task_id, options)
+      IronWorker.service.log(task_id, options)
     end
 
     # Callbacks for developer

data/lib/iron_worker/config.rb

@@ -28,7 +28,8 @@ module IronWorker
                   :unmerged,
                   :merged_gems,
                   :unmerged_gems,
-                  :force_upload
+                  :force_upload,
+                  :beta
 
 
     def initialize
@@ -249,14 +250,15 @@ module IronWorker
       else
         gem_info[:version] = options
       end
-      gem_info[:require] ||= gem_name
 
-      path = IronWorker::Service.get_gem_path(gem_info)
+      gemspec, path = IronWorker::Service.get_gem_path(gem_info)
       IronWorker.logger.debug "Gem path=#{path}"
       if !path
         raise "Gem '#{gem_name}' not found."
       end
+      gem_info[:gemspec] = gemspec
       gem_info[:path] = path
+      gem_info[:require] ||= gem_name
       gem_info
     end
   end

data/lib/iron_worker/service.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'logger'
 require 'zip'
+require 'bundler'
 require 'rest_client'
 require 'json'
 
@@ -47,23 +48,25 @@ module IronWorker
         existing_md5 = IO.read(md5_f)
       end
 
-      # Check for code changes.
-      md5 = Digest::MD5.hexdigest(File.read(filename))
-      new_code = false
-      if self.config.force_upload || md5 != existing_md5
-        IronWorker.logger.info "Uploading #{class_name}, code modified."
-        File.open(md5_f, 'w') { |f| f.write(md5) }
-        new_code = true
-        # todo: delete md5 file if error occurs during upload process
-      else
-#        puts "#{class_name}: same code, not uploading"
-        return
-      end
 
       begin
 
         zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_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(:+)
+        new_code = false
+        if self.config.force_upload || crc.to_s != existing_md5
+          IronWorker.logger.info "Uploading #{class_name}, code modified."
+          File.open(md5_f, 'w') { |f| f.write(crc) }
+          new_code = true
+          # todo: delete md5 file if error occurs during upload process
+        else
+#        puts "#{class_name}: same code, not uploading"
+          return
+        end
+
         if new_code
           upload_code(name, zip_filename, 'runner.rb', :runtime=>'ruby')
         end
@@ -96,10 +99,31 @@ module IronWorker
       gems = gems.select { |g| g.version.version==gem_info[:version] } if gem_info[:version]
       if !gems.empty?
         gem = gems.last
-        gem.full_gem_path
+        return gem,gem.full_gem_path
       else
-        return nil
+        return nil,nil
+      end
+    end
+
+
+    def gem_dependencies(list_of_gems)
+      deps = []
+      dependendent_gems ={}
+      list_of_gems.each_value do |v|
+        @deps = v[:gemspec].dependencies
+        @deps.each do |d|
+          deps << Bundler::DepProxy.new(d, 'ruby')
+        end
       end
+      filtered_deps = deps.select { |d| d.type != :development }
+      index = Bundler::Index.new
+      Gem::Specification.all.collect { |s| index<<s }
+      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)
+      end
+      dependendent_gems
     end
 
     def build_merged_file(filename, merged, unmerge, merged_gems, merged_mailers, merged_folders)
@@ -122,7 +146,8 @@ module IronWorker
         merged_gems.delete(k)
       end
       IronWorker.logger.debug 'merged_gems_after=' + merged_gems.inspect
-
+      gems_dependencies = IronWorker.config.beta ? 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
 
@@ -154,6 +179,11 @@ ARGV.each do |arg|
 end
 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"
+        end
         # require merged gems
         merged_gems.each_pair do |k, gem|
           IronWorker.logger.debug "Bundling gem #{gem[:name]}..."
@@ -263,6 +293,8 @@ end
       #            puts 'merged_file_array=' + merge.inspect
       #File.open(fname2, "w") do |f|
       File.delete(fname2) if File.exist?(fname2)
+      #merging all gems and deps
+      merged_gems.merge!(gems_dependencies)
       Zip::ZipFile.open(fname2, 'w') do |f|
         if merged_gems && merged_gems.size > 0
           merged_gems.each_pair do |k, gem|
@@ -479,41 +511,30 @@ end
       delete(uri, hash_to_send)
     end
 
-    def get_projects()
-      hash_to_send = {}
-      ret = get("projects", hash_to_send)
-      ret
-    end
-
     def get_project_id(options={})
       options[:project_id] || config.project_id
     end
 
-    def get_project(options={})
-      hash_to_send = {}
-
-      ret = get("projects/"+ get_project_id(options) +"/", hash_to_send)
-      #uri = project_url_prefix(id)
-      #puts "get_project, uri = " + uri
-      #ret = get(uri, hash_to_send)
-      ret
-    end
-
-    def get_codes(options={})
+    def codes(options={})
       hash_to_send = {}
       uri = "projects/" + get_project_id(options) + "/codes"
       ret = get(uri, hash_to_send)
       ret
     end
 
-    def get_schedules(options={})
+    def schedules(options={})
       hash_to_send = {}
       uri = "projects/" + get_project_id(options) + "/schedules"
       ret = get(uri, hash_to_send)
       ret
     end
 
-    def get_jobs(options={})
+    def jobs(options={})
+      puts 'Service.jobs is deprecated, use Service.tasks instead'
+      tasks(options)
+    end
+
+    def tasks(options={})
       hash_to_send = {}
       uri = "projects/" + get_project_id(options) + "/tasks"
       ret = get(uri, hash_to_send)
@@ -521,6 +542,7 @@ end
     end
 
     def get_log(job_id, options={})
+      puts 'Service.get_log is deprecated, use Service.log instead'
       log(job_id, options)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &9516660 !ruby/object:Gem::Requirement
+  requirement: &24684180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9516660
+  version_requirements: *24684180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &9548900 !ruby/object:Gem::Requirement
+  requirement: &24682880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9548900
+  version_requirements: *24682880
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &9545520 !ruby/object:Gem::Requirement
+  requirement: &24681840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9545520
+  version_requirements: *24681840
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &24681260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24681260
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &9544720 !ruby/object:Gem::Requirement
+  requirement: &24680760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9544720
+  version_requirements: *24680760
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &9567580 !ruby/object:Gem::Requirement
+  requirement: &24680260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9567580
+  version_requirements: *24680260
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &9564080 !ruby/object:Gem::Requirement
+  requirement: &24679760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *24679760
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &24762060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9564080
+  version_requirements: *24762060
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []