iron_worker_ng 1.5.2 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a654f4e22e048d2a9812b02b4355704b5f6c6670
-  data.tar.gz: 4ed6669f27699dcd3f4ca51f91e2a07dd124c454
+  metadata.gz: ec003beb156fbb334b0a0d1447742f434457e000
+  data.tar.gz: dd390f78a508f82c0a6b5c909ea2015063ff1af0
 SHA512:
-  metadata.gz: 02beee3cc652603989da4eba6005c3ec9ee9f9adcf4738289c85fca859bfd51bd8f8592b7ee25575f5ad7dd8ddc0e7e0395446cf24f14ec97da42e25f7e13ec2
-  data.tar.gz: 166cbabf5dcb22a8e2116c3970c7a7b3e230c89af887fcca8058e9ceac130d7caaff3231c49ab3aeee5e361ef1b15889ae33f55c33922cabf0a8c350df5d91b2
+  metadata.gz: 5e89a774dc83290bc649b438b33d208bf5073d94fe8cab027a43bfff3858b10a3a23e0dcf584939e3d06625f7da59f60f4be9e4fcce0f1e7d4981597a6a808e9
+  data.tar.gz: fbbfde46222f1178b00cc6338592bb7dd4c07f6c87c8f630e11082c72180f2d492d007db24207f6f0c1728bc2e26fcbf2a179abd5015765c09caac0ddb09d94b

data/README.md

@@ -43,7 +43,8 @@ supplementary data, and other dependencies with it. `.worker` files make it easy
 
 ```ruby
 # define the runtime language, this can be ruby, java, node, php, go, etc.
-runtime "ruby"
+# also you could set version of language(check of available versions via iron_worker stacks)
+runtime "ruby","2.1"
 # exec is the file that will be executed:
 exec "hello_worker.rb"
 ```
@@ -90,7 +91,7 @@ You can specify priority of the task using `--priority` parameter:
 
 ```ruby
 iron_worker queue hello --priority 0 # default value, lowest priority
-iron_worker queue hello --priority 1 # medium priority
+iron_worker queue hello --priority 1 --label 'medium priority task' # medium priority
 ```
 
 Value of priority parameter means the priority queue to run the task in. Valid values are 0, 1, and 2. 0 is the default.
@@ -108,6 +109,7 @@ You can specify not only priority:
   - **priority**: Setting the priority of your job. Valid values are 0, 1, and 2. The default is 0.
   - **timeout**: The maximum runtime of your task in seconds. No task can exceed 3600 seconds (60 minutes). The default is 3600 but can be set to a shorter duration.
   - **delay**: The number of seconds to delay before actually queuing the task. Default is 0.
+  - **label**: Optional text label for your task.
 
 ## Get task status
 
@@ -437,7 +439,12 @@ iron_worker stacks
 And to specify stack add following line in your .worker file
 
 ```ruby
-# define the runtime language, this can be ruby, java, node, php, go, etc.
+runtime 'ruby', '2.1'
+```
+Or
+
+```ruby
+exec 'java.sh'
 runtime 'binary'
 stack 'java-1.7'
 exec 'java.sh'
@@ -603,7 +610,7 @@ puts client.schedules.get('1234567890').last_run_time
 Create a new scheduled task for the code package specified by `code_name`, passing the params hash to it as a data payload and returning a scheduled task object with only the `id` field filled. Visit http://dev.iron.io/worker/reference/api/#schedule_a_task for more information about the available options.
 
 ```ruby
-schedule = client.schedules.create('MyWorker', {:client => 'Joe'}, {:start_at => Time.now + 3600})
+schedule = client.schedules.create('MyWorker', {:client => 'Joe'}, {:start_at => Time.now + 3600, :run_every =>60, :priority => 0, :run_times => 100, :end_at: Time.now + 2592000, Time.now + 84600})
 puts schedule.id
 ```
 

data/bin/iron_worker

@@ -184,6 +184,11 @@ elsif command == 'queue' || command == 'schedule'
       options[:cluster] = v
     end
 
+    desc = command == 'queue' ? 'task' : 'schedule'
+    opts.on('--label LABEL', String, "Label #{desc} with given name") do |v|
+      options[:label] = v
+    end
+
     if command == 'queue'
       opts.on('--wait', Integer, 'wait for task to complete and print log') do |v|
         options[:wait] = true
@@ -211,9 +216,6 @@ elsif command == 'queue' || command == 'schedule'
         options[:run_every] = v
       end
 
-      opts.on('--label LABEL', String, 'Label schedule with given name') do |v|
-        options[:label] = v
-      end
     end
 
     common_opts(opts)

data/lib/iron_worker_ng/cli.rb

@@ -294,6 +294,7 @@ module IronWorkerNG
       data << ['code package', task.code_name]
       data << ['code revision', task.code_rev]
       data << ['status', task.status]
+      data << ['label', task.label] if task.label
       data << ['priority', task.priority || 2]
       data << ['queued', parse_time(task.created_at) || '-']
       data << ['started', parse_time(task.start_time) || '-']

data/lib/iron_worker_ng/code/base.rb

@@ -179,7 +179,7 @@ module IronWorkerNG
         @full_remote_build = true
       end
 
-      def runtime(runtime = nil)
+      def runtime(runtime = nil, version = nil)
         return @runtime unless runtime
 
         unless @runtime.nil?
@@ -189,6 +189,12 @@ module IronWorkerNG
         runtime_module = nil
         runtime = runtime.to_s
 
+        if version
+          s = "#{runtime}-#{version}"
+          IronCore::Logger.info 'IronWorkerNG', "Trying to set stack to:#{s}'"
+          stack(s)
+        end
+
         begin
           runtime_module = IronWorkerNG::Code::Runtime.const_get(runtime.capitalize)
         rescue

data/lib/iron_worker_ng/code/container/zip.rb

@@ -1,6 +1,6 @@
-require 'zip/zip'
+require 'zip'
 
-Zip.options[:continue_on_exists_proc] = true
+Zip.continue_on_exists_proc = true
 
 module IronWorkerNG
   module Code
@@ -10,7 +10,7 @@ module IronWorkerNG
           super
 
           @name = @name + '.zip'
-          @zip = ::Zip::ZipFile.open(@name, ::Zip::ZipFile::CREATE)
+          @zip = ::Zip::File.open(@name, ::Zip::File::CREATE)
         end
 
         def add(dest, src)

data/lib/iron_worker_ng/feature/common/merge_zip.rb

@@ -22,7 +22,7 @@ module IronWorkerNG
               ::Dir.mkdir(tmp_dir_name)
 
               IronWorkerNG::Fetcher.fetch_to_file(rebase(@path)) do |zip|
-                zipf = ::Zip::ZipFile.open(zip)
+                zipf = ::Zip::File.open(zip)
                 zipf.restore_permissions = true
 
                 zipf.each do |f|

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.5.2'
+  VERSION = '1.6.1'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.1
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -43,16 +43,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement