iron_worker_ng 0.16.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf217b118d97da56fdf20036b87cddbec177c697
-  data.tar.gz: 2efd49c7a8b76c22849a0c8a70858075ba343cce
+  metadata.gz: d161b8b3f520612288c567abcaf8c7de5c439bdb
+  data.tar.gz: 991e6a67ddfdfe01772203ad952e535ae65fbafe
 SHA512:
-  metadata.gz: 25218886b07fbd334dc2675cf4b3e574f3940a862542f0182cc77afe439dd73d31540d7daa9ee95276b9f910f83943486eb54644a15ebbb8b44c0239c6b703bd
-  data.tar.gz: 7f4d0126915b6b8e7605ddc5a5ebdbb63f98a28b42b5fa58543f83a3d2d11d284330494509b8b0aba62db7ba23a9a7b465dfce11b835db2c51080ac039eb1516
+  metadata.gz: 291b78dc0e3c213473fded9d559610fbbff74d256b26229bb990f6db1c727c0a6d64dc3b071030a2e5b86dbebe8cd8e1ef3fcfc096a3ff321b06625d26d01ca5
+  data.tar.gz: 41654a46d1e1901777b1442676cadc7744e04a9e9b41e0180be74fe18f89cb678c96867fdae4c1de60d4cdb10aefd888e873deea166cbde0d0652b82752443c5

data/README.md

@@ -35,7 +35,7 @@ All output to `STDOUT` will be logged and available for your review when your wo
 # Creating The Code Package
 
 Before you can run use IronWorker, be sure you've [created a free account with Iron.io](http://www.iron.io)
