iron_worker_ng 0.7.4 → 0.8.0

data/README.md

@@ -19,12 +19,6 @@ Also, you'll need a Ruby 1.9 interpreter and the IronWorkerNG gem. Install it us
 gem install iron_worker_ng
 ```
 
-We recommend that you install the `typhoeus` gem as well for faster API interaction.
-
-```sh
-gem install typhoeus
-```
-
 # Creating A Worker
 
 Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as complex as you want. For example, 
@@ -83,6 +77,12 @@ client = IronWorkerNG::Client.new
    client.tasks.create("hello", "foo"=>"bar")
 end
 ```
+### Debugging
+
+To get a bunch of extra output to debug things, turn it on using:
+
+    IronCore::Logger.logger.level = ::Logger::DEBUG
+
 
 ## IronWorkerNG::Code::Ruby API
 
@@ -95,7 +95,6 @@ Create new code package with the specified args.
 ```ruby
 code_with_name = IronWorkerNG::Code::Ruby.new(:exec => 'cool_worker.rb', :name => 'CoolWorker')
 code_with_guessed_name = IronWorkerNG::Code::Ruby.new(:exec => 'cool_worker.rb')
-code_with_short_form_syntax = IronWorkeNG::Code::Ruby.new('cool_worker.rb')
 code = IronWorkerNG::Code::Ruby.new # will need to use code.merge_exec later
 ```
 

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.8.0

data/bin/iron_worker

@@ -31,44 +31,20 @@ if $*.include?('--debug')
   $*.reject! { |p| p == '--debug' }
 end
 
-client = IronWorkerNG::Client.new
-
 if command == 'codes.create'
   if $*.size > 0 && $*[0][0] != '-'
     $*.unshift('-n')
   end
 
-  runtimes = IronWorkerNG::Code::Base.registered_types
-  runtimes_help = runtimes[0][:name] + ' (default)' + (runtimes.size == 1 ? '' : ', ') + runtimes.map { |r| r[:name] }[1 .. -1].join(', ')
-
-  features = []
-
   name = nil
-  runtime = nil
-  execute_features = []
+  wfile = nil
 
   opts = OptionParser.new do |opts|
     opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
-    opts.on('-r', '--runtime RUNTIME', runtimes.map { |r| r[:name] }, "#{runtimes_help}") do |v|
-      runtime = v
-    end
-
-    opts.on('-n', '--name NAME', 'code name') do |v|
+    opts.on('-n', '--name NAME', 'code name or workerfile') do |v|
       name = v
     end
-
-    IronWorkerNG::Code::Base.registered_features.each do |f|
-      prefix = ''
-
-      if f[:for_klass] != IronWorkerNG::Code::Base
-        prefix = runtimes.find { |r| r[:klass] == f[:for_klass] }[:name] + '-'
-      end
-
-      opts.on("--#{prefix}#{f[:name].gsub('_', '-')} #{f[:args]}", Array) do |v|
-        execute_features << {:name => f[:name], :args => v}
-      end
-    end
   end
 
   begin
@@ -78,21 +54,14 @@ if command == 'codes.create'
     exit 1
   end
 
-  code = nil
-
-  if runtime.nil?
-    code = IronWorkerNG::Code::Creator.create(:name => name) do
-      execute_features.each do |f|
-        send(f[:name], *f[:args])
-      end
-    end
-  else
-    code = runtimes.find { |r| r[:name] == runtime }[:klass].new(:name => name)
+  if name.nil?
+    puts opts
+    exit 1
   end
 
-  execute_features.each do |f|
-    code.send(f[:name], *f[:args])
-  end
+  code = IronWorkerNG::Code::Base.new(name)
+
+  client = IronWorkerNG::Client.new
 
   client.codes.create(code)
 elsif command == 'tasks.create' || command == 'schedules.create'
@@ -185,6 +154,8 @@ elsif command == 'tasks.create' || command == 'schedules.create'
     options[:run_every] = run_every unless run_every.nil?
   end
 
+  client = IronWorkerNG::Client.new
+
   id = nil
 
   if command == 'tasks.create'
@@ -226,12 +197,14 @@ elsif command == 'tasks.log'
     exit 1
   end
 
+  client = IronWorkerNG::Client.new
+
   log = ''
 
   if live
     begin
       log = client.tasks.log(task_id)
-    rescue IronCore::IronError
+    rescue IronCore::Error
     end
   else
     log = client.tasks.log(task_id)
@@ -246,7 +219,7 @@ elsif command == 'tasks.log'
           next_log = client.tasks.log(task_id)
           print next_log[log.length .. - 1]
           log = next_log
-        rescue IronCore::IronError
+        rescue IronCore::Error
         end
       end
     end
@@ -254,7 +227,7 @@ elsif command == 'tasks.log'
     begin
       next_log = client.tasks.log(task_id)
       print next_log[log.length .. - 1]
-    rescue IronCore::IronError
+    rescue IronCore::Error
     end
   end
 end

data/lib/iron_worker_ng/api_client.rb

@@ -7,19 +7,27 @@ module IronWorkerNG
     AWS_US_EAST_HOST = 'worker-aws-us-east-1.iron.io'
 
     def initialize(options = {})
-      super('worker', options)
+      default_options = {
+        :scheme => 'https',
+        :host => IronWorkerNG::APIClient::AWS_US_EAST_HOST,
+        :port => 443,
+        :api_version => 2,
+        :user_agent => IronWorkerNG.full_version
+      }
 
-      load_from_hash('defaults', {
-                     :scheme => 'https',
-                     :host => IronWorkerNG::APIClient::AWS_US_EAST_HOST,
-                     :port => 443,
-                     :api_version => 2,
-                     :user_agent => IronWorkerNG.full_version})
+      super('iron', 'worker', options, default_options, [:project_id, :token, :api_version])
 
-      if (not @token) || (not @project_id)
-        IronCore::Logger.error 'IronWorkerNG', 'Both token and project_id must be specified' 
-        raise IronCore::IronError.new('Both token and project_id must be specified')
-      end
+      IronCore::Logger.error 'IronWorkerNG', "Token is not set", IronCore::Error if @token.nil?
+
+      check_id(@project_id, 'project_id')
+    end
+
+    def headers
+      super.merge({'Authorization' => "OAuth #{@token}"})
+    end
+
+    def url
+      super + @api_version.to_s + '/'
     end
 
     def codes_list(options = {})
