iron_worker_ng 0.2.4 → 0.2.5

data/README.md

@@ -45,7 +45,7 @@ Because your worker will be executed in the cloud, you'll need to bundle all the
 ```ruby
 code = IronWorkerNG::Code::Ruby.new
 
-code.merge_worker 'my_worker.rb'
+code.merge_exec 'my_worker.rb'
 code.merge_file '../lib/utils.rb'
 code.merge_dir '../config'
 code.merge_gem 'activerecord'
@@ -60,10 +60,10 @@ The IronWorkerNG::Code::Ruby class will help you package your code for upload, b
 Create new code package with the specified args.
 
 ```ruby
-code_with_name = IronWorkerNG::Code::Ruby.new(:worker => 'cool_worker.rb', :name => 'CoolWorker')
-code_with_guessed_name = IronWorkerNG::Code::Ruby.new(:worker => 'cool_worker.rb')
+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_worker later
+code = IronWorkerNG::Code::Ruby.new # will need to use code.merge_exec later
 ```
 
 ### name()
@@ -108,12 +108,12 @@ code.merge_dir '../config' # will be in the same directory as worker
 code.merge_dir 'lib', 'utils' # will be in utils subdirectory, accessible as utils/lib
 ```
 
-### merge_worker(path, name = nil)
+### merge_exec(path, name = nil)
 
 Merge the worker located at `path`. If `name` is omitted, a camel-cased version of the file name will be used. **You can have only one worker merged per code package.**
 
 ```ruby
-code.merge_worker 'my_worker.rb' # name will be MyWorker
+code.merge_exec 'my_worker.rb' # name will be MyWorker
 ```
 
 ### merge_gem(name, version = '>= 0')

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/examples/ruby/hello/hello.rb

