iron_worker 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d686c3db4952165f77d6ab2bbaca5c0a50f58b04
-  data.tar.gz: 9abed5a00fe87b71f0dd0423376b1e812af516ab
+  metadata.gz: 45f10beed01a145026c8ecf904b458d2d98c0de3
+  data.tar.gz: f915424385129c96823f092213ac9985ffd37c43
 SHA512:
-  metadata.gz: f594597acfad83b64a32e82b87e2fd984ed8fde74dd79e01dbae86834b8cbea86434b16ef7d0cb098d779b5ccb997df3ac7095e26627517e07060e24adf44c01
-  data.tar.gz: c267c7c5dd765e375a7aab178bd1dddceb99683fd6a5147b1af6f716152c908fb21732dc89057eeb0d3987a8217dd16d0dde69f0ae96cfa98ee3312e3df71118
+  metadata.gz: aec12031b24ba4b60d3a55358f671827186c2464231d5ba3e8c4c62f68f6ad4ed998e4c9483d4d2ea6c33d393d0ead3c2a8ae6839dc1ae0c0e30e2245a88d5af
+  data.tar.gz: 248199b7bd787670c6f3035af208f850a25c427bd3d7f4efc2caf1893c4dfb989b011824dd97408475a4df7bb1233d3d267b6ca4514d4079ba672f4989c1442c

data/lib/iron_worker/service.rb

@@ -1,6 +1,13 @@
 require 'base64'
 require 'logger'
-require 'zip'
+begin
+  # Little hack until everyone upgrades to rubyzip >= 1
+  require 'zip'
+  ZIPCLZ = Zip::File
+rescue Exception => ex
+  require 'zip/zip'
+  ZIPCLZ = Zip::ZipFile
+end
 require 'bundler'
 require 'rest_client'
 require 'json'
@@ -26,7 +33,7 @@ module IronWorker
       super("worker-aws-us-east-1.iron.io", token, options)
       self.host = self.config.host if self.config && self.config.host
       # automerge simple worker gem and dependencies
-      self.config.merge_gem('rubyzip', :require=>'zip')
+      self.config.merge_gem('rubyzip', :require => 'zip')
       self.config.merge_gem('rest-client')
       self.config.merge_gem('rest')
       self.config.merge_gem('iron_worker')
@@ -58,7 +65,7 @@ module IronWorker
         zip_filename = build_merged_file(filename, options[:merge], options[:unmerge], options[:merged_gems], options[:unmerged_gems], options[:merged_mailers], options[:merged_folders], class_name)
 
         # Check for code changes.
-        zipfile = Zip::File.open(zip_filename, Zip::File::CREATE)
+        zipfile = ZIPCLZ.open(zip_filename, ZIPCLZ::CREATE)
         crc = zipfile.entries.collect { |x| x.crc }.inject(:+)
         new_code = false
         if self.config.force_upload || crc.to_s != existing_md5
@@ -72,7 +79,7 @@ module IronWorker
         end
 
         if new_code
-          upload_code(name, zip_filename, 'runner.rb', :runtime=>'ruby')
+          upload_code(name, zip_filename, 'runner.rb', :runtime => 'ruby')
         end
 
       rescue Exception => ex
@@ -332,9 +339,9 @@ end
 
       end
       #puts 'funner.rb=' + tmp_file
-      merge['runner.rb'] = {:path=>tmp_file}
+      merge['runner.rb'] = {:path => tmp_file}
       #puts 'filename=' + filename
-      merge[File.basename(filename)] = {:path=>filename}
+      merge[File.basename(filename)] = {:path => filename}
       #puts "merge before uniq! " + merge.inspect      
       # puts "merge after uniq! " + merge.inspect
 
@@ -345,7 +352,7 @@ end
       File.delete(fname2) if File.exist?(fname2)
       #merging all gems and deps
       merged_gems.merge!(gems_dependencies)
-      Zip::File.open(fname2, 'w') do |f|
+      ZIPCLZ.open(fname2, 'w') do |f|
         if merged_gems && merged_gems.size > 0
           merged_gems.each_pair do |k, gem|
             next unless gem[:merge]
@@ -364,10 +371,10 @@ end
               Dir.glob(paths_to_use).each do |file|
                 # todo: could check if directory and it not lib, skip it
                 #IronWorker.logger.debug 'file for gem=' + file.inspect
-#                puts 'gem2=' + gem.inspect
+                #                puts 'gem2=' + gem.inspect
                 zdest = "gems/#{gem[:name]}/#{file.sub(path+'/', '')}"
 #                puts 'gem file=' + file.to_s
-                #IronWorker.logger.debug 'zip dest=' + zdest
+#IronWorker.logger.debug 'zip dest=' + zdest
                 f.add(zdest, file)
               end
             else
@@ -424,7 +431,7 @@ end
     def package_code(files)
       fname2 = "package.zip"
       File.delete(fname2) if File.exist?(fname2)
-      Zip::File.open(fname2, 'w') do |f|
+      ZIPCLZ.open(fname2, 'w') do |f|
         files.each do |file|
           f.add(file, file)
         end
@@ -437,10 +444,10 @@ end
     def upload_code(name, package_file, exec_file, options={})
       IronWorker.logger.info 'file size to upload: ' + File.size(package_file).to_s
       options = {
-          "name"=>name,
-          "standalone"=>true,
-          "runtime"=>options[:runtime] || "ruby",
-          "file_name"=> exec_file # File.basename(filename)
+          "name" => name,
+          "standalone" => true,
+          "runtime" => options[:runtime] || "ruby",
+          "file_name" => exec_file # File.basename(filename)
       }
       #puts 'options for upload=' + options.inspect
       IronWorker.logger.info "Uploading now..."
@@ -608,19 +615,19 @@ end
 
     def log(task_id, options={})
       data = options
-      ret = get("#{project_url_prefix(get_project_id(options))}tasks/#{task_id}/log", data, :parse=>false)
+      ret = get("#{project_url_prefix(get_project_id(options))}tasks/#{task_id}/log", data, :parse => false)
       ret
     end
 
 
     def status(task_id, options={})
-      data = {"task_id"=>task_id}
+      data = {"task_id" => task_id}
       ret = get("#{project_url_prefix(get_project_id(options))}tasks/#{task_id}", data)
       ret
     end
 
     def schedule_status(schedule_id, options={})
-      data = {"schedule_id"=>schedule_id}
+      data = {"schedule_id" => schedule_id}
       ret = get("#{project_url_prefix(get_project_id(options))}schedules/#{schedule_id}", data)
       ret
     end

data/lib/iron_worker/version.rb

@@ -1,4 +1,4 @@
 module IronWorker
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core