iron_worker_ng 0.7.4 → 0.8.0

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

@@ -0,0 +1,96 @@
+require_relative '../../feature/ruby/merge_gem'
+require_relative '../../feature/ruby/merge_gemfile'
+require_relative '../../feature/ruby/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Ruby
+        include IronWorkerNG::Feature::Ruby::MergeGem::InstanceMethods
+        include IronWorkerNG::Feature::Ruby::MergeGemfile::InstanceMethods
+        include IronWorkerNG::Feature::Ruby::MergeExec::InstanceMethods
+
+        def runtime_bundle(zip)
+          zip.get_output_stream(@dest_dir + '__runner__.rb') do |runner|
+            runner.write <<RUBY_RUNNER
+# #{IronWorkerNG.full_version}
+
+module IronWorkerNG
+#{File.read(File.dirname(__FILE__) + '/../../../3rdparty/hashie/merge_initializer.rb')}
+#{File.read(File.dirname(__FILE__) + '/../../../3rdparty/hashie/indifferent_access.rb')}
+end
+
+class IronWorkerNGHash < Hash
+  include IronWorkerNG::Hashie::Extensions::MergeInitializer
+  include IronWorkerNG::Hashie::Extensions::IndifferentAccess
+end
+
+root = nil
+payload_file = nil
+task_id = nil
+
+0.upto($*.length - 2) do |i|
+  root = $*[i + 1] if $*[i] == '-d'
+  payload_file = $*[i + 1] if $*[i] == '-payload'
+  task_id = $*[i + 1] if $*[i] == '-id'
+end
+
+ENV['GEM_PATH'] = ([root + '__gems__'] + (ENV['GEM_PATH'] || '').split(':')).join(':')
+
+$:.unshift("\#{root}")
+
+require 'json'
+
+@iron_task_id = task_id
+
+@payload = File.read(payload_file)
+
+params = {}
+begin
+  params = JSON.parse(@payload)
+rescue
+end
+
+@params = IronWorkerNGHash.new(params)
+
+def payload
+  @payload
+end
+
+def params
+  @params
+end
+
+def iron_task_id
+  @iron_task_id
+end
+
+require '#{File.basename(@exec.path)}'
+
+unless #{@exec.klass == nil}
+  exec_class = Kernel.const_get('#{@exec.klass}')
+  exec_inst = exec_class.new
+
+  params.keys.each do |param|
+    if param.class == String
+      if exec_inst.respond_to?(param + '=')
+        exec_inst.send(param + '=', params[param])
+      end
+    end
+  end
+
+  exec_inst.run
+end
+RUBY_RUNNER
+          end
+        end
+
+        def runtime_run_code
+          <<RUN_CODE
+ruby __runner__.rb "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/feature/base.rb

@@ -17,8 +17,7 @@ module IronWorkerNG
         new_src = File.expand_path(new_src) unless new_src.nil?
 
         if new_src.nil? || (not File.exists?(new_src))
-          IronCore::Logger.error 'IronWorkerNG', "Can't find src with path='#{src}'"
-          raise IronCore::IronError.new("Can't find src with path='#{src}'")
+          IronCore::Logger.error 'IronWorkerNG', "Can't find src with path='#{src}'", IronCore::Error
         end
 
         src = new_src

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

@@ -23,9 +23,11 @@ module IronWorkerNG
         end
 
         module InstanceMethods
-          def merge_exec(path)
+          def merge_exec(path=nil)
             @exec ||= nil 
 
+            return @exec unless path
+
             unless @exec.nil?
               IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge binary exec with path='#{path}'"
               return
@@ -42,10 +44,6 @@ module IronWorkerNG
 
           alias :merge_worker :merge_exec
           alias :worker :merge_worker
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH')
-          end
         end
       end
     end

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

@@ -41,10 +41,6 @@ module IronWorkerNG
           end
 
           alias :dir :merge_dir
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_dir', :for_klass => base, :args => 'PATH[,DEST]')
-          end
         end
       end
     end

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

@@ -35,10 +35,6 @@ module IronWorkerNG
           end
 
           alias :file :merge_file
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_file', :for_klass => base, :args => 'PATH[,DEST]')
-          end
         end
       end
     end

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