@@ -11,7 +11,7 @@ client = IronWorkerNG::Client.new(:token => token,
 
 # create ruby code bundle
 code = IronWorkerNG::Code::Ruby.new
-code.merge_worker(File.dirname(__FILE__) + '/hello_worker.rb')
+code.merge_exec(File.dirname(__FILE__) + '/hello_worker.rb')
 
 # upload it to iron.io
 client.codes.create(code)

data/examples/ruby/master_slave/master_slave.rb

@@ -11,12 +11,12 @@ client = IronWorkerNG::Client.new(:token => token,
 
 # create master code bundle
 master = IronWorkerNG::Code::Ruby.new
-master.merge_worker(File.dirname(__FILE__) + '/master_worker.rb')
+master.merge_exec(File.dirname(__FILE__) + '/master_worker.rb')
 master.merge_gem('iron_worker_ng') # we need it to queue slave workers
 
 # create slave code bundle
 slave = IronWorkerNG::Code::Ruby.new
-slave.merge_worker(File.dirname(__FILE__) + '/slave_worker.rb')
+slave.merge_exec(File.dirname(__FILE__) + '/slave_worker.rb')
 
 # upload both
 client.codes.create(master)

data/examples/ruby/simple/simple.rb

@@ -20,16 +20,16 @@ client = IronWorkerNG::Client.new(:token => token,
 
 # if not specified, name default to worker name converted from underscore to camel style
 code = IronWorkerNG::Code::Ruby.new
-code.merge_worker('/sample_worker.rb')
+code.merge_exec('/sample_worker.rb')
 #> code.name == 'SampleWorker'
 
 # still can pass name in constructor
 code = IronWorkerNG::Code::Ruby.new('transmogrify')
 #> code.name == 'transmogrify'
-code.merge_worker(File.dirname(__FILE__) + '/sample_worker.rb')
+code.merge_exec(File.dirname(__FILE__) + '/sample_worker.rb')
 
 # once worker merged, following attempts will be ignored
-code.merge_worker('anything')
+code.merge_exec('anything')
 #> code.worker.path.end_with? '/worker.rb'
 
 # if worker requires some gems, we 

data/lib/iron_worker_ng/code/base.rb

@@ -39,14 +39,14 @@ module IronWorkerNG
         @features = []
 
         if args.length == 1 && args[0].class == String && File.exists?(args[0])
-          merge_worker(args[0])
+          merge_exec(args[0])
         elsif args.length == 1 && args.class == String
           @name = args[0]
         elsif args.length == 1 && args.class == Hash
-          @name = args[0][:name] || args[0]]['name']
+          @name = args[0][:name] || args[0]['name']
 
-          worker = args[0][:worker] || args[0]['worker']
-          merge_worker(worker) unless worker.nil?
+          exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
+          merge_exec(exec) unless exec.nil?
         end
       end
 
@@ -71,9 +71,9 @@ module IronWorkerNG
       end
 
       def create_zip
-        unless @worker
-          IronWorkerNG::Logger.error 'No worker specified'
-          raise 'No worker specified'
+        unless @exec
+          IronWorkerNG::Logger.error 'No exec specified'
+          raise 'No exec specified'
         end
 
         fixate

data/lib/iron_worker_ng/code/binary.rb

@@ -1,9 +1,9 @@
-require_relative '../feature/binary/merge_worker'
+require_relative '../feature/binary/merge_exec'
 
 module IronWorkerNG
   module Code
     class Binary < IronWorkerNG::Code::Base
-      include IronWorkerNG::Feature::Binary::MergeWorker::InstanceMethods
+      include IronWorkerNG::Feature::Binary::MergeExec::InstanceMethods
 
       def create_runner(zip)
         zip.get_output_stream(runner) do |runner|
@@ -22,9 +22,9 @@ root() {
 
 cd "$(root "$@")"
 
-chmod +x #{File.basename(worker.path)}
+chmod +x #{File.basename(@exec.path)}
 
-LD_LIBRARY_PATH=. ./#{File.basename(worker.path)} "$@"
+LD_LIBRARY_PATH=. ./#{File.basename(@exec.path)} "$@"
 RUNNER
         end
       end

data/lib/iron_worker_ng/code/java.rb

@@ -1,11 +1,11 @@
 require_relative '../feature/java/merge_jar'
-require_relative '../feature/java/merge_worker'
+require_relative '../feature/java/merge_exec'
 
 module IronWorkerNG
   module Code
     class Java < IronWorkerNG::Code::Base
       include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
-      include IronWorkerNG::Feature::Java::MergeWorker::InstanceMethods
+      include IronWorkerNG::Feature::Java::MergeExec::InstanceMethods
 
       def create_runner(zip)
         classpath_array = []
@@ -36,7 +36,7 @@ root() {
 
 cd "$(root "$@")"
 
-java -cp #{classpath} #{worker.klass.nil? ? "-jar #{File.basename(worker.path)}" : worker.klass} "$@"
+java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
 RUNNER
         end
       end

data/lib/iron_worker_ng/code/node.rb

@@ -1,9 +1,9 @@
-require_relative '../feature/node/merge_worker'
+require_relative '../feature/node/merge_exec'
 
 module IronWorkerNG
   module Code
     class Node < IronWorkerNG::Code::Base
-      include IronWorkerNG::Feature::Node::MergeWorker::InstanceMethods
+      include IronWorkerNG::Feature::Node::MergeExec::InstanceMethods
 
       def create_runner(zip)
         zip.get_output_stream(runner) do |runner|
@@ -22,7 +22,7 @@ root() {
 
 cd "$(root "$@")"
 
-node #{File.basename(worker.path)} "$@"
+node #{File.basename(@exec.path)} "$@"
 RUNNER
         end
       end

data/lib/iron_worker_ng/code/ruby.rb

@@ -1,13 +1,13 @@
 require_relative '../feature/ruby/merge_gem'
 require_relative '../feature/ruby/merge_gemfile'
-require_relative '../feature/ruby/merge_worker'
+require_relative '../feature/ruby/merge_exec'
 
 module IronWorkerNG
   module Code
     class Ruby < IronWorkerNG::Code::Base
       include IronWorkerNG::Feature::Ruby::MergeGem::InstanceMethods
       include IronWorkerNG::Feature::Ruby::MergeGemfile::InstanceMethods
-      include IronWorkerNG::Feature::Ruby::MergeWorker::InstanceMethods
+      include IronWorkerNG::Feature::Ruby::MergeExec::InstanceMethods
 
       def create_runner(zip)
         gempath_code_array = []
@@ -80,27 +80,27 @@ def params
   @params
 end
 
-require '#{File.basename(worker.path)}'
+require '#{File.basename(@exec.path)}'
 
-worker_class = nil
+exec_class = nil
 
 begin
-  worker_class = Kernel.const_get('#{worker.klass}')
+  exec_class = Kernel.const_get('#{@exec.klass}')
 rescue
 end
 
-unless worker_class.nil?
-  worker_inst = worker_class.new
+unless exec_class.nil?
+  exec_inst = exec_class.new
 
   params.keys.each do |param|
     if param.class == String
-      if worker_inst.respond_to?(param + '=')
-        worker_inst.send(param + '=', params[param])
+      if exec_inst.respond_to?(param + '=')
+        exec_inst.send(param + '=', params[param])
       end
     end
   end
 
-  worker_inst.run
+  exec_inst.run
 end
 RUNNER
         end

data/lib/iron_worker_ng/feature/binary/{merge_worker.rb → merge_exec.rb}

@@ -1,7 +1,7 @@
 module IronWorkerNG
   module Feature
     module Binary
-      module MergeWorker
+      module MergeExec
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
 
@@ -14,34 +14,36 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling binary worker with path='#{@path}'"
+            IronWorkerNG::Logger.debug "Bundling binary exec with path='#{@path}'"
 
             zip.add(File.basename(@path), @path)
           end
         end
 
         module InstanceMethods
-          attr_reader :worker
+          attr_reader :exec
 
-          def merge_worker(path)
-            @worker ||= nil 
+          def merge_exec(path)
+            @exec ||= nil 
 
-            unless @worker.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge binary worker with path='#{path}'"
+            unless @exec.nil?
+              IronWorkerNG::Logger.warn "Ignoring attempt to merge binary exec with path='#{path}'"
               return
             end
 
             @name ||= File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
 
-            @worker = IronWorkerNG::Feature::Binary::MergeWorker::Feature.new(path)
+            @exec = IronWorkerNG::Feature::Binary::MergeExec::Feature.new(path)
 
-            IronWorkerNG::Logger.info "Merging binary worker with path='#{path}'"
+            IronWorkerNG::Logger.info "Merging binary exec with path='#{path}'"
 
-            @features << @worker
+            @features << @exec
           end
 
+          alias :merge_worker :merge_exec
+
           def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_worker', :for_klass => base, :args => 'PATH')
+            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH')
           end
         end
       end

data/lib/iron_worker_ng/feature/java/{merge_worker.rb → merge_exec.rb}

@@ -1,7 +1,7 @@
 module IronWorkerNG
   module Feature
     module Java
-      module MergeWorker
+      module MergeExec
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
           attr_reader :klass
@@ -16,7 +16,7 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling java worker with path='#{@path}' and class='#{@klass}'"
+            IronWorkerNG::Logger.debug "Bundling java exec with path='#{@path}' and class='#{@klass}'"
 
             zip.add(File.basename(@path), @path)
           end
@@ -27,13 +27,13 @@ module IronWorkerNG
         end
 
         module InstanceMethods
-          attr_reader :worker
+          attr_reader :exec
 
-          def merge_worker(path, klass = nil)
-            @worker ||= nil 
+          def merge_exec(path, klass = nil)
+            @exec ||= nil 
 
-            unless @worker.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge java worker with path='#{path}' and class='#{klass}'"
+            unless @exec.nil?
+              IronWorkerNG::Logger.warn "Ignoring attempt to merge java exec with path='#{path}' and class='#{klass}'"
               return
             end
 
@@ -43,15 +43,17 @@ module IronWorkerNG
               @name ||= klass.split('.')[-1]
             end
 
-            @worker = IronWorkerNG::Feature::Java::MergeWorker::Feature.new(path, klass)
+            @exec = IronWorkerNG::Feature::Java::MergeExec::Feature.new(path, klass)
 
-            IronWorkerNG::Logger.info "Merging java worker with path='#{path}' and class='#{klass}'"
+            IronWorkerNG::Logger.info "Merging java exec with path='#{path}' and class='#{klass}'"
 
-            @features << @worker
+            @features << @exec
           end
 
+          alias :merge_worker :merge_exec
+
           def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_worker', :for_klass => base, :args => 'PATH,CLASS')
+            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH,CLASS')
           end
         end
       end

data/lib/iron_worker_ng/feature/node/{merge_worker.rb → merge_exec.rb}

@@ -1,7 +1,7 @@
 module IronWorkerNG
   module Feature
     module Node
-      module MergeWorker
+      module MergeExec
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
 
@@ -14,34 +14,36 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling node worker with path='#{@path}'"
+            IronWorkerNG::Logger.debug "Bundling node exec with path='#{@path}'"
 
             zip.add(File.basename(@path), @path)
           end
         end
 
         module InstanceMethods
-          attr_reader :worker
+          attr_reader :exec
 
-          def merge_worker(path)
-            @worker ||= nil 
+          def merge_exec(path)
+            @exec ||= nil 
 
-            unless @worker.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge node worker with path='#{path}'"
+            unless @exec.nil?
+              IronWorkerNG::Logger.warn "Ignoring attempt to merge node exec with path='#{path}'"
               return
             end
 
             @name ||= File.basename(path).gsub(/\.js$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
 
-            @worker = IronWorkerNG::Feature::Node::MergeWorker::Feature.new(path)
+            @exec = IronWorkerNG::Feature::Node::MergeExec::Feature.new(path)
 
-            IronWorkerNG::Logger.info "Merging node worker with path='#{path}'"
+            IronWorkerNG::Logger.info "Merging node exec with path='#{path}'"
 
-            @features << @worker
+            @features << @exec
           end
 
+          alias :merge_worker :merge_exec
+
           def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_worker', :for_klass => base, :args => 'PATH')
+            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH')
           end
         end
       end

data/lib/iron_worker_ng/feature/ruby/{merge_worker.rb → merge_exec.rb}

@@ -1,7 +1,7 @@
 module IronWorkerNG
   module Feature
     module Ruby
-      module MergeWorker
+      module MergeExec
         class Feature < IronWorkerNG::Feature::Base
           attr_reader :path
           attr_reader :klass
@@ -16,38 +16,38 @@ module IronWorkerNG
           end
 
           def bundle(zip)
-            IronWorkerNG::Logger.debug "Bundling ruby worker with path='#{path}' and class='#{klass}'"
+            IronWorkerNG::Logger.debug "Bundling ruby exec with path='#{path}' and class='#{klass}'"
 
             zip.add(File.basename(@path), @path)
           end
         end
 
         module InstanceMethods
-          attr_reader :worker
+          attr_reader :exec
 
-          def merge_worker(path, klass = nil)
-            @worker ||= nil 
+          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 @worker.nil?
-              IronWorkerNG::Logger.warn "Ignoring attempt to merge ruby worker with path='#{path}' and class='#{klass}'"
+            unless @exec.nil?
+              IronWorkerNG::Logger.warn "Ignoring attempt to merge ruby exec with path='#{path}' and class='#{klass}'"
               return
             end
 
             @name ||= klass
 
-            @worker = IronWorkerNG::Feature::Ruby::MergeWorker::Feature.new(path, klass)
+            @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(path, klass)
 
-            IronWorkerNG::Logger.info "Merging ruby worker with path='#{path}' and class='#{klass}'"
+            IronWorkerNG::Logger.info "Merging ruby exec with path='#{path}' and class='#{klass}'"
 
-            @features << @worker
+            @features << @exec
           end
 
           def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_worker', :for_klass => base, :args => 'PATH[,CLASS]')
+            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH[,CLASS]')
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -139,15 +139,15 @@ files:
 - lib/iron_worker_ng/code/node.rb
 - lib/iron_worker_ng/code/ruby.rb
 - lib/iron_worker_ng/feature/base.rb
-- lib/iron_worker_ng/feature/binary/merge_worker.rb
+- lib/iron_worker_ng/feature/binary/merge_exec.rb
 - lib/iron_worker_ng/feature/common/merge_dir.rb
 - lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/java/merge_exec.rb
 - lib/iron_worker_ng/feature/java/merge_jar.rb
-- lib/iron_worker_ng/feature/java/merge_worker.rb
-- lib/iron_worker_ng/feature/node/merge_worker.rb
+- lib/iron_worker_ng/feature/node/merge_exec.rb
+- 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/feature/ruby/merge_worker.rb
 - lib/iron_worker_ng/logger.rb
 - lib/iron_worker_ng/version.rb
 - test/Gemfile
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -253039331
+      hash: 1033714541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: