iron_worker_ng 0.4.1 → 0.4.2

data/README.md

@@ -32,7 +32,6 @@ Each IronWorkerNG Ruby worker is just Ruby code. It can be as simple or as compl
 ```ruby
 puts "I'm worker"
 puts "My task_id is #{@iron_worker_task_id}"
-puts "I'm executing inside #{@iron_io_project_id} and was queued using #{@iron_io_token} token"
 puts "I got '#{params}' parameters"
 ```
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/bin/iron_worker

@@ -4,19 +4,36 @@ require 'optparse'
 require 'time'
 require 'iron_worker_ng'
 
-if $*.size == 0 || (not ['codes.create', 'tasks.create', 'schedules.create', 'tasks.log'].include?($*[0]))
+if $*.size == 1 && ($*[0] == '-v' || $*[0] == '--version')
+  puts IronWorkerNG.full_version
+  exit 0
+end
+
+if $*.size == 0 || (not ['codes.create', 'upload', 'tasks.create', 'queue', 'schedules.create', 'schedule', 'tasks.log', 'log'].include?($*[0]))
   puts 'usage: iron_worker COMMAND [OPTIONS]'
-  puts '    COMMAND: codes.create, tasks.create, schedules.create, tasks.log'
+  puts '    COMMAND: codes.create (upload), tasks.create (queue), schedules.create (schedule), tasks.log (log)'
   puts '    run iron_worker COMMAND --help to get more information about each command'
   exit 1
 end
 
-command = $*[0]
-$*.shift
+command = $*.shift
+
+command = 'codes.create' if command == 'upload'
+command = 'tasks.create' if command == 'queue'
+command = 'schedules.create' if command == 'schedule'
+command = 'tasks.log' if command == 'log'
+
+if level = ENV['LOG_LEVEL']
+  IronCore::Logger.logger.level = eval "::Logger::#{level}"
+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(', ')
 
@@ -57,7 +74,7 @@ if command == 'codes.create'
     exit 1
   end
 
-  runtime = runtimes[0][:name] if runtime.nil?
+  runtime = 'ruby' if runtime.nil?
 
   code = runtimes.find { |r| r[:name] == runtime }[:klass].new(:name => name)
 
@@ -67,6 +84,10 @@ if command == 'codes.create'
 
   client.codes.create(code)
 elsif command == 'tasks.create' || command == 'schedules.create'
+  if $*.size > 0 && $*[0][0] != '-'
+    $*.unshift('-n')
+  end
+  
   name = nil
   payload = nil
 
@@ -162,17 +183,21 @@ elsif command == 'tasks.create' || command == 'schedules.create'
 
   print id if print_id
 elsif command == 'tasks.log'
+  if $*.size > 0 && $*[0][0] != '-'
+    $*.unshift('-t')
+  end
+
   task_id = nil
   live = false
 
   opts = OptionParser.new do |opts|
     opts.banner = "usage: iron_worker #{command} [OPTIONS]"
 
-    opts.on('-t --task-id ID', 'task id') do |v|
+    opts.on('-t', '--task-id ID', 'task id') do |v|
       task_id = v 
     end
 
-    opts.on('--live', 'live log session') do |v|
+    opts.on('-w', '--wait', 'wait for task') do |v|
       live = true
     end
   end

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