@@ -29,9 +29,11 @@ module IronWorkerNG
         end
 
         module InstanceMethods
-          def merge_exec(path, klass = nil)
+          def merge_exec(path = nil, klass = nil)
             @exec ||= nil 
 
+            return @exec unless path
+
             unless @exec.nil?
               IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge java exec with path='#{path}' and class='#{klass}'"
               return
@@ -48,10 +50,6 @@ module IronWorkerNG
 
           alias :merge_worker :merge_exec
           alias :worker :merge_worker
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH,CLASS')
-          end
         end
       end
     end

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

@@ -34,10 +34,6 @@ module IronWorkerNG
           end
 
           alias :jar :merge_jar
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_jar', :for_klass => base, :args => 'PATH')
-          end
         end
       end
     end

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

@@ -0,0 +1,51 @@
+module IronWorkerNG
+  module Feature
+    module Mono
+      module MergeExec
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+
+          def initialize(code, path)
+            super(code)
+
+            @path = path
+          end
+
+          def hash_string
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
+          end
+
+          def bundle(zip)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling mono exec with path='#{@path}'"
+
+            zip_add(zip, File.basename(@path), rebase(@path))
+          end
+        end
+
+        module InstanceMethods
+          def merge_exec(path=nil)
+            @exec ||= nil 
+
+            return @exec unless path
+
+            unless @exec.nil?
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge mono exec with path='#{path}'"
+              return
+            end
+
+            @exec = IronWorkerNG::Feature::Mono::MergeExec::Feature.new(self, path)
+
+            IronCore::Logger.info 'IronWorkerNG', "Merging mono exec with path='#{path}'"
+
+            @features << @exec
+          end
+
+          alias :exec :merge_exec
+
+          alias :merge_worker :merge_exec
+          alias :worker :merge_worker
+        end
+      end
+    end
+  end
+end

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

@@ -23,9 +23,11 @@ module IronWorkerNG
         end
 
         module InstanceMethods
-          def merge_exec(path)
+          def merge_exec(path=nil)
             @exec ||= nil 
 
+            return @exec unless path
+
             unless @exec.nil?
               IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge node exec with path='#{path}'"
               return
@@ -42,10 +44,6 @@ module IronWorkerNG
 
           alias :merge_worker :merge_exec
           alias :worker :merge_worker
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH')
-          end
         end
       end
     end

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

@@ -0,0 +1,51 @@
+module IronWorkerNG
+  module Feature
+    module PHP
+      module MergeExec
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+
+          def initialize(code, path)
+            super(code)
+
+            @path = path
+          end
+
+          def hash_string
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
+          end
+
+          def bundle(zip)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling php exec with path='#{@path}'"
+
+            zip_add(zip, File.basename(@path), rebase(@path))
+          end
+        end
+
+        module InstanceMethods
+          def merge_exec(path=nil)
+            @exec ||= nil 
+
+            return @exec unless path
+
+            unless @exec.nil?
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge php exec with path='#{path}'"
+              return
+            end
+
+            @exec = IronWorkerNG::Feature::PHP::MergeExec::Feature.new(self, path)
+
+            IronCore::Logger.info 'IronWorkerNG', "Merging php exec with path='#{path}'"
+
+            @features << @exec
+          end
+
+          alias :exec :merge_exec
+
+          alias :merge_worker :merge_exec
+          alias :worker :merge_worker
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module IronWorkerNG
+  module Feature
+    module Python
+      module MergeExec
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+
+          def initialize(code, path)
+            super(code)
+
+            @path = path
+          end
+
+          def hash_string
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
+          end
+
+          def bundle(zip)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling python exec with path='#{@path}'"
+
+            zip_add(zip, File.basename(@path), rebase(@path))
+          end
+        end
+
+        module InstanceMethods
+          def merge_exec(path=nil)
+            @exec ||= nil 
+
+            return @exec unless path
+
+            unless @exec.nil?
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge python exec with path='#{path}'"
+              return
+            end
+
+            @exec = IronWorkerNG::Feature::Python::MergeExec::Feature.new(self, path)
+
+            IronCore::Logger.info 'IronWorkerNG', "Merging python exec with path='#{path}'"
+
+            @features << @exec
+          end
+
+          alias :exec :merge_exec
+
+          alias :merge_worker :merge_exec
+          alias :worker :merge_worker
+        end
+      end
+    end
+  end
+end

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

@@ -25,9 +25,11 @@ module IronWorkerNG
         end
 
         module InstanceMethods
-          def merge_exec(path, klass = nil)
+          def merge_exec(path = nil, klass = nil)
             @exec ||= nil 
 
+            return @exec unless path
+
             unless @exec.nil?
               IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge ruby exec with path='#{path}' and class='#{klass}'"
               return
@@ -44,10 +46,6 @@ module IronWorkerNG
 
           alias :merge_worker :merge_exec
           alias :worker :merge_worker
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_exec', :for_klass => base, :args => 'PATH[,CLASS]')
-          end
         end
       end
     end

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

@@ -57,6 +57,10 @@ module IronWorkerNG
 
             @merge_gem_reqs ||= []
             @merge_gem_reqs << Bundler::Dependency.new(name, version.split(', '))
+
+            unless @fixators.include?(:merge_gem_fixate)
+              @fixators << :merge_gem_fixate
+            end
           end
 
           alias :gem :merge_gem
@@ -94,10 +98,6 @@ module IronWorkerNG
               end
             end
           end
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_gem', :for_klass => base, :args => 'NAME[,VERSION]')
-          end
         end
       end
     end

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

@@ -37,10 +37,6 @@ module IronWorkerNG
           end
 
           alias :gemfile :merge_gemfile
-
-          def self.included(base)
-            IronWorkerNG::Code::Base.register_feature(:name => 'merge_gemfile', :for_klass => base, :args => 'PATH[,GROUP...]')
-          end
         end
       end
     end

data/lib/iron_worker_ng.rb

@@ -1,4 +1,12 @@
 require_relative 'iron_worker_ng/version'
 require_relative 'iron_worker_ng/fetcher'
 require_relative 'iron_worker_ng/client'
-require_relative 'iron_worker_ng/code/creator'
+require_relative 'iron_worker_ng/code/base'
+require_relative 'iron_worker_ng/code/ruby'
+require_relative 'iron_worker_ng/code/binary'
+require_relative 'iron_worker_ng/code/java'
+require_relative 'iron_worker_ng/code/node'
+require_relative 'iron_worker_ng/code/mono'
+require_relative 'iron_worker_ng/code/python'
+require_relative 'iron_worker_ng/code/php'
+require_relative 'iron_worker_ng/code/builder'

data/remote_test.rb

@@ -17,7 +17,9 @@ require_relative 'test/iron_io_config.rb'
 
 client = IronWorkerNG::Client.new
 
-code = IronWorkerNG::Code::Ruby.new do
+code = IronWorkerNG::Code.new do
+  runtime 'ruby'
+
   exec 'ng_tests_worker.rb'
   gemfile 'Gemfile'
   gemfile 'test/Gemfile'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: zip
   requirement: !ruby/object:Gem::Requirement
@@ -113,18 +113,29 @@ files:
 - lib/iron_worker_ng/code/base.rb
 - lib/iron_worker_ng/code/binary.rb
 - lib/iron_worker_ng/code/builder.rb
-- lib/iron_worker_ng/code/creator.rb
-- lib/iron_worker_ng/code/initializer.rb
 - lib/iron_worker_ng/code/java.rb
+- lib/iron_worker_ng/code/mono.rb
 - lib/iron_worker_ng/code/node.rb
+- lib/iron_worker_ng/code/php.rb
+- lib/iron_worker_ng/code/python.rb
 - lib/iron_worker_ng/code/ruby.rb
+- lib/iron_worker_ng/code/runtime/binary.rb
+- lib/iron_worker_ng/code/runtime/java.rb
+- lib/iron_worker_ng/code/runtime/mono.rb
+- lib/iron_worker_ng/code/runtime/node.rb
+- lib/iron_worker_ng/code/runtime/php.rb
+- lib/iron_worker_ng/code/runtime/python.rb
+- lib/iron_worker_ng/code/runtime/ruby.rb
 - lib/iron_worker_ng/feature/base.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/mono/merge_exec.rb
 - lib/iron_worker_ng/feature/node/merge_exec.rb
