iron_worker_ng 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/iron_worker_ng

@@ -4,9 +4,9 @@ require 'optparse'
 require 'time'
 require 'iron_worker_ng'
 
-if $*.size == 0 || (not ['upload', 'queue', 'schedule'].include?($*[0]))
+if $*.size == 0 || (not ['codes.create', 'tasks.create', 'schedules.create', 'tasks.log'].include?($*[0]))
   puts 'usage: iron_worker_ng COMMAND [OPTIONS]'
-  puts '    COMMAND: upload, queue, schedule'
+  puts '    COMMAND: codes.create, tasks.create, schedules.create, tasks.log'
   puts '    run iron_worker_ng COMMAND --help to get more information about each command'
   exit 1
 end
@@ -21,7 +21,7 @@ end
 
 client = IronWorkerNG::Client.new(ENV['IRON_IO_TOKEN'], ENV['IRON_IO_PROJECT_ID'])
 
-if command == 'upload'
+if command == 'codes.create'
   runtimes = IronWorkerNG::Code::Base.registered_types
   runtimes_help = runtimes[0][:name] + ' (default)' + (runtimes.size == 1 ? '' : ', ') + runtimes.map { |r| r[:name] }[1 .. -1].join(', ')
 
@@ -32,7 +32,7 @@ if command == 'upload'
   execute_features = []
 
   opts = OptionParser.new do |opts|
-    opts.banner = 'usage: iron_worker_ng upload [OPTIONS]'
+    opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
 
     opts.on('-r', '--runtime RUNTIME', runtimes.map { |r| r[:name] }, "#{runtimes_help}") do |v|
       runtime = v
@@ -76,7 +76,7 @@ if command == 'upload'
   end
 
   client.codes.create(code)
-elsif command == 'queue' || command == 'schedule'
+elsif command == 'tasks.create' || command == 'schedules.create'
   name = nil
   params = {}
 
@@ -89,6 +89,8 @@ elsif command == 'queue' || command == 'schedule'
   run_times = nil
   run_every = nil
 
+  print_id = false
+
   opts = OptionParser.new do |opts|
     opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
 
@@ -112,7 +114,7 @@ elsif command == 'queue' || command == 'schedule'
       delay = v
     end
 
-    if command == 'schedule'
+    if command == 'schedules.create'
       opts.on('--start-at TIME', 'start task at specified time') do |v|
         start_at = Time.parse(v)
       end
@@ -129,6 +131,10 @@ elsif command == 'queue' || command == 'schedule'
         run_every = v
       end
     end
+
+    opts.on('--print-id', 'prints result id') do |v|
+      print_id = true
+    end
   end
 
   begin
@@ -149,16 +155,84 @@ elsif command == 'queue' || command == 'schedule'
   options[:timeout] = timeout unless timeout.nil?
   options[:delay] = delay unless delay.nil?
 
-  if command == 'schedule'
+  if command == 'schedules.create'
     options[:start_at] = start_at unless start_at.nil?
     options[:end_at] = end_at unless end_at.nil?
     options[:run_times] = run_times unless run_times.nil?
     options[:run_every] = run_every unless run_every.nil?
   end
 
-  if command == 'queue'
-    client.tasks.create(name, params, options)
+  id = nil
+
+  if command == 'tasks.create'
+    id = client.tasks.create(name, params, options).id
   else
-    client.schedules.create(name, params, options)
+    id = client.schedules.create(name, params, options).id
+  end
+
+  print id if print_id
+elsif command == 'tasks.log'
+  task_id = nil
+  live = false
+
+  opts = OptionParser.new do |opts|
+    opts.banner = "usage: iron_worker_ng #{command} [OPTIONS]"
+
+    opts.on('-t --task-id ID', 'task id') do |v|
+      task_id = v 
+    end
+
+    #opts.on('--live', 'live log session') do |v|
+    #  live = true
+    #end
+  end
+
+  begin
+    opts.parse!
+  rescue OptionParser::ParseError
+    puts $!.to_s
+    exit 1
+  end
+
+  if task_id.nil?
+    puts opts
+    exit 1
+  end
+
+  log = ''
+  if live
+    begin
+      log = client.tasks.log(task_id)
+    rescue IronWorkerNG::APIClientError
+    end
+  else
+    log = client.tasks.log(task_id)
+  end
+
+  print log
+
+  if live
+    status = client.tasks.get(task_id).status
+
+    while status == 'queued' || status == 'running'
+      if status == 'running'
+        begin
+          next_log = client.tasks.log(task_id)
+          print next_log[log.length .. - 1]
+          log = next_log
+        rescue IronWorkerNG::APIClientError
+        end
+      end
+
+      sleep 1
+   
+      status = client.tasks.get(task_id).status
+    end
+
+    begin
+      next_log = client.tasks.log(task_id)
+      print next_log[log.length .. - 1]
+    rescue IronWorkerNG::APIClientError
+    end
   end
 end

data/lib/iron_worker_ng/client.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 require_relative 'api_client'
 
 module IronWorkerNG
@@ -40,16 +42,24 @@ module IronWorkerNG
       true
     end
 
+    def tasks_get(task_id)
+      OpenStruct.new(@api.tasks_get(task_id))
+    end
+
     def tasks_create(code_name, params = {}, options = {})
       res = @api.tasks_create(code_name, {:project_id => @api.project_id, :token => @api.token, :params => params}.to_json, options)
 
-      res['tasks'][0]['id']
+      OpenStruct.new(res['tasks'][0])
+    end
+
+    def tasks_log(task_id)
+      @api.tasks_log(task_id)
     end
 
     def schedules_create(code_name, params = {}, options = {})
       res = @api.schedules_create(code_name, {:project_id => @api.project_id, :token => @api.token, :params => params}.to_json, options)
 
-      res['schedules'][0]['id']
+      OpenStruct.new(res['schedules'][0])
     end
   end
 end

data/lib/iron_worker_ng/code/ruby.rb

@@ -35,12 +35,19 @@ end
 
 require 'json'
 
-payload = JSON.load(File.open(payload_file))
-
-@iron_io_token = payload['token']
-@iron_io_project_id = payload['project_id']
 @iron_worker_task_id = task_id
-@params = payload['params']
+
+@payload = File.read(payload_file)
+
+parsed_payload = {}
+begin
+  parsed_payload = JSON.parse(@payload)
+rescue
+end
+
+@iron_io_token = parsed_payload['token']
+@iron_io_project_id = parsed_payload['project_id']
+@params = parsed_payload['params'] || {}
 
 require worker_file_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &78933470 !ruby/object:Gem::Requirement
+  requirement: &83479100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78933470
+  version_requirements: *83479100
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &78933170 !ruby/object:Gem::Requirement
+  requirement: &83478800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78933170
+  version_requirements: *83478800
 - !ruby/object:Gem::Dependency
   name: rest
-  requirement: &78932880 !ruby/object:Gem::Requirement
+  requirement: &83302470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78932880
+  version_requirements: *83302470
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &78932460 !ruby/object:Gem::Requirement
+  requirement: &83301960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *78932460
+  version_requirements: *83301960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &78925690 !ruby/object:Gem::Requirement
+  requirement: &83301580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *78925690
+  version_requirements: *83301580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &78925310 !ruby/object:Gem::Requirement
+  requirement: &83301220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *78925310
+  version_requirements: *83301220
 description: New generation ruby client for IronWorker
 email: info@iron.io
 executables:
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 670052751
+      hash: -801788643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: