iron_worker_ng 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb7f49b2e34e9e2a4e4043b3a15b2a78b351a15
-  data.tar.gz: dabea66df219251596de9ddcd95aa184fdb3c995
+  metadata.gz: cf217b118d97da56fdf20036b87cddbec177c697
+  data.tar.gz: 2efd49c7a8b76c22849a0c8a70858075ba343cce
 SHA512:
-  metadata.gz: 719ae62f94f82fd2d120b12193afa1fa206d5624855e0d27a17642c9762012fc17b7c6f8897d59182c925c085030afb3db66ae2fc3f92fd188d83db35eb663cc
-  data.tar.gz: 72e1f4c6e991acff3409629d0c7b979b438856c98a54fa6b1142ada922948ea0802331c71dae9f69bd681fa8c873218bf6165105c4b5c1d7e6ef56fccff19f76
+  metadata.gz: 25218886b07fbd334dc2675cf4b3e574f3940a862542f0182cc77afe439dd73d31540d7daa9ee95276b9f910f83943486eb54644a15ebbb8b44c0239c6b703bd
+  data.tar.gz: 7f4d0126915b6b8e7605ddc5a5ebdbb63f98a28b42b5fa58543f83a3d2d11d284330494509b8b0aba62db7ba23a9a7b465dfce11b835db2c51080ac039eb1516

data/bin/iron_worker

@@ -77,6 +77,10 @@ if command == 'upload'
       options[:retries_delay] = v
     end
 
+    opts.on('--worker-config CONFIG_FILE', 'config file for worker') do |v|
+      options[:worker_config] = v
+    end
+
     opts.on('-h', '--host HOST', String, 'host name, eg: www.mydomain.com') do |v|
       options[:host] = v
     end
@@ -133,6 +137,12 @@ elsif command == 'queue' || command == 'schedule'
       options[:delay] = v
     end
 
+    if command == 'queue'
+      opts.on('--wait', Integer, 'wait for task to complete and print log') do |v|
+        options[:wait] = true
+      end
+    end
+
     if command == 'schedule'
       opts.on('--start-at TIME', 'start task at specified time') do |v|
         options[:start_at] = Time.parse(v)
@@ -183,6 +193,10 @@ elsif command == 'retry'
       options[:delay] = v
     end
 
+    opts.on('--wait', Integer, 'wait for task to complete and print log') do |v|
+      options[:wait] = true
+    end
+
     common_opts(opts)
   end
 
@@ -207,8 +221,8 @@ elsif command == 'log'
   opts = OptionParser.new do |opts|
     opts.banner = "usage: iron_worker log TASK_ID [OPTIONS]"
 
-    opts.on('-w', '--wait', 'wait for task') do |v|
-      params[:wait] = true
+    opts.on('-w', '--wait', 'wait for task to complete') do |v|
+      options[:wait] = true
     end
 
     common_opts(opts)

data/lib/iron_worker_ng/cli.rb

@@ -74,6 +74,12 @@ module IronWorkerNG
       log "Retries delay set to '#{options[:retries_delay]}'" unless options[:retries_delay].nil?
       log "Host set to '#{options[:host]}'" unless options[:host].nil?
 
+      if options[:worker_config]
+        log "Loading worker_config at #{options[:worker_config]}"
+        c = IO.read(options[:worker_config])
+        options[:config] = c
+      end
+
       if code.remote_build_command || code.full_remote_build
         log_group "Uploading and building code package '#{code.name}'"
       else
@@ -103,6 +109,10 @@ module IronWorkerNG
 
       log "Code package '#{name}' queued with id='#{id}'"
       log "Check 'https://hud.iron.io/tq/projects/#{client.api.project_id}/jobs/#{id}' for more info"
+
+      if options[:wait] == true
+        getlog(id, {}, {:wait => true})
+      end
     end
 
     def schedule(name, params, options)
@@ -125,41 +135,40 @@ module IronWorkerNG
 
       log "Task retried with id='#{retry_task_id}'"
       log "Check 'https://hud.iron.io/tq/projects/#{client.api.project_id}/jobs/#{retry_task_id}' for more info"
+
+      if options[:wait] == true
+        getlog(retry_task_id, {}, {:wait => true})
+      end
     end
 
     def getlog(task_id, params, options)
       client
 
-      live = params[:live] || params['live']
-      wait = params[:wait] || params['wait']
+      wait = options[:wait] || options['wait']
 
       log_group "Getting log for task with id='#{task_id}'"
 
       log = ''
 
-      if live
+      if wait
         begin
           log = client.tasks.log(task_id)
-        rescue IronCore::Error
+        rescue
         end
       else
-        if wait
-          client.tasks.wait_for(task_id)
-        end
-
         log = client.tasks.log(task_id)
       end
 
       print log
 
-      if live
+      if wait
         client.tasks.wait_for(task_id) do |task|
           if task.status == 'running'
             begin
               next_log = client.tasks.log(task_id)
               print next_log[log.length .. - 1]
               log = next_log
-            rescue IronCore::Error
+            rescue
             end
           end
         end
@@ -167,7 +176,7 @@ module IronWorkerNG
         begin
           next_log = client.tasks.log(task_id)
           print next_log[log.length .. - 1]
-        rescue IronCore::Error
+        rescue
         end
       end
     end

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

@@ -46,6 +46,7 @@ ENV['GEM_HOME'] = root + '__gems__'
 $:.unshift("\#{root}")
 
 require 'json'
+require 'yaml'
 
 @iron_task_id = task_id
 
@@ -64,6 +65,12 @@ if config_file
     @config = JSON.parse(@config)
     @config = IronWorkerNGHash.new(@config)
   rescue
+    # try yaml
+    begin
+      @config = YAML.load(@config)
+      @config = IronWorkerNGHash.new(@config)
+    rescue
+    end
   end
 end
 

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -151,6 +151,20 @@ dependencies:
     - - '>='
       - !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
 email:
 - info@iron.io