@@ -0,0 +1,111 @@
+# source: https://github.com/intridea/hashie/blob/6d21c6868512603e77a340827ec91ecd3bcef078/lib/hashie/extensions/indifferent_access.rb
+module Hashie
+  module Extensions
+    # IndifferentAccess gives you the ability to not care
+    # whether your hash has string or symbol keys. Made famous
+    # in Rails for accessing query and POST parameters, this
+    # is a handy tool for making sure your hash has maximum
+    # utility.
+    #
+    # One unique feature of this mixin is that it will recursively
+    # inject itself into sub-hash instances without modifying
+    # the actual class of the sub-hash.
+    #
+    # @example
+    #   class MyHash < Hash
+    #     include Hashie::Extensions::MergeInitializer
+    #     include Hashie::Extensions::IndifferentAccess
+    #   end
+    #
+    #   h = MyHash.new(:foo => 'bar', 'baz' => 'blip')
+    #   h['foo'] # => 'bar'
+    #   h[:foo]  # => 'bar'
+    #   h[:baz]  # => 'blip'
+    #   h['baz'] # => 'blip'
+    #
+    module IndifferentAccess
+      def self.included(base)
+        base.class_eval do
+          alias_method :regular_writer, :[]=
+          alias_method :[]=, :indifferent_writer
+          %w(default update fetch delete key? values_at).each do |m|
+            alias_method "regular_#{m}", m
+            alias_method m, "indifferent_#{m}"
+          end
+        end
+      end
+
+      # This will inject indifferent access into an instance of
+      # a hash without modifying the actual class. This is what
+      # allows IndifferentAccess to spread to sub-hashes.
+      def self.inject!(hash)
+        (class << hash; self; end).send :include, Hashie::Extensions::IndifferentAccess
+        hash.convert!
+      end
+
+      # Injects indifferent access into a duplicate of the hash
+      # provided. See #inject!
+      def self.inject(hash)
+        inject!(hash.dup)
+      end
+
+      def convert_key(key)
+        key.to_s
+      end
+
+      # Iterates through the keys and values, reconverting them to
+      # their proper indifferent state. Used when IndifferentAccess
+      # is injecting itself into member hashes.
+      def convert!
+        keys.each do |k|
+          regular_writer convert_key(k), convert_value(self.regular_delete(k))
+        end
+        self
+      end
+
+      def convert_value(value)
+        if hash_lacking_indifference?(value)
+          Hashie::Extensions::IndifferentAccess.inject(value.dup)
+        elsif value.is_a?(::Array)
+          value.dup.replace(value.map { |e| convert_value(e) })
+        else
+          value
+        end
+      end
+      
+      def indifferent_default(key = nil)
+        return self[convert_key(key)] if key?(key)
+        regular_default(key)
+      end
+
+      def indifferent_update(other_hash)
+        return regular_update(other_hash) if hash_with_indifference?(other_hash)
+        other_hash.each_pair do |k,v|
+          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
+      def indifferent_key?(key);           regular_key?   convert_key(key)                       end
+      def indifferent_values_at(*indices); indices.map{|i| self[i] }                             end
+
+      def indifferent_access?; true end
+      
+      protected
+
+      def hash_lacking_indifference?(other)
+        other.is_a?(::Hash) &&
+        !(other.respond_to?(:indifferent_access?) &&
+          other.indifferent_access?)
+      end
+
+      def hash_with_indifference?(other)
+        other.is_a?(::Hash) &&
+        other.respond_to?(:indifferent_access?) &&
+        other.indifferent_access?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# source: https://github.com/intridea/hashie/blob/6d21c6868512603e77a340827ec91ecd3bcef078/lib/hashie/extensions/merge_initializer.rb
+module Hashie
+  module Extensions
+    # The MergeInitializer is a super-simple mixin that allows
+    # you to initialize a subclass of Hash with another Hash
+    # to give you faster startup time for Hash subclasses. Note
+    # that you can still provide a default value as a second
+    # argument to the initializer.
+    #
+    # @example
+    #   class MyHash < Hash
+    #     include Hashie::Extensions::MergeInitializer
+    #   end
+    #
+    #   h = MyHash.new(:abc => 'def')
+    #   h[:abc] # => 'def'
+    #
+    module MergeInitializer
+      def initialize(hash = {}, default = nil, &block)
+        default ? super(default) : super(&block)
+        update(hash)
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/api_client.rb

@@ -13,7 +13,7 @@ module IronWorkerNG
                      :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 + ')')
+                     :user_agent => IronWorkerNG.full_version)
 
       if (not @token) || (not @project_id)
         IronCore::Logger.error 'IronWorkerNG', 'Both token and project_id must be specified' 

data/lib/iron_worker_ng/client.rb

@@ -31,6 +31,14 @@ module IronWorkerNG
       end
     end
 
+    def token
+      @api.token
+    end
+
+    def project_id
+      @api.project_id
+    end
+
     def method_missing(name, *args, &block)
       if args.length == 0
         IronWorkerNG::ClientProxyCaller.new(self, name)
@@ -49,10 +57,10 @@ module IronWorkerNG
 
     def codes_create(code)
       zip_file = code.create_zip
-      @api.codes_create(code.name, zip_file, code.runtime, code.runner)
+      res = @api.codes_create(code.name, zip_file, code.runtime, code.runner)
       File.unlink(zip_file)
 
-      true
+      OpenStruct.new(res)
     end
 
     def codes_delete(code_id)

data/lib/iron_worker_ng/code/base.rb

@@ -8,8 +8,8 @@ require_relative '../feature/common/merge_dir'
 module IronWorkerNG
   module Code
     class Base
-      attr_accessor :name
       attr_reader :features
+      attr_accessor :name
 
       @@registered_types = []
     
