iron_worker_ng 0.3.9 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.4.0

data/bin/iron_worker

@@ -14,7 +14,7 @@ end
 command = $*[0]
 $*.shift
 
-client = IronWorkerNG::Client.new(:token => ENV['IRON_IO_TOKEN'], :project_id => ENV['IRON_IO_PROJECT_ID'])
+client = IronWorkerNG::Client.new
 
 if command == 'codes.create'
   runtimes = IronWorkerNG::Code::Base.registered_types
@@ -72,7 +72,7 @@ if command == 'codes.create'
   client.codes.create(code)
 elsif command == 'tasks.create' || command == 'schedules.create'
   name = nil
-  params = {}
+  payload = nil
 
   priority = nil
   timeout = nil
@@ -92,8 +92,8 @@ elsif command == 'tasks.create' || command == 'schedules.create'
       name = v 
     end
 
-    opts.on('-p', '--param NAME,VALUE', Array, 'parameters to pass') do |v|
-      params[v[0]] = v[1]
+    opts.on('-p', '--payload PAYLOAD', String, 'payload to pass') do |v|
+      payload = v
     end
 
     opts.on('--priority PRIORITY', Integer, '0 (default), 1, 2') do |v|
@@ -159,9 +159,9 @@ elsif command == 'tasks.create' || command == 'schedules.create'
   id = nil
 
   if command == 'tasks.create'
-    id = client.tasks.create(name, params, options).id
+    id = client.tasks.create(name, payload, options).id
   else
-    id = client.schedules.create(name, params, options).id
+    id = client.schedules.create(name, payload, options).id
   end
 
   print id if print_id

data/lib/iron_worker_ng/api_client.rb

@@ -1,151 +1,22 @@
-require 'rest-client'
-require 'rest'
-require 'json'
 require 'time'
 
-require_relative 'api_client_error'
+require 'iron_core'
 
 module IronWorkerNG
-  class APIClient
+  class APIClient < IronCore::Client
     AWS_US_EAST_HOST = 'worker-aws-us-east-1.iron.io'
 
-    attr_accessor :token
-    attr_accessor :project_id
-    attr_accessor :scheme
-    attr_accessor :host
-    attr_accessor :port
-    attr_accessor :api_version
-    attr_accessor :user_agent
-
-    attr_reader :options
-
     def initialize(options = {})
-      load_from_hash(options)
-      load_from_config(options[:config_file] || options['config_file'])
-      load_from_config('iron.json')
-      load_from_env('IRON_WORKER')
-      load_from_env('IRON')
-      load_from_config('~/.iron.json')
-      load_from_hash(:scheme => 'https', :host => IronWorkerNG::APIClient::AWS_US_EAST_HOST, :port => 443, :api_version => 2, :user_agent => 'iron_worker_ng-' + IronWorkerNG.version)
-
-      if (not @token) || (not @project_id)
-        IronWorkerNG::Logger.error 'Both iron.io token and project_id must be specified' 
-        raise 'Both iron.io token and project_id must be specified' 
-      end
-
-      @options = {
-        :token => @token,
-        :project_id => @project_id,
+      super('worker', options)
 
-        :scheme => @scheme,
-        :host => @host,
-        :port => @port,
-        :api_version => @api_version,
-        :user_agent => @user_agent
-      }
+      load_from_hash(:scheme => 'https', :host => IronWorkerNG::APIClient::AWS_US_EAST_HOST, :port => 443, :api_version => 2, :user_agent => 'iron_worker_ruby_ng-' + IronWorkerNG.version + ' (iron_core_ruby-' + IronCore.version + ')')
 
-      @rest = Rest::Client.new
-    end
-
-    def load_from_hash(hash)
-      return if hash.nil?
-
-      @token ||= hash[:token] || hash['token']
-      @project_id ||= hash[:project_id] || hash['project_id']
-
-      @scheme ||= hash[:scheme] || hash['scheme']
-      @host ||= hash[:host] || hash['host']
-      @port ||= hash[:port] || hash['port']
-      @api_version ||= hash[:api_version] || hash['api_version']
-      @user_agent ||= hash[:user_agent] || hash['user_agent']
-    end
-
-    def load_from_env(prefix)
-      @token ||= ENV[prefix + '_TOKEN']
-      @project_id ||= ENV[prefix + '_PROJECT_ID']
-
-      @scheme ||= ENV[prefix + '_SCHEME']
-      @host ||= ENV[prefix + '_HOST']
-      @port ||= ENV[prefix + '_PORT']
-      @api_version ||= ENV[prefix + '_API_VERSION']
-      @user_agent ||= ENV[prefix + '_USER_AGENT']
-    end
-
-    def load_from_config(config_file)
-      return if config_file.nil?
-
-      if File.exists?(File.expand_path(config_file))
-        config = JSON.load(File.read(File.expand_path(config_file)))
-
-        load_from_hash(config['iron_worker'])
-        load_from_hash(config['iron'])
-        load_from_hash(config)
+      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
     end
 