-and [setup your Iron.io credentials on your system](http://dev.iron.io/articles/configuration/) (either in a json
+and [setup your Iron.io credentials on your system](http://dev.iron.io/worker/reference/configuration/) (either in a json
 file or using ENV variables). You only need to do that once for your machine. If you've done that, then you can continue.
 
 Since our worker will be executed in the cloud, you'll need to bundle all the necessary gems,
@@ -68,6 +68,10 @@ Use the `-p` parameter to pass in a payload:
 
     iron_worker queue hello -p "{\"hi\": \"world\"}"
 
+Use the `--wait` parameter to queue a task, wait for it to complete and print the log.
+
+    iron_worker queue hello -p "{\"hi\": \"world\"}" --wait
+
 Most commonly you'll be queuing up tasks from code though, so you can do this:
 
 ```ruby
@@ -78,6 +82,18 @@ client = IronWorkerNG::Client.new
 end
 ```
 
+## 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.
+
+    iron_worker info task 5032f7360a4681382838e082
+
+## Get task log
+
+Similar to getting status, get the task ID in the queue command output, then:
+
+    iron_worker log 5032f7360a4681382838e082 --wait
+
 ## Retry a Task
 
 You can retry task by id using same payload and options:

data/bin/iron_worker

@@ -30,6 +30,10 @@ def common_opts(opts)
   opts.on('--project-id PROJECT_ID', 'project id') do |v|
     @cli.project_id = v
   end
+
+  opts.on('--token TOKEN', 'token') do |v|
+    @cli.token = v
+  end
 end
 
 if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
@@ -37,7 +41,7 @@ if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
   exit 0
 end
 
-commands = ['upload', 'queue', 'retry', 'schedule', 'log', 'run', 'install', 'webhook', 'info']
+commands = ['upload', 'patch', 'queue', 'retry', 'schedule', 'log', 'run', 'install', 'webhook', 'info']
 
 if $*.size == 0 || (not commands.include?($*[0]))
   puts 'usage: iron_worker COMMAND [OPTIONS]'
@@ -110,6 +114,40 @@ if command == 'upload'
   end
 
   @cli.upload($*[0], params, options)
+elsif command == 'patch'
+  params = {}
+  options = {}
+
+  opts = OptionParser.new do |opts|
+    opts.banner = "usage: iron_worker patch CODE_PACKAGE_NAME [OPTIONS]"
+
+    opts.on('-p', '--patch PATCH', 'patch file') do |v|
+      options[:patch] = v
+    end
+
+    common_opts(opts)
+  end
+
+  begin
+    opts.parse!
+  rescue OptionParser::ParseError
+    puts $!.to_s
+    exit 1
+  end
+
+  unless $*.size == 1
+    puts 'Please specify code package name'
+    puts opts
+    exit 1
+  end
+
+  if options[:patch].nil?
+    puts 'Please specify patch'
+    puts opts
+    exit 1
+  end
+
+  @cli.patch($*[0], params, options)
 elsif command == 'queue' || command == 'schedule'
   params = {}
   options = {}

data/lib/iron_worker_ng/api_client.rb

@@ -83,7 +83,13 @@ module IronWorkerNG
 
     def tasks_log(id)
       check_id(id)
-      parse_response(get("projects/#{@project_id}/tasks/#{id}/log"), false)
+      if block_given?
+        stream_get("projects/#{@project_id}/tasks/#{id}/log") do |chunk|
+          yield chunk
+        end
+      else
+        parse_response(get("projects/#{@project_id}/tasks/#{id}/log"), false)
+      end
     end
 
     def tasks_set_progress(id, options = {})

data/lib/iron_worker_ng/cli.rb

@@ -9,6 +9,7 @@ module IronWorkerNG
       @config = nil
       @env = nil
       @project_id = nil
+      @token = nil
     end
 
     def beta?
@@ -35,6 +36,12 @@ module IronWorkerNG
       @project_id = project_id
     end
 
+    def token=(token)
+      @client = nil
+
+      @token = token
+    end
+
     def log(msg)
       IronCore::Logger.info 'IronWorkerNG', msg
     end
@@ -47,7 +54,7 @@ module IronWorkerNG
       if @client.nil?
         log_group "Creating client"
 
-        @client = IronWorkerNG::Client.new(:config => @config, :env => @env, :project_id => @project_id)
+        @client = IronWorkerNG::Client.new(:config => @config, :env => @env, :project_id => @project_id, :token => @token)
 
         project = client.projects.get
 
@@ -100,6 +107,18 @@ module IronWorkerNG
       end
     end
 
+    def patch(name, params, options)
+      client
+
+      log_group "Patching code package '#{name}'"
+
+      code_id = client.codes.patch(name, options)._id
+      code_info = client.codes.get(code_id)
+
+      log "Patched code package uploaded with id='#{code_id}' and revision='#{code_info.rev}'"
+      log "Check 'https://hud.iron.io/tq/projects/#{client.api.project_id}/code/#{code_id}' for more info"
+    end
+
     def queue(name, params, options)
       client
 

data/lib/iron_worker_ng/client.rb

@@ -1,5 +1,7 @@
 require 'ostruct'
 require 'base64'
+require 'tmpdir'
+require 'fileutils'
 
 require 'iron_worker_ng/api_client'
 
@@ -153,6 +155,93 @@ module IronWorkerNG
       OpenStruct.new(res)
     end
 
+    def codes_patch(name, options = {})
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.patch with name='#{name}' and options='#{options.to_s}'"
+  
+      code = codes.list(:all => true).find { |c| c.name == name }
+
+      if code.nil?
+        IronCore::Logger.error 'IronWorkerNG', "Can't find code with name='#{name}' to patch", IronCore::Error
+      end
+
+      patcher_code_name = name + (name[0 .. 0].upcase == name[0 .. 0] ? '::Patcher' : '::patcher')
+
+      exec_dir = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'exec')
+      exec_file_name = exec_dir + '/patchcer.rb'
+
+      FileUtils.mkdir_p(exec_dir)
+
+      exec_file = File.open(exec_file_name, 'w')
+      exec_file.write <<EXEC_FILE
+# #{IronWorkerNG.full_version}
+
+File.open('.gemrc', 'w') do |gemrc|
+  gemrc.puts('gem: --no-ri --no-rdoc')
+end
+
+`gem install iron_worker_ng`
+
+require 'iron_worker_ng'
+
+client = IronWorkerNG::Client.new(JSON.parse(params[:client_options]))
+
+original_code = client.codes.get(params[:code_id])
+original_code_data = client.codes.download(params[:code_id])
+
+`mkdir code`
+original_code_zip = File.open('code/code.zip', 'w')
+original_code_zip.write(original_code_data)
+original_code_zip.close
+`cd code && unzip code.zip && rm code.zip && cd ..`
+
+patch_file = Dir['patch/*'].first
+
+system("cd code && patch -fp1 <../\#{patch_file} && cd ..") || exit(1)
+
+code_container = IronWorkerNG::Code::Container::Zip.new
+
+Dir['code/*'].each do |entry|
+  code_container.add(entry[5 .. -1], entry)
+end
+
+code_container.close
+
+res = client.api.codes_create(original_code.name, code_container.name, 'sh', '__runner__.sh', :config => original_code.config)
+
+res['_id'] = res['id']
+res = OpenStruct.new(res)
+
+client.tasks.set_progress(iron_task_id, :msg => res.marshal_dump.to_json)
+EXEC_FILE
+      exec_file.close
+
+      patcher_code = IronWorkerNG::Code::Base.new
+      patcher_code.runtime = :ruby
+      patcher_code.name = patcher_code_name
+      patcher_code.exec(exec_file_name)
+      patcher_code.file(options[:patch], 'patch')
+
+      patcher_container_file = patcher_code.create_container
+
+      @api.codes_create(patcher_code_name, patcher_container_file, 'sh', '__runner__.sh', {})
+
+      FileUtils.rm_rf(exec_dir)
+      File.unlink(patcher_container_file)
+
+      patcher_task = tasks.create(patcher_code_name, :code_id => code._id, :client_options => @api.options.to_json)
+
+      patcher_task = tasks.wait_for(patcher_task._id)
+
+      if patcher_task.status != 'complete'
+        log = tasks.log(patcher_task._id)
+        IronCore::Logger.error 'IronWorkerNG', "Error while patching worker\n" + log, IronCore::Error
+      end
+
+      res = JSON.parse(patcher_task.msg)
+      res['_id'] = res['id']
+      OpenStruct.new(res)
+    end
+
     def codes_delete(code_id)
       IronCore::Logger.debug 'IronWorkerNG', "Calling codes.delete with code_id='#{code_id}'"
 
@@ -226,7 +315,11 @@ module IronWorkerNG
     def tasks_log(task_id)
       IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.log with task_id='#{task_id}'"
 
-      @api.tasks_log(task_id)
+      if block_given?
+        @api.tasks_log(task_id) { |chunk| yield(chunk) }
+      else
+        @api.tasks_log(task_id)
+      end
     end
 
     def tasks_set_progress(task_id, options = {})

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

@@ -40,8 +40,8 @@ task_id = nil
   task_id = $*[i + 1] if $*[i] == '-id'
 end
 
-ENV['GEM_PATH'] = ([root + '__gems__'] + (ENV['GEM_PATH'] || '').split(':')).join(':')
-ENV['GEM_HOME'] = root + '__gems__'
+ENV['GEM_PATH'] = ([File.join(root, '__gems__')] + Gem.path).join(':')
+ENV['GEM_HOME'] = File.join(root, '__gems__')
 
 $:.unshift("\#{root}")
 

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.16.4'
+  VERSION = '1.0.0'
 
   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.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: New generation ruby client for IronWorker