@@ -49,19 +49,35 @@ module IronWorkerNG
 
         if args.length == 1 && args[0].class == Hash && ((not args[0][:workerfile].nil?) || (not args[0]['workerfile'].nil?))
           eval(File.read(File.expand_path(args[0][:workerfile] || args[0]['workerfile'])))
-        else
-          if (not @name.nil?) && File.exists?(@name + '.worker')
-            eval(File.read(@name + '.worker'))
-          end
+        end
 
-          if File.exists?('Workerfile')
-            eval(File.read('Workerfile'))
-          end
+        unless @exec.nil?
+          @name ||= guess_name(@exec.path)
+        end
+
+        if (not @name.nil?) && File.exists?(@name + '.worker')
+          eval(File.read(@name + '.worker'))
+        end
+
+        if (not @name.nil?) && File.exists?(@name + '.workerfile')
+          eval(File.read(@name + '.workerfile'))
+        end
+
+        if File.exists?('Workerfile')
+          eval(File.read('Workerfile'))
         end
 
         unless block.nil?
           instance_eval(&block)
         end
+
+        unless @exec.nil?
+          @name ||= guess_name(@exec.path)
+        end
+      end
+
+      def guess_name(path)
+        File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
       end
 
       def fixate
@@ -92,6 +108,8 @@ module IronWorkerNG
 
         fixate
 
+        @name ||= guess_name(@exec.path)
+
         zip_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "code.zip")
 
         IronCore::Logger.debug 'IronWorkerNG', "Creating code zip '#{zip_name}'"
@@ -107,10 +125,6 @@ module IronWorkerNG
       def create_runner(zip)
       end
 
-      def runtime
-        nil
-      end
-
       def runner
         nil
       end

data/lib/iron_worker_ng/code/binary.rb

@@ -9,7 +9,7 @@ module IronWorkerNG
         zip.get_output_stream(runner) do |runner|
           runner.write <<RUNNER
 #!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.version}
