iron_worker_ng 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21cb18e68aec2b9f25a095b90a195e4f9a7db3aa
-  data.tar.gz: 980cae983aff2f5c6ba5279bac6ce652de96a7e8
+  metadata.gz: 8b0e4d4aa270911d8fb351eef0d9f699bed21645
+  data.tar.gz: d375f5157a3eccac3a39291f8ebcdba23e7bcfd7
 SHA512:
-  metadata.gz: e85488731c141bd7ac2a9df0fd04ba121fa77d3d4c05b26f3e7c818c63fc9b51c57aabb90d85fca0a24a9e478961b3caddfd1f4aa536898271691cfd8fcb5ba5
-  data.tar.gz: 076068df20091a051c19e95cc85c4748bc6cdd11e9987b45768f0e74439b56bbd8959b420cd56242497b4a92d0e867b490c5d63d3a7d6da751bc8cc0fd94f240
+  metadata.gz: c312b4699081f8f2f1da4f5ee39dba3c097e5bc1e5c2deb3d7cf3d540610e5c399a29f80d935abdb3cddbe1e70928e43b6c7fb526358e593b2e8301f6a540473
+  data.tar.gz: 89e486619760f5b0720b966fada3e623a08ed428dc6f1d1d7d43c5469dcbfdcb69c6e6a24b11a3297573f4207a981278453df36faecb3669e7bf6fc6f19a3fd4

data/README.md

@@ -101,6 +101,14 @@ From code you can set the priority like it done in snippet below:
 client.tasks.create("hello", some_params, priority: 2) # highest priority
 ```
 
+### Setting additional Options
+
+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.
+
 ## Get task status
 
 When you call `iron_worker queue X`, you'll see the task ID in the output which you can use to get the status.
@@ -599,6 +607,19 @@ schedule = client.schedules.create('MyWorker', {:client => 'Joe'}, {:start_at =>
 puts schedule.id
 ```
 
+#### Scheduling Options
+
+  - **run_every**: The amount of time, in seconds, between runs. By default, the task will only run once. run_every will return a 400 error if it is set to less than 60.
+  - **end_at**: The time tasks will stop being queued.
+  - **run_times**: The number of times a task will run.
+  - **priority**: Setting the priority of your job. Valid values are 0, 1, and 2. The default is 0. Higher values means tasks spend less time in the queue once they come off the schedule.
+  - **start_at**: The time the scheduled task should first be run.
+  - **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 scheduling the tasks. Default is 0.
+  - **task_delay**: The number of seconds to delay before actually queuing the task. Default is 0.
+  - **label**: Optional label for adding custom labels to scheduled tasks.
+  - **cluster**: cluster name ex: "high-mem" or "dedicated".  This is a premium feature for customers to have access to more powerful or custom built worker solutions. Dedicated worker clusters exist for users who want to reserve a set number of workers just for their queued tasks. If not set default is set to  "default" which is the public IronWorker cluster.
+
 ### schedules.cancel(schedule_id)
 
 Cancel the scheduled task specified by `schedule_id`.

data/bin/iron_worker

@@ -73,6 +73,10 @@ if command == 'upload'
       options[:max_concurrency] = v
     end
 
+    opts.on('-p', '--default-priority DEFAULT_PRIORITY', Integer, 'default priority of the tasks') do |v|
+      options[:default_priority] = v
+    end
+
     opts.on('-r', '--retries NUM_RETRIES', Integer, 'max number of automatic retries on task fail') do |v|
       options[:retries] = v
     end
@@ -171,7 +175,8 @@ elsif command == 'queue' || command == 'schedule'
       options[:timeout] = v
     end
 
-    opts.on('--delay DELAY', Integer, 'delay before start in seconds') do |v|
+    desc = command == 'queue' ? 'delay before start in seconds' : 'delay before scheduling tasks in seconds'
+    opts.on('--delay DELAY', Integer, desc) do |v|
       options[:delay] = v
     end
 
