iron_worker_ng 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dceb21b4e176225f0a5734c84418c1869057002
-  data.tar.gz: 0a4661a382515893776e9fe322966dce35348e58
+  metadata.gz: c2b00fa9d2ec3be6e169106791773b106146c054
+  data.tar.gz: 788a1a3cea550f35b028de1efeead9527a3ceef4
 SHA512:
-  metadata.gz: b4f81f7d49ee9780b5309059706c289256de133322b761ff7c0cd2133fb2721881ea57fa15d6575047e803f91dbdf2c71919399da05aedc7b510d0a6d24d7ba8
-  data.tar.gz: 98cc687d4f7b4e3cc91cbcf73435bdee44cd299081672d47b87c3b8bf75772e67ddb4912fe7fc5d4cbf3838a0e2338ec1d8173c8bd256ca5e879a1b472502ffb
+  metadata.gz: 37f4a6a29f7dd0a369d6b3dba01bb108ccc8e8a658f688a9a260cb5f3151707c87963dae8f32a109a5805e2016d906b2ef87326d82969c1e0a8ccf6bd1df4d4b
+  data.tar.gz: 9a3225a36201619298d5ec3f78df0450f58dc7e739aceda62fc7818dcd53ae2b9c88f7733f2b4921f99df28b170a1d3a5fc1160ec65e4b02a5ff7c50f8735192

data/README.md

@@ -656,8 +656,6 @@ puts schedule.id
   - **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.
 

data/bin/iron_worker

@@ -179,11 +179,6 @@ elsif command == 'queue' || command == 'schedule'
       options[:timeout] = v
     end
 
-    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
-
     opts.on('--cluster CLUSTER', String, 'Run task on selected cluster') do |v|
       options[:cluster] = v
     end
@@ -194,16 +189,16 @@ elsif command == 'queue' || command == 'schedule'
     end
 
     if command == 'queue'
+      opts.on('--delay DELAY', Integer, 'delay before start in seconds') do |v|
+        options[:delay] = v
+      end
+
       opts.on('--wait', Integer, 'wait for task to complete and print log') do |v|
         options[:wait] = true
       end
     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

data/lib/iron_worker_ng/api_client.rb

@@ -48,7 +48,9 @@ module IronWorkerNG
     end
 
     def codes_create(name, file, runtime, runner, options)
-      parse_response(post_file("projects/#{@project_id}/codes", :file, File.new(file, 'rb'), :data, {:name => name, :runtime => runtime, :file_name => runner}.merge(options)))
+      file_instance = file.to_s.strip ==  "" || runner.to_s.strip == "" ? "" : File.new(file, 'rb')
+      options = {:name => name, :runtime => runtime, :file_name => runner}.merge(options)
+      parse_response(post_file("projects/#{@project_id}/codes", :file, file_instance, :data, options))
     end
 
     def codes_delete(id)

data/lib/iron_worker_ng/feature/python/merge_pip.rb

@@ -21,7 +21,7 @@ module IronWorkerNG
 
             ::Dir.mkdir(pip_dir_name)
 
-            p = 'pip-6.0.8'
+            p = 'pip-1.3.1'
             `cd #{pip_dir_name} && curl -O https://pypi.python.org/packages/source/p/pip/#{p}.tar.gz && tar xf #{p}.tar.gz && cd #{p} && python setup.py install --user --root #{pip_dir_name} && cd .. && rm -rf #{p} #{p}.tar.gz`
 
             pip_packages_dir = ::Dir.glob(pip_dir_name + ENV['HOME'] + '/.local/lib/python*').first
@@ -44,7 +44,6 @@ module IronWorkerNG
             deps_string = @deps.map { |dep| dep.name + dep.version.to_s.sub(/\A\d/, '==\0') }.join(' ')
             install_command = pip_binary + ' install -U -I --user --root ' + pips_dir_name + ' ' + deps_string
 
-            puts install_command
             fork do
               ENV['PYTHONPATH'] = pip_packages_dir + '/site-packages:' + pip_packages_dir + '/dist-packages'
               puts `#{install_command}`

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: New generation ruby client for IronWorker