-    def common_request_hash
-      {
-        'Content-Type' => 'application/json',
-        'Authorization' => "OAuth #{@token}",
-        'User-Agent' => @user_agent
-      }
-    end
-
-    def url
-      "#{scheme}://#{host}:#{port}/#{api_version}/"
-    end
-
-    def get(method, params = {})
-      request_hash = {}
-      request_hash[:headers] = common_request_hash
-      request_hash[:params] = params
-
-      IronWorkerNG::Logger.debug "GET #{url + method} with params='#{request_hash.to_s}'"
-
-      @rest.get(url + method, request_hash)
-    end
-
-    def post(method, params = {})
-      request_hash = {}
-      request_hash[:headers] = common_request_hash
-      request_hash[:body] = params.to_json
-
-      IronWorkerNG::Logger.debug "POST #{url + method} with params='#{request_hash.to_s}'" 
-
-      @rest.post(url + method, request_hash)
-    end
-
-    def delete(method, params = {})
-      request_hash = {}
-      request_hash[:headers] = common_request_hash
-      request_hash[:params] = params
-
-      IronWorkerNG::Logger.debug "DELETE #{url + method} with params='#{request_hash.to_s}'"
-
-      @rest.delete(url + method, request_hash)
-    end
-
-    # FIXME: retries support
-    # FIXME: user agent support
-    def post_file(method, file, params = {})
-      request_hash = {}
-      request_hash[:data] = params.to_json
-      request_hash[:file] = file
-
-      IronWorkerNG::Logger.debug "POST #{url + method + "?oauth=" + @token} with params='#{request_hash.to_s}'"
-
-      RestClient.post(url + method + "?oauth=#{@token}", request_hash) 
-    end
-
-    def parse_response(response, parse_json = true)
-      IronWorkerNG::Logger.debug "GOT #{response.code} with params='#{response.body}'"
-
-      raise IronWorkerNG::APIClientError.new(response.body) if response.code != 200
-
-      return response.body unless parse_json
-      JSON.parse(response.body)
-    end
-
     def codes_list(options = {})
       parse_response(get("projects/#{@project_id}/codes", options))
     end

data/lib/iron_worker_ng/client.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'json'
 
 require_relative 'api_client'
 

data/lib/iron_worker_ng/code/base.rb

@@ -84,15 +84,15 @@ module IronWorkerNG
 
       def create_zip
         unless @exec
-          IronWorkerNG::Logger.error 'No exec specified'
-          raise 'No exec specified'
+          IronCore::Logger.error 'IronWorkerNG', 'No exec specified'
+          raise IronCore::IronError.new('No exec specified')
         end
 
         fixate
 
         zip_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "code.zip")
 
-        IronWorkerNG::Logger.debug "Creating code zip '#{zip_name}'"
+        IronCore::Logger.debug 'IronWorkerNG', "Creating code zip '#{zip_name}'"
 
         Zip::ZipFile.open(zip_name, Zip::ZipFile::CREATE) do |zip|
           bundle(zip)

data/lib/iron_worker_ng/code/java.rb

@@ -18,7 +18,7 @@ module IronWorkerNG
 
         classpath = classpath_array.join(':')
 
-        IronWorkerNG::Logger.info "Collected '#{classpath}' classpath"
+        IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
       
         zip.get_output_stream(runner) do |runner|
           runner.write <<RUNNER

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

@@ -14,7 +14,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling binary exec with path='#{@path}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling binary exec with path='#{@path}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -25,7 +25,7 @@ module IronWorkerNG
             @exec ||= nil 
 
             unless @exec.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge binary exec with path='#{path}'"
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge binary exec with path='#{path}'"
               return
             end
 
