iron_worker_ng 0.8.3 → 0.8.4

data/README.md

@@ -4,9 +4,9 @@ To run your code in cloud you need to do three things:
 
 - **Create code package**
 - **Upload code package**
-- **Queue or schedule tasks** for execution 
+- **Queue or schedule tasks** for execution
 
-While you can use [REST APIs](http://dev.iron.io/worker/reference/api) for that, it's easier to use an 
+While you can use [REST APIs](http://dev.iron.io/worker/reference/api) for that, it's easier to use an
 IronWorker library created specifically for your language of choice, such as this gem, IronWorkerNG.
 
 # Preparing Your Environment
@@ -21,7 +21,7 @@ gem install iron_worker_ng
 
 # Creating A Worker
 
-Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as complex as you want. For example, 
+Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as complex as you want. For example,
 the following is an acceptable worker:
 
 ```ruby
@@ -35,14 +35,14 @@ 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 
-file or using ENV variables). You only need to do that once for your machine. If you've done that, then you can continue. 
+and [setup your Iron.io credentials on your system](http://dev.iron.io/articles/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, 
+Since our worker will be executed in the cloud, you'll need to bundle all the necessary gems,
 supplementary data, and other dependencies with it. `.worker` files make it easy to define your worker.
 
 ```ruby
-# define the runtime language, this can be ruby, java, node, php, go, etc. 
+# define the runtime language, this can be ruby, java, node, php, go, etc.
 runtime "ruby"
 # exec is the file that will be executed:
 exec "hello_worker.rb"
@@ -52,7 +52,7 @@ You can read more about `.worker` files here: http://dev.iron.io/worker/referenc
 
 ## Uploading the Code Package
 
-If your .worker file is called `hello.worker`, then run: 
+If your .worker file is called `hello.worker`, then run:
 
     iron_worker upload hello
 
@@ -73,7 +73,7 @@ Most commonly you'll be queuing up tasks from code though, so you can do this:
 ```ruby
 require "iron_worker_ng"
 client = IronWorkerNG::Client.new
-100.times do 
+100.times do
    client.tasks.create("hello", "foo"=>"bar")
 end
 ```
@@ -167,7 +167,7 @@ code.merge_gemfile '../Gemfile', 'common', 'worker' # merges gems from common an
 
 # Upload Your Worker
 
-When you have your code package, you are ready to upload and run it on the IronWorker cloud. 
+When you have your code package, you are ready to upload and run it on the IronWorker cloud.
 
 ```ruby
 # Initialize the client
@@ -180,8 +180,8 @@ client.codes.create(code)
 
 # Queue Up Tasks for Your Worker
 
-Now that the code is uploaded, we can create/queue up tasks. You can call this over and over 
-for as many tasks as you want. 
+Now that the code is uploaded, we can create/queue up tasks. You can call this over and over
+for as many tasks as you want.
 
 ```ruby
 client.tasks.create('MyWorker', {:client => 'Joe'})

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.8.4

data/bin/iron_worker

@@ -4,6 +4,22 @@ require 'optparse'
 require 'time'
 require 'iron_worker_ng'
 
+class IronWorkerCLILoggerFormatter < ::Logger::Formatter
+  def call(severity, time, proname, msg)
+    msg + "\n"
+  end
+end
+
+def create_client
+  client = IronWorkerNG::Client.new
+
+  project = client.projects.get
+  
+  IronCore::Logger.info 'IronWorkerNG', "Working with project '#{project.name}' ('#{project.id}')"
+
+  client
+end
+
 if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
   puts IronWorkerNG.full_version
   exit 0
@@ -23,7 +39,7 @@ command = 'tasks.create' if command == 'queue'
 command = 'schedules.create' if command == 'schedule'
 command = 'tasks.log' if command == 'log'
 
-IronCore::Logger.logger.datetime_format = ''
+IronCore::Logger.logger.formatter = IronWorkerCLILoggerFormatter.new
 
 if $*.include?('--debug')
   IronCore::Logger.logger.level = ::Logger::DEBUG
@@ -59,16 +75,20 @@ if command == 'codes.create'
     exit 1
   end
 
-  code = IronWorkerNG::Code::Base.new(name)
-
-  client = IronWorkerNG::Client.new
+  client = create_client
 
+  code = IronWorkerNG::Code::Base.new(name)
+  
+  IronCore::Logger.info 'IronWorkerNG', "Worker '#{code.name}' upload started"
+  
   client.codes.create(code)
+
+  IronCore::Logger.info 'IronWorkerNG', "Worker '#{code.name}' uploaded"
 elsif command == 'tasks.create' || command == 'schedules.create'
   if $*.size > 0 && $*[0][0] != '-'
     $*.unshift('-n')
   end
-  
+
   name = nil
   payload = nil
   payload_file = nil
@@ -88,7 +108,7 @@ elsif command == 'tasks.create' || command == 'schedules.create'
     opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
     opts.on('-n', '--name NAME', 'code name') do |v|
-      name = v 
+      name = v
     end
 
     opts.on('-p', '--payload PAYLOAD', String, 'payload to pass') do |v|
@@ -163,14 +183,18 @@ elsif command == 'tasks.create' || command == 'schedules.create'
     options[:run_every] = run_every unless run_every.nil?
   end
 
-  client = IronWorkerNG::Client.new
+  client = create_client
 
   id = nil
 
   if command == 'tasks.create'
     id = client.tasks.create(name, payload, options).id
+
+    IronCore::Logger.info 'IronWorkerNG', "Worker '#{name}' queued"
   else
     id = client.schedules.create(name, payload, options).id
+
+    IronCore::Logger.info 'IronWorkerNG', "Worker '#{name}' scheduled"
   end
 
   puts id if print_id
@@ -187,7 +211,7 @@ elsif command == 'tasks.log'
     opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
     opts.on('-t', '--task-id ID', 'task id') do |v|
-      task_id = v 
+      task_id = v
     end
 
     opts.on('-w', '--wait', 'wait for task') do |v|
@@ -207,7 +231,7 @@ elsif command == 'tasks.log'
     exit 1
   end
 
-  client = IronWorkerNG::Client.new
+  client = create_client
 
   log = ''
 
@@ -220,7 +244,7 @@ elsif command == 'tasks.log'
     if wait
       client.tasks.wait_for(task_id)
     end
-    
+
     log = client.tasks.log(task_id)
   end
 

data/lib/3rdparty/hashie/indifferent_access.rb

@@ -72,7 +72,7 @@ module Hashie
           value
         end
       end
-      
+
       def indifferent_default(key = nil)
         return self[convert_key(key)] if key?(key)
         regular_default(key)
@@ -84,7 +84,7 @@ module Hashie
           self[k] = v
         end
       end
-      
+
       def indifferent_writer(key, value);  regular_writer convert_key(key), convert_value(value) end
       def indifferent_fetch(key, *args);   regular_fetch  convert_key(key), *args                end
       def indifferent_delete(key);         regular_delete convert_key(key)                       end
@@ -92,7 +92,7 @@ module Hashie
       def indifferent_values_at(*indices); indices.map{|i| self[i] }                             end
 
       def indifferent_access?; true end
-      
+
       protected
 
       def hash_lacking_indifference?(other)

data/lib/iron_worker_ng/api_client.rb

@@ -111,5 +111,9 @@ module IronWorkerNG
       check_id(id)
       parse_response(post("projects/#{@project_id}/schedules/#{id}/cancel"))
     end
+
+    def projects_get
+      parse_response(get("projects/#{@project_id}"))
+    end
   end
 end

data/lib/iron_worker_ng/client.rb

@@ -49,19 +49,19 @@ module IronWorkerNG
     end
 
     def codes_list(options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.list with options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.list with options='#{options.to_s}'"
 
       @api.codes_list(options)['codes'].map { |c| OpenStruct.new(c) }
     end
 
     def codes_get(code_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.get with code_id='#{code_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.get with code_id='#{code_id}'"
 
       OpenStruct.new(@api.codes_get(code_id))
     end
 
     def codes_create(code, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.create with code='#{code.to_s}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.create with code='#{code.to_s}' and options='#{options.to_s}'"
 
       zip_file = code.create_zip
 
@@ -89,7 +89,7 @@ module IronWorkerNG
     end
 
     def codes_delete(code_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.delete with code_id='#{code_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.delete with code_id='#{code_id}'"
 
       @api.codes_delete(code_id)
 
@@ -97,31 +97,31 @@ module IronWorkerNG
     end
 
     def codes_revisions(code_id, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.revisions with code_id='#{code_id}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.revisions with code_id='#{code_id}' and options='#{options.to_s}'"
 
       @api.codes_revisions(code_id, options)['revisions'].map { |c| OpenStruct.new(c) }
     end
 
     def codes_download(code_id, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling codes.download with code_id='#{code_id}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling codes.download with code_id='#{code_id}' and options='#{options.to_s}'"
 
       @api.codes_download(code_id, options)
     end
 
     def tasks_list(options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.list with options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.list with options='#{options.to_s}'"
 
       @api.tasks_list(options)['tasks'].map { |t| OpenStruct.new(t) }
     end
 
     def tasks_get(task_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.get with task_id='#{task_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.get with task_id='#{task_id}'"
 
       OpenStruct.new(@api.tasks_get(task_id))
     end
 
     def tasks_create(code_name, params = {}, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.create with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.create with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
 
       res = @api.tasks_create(code_name, params.class == String ? params : params.to_json, options)
 
@@ -129,7 +129,7 @@ module IronWorkerNG
     end
 
     def tasks_create_legacy(code_name, params = {}, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.create_legacy with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.create_legacy with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
 
       res = @api.tasks_create(code_name, params_for_legacy(code_name, params), options)
 
@@ -137,7 +137,7 @@ module IronWorkerNG
     end
 
     def tasks_cancel(task_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.cancel with task_id='#{task_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.cancel with task_id='#{task_id}'"
 
       @api.tasks_cancel(task_id)
 
@@ -145,7 +145,7 @@ module IronWorkerNG
     end
 
     def tasks_cancel_all(code_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.cancel_all with code_id='#{code_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.cancel_all with code_id='#{code_id}'"
 
       @api.tasks_cancel_all(code_id)
 
@@ -153,13 +153,13 @@ module IronWorkerNG
     end
 
     def tasks_log(task_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.log with task_id='#{task_id}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.log with task_id='#{task_id}'"
 
       @api.tasks_log(task_id)
     end
 
     def tasks_set_progress(task_id, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.set_progress with task_id='#{task_id}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.set_progress with task_id='#{task_id}' and options='#{options.to_s}'"
 
       @api.tasks_set_progress(task_id, options)
 
@@ -167,7 +167,7 @@ module IronWorkerNG
     end
 
     def tasks_wait_for(task_id, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.wait_for with task_id='#{task_id}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling tasks.wait_for with task_id='#{task_id}' and options='#{options.to_s}'"
 
       options[:sleep] ||= options['sleep'] || 5
 
@@ -183,19 +183,19 @@ module IronWorkerNG
     end
 
     def schedules_list(options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.list with options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling schedules.list with options='#{options.to_s}'"
 
       @api.schedules_list(options)['schedules'].map { |s| OpenStruct.new(s) }
     end
 
     def schedules_get(schedule_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.get with schedule_id='#{schedule_id}"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling schedules.get with schedule_id='#{schedule_id}"
 
       OpenStruct.new(@api.schedules_get(schedule_id))
     end
 
     def schedules_create(code_name, params = {}, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.create with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling schedules.create with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
 
       res = @api.schedules_create(code_name, params.class == String ? params : params.to_json, options)
 
@@ -203,7 +203,7 @@ module IronWorkerNG
     end
 
     def schedules_create_legacy(code_name, params = {}, options = {})
-      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.create_legacy with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling schedules.create_legacy with code_name='#{code_name}', params='#{params.to_s}' and options='#{options.to_s}'"
 
       res = @api.schedules_create(code_name, params_for_legacy(code_name, params), options)
 
@@ -211,20 +211,28 @@ module IronWorkerNG
     end
 
     def schedules_cancel(schedule_id)
-      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.cancel with schedule_id='#{schedule_id}"
+      IronCore::Logger.debug 'IronWorkerNG', "Calling schedules.cancel with schedule_id='#{schedule_id}"
 
       @api.schedules_cancel(schedule_id)
 
       true
     end
 
+    def projects_get
+      IronCore::Logger.debug 'IronWorkerNG', "Calling projects.get"
+
+      res =@api.projects_get
+
+      OpenStruct.new(res)
+    end
+
     def params_for_legacy(code_name, params)
       if params.class == String
         params = JSON.parse(params)
       end
 
       attrs = {}
-        
+
       params.keys.each do |k|
         attrs['@' + k.to_s] = params[k]
       end

data/lib/iron_worker_ng/code/base.rb

@@ -70,7 +70,7 @@ module IronWorkerNG
           src, clean = IronWorkerNG::Fetcher.fetch(wfile)
 
           unless src.nil?
-            IronCore::Logger.info 'IronWorkerNG', "Using workerfile #{wfile}"
+            IronCore::Logger.info 'IronWorkerNG', "Using workerfile '#{wfile}'"
 
             eval(src)
 

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

@@ -10,7 +10,7 @@ module IronWorkerNG
 
         def runtime_run_code
           classpath_array = []
-      
+
           @features.each do |f|
             if f.respond_to?(:code_for_classpath)
               classpath_array << f.send(:code_for_classpath)
@@ -20,7 +20,7 @@ module IronWorkerNG
           classpath = classpath_array.join(':')
 
           IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
-        
+
           <<RUN_CODE
 java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
 RUN_CODE

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

@@ -12,8 +12,8 @@ module IronWorkerNG
 <?php
 /* #{IronWorkerNG.full_version} */
 
-function getArgs() { 
-  global $argv; 
+function getArgs() {
+  global $argv;
 
   $args = array('task_id' => null, 'dir' => null, 'payload' => array());
 

data/lib/iron_worker_ng/feature/binary/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/go/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/java/merge_exec.rb

@@ -30,7 +30,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path = nil, klass = nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/mono/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/node/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/perl/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/php/merge_exec.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

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

@@ -24,7 +24,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path=nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/ruby/merge_exec.rb

@@ -26,7 +26,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_exec(path = nil, klass = nil)
-            @exec ||= nil 
+            @exec ||= nil
 
             return @exec unless path
 

data/lib/iron_worker_ng/feature/ruby/merge_gem.rb

@@ -24,7 +24,7 @@ module IronWorkerNG
           def gem_path
             path = @spec.full_gem_path
 
-            # bundler fix 
+            # bundler fix
 
             ['/gems/' + @spec.full_name, '/gems'].each do |bad_part|
               path.gsub!(bad_part + bad_part, bad_part)

data/lib/iron_worker_ng/fetcher.rb

@@ -25,7 +25,7 @@ module IronWorkerNG
           tmp_dir_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "http")
 
           Dir.mkdir(tmp_dir_name)
- 
+
           File.open(tmp_dir_name + '/' + File.basename(url), 'wb') do |f|
             f.write(response.body)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -147,8 +147,6 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
 - lib/iron_worker_ng/fetcher.rb
 - lib/iron_worker_ng/version.rb
-- ng_tests_worker.rb
-- remote_test.rb
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
 post_install_message: 
@@ -163,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 377459699
+      hash: -427365489
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/ng_tests_worker.rb

@@ -1,5 +0,0 @@
-Dir.chdir 'iwng'
-cmd = 'rake -f test/Rakefile test ' + params[:args]
-puts cmd
-STDOUT.flush
-exec cmd

data/remote_test.rb

@@ -1,45 +0,0 @@
-require 'bundler'
-require 'tmpdir'
-
-tmpdir = Dir.mktmpdir
-File.open(tmpdir + '/Gemfile', 'w') do |f|
-  f << File.read('Gemfile')
-  f << File.read('test/Gemfile')
-end
-Dir.chdir tmpdir do
-  Bundler.setup
-end
-
-$LOAD_PATH.unshift 'lib'
-
-require 'iron_worker_ng'
-require_relative 'test/iron_io_config.rb'
-
-client = IronWorkerNG::Client.new
-
-code = IronWorkerNG::Code.new do
-  runtime 'ruby'
-
-  exec 'ng_tests_worker.rb'
-  gemfile 'Gemfile'
-  gemfile 'test/Gemfile'
-
-  Dir.glob('*').each do |p|
-    dir  p, 'iwng' if File.directory?  p
-    file p, 'iwng' if File.file? p
-  end
-
-  iron_io_config 'iwng'
-end
-
-puts client.codes.create(code)
-
-puts code.create_zip
-
-task = client.tasks.create 'NgTestsWorker', args: $*.join(' ')
-
-client.tasks.wait_for task.id
-
-puts '-' * 80
-
-puts client.tasks.log(task.id)