@@ -186,6 +191,10 @@ elsif command == 'queue' || command == 'schedule'
     end
 
     if command == 'schedule'
+      opts.on('--task-delay DELAY', Integer, 'delay before start of task in seconds') do |v|
+        options[:task_delay] = v
+      end
+
       opts.on('--start-at TIME', 'start task at specified time') do |v|
         options[:start_at] = Time.parse(v)
       end
@@ -201,6 +210,10 @@ elsif command == 'queue' || command == 'schedule'
       opts.on('--run-every RUN_EVERY', Integer, 'run task every RUN_EVERY seconds') do |v|
         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

@@ -83,6 +83,7 @@ module IronWorkerNG
 
       log "Code package name is '#{code.name}'"
       log "Max concurrency set to '#{options[:max_concurrency]}'" unless options[:max_concurrency].nil?
+      log "Default priority set to '#{options[:default_priority]}'" unless options[:default_priority].nil?
       log "Retries set to '#{options[:retries]}'" unless options[:retries].nil?
       log "Retries delay set to '#{options[:retries_delay]}'" unless options[:retries_delay].nil?
       log "Host set to '#{options[:host]}'" unless options[:host].nil?
@@ -299,6 +300,7 @@ module IronWorkerNG
       data << ['id', schedule._id]
       data << ['code package', schedule.code_name]
       data << ['status', schedule.status]
+      data << ['label', schedule.label] if schedule.label
       data << ['created', parse_time(schedule.created_at) || '-']
       data << ['next start', parse_time(schedule.next_start) || '-']
       data << ['run count', schedule.run_count || '-']

data/lib/iron_worker_ng/code/runtime/node.rb

@@ -10,13 +10,26 @@ module IronWorkerNG
 /* #{IronWorkerNG.full_version} */
 
 var fs = require('fs');
+var querystring = require('querystring');
 var params = null;
 var task_id = null;
 var config = null;
 
 process.argv.forEach(function(val, index, array) {
   if (val == "-payload") {
-    params = JSON.parse(fs.readFileSync(process.argv[index + 1], 'utf8'));
+    params = fs.readFileSync(process.argv[index + 1], 'utf8');
+    try {
+      params = JSON.parse(params);
+    } catch(e) {
+      try {
+        var parsed = querystring.parse(params);
+        if (!(Object.keys(parsed).length == 1 && parsed[Object.keys(parsed)[0]] == '')) {
+          params = parsed
+        }
+      } catch(e) {
+
+      }
+    }
   }
 
   if (val == "-config") {

data/lib/iron_worker_ng/code/runtime/ruby.rb

@@ -63,18 +63,22 @@ if config_file
   @config = File.read(config_file)
   begin
     @config = JSON.parse(@config)
-    @config = IronWorkerNGHash.new(@config)
+    @config = IronWorkerNGHash.new(@config) if @config.is_a?(::Hash)
   rescue
     # try yaml
     begin
       @config = YAML.load(@config)
-      @config = IronWorkerNGHash.new(@config)
+      @config = IronWorkerNGHash.new(@config) if @config.is_a?(::Hash)
     rescue
     end
   end
 end
 
-@params = IronWorkerNGHash.new(params)
+if params.is_a?(::Hash)
+  @params = IronWorkerNGHash.new(params)
+else
+  @params = params
+end
 
 def payload
   @payload

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.5.0'
+  VERSION = '1.5.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.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -57,112 +57,112 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: iron_cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: go
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: New generation ruby client for IronWorker
@@ -173,54 +173,54 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- bin/iron_worker
 - lib/3rdparty/hashie/indifferent_access.rb
 - lib/3rdparty/hashie/merge_initializer.rb
-- lib/iron_worker_ng/fetcher.rb
-- lib/iron_worker_ng/compat.rb
+- lib/iron_worker_ng.rb
+- lib/iron_worker_ng/api_client.rb
+- lib/iron_worker_ng/cli.rb
 - lib/iron_worker_ng/client.rb
-- lib/iron_worker_ng/version.rb
-- lib/iron_worker_ng/code/python.rb
-- lib/iron_worker_ng/code/ruby.rb
-- lib/iron_worker_ng/code/mono.rb
-- lib/iron_worker_ng/code/node.rb
 - lib/iron_worker_ng/code/base.rb
+- lib/iron_worker_ng/code/binary.rb
+- lib/iron_worker_ng/code/builder.rb
+- lib/iron_worker_ng/code/container/base.rb
+- lib/iron_worker_ng/code/container/dir.rb
+- lib/iron_worker_ng/code/container/zip.rb
+- lib/iron_worker_ng/code/go.rb
 - lib/iron_worker_ng/code/java.rb
-- lib/iron_worker_ng/code/runtime/python.rb
-- lib/iron_worker_ng/code/runtime/ruby.rb
+- lib/iron_worker_ng/code/mono.rb
+- lib/iron_worker_ng/code/node.rb
+- lib/iron_worker_ng/code/perl.rb
+- lib/iron_worker_ng/code/php.rb
+- lib/iron_worker_ng/code/python.rb
+- lib/iron_worker_ng/code/ruby.rb
+- lib/iron_worker_ng/code/runtime/binary.rb
+- lib/iron_worker_ng/code/runtime/go.rb
+- lib/iron_worker_ng/code/runtime/java.rb
 - lib/iron_worker_ng/code/runtime/mono.rb
 - lib/iron_worker_ng/code/runtime/node.rb
-- lib/iron_worker_ng/code/runtime/java.rb
 - lib/iron_worker_ng/code/runtime/perl.rb
-- lib/iron_worker_ng/code/runtime/binary.rb
 - lib/iron_worker_ng/code/runtime/php.rb
-- lib/iron_worker_ng/code/runtime/go.rb
-- lib/iron_worker_ng/code/perl.rb
-- lib/iron_worker_ng/code/builder.rb
-- lib/iron_worker_ng/code/binary.rb
-- lib/iron_worker_ng/code/container/zip.rb
-- lib/iron_worker_ng/code/container/dir.rb
-- lib/iron_worker_ng/code/container/base.rb
-- lib/iron_worker_ng/code/php.rb
-- lib/iron_worker_ng/code/go.rb
+- lib/iron_worker_ng/code/runtime/python.rb
+- lib/iron_worker_ng/code/runtime/ruby.rb
+- lib/iron_worker_ng/compat.rb
 - lib/iron_worker_ng/feature/base.rb
+- lib/iron_worker_ng/feature/common/merge_deb.rb
+- lib/iron_worker_ng/feature/common/merge_dir.rb
+- lib/iron_worker_ng/feature/common/merge_exec.rb
+- lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/common/merge_zip.rb
+- lib/iron_worker_ng/feature/common/set_env.rb
+- lib/iron_worker_ng/feature/java/merge_jar.rb
 - lib/iron_worker_ng/feature/python/merge_pip.rb
 - lib/iron_worker_ng/feature/python/merge_pip_dependency.rb
-- lib/iron_worker_ng/feature/java/merge_jar.rb
-- lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
+- lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
-- lib/iron_worker_ng/feature/common/set_env.rb
-- lib/iron_worker_ng/feature/common/merge_file.rb
-- lib/iron_worker_ng/feature/common/merge_zip.rb
-- lib/iron_worker_ng/feature/common/merge_deb.rb
-- lib/iron_worker_ng/feature/common/merge_dir.rb
-- lib/iron_worker_ng/feature/common/merge_exec.rb
-- lib/iron_worker_ng/cli.rb
-- lib/iron_worker_ng/api_client.rb
-- lib/iron_worker_ng.rb
-- README.md
-- LICENSE
-- bin/iron_worker
+- lib/iron_worker_ng/fetcher.rb
+- lib/iron_worker_ng/version.rb
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
 metadata: {}
@@ -230,17 +230,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: New generation ruby client for IronWorker