@@ -33,7 +33,7 @@ module IronWorkerNG
 
             @exec = IronWorkerNG::Feature::Binary::MergeExec::Feature.new(path)
 
-            IronWorkerNG::Logger.info "Merging binary exec with path='#{path}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging binary exec with path='#{path}'"
 
             @features << @exec
           end

data/lib/iron_worker_ng/feature/common/merge_dir.rb

@@ -9,7 +9,6 @@ module IronWorkerNG
           attr_reader :dest
 
           def initialize(path, dest)
-            raise 'No such directory - ' + path unless Dir.exist? path
             @path = File.expand_path(path)
             @dest = dest
             @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
@@ -26,7 +25,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling dir with path='#{@path}' and dest='#{@dest}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling dir with path='#{@path}' and dest='#{@dest}'"
 
             Dir.glob(@path + '/**/**') do |path|
               zip.add(@dest + File.basename(@path) + path[@path.length .. -1], path)
@@ -36,7 +35,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_dir(path, dest = '')
-            IronWorkerNG::Logger.info "Merging dir with path='#{path}' and dest='#{dest}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging dir with path='#{path}' and dest='#{dest}'"
 
             @features << IronWorkerNG::Feature::Common::MergeDir::Feature.new(path, dest)
           end

data/lib/iron_worker_ng/feature/common/merge_file.rb

@@ -19,7 +19,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling file with path='#{@path}' and dest='#{@dest}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling file with path='#{@path}' and dest='#{@dest}'"
 
             zip.add(@dest + File.basename(@path), @path)
           end
@@ -27,7 +27,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_file(path, dest = '')
-            IronWorkerNG::Logger.info "Merging file with path='#{path}' and dest='#{dest}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging file with path='#{path}' and dest='#{dest}'"
 
             @features << IronWorkerNG::Feature::Common::MergeFile::Feature.new(path, dest)
           end

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

@@ -16,7 +16,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling java exec with path='#{@path}' and class='#{@klass}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling java exec with path='#{@path}' and class='#{@klass}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -31,7 +31,7 @@ module IronWorkerNG
             @exec ||= nil 
 
             unless @exec.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge java exec with path='#{path}' and class='#{klass}'"
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge java exec with path='#{path}' and class='#{klass}'"
               return
             end
 
@@ -43,7 +43,7 @@ module IronWorkerNG
 
             @exec = IronWorkerNG::Feature::Java::MergeExec::Feature.new(path, klass)
 
-            IronWorkerNG::Logger.info "Merging java exec with path='#{path}' and class='#{klass}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging java exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
           end

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

@@ -14,7 +14,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling java jar with path='#{@path}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling java jar with path='#{@path}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -26,7 +26,7 @@ module IronWorkerNG
 
         module InstanceMethods
           def merge_jar(path)
-            IronWorkerNG::Logger.info "Merging java jar with path='#{path}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging java jar with path='#{path}'"
 
             @features << IronWorkerNG::Feature::Java::MergeJar::Feature.new(path)
           end

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

@@ -14,7 +14,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling node exec with path='#{@path}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling node exec with path='#{@path}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -25,7 +25,7 @@ module IronWorkerNG
             @exec ||= nil 
 
             unless @exec.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge node exec with path='#{path}'"
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge node exec with path='#{path}'"
               return
             end
 
@@ -33,7 +33,7 @@ module IronWorkerNG
 
             @exec = IronWorkerNG::Feature::Node::MergeExec::Feature.new(path)
 
-            IronWorkerNG::Logger.info "Merging node exec with path='#{path}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging node exec with path='#{path}'"
 
             @features << @exec
           end

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

@@ -16,7 +16,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling ruby exec with path='#{path}' and class='#{klass}'"
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby exec with path='#{path}' and class='#{klass}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -31,7 +31,7 @@ module IronWorkerNG
             end
 
             unless @exec.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge ruby exec with path='#{path}' and class='#{klass}'"
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge ruby exec with path='#{path}' and class='#{klass}'"
               return
             end
 
@@ -39,7 +39,7 @@ module IronWorkerNG
 
             @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(path, klass)
 
-            IronWorkerNG::Logger.info "Merging ruby exec with path='#{path}' and class='#{klass}'"
+            IronCore::Logger.info 'IronWorkerNG', "Merging ruby exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
           end

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

@@ -40,14 +40,14 @@ module IronWorkerNG
 
           def bundle(zip)
             if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