+- lib/iron_worker_ng/feature/php/merge_exec.rb
+- lib/iron_worker_ng/feature/python/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
@@ -146,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -96405151
+      hash: -271964877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/iron_worker_ng/code/creator.rb

@@ -1,63 +0,0 @@
-require_relative 'initializer'
-require_relative 'base'
-require_relative 'ruby'
-require_relative 'java'
-require_relative 'node'
-require_relative 'binary'
-require_relative 'builder'
-
-module IronWorkerNG
-  module Code
-    class Creator
-      include IronWorkerNG::Code::Initializer::InstanceMethods
-
-      def self.create(*args, &block)
-        runtime = IronWorkerNG::Code::Creator.new(*args, &block).runtime || 'ruby'
-
-        IronWorkerNG::Code::Base.registered_types.find { |r| r[:name] == runtime }[:klass].new(*args, &block)
-      end
-
-      def initialize(*args, &block)
-        initialize_code(*args, &block)
-      end
-
-      def name(name = nil)
-        @name = name if name
-
-        @name
-      end
-
-      def name=(name)
-        @name = name
-      end
-
-      def remote_build_command(remote_build_command = nil)
-      end
-
-      def remote_build_command=(remote_build_command)
-      end
-
-      def runtime(*args)
-        @runtime = args[0] if args.length == 1
-
-        @runtime
-      end
-
-      def runtime=(runtime)
-        @runtime = runtime
-      end
-
-      def merge_exec(path, *args)
-        @exec = OpenStruct.new(:path => path)
-      end
-
-      alias :exec :merge_exec
-
-      alias :merge_worker :merge_exec
-      alias :worker :merge_worker
-
-      def method_missing(name, *args)
-      end
-    end
-  end
-end

data/lib/iron_worker_ng/code/initializer.rb

@@ -1,76 +0,0 @@
-module IronWorkerNG
-  module Code
-    module Initializer
-      module InstanceMethods
-        def initialize_code(*args, &block)
-          @name = nil
-          @exec = nil
-
-          wfiles = []
-
-          if args.length == 1 && args[0].class == String
-            name = args[0]
-
-            if name.end_with?('.worker') || name.end_with?('.workerfile')
-              @name = name.gsub(/\.worker$/, '').gsub(/\.workerfile$/, '')
-            else
-              merge_exec(name)
-            end
-          elsif args.length == 1 && args[0].class == Hash
-            @name = args[0][:name] || args[0]['name']
-
-            unless @name.nil?
-              if @name.end_with?('.worker') || @name.end_with?('.workerfile')
-                @name = @name.gsub(/\.worker$/, '').gsub(/\.workerfile$/, '')
-              end
-            end
-
-            exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
-            merge_exec(exec) unless exec.nil?
-          end
-
-          if args.length == 1 && args[0].class == Hash && (args[0][:workerfile] || args[0]['workerfile'])
-            wfiles << args[0][:workerfile] || args[0]['workerfile']
-          end
-
-          if @name.nil? and @exec
-            @name = guess_name_for_path(@exec.path)
-          end
-
-          unless @name.nil?
-            wfiles << @name + '.worker'
-            wfiles << @name + '.workerfile'
-          end
-
-          wfiles << 'Workerfile'
-
-          wfiles.each do |wfile|
-            src, clean = IronWorkerNG::Fetcher.fetch(wfile)
-
-            unless src.nil?
-              eval(src)
-
-              @base_dir = File.dirname(wfile) == '.' ? '' : File.dirname(wfile) + '/'
-
-              break
-            end
-          end
-
-          unless block.nil?
-            instance_eval(&block)
-          end
-
-          if @name.nil? and @exec
-            @name = guess_name_for_path(@exec.path)
-          end
-
-          @name = File.basename(@name) unless @name.nil?
-        end
-
-        def guess_name_for_path(path)
-          File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
-        end
-      end
-    end
-  end
-end