@@ -27,26 +35,26 @@ module IronWorkerNG
     end
 
     def codes_get(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/codes/#{id}"))
     end
 
     def codes_create(name, file, runtime, runner, options)
-      parse_response(post_file("projects/#{@project_id}/codes", File.new(file, 'rb'), {:name => name, :runtime => runtime, :file_name => runner}.merge(options)))
+      parse_response(post_file("projects/#{@project_id}/codes", :file, File.new(file, 'rb'), :data, {:name => name, :runtime => runtime, :file_name => runner}.merge(options)))
     end
 
     def codes_delete(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(delete("projects/#{@project_id}/codes/#{id}"))
     end
 
     def codes_revisions(id, options = {})
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/codes/#{id}/revisions", options))
     end
 
     def codes_download(id, options = {})
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/codes/#{id}/download", options), false)
     end
 
@@ -55,7 +63,7 @@ module IronWorkerNG
     end
 
     def tasks_get(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/tasks/#{id}"))
     end
 
@@ -64,22 +72,22 @@ module IronWorkerNG
     end
 
     def tasks_cancel(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(post("projects/#{@project_id}/tasks/#{id}/cancel"))
     end
 
     def tasks_cancel_all(code_id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(post("projects/#{@project_id}/codes/#{code_id}/cancel_all"))
     end
 
     def tasks_log(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/tasks/#{id}/log"), false)
     end
 
     def tasks_set_progress(id, options = {})
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(post("projects/#{@project_id}/tasks/#{id}/progress", options))
     end
 
@@ -88,18 +96,19 @@ module IronWorkerNG
     end
 
     def schedules_get(id)
-      raise "Expecting id string, not #{id.class}" unless id.is_a? String
+      check_id(id)
       parse_response(get("projects/#{@project_id}/schedules/#{id}"))
     end
 
     def schedules_create(code_name, payload, options = {})
-      options[:start_at] = options[:start_at].iso8601 if (not options[:start_at].nil?) && options[:start_at].class == Time
-      options[:end_at] = options[:end_at].iso8601 if (not options[:end_at].nil?) && options[:end_at].class == Time
+      options[:start_at] = options[:start_at].iso8601 if (not options[:start_at].nil?) && options[:start_at].respond_to?(:iso8601)
+      options[:end_at] = options[:end_at].iso8601 if (not options[:end_at].nil?) && options[:end_at].respond_to?(:iso8601)
 
       parse_response(post("projects/#{@project_id}/schedules", {:schedules => [{:code_name => code_name, :payload => payload}.merge(options)]}))
     end
 
     def schedules_cancel(id)
+      check_id(id)
       parse_response(post("projects/#{@project_id}/schedules/#{id}/cancel"))
     end
   end

data/lib/iron_worker_ng/client.rb

@@ -16,7 +16,7 @@ module IronWorkerNG
       if @client.respond_to?(full_name)
         @client.send(full_name, *args, &block)
       else
-        super
+        super(name, *args, &block)
       end
     end
   end
@@ -44,36 +44,43 @@ module IronWorkerNG
       if args.length == 0
         IronWorkerNG::ClientProxyCaller.new(self, name)
       else
-        super
+        super(name, *args, &block)
       end
     end
 
     def codes_list(options = {})
+      IronCore::Logger.info '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}'"
+
       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}'"
+
       zip_file = code.create_zip
 
       if code.remote_build_command.nil?
         res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh', options)
       else
-        builder_code_name = code.name + 'Builder'
+        builder_code_name = code.name + (code.name.capitalize == code.name ? '::Builder' : '::builder')
 
         @api.codes_create(builder_code_name, zip_file, 'sh', '__runner__.sh', options)
 
-        builder_task_id = tasks.create(builder_code_name, :iron_token => token, :iron_project_id => project_id, :code_name => code.name, :codes_create_options => options.to_json).id
-        task = tasks.wait_for(builder_task_id)
+        builder_task = tasks.create(builder_code_name, :code_name => code.name, :client_options => @api.options.to_json, :codes_create_options => options.to_json)
+        builder_task = tasks.wait_for(builder_task.id)
 
-        if task.status != 'complete'
-          raise IronCore::IronError.new("Error while remote building: \"#{tasks.log(task.id)}\"")
+        unless builder_task.status == 'complete'
+          log = tasks.log(builder_task.id)
+          IronCore::Logger.error 'IronWorkerNG', 'Error while remote building worker: ' + log, IronCore::Error
         end
 
-        res = JSON.parse(task.msg)
+        res = JSON.parse(builder_task.msg)
       end
 
       File.unlink(zip_file)
@@ -82,62 +89,86 @@ module IronWorkerNG
     end
 
     def codes_delete(code_id)
+      IronCore::Logger.info 'IronWorkerNG', "Calling codes.delete with code_id='#{code_id}'"
+
       @api.codes_delete(code_id)
 
       true
     end
 
     def codes_revisions(code_id, options = {})
+      IronCore::Logger.info '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}'"
+
       @api.codes_download(code_id, options)
     end
 
     def tasks_list(options = {})
+      IronCore::Logger.info '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}'"
+
       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}'"
+
       res = @api.tasks_create(code_name, params.class == String ? params : params.to_json, options)
 
       OpenStruct.new(res['tasks'][0])
     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}'"
+
       res = @api.tasks_create(code_name, params_for_legacy(code_name, params), options)
 
       OpenStruct.new(res['tasks'][0])
     end
 
     def tasks_cancel(task_id)
+      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.cancel with task_id='#{task_id}'"
+
       @api.tasks_cancel(task_id)
 
       true
     end
 
     def tasks_cancel_all(code_id)
+      IronCore::Logger.info 'IronWorkerNG', "Calling tasks.cancel_all with code_id='#{code_id}'"
+
       @api.tasks_cancel_all(code_id)
 
       true
     end
 
     def tasks_log(task_id)
+      IronCore::Logger.info '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}'"
+
       @api.tasks_set_progress(task_id, options)
 
       true
     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}'"
+
       options[:sleep] ||= options['sleep'] || 5
 
       task = tasks_get(task_id)
@@ -152,33 +183,41 @@ module IronWorkerNG
     end
 
     def schedules_list(options = {})
+      IronCore::Logger.info '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}"
+
       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}'"
+
       res = @api.schedules_create(code_name, params.class == String ? params : params.to_json, options)
 
       OpenStruct.new(res['schedules'][0])
     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}'"
+
       res = @api.schedules_create(code_name, params_for_legacy(code_name, params), options)
 
       OpenStruct.new(res['schedules'][0])
     end
 
     def schedules_cancel(schedule_id)
+      IronCore::Logger.info 'IronWorkerNG', "Calling schedules.cancel with schedule_id='#{schedule_id}"
+
       @api.schedules_cancel(schedule_id)
 
       true
     end
 
-    private
-
     def params_for_legacy(code_name, params)
       if params.class == String
         params = JSON.parse(params)