+# iron_worker_ng-#{IronWorkerNG.full_version}
 
 root() {
   while [ $# -gt 0 ]; do
@@ -29,7 +29,7 @@ RUNNER
         end
       end
 
-      def runtime
+      def runtime(runtime = nil)
         'sh'
       end
 

data/lib/iron_worker_ng/code/java.rb

@@ -23,7 +23,7 @@ module IronWorkerNG
         zip.get_output_stream(runner) do |runner|
           runner.write <<RUNNER
 #!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.version}
+# iron_worker_ng-#{IronWorkerNG.full_version}
 
 root() {
   while [ $# -gt 0 ]; do
@@ -41,7 +41,7 @@ RUNNER
         end
       end
 
-      def runtime
+      def runtime(runtime = nil)
         'sh'
       end
 

data/lib/iron_worker_ng/code/node.rb

@@ -9,7 +9,7 @@ module IronWorkerNG
         zip.get_output_stream(runner) do |runner|
           runner.write <<RUNNER
 #!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.version}
+# iron_worker_ng-#{IronWorkerNG.full_version}
 
 root() {
   while [ $# -gt 0 ]; do
@@ -27,7 +27,7 @@ RUNNER
         end
       end
 
-      def runtime
+      def runtime(runtime = nil)
         'sh'
       end
 

data/lib/iron_worker_ng/code/ruby.rb

@@ -22,151 +22,16 @@ module IronWorkerNG
 
         zip.get_output_stream(runner) do |runner|
           runner.write <<RUNNER
-# iron_worker_ng-#{IronWorkerNG.version}
-
-# https://github.com/intridea/hashie/ 6d21c6868512603e77a340827ec91ecd3bcef078 START
-
-module Hashie
-  module Extensions
-    # The MergeInitializer is a super-simple mixin that allows
-    # you to initialize a subclass of Hash with another Hash
-    # to give you faster startup time for Hash subclasses. Note
-    # that you can still provide a default value as a second
-    # argument to the initializer.
-    #
-    # @example
-    #   class MyHash < Hash
-    #     include Hashie::Extensions::MergeInitializer
-    #   end
-    #
-    #   h = MyHash.new(:abc => 'def')
-    #   h[:abc] # => 'def'
-    #
-    module MergeInitializer
-      def initialize(hash = {}, default = nil, &block)
-        default ? super(default) : super(&block)
-        update(hash)
-      end
-    end
-  end
-end
-
-module Hashie
-  module Extensions
-    # IndifferentAccess gives you the ability to not care
-    # whether your hash has string or symbol keys. Made famous
-    # in Rails for accessing query and POST parameters, this
-    # is a handy tool for making sure your hash has maximum
-    # utility.
-    #
-    # One unique feature of this mixin is that it will recursively
-    # inject itself into sub-hash instances without modifying
-    # the actual class of the sub-hash.
-    #
-    # @example
-    #   class MyHash < Hash
-    #     include Hashie::Extensions::MergeInitializer
-    #     include Hashie::Extensions::IndifferentAccess
-    #   end
-    #
-    #   h = MyHash.new(:foo => 'bar', 'baz' => 'blip')
-    #   h['foo'] # => 'bar'
-    #   h[:foo]  # => 'bar'
-    #   h[:baz]  # => 'blip'
-    #   h['baz'] # => 'blip'
-    #
-    module IndifferentAccess
-      def self.included(base)
-        base.class_eval do
-          alias_method :regular_writer, :[]=
-          alias_method :[]=, :indifferent_writer
-          %w(default update fetch delete key? values_at).each do |m|
-            alias_method "regular_\#{m}", m
-            alias_method m, "indifferent_\#{m}"
-          end
-        end
-      end
-
-      # This will inject indifferent access into an instance of
-      # a hash without modifying the actual class. This is what
-      # allows IndifferentAccess to spread to sub-hashes.
-      def self.inject!(hash)
-        (class << hash; self; end).send :include, Hashie::Extensions::IndifferentAccess
-        hash.convert!
-      end
-
-      # Injects indifferent access into a duplicate of the hash
-      # provided. See #inject!
-      def self.inject(hash)
-        inject!(hash.dup)
-      end
-
-      def convert_key(key)
-        key.to_s
-      end
-
-      # Iterates through the keys and values, reconverting them to
-      # their proper indifferent state. Used when IndifferentAccess
-      # is injecting itself into member hashes.
-      def convert!
-        keys.each do |k|
-          regular_writer convert_key(k), convert_value(self.regular_delete(k))
-        end
-        self
-      end
-
-      def convert_value(value)
-        if hash_lacking_indifference?(value)
-          Hashie::Extensions::IndifferentAccess.inject(value.dup)
-        elsif value.is_a?(::Array)
-          value.dup.replace(value.map { |e| convert_value(e) })
-        else
-          value
-        end
-      end
-      
-      def indifferent_default(key = nil)
-        return self[convert_key(key)] if key?(key)
-        regular_default(key)
-      end
-
-      def indifferent_update(other_hash)
-        return regular_update(other_hash) if hash_with_indifference?(other_hash)
-        other_hash.each_pair do |k,v|
-          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
-      def indifferent_key?(key);           regular_key?   convert_key(key)                       end
-      def indifferent_values_at(*indices); indices.map{|i| self[i] }                             end
-
-      def indifferent_access?; true end
-      
-      protected
-
-      def hash_lacking_indifference?(other)
-        other.is_a?(::Hash) &&
-        !(other.respond_to?(:indifferent_access?) &&
-          other.indifferent_access?)
-      end
+# iron_worker_ng-#{IronWorkerNG.full_version}
 
-      def hash_with_indifference?(other)
-        other.is_a?(::Hash) &&
-        other.respond_to?(:indifferent_access?) &&
-        other.indifferent_access?
-      end
-    end
-  end
+module IronWorkerNG
+  #{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/merge_initializer.rb')}
+  #{File.read(File.dirname(__FILE__) + '/../../3rdparty/hashie/indifferent_access.rb')}
 end
 
-# https://github.com/intridea/hashie/ 6d21c6868512603e77a340827ec91ecd3bcef078 END
-
 class IronWorkerNGHash < Hash
-  include Hashie::Extensions::MergeInitializer
-  include Hashie::Extensions::IndifferentAccess
+  include IronWorkerNG::Hashie::Extensions::MergeInitializer
+  include IronWorkerNG::Hashie::Extensions::IndifferentAccess
 end
 
 root = nil
@@ -212,14 +77,8 @@ end
 
 require '#{File.basename(@exec.path)}'
 
-exec_class = nil
-
-begin
+unless #{@exec.klass == nil}
   exec_class = Kernel.const_get('#{@exec.klass}')
-rescue
-end
-
-unless exec_class.nil?
   exec_inst = exec_class.new
 
   params.keys.each do |param|
@@ -236,7 +95,7 @@ RUNNER
         end
       end
 
-      def runtime
+      def runtime(runtime = nil)
         'ruby'
       end
 

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

@@ -6,6 +6,11 @@ module IronWorkerNG
           attr_reader :path
 
           def initialize(path)
+            unless File.exist?(path)
+              IronCore::Logger.error 'IronWorkerNG', "Can't find binary exec with path='#{path}'"
+              raise IronCore::IronError.new("Can't find binary exec with path='#{path}'")
+            end
+
             @path = File.expand_path(path)
           end
 
@@ -29,8 +34,6 @@ module IronWorkerNG
               return
             end
 
-            @name ||= File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-
             @exec = IronWorkerNG::Feature::Binary::MergeExec::Feature.new(path)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging binary exec with path='#{path}'"

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

@@ -7,6 +7,11 @@ module IronWorkerNG
           attr_reader :klass
 
           def initialize(path, klass)
+            unless File.exist?(path)
+              IronCore::Logger.error 'IronWorkerNG', "Can't find java exec with path='#{path}'"
+              raise IronCore::IronError.new("Can't find java exec with path='#{path}'")
+            end
+
             @path = File.expand_path(path)
             @klass = klass
           end
@@ -35,12 +40,6 @@ module IronWorkerNG
               return
             end
 
-            if klass.nil?
-              @name ||= File.basename(path).gsub(/\.jar$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-            else
-              @name ||= klass.split('.')[-1]
-            end
-
             @exec = IronWorkerNG::Feature::Java::MergeExec::Feature.new(path, klass)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging java exec with path='#{path}' and class='#{klass}'"

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

@@ -6,6 +6,11 @@ module IronWorkerNG
           attr_reader :path
 
           def initialize(path)
+            unless File.exist?(path)
+              IronCore::Logger.error 'IronWorkerNG', "Can't find java jar with path='#{path}'"
+              raise IronCore::IronError.new("Can't find java jar with path='#{path}'")
+            end
+
             @path = File.expand_path(path)
           end
 

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

@@ -6,6 +6,11 @@ module IronWorkerNG
           attr_reader :path
 
           def initialize(path)
+            unless File.exist?(path)
+              IronCore::Logger.error 'IronWorkerNG', "Can't find node exec with path='#{path}'"
+              raise IronCore::IronError.new("Can't find node exec with path='#{path}'")
+            end
+
             @path = File.expand_path(path)
           end
 
@@ -29,8 +34,6 @@ module IronWorkerNG
               return
             end
 
-            @name ||= File.basename(path).gsub(/\.js$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-
             @exec = IronWorkerNG::Feature::Node::MergeExec::Feature.new(path)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging node exec with path='#{path}'"

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

@@ -7,6 +7,11 @@ module IronWorkerNG
           attr_reader :klass
 
           def initialize(path, klass)
+            unless File.exist?(path)
+              IronCore::Logger.error 'IronWorkerNG', "Can't find ruby exec with path='#{path}'"
+              raise IronCore::IronError.new("Can't find ruby exec with path='#{path}'")
+            end
+
             @path = File.expand_path(path)
             @klass = klass
           end
@@ -26,17 +31,11 @@ module IronWorkerNG
           def merge_exec(path, klass = nil)
             @exec ||= nil 
 
-            if klass == nil
-              klass = File.basename(path).gsub(/\.rb$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-            end
-
             unless @exec.nil?
               IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge ruby exec with path='#{path}' and class='#{klass}'"
               return
             end
 
-            @name ||= klass
-
             @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(path, klass)
 
             IronCore::Logger.info 'IronWorkerNG', "Merging ruby exec with path='#{path}' and class='#{klass}'"

data/lib/iron_worker_ng/version.rb

@@ -4,4 +4,8 @@ module IronWorkerNG
   def self.version
     @@version ||= File.read(File.dirname(__FILE__) + '/../../VERSION').strip
   end
+
+  def self.full_version
+    'iron_worker_ruby_ng-' + IronWorkerNG.version + ' (iron_core_ruby-' + IronCore.version + ')'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -44,22 +44,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -77,21 +61,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: jeweler2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 description: New generation ruby client for IronWorker
 email: info@iron.io
 executables:
@@ -105,6 +89,8 @@ files:
 - README.md
 - VERSION
 - bin/iron_worker
+- lib/3rdparty/hashie/indifferent_access.rb
+- lib/3rdparty/hashie/merge_initializer.rb
 - lib/iron_worker_ng.rb
 - lib/iron_worker_ng/api_client.rb
 - lib/iron_worker_ng/client.rb
@@ -138,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -520853037
+      hash: -641630419
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: New generation ruby client for IronWorker