-              IronWorkerNG::Logger.debug "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
+              IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
 
               zip.add('__gems__/' + @spec.full_name, gem_path)
               Dir.glob(gem_path + '/**/**') do |path|
                 zip.add('__gems__/' + @spec.full_name + path[gem_path.length .. -1], path)
               end
             else
-              IronWorkerNG::Logger.warn "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions"
+              IronCore::Logger.warn 'IronWorkerNG', "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions"
             end
           end
 
@@ -64,7 +64,7 @@ module IronWorkerNG
           attr_reader :merge_gem_reqs
 
           def merge_gem(name, version = '>= 0')
-            IronWorkerNG::Logger.info "Adding ruby gem dependency with name='#{name}' and version='#{version}'"
+            IronCore::Logger.info 'IronWorkerNG', "Adding ruby gem dependency with name='#{name}' and version='#{version}'"
 
             @merge_gem_reqs ||= []
             @merge_gem_reqs << Bundler::Dependency.new(name, version.split(', '))
@@ -73,7 +73,7 @@ module IronWorkerNG
           alias :gem :merge_gem
 
           def merge_gem_fixate
-            IronWorkerNG::Logger.info 'Fixating gems dependencies'
+            IronCore::Logger.info 'IronWorkerNG', 'Fixating gems dependencies'
 
             @merge_gem_reqs ||= []
 
@@ -99,7 +99,7 @@ module IronWorkerNG
               spec_set.to_a.each do |spec|
                 spec.__materialize__
 
-                IronWorkerNG::Logger.info "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
+                IronCore::Logger.info 'IronWorkerNG', "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
 
                 @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(spec)
               end

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

@@ -23,7 +23,7 @@ module IronWorkerNG
             groups = groups.map { |g| g.to_sym }
             groups << :default if groups.length == 0
 
-            IronWorkerNG::Logger.info "Adding ruby gems dependencies from #{groups.join(', ')} group#{groups.length > 1 ? 's' : ''} of #{path}"
+            IronCore::Logger.info 'IronWorkerNG', "Adding ruby gems dependencies from #{groups.join(', ')} group#{groups.length > 1 ? 's' : ''} of #{path}"
 
             specs = Bundler::Definition.build(path, path + '.lock', nil).specs_for(groups)
 

data/lib/iron_worker_ng.rb

@@ -1,5 +1,4 @@
 require_relative 'iron_worker_ng/version'
-require_relative 'iron_worker_ng/logger'
 require_relative 'iron_worker_ng/client'
 require_relative 'iron_worker_ng/code/base'
 require_relative 'iron_worker_ng/code/ruby'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: iron_core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -29,23 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest
+  name: zip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,7 +107,6 @@ files:
 - bin/iron_worker
 - lib/iron_worker_ng.rb
 - lib/iron_worker_ng/api_client.rb
-- lib/iron_worker_ng/api_client_error.rb
 - lib/iron_worker_ng/client.rb
 - lib/iron_worker_ng/code/base.rb
 - lib/iron_worker_ng/code/binary.rb
@@ -140,7 +123,6 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_exec.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
-- lib/iron_worker_ng/logger.rb
 - lib/iron_worker_ng/version.rb
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
@@ -156,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -543812495
+      hash: 422396125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/iron_worker_ng/api_client_error.rb

@@ -1,4 +0,0 @@
-module IronWorkerNG
-  class APIClientError < Exception
-  end
-end

data/lib/iron_worker_ng/logger.rb

@@ -1,38 +0,0 @@
-require 'logger'
-
-module IronWorkerNG
-  module Logger
-    def self.logger
-      unless @logger
-        @logger = ::Logger.new(STDOUT)
-        @logger.level = ::Logger::INFO
-      end
-
-      @logger
-    end
-
-    def self.logger=(logger)
-      @logger = logger
-    end
-
-    def self.fatal(msg)
-      self.logger.fatal("IronWorkerNG") { msg }
-    end
-
-    def self.error(msg)
-      self.logger.error("IronWorkerNG") { msg }
-    end
-
-    def self.warn(msg)
-      self.logger.warn("IronWorkerNG") { msg }
-    end
-
-    def self.info(msg)
-      self.logger.info("IronWorkerNG") { msg }
-    end
-
-    def self.debug(msg)
-      self.logger.debug("IronWorkerNG") { msg }
-    end
-  end
-end