iron_worker_ng 0.7.4 → 0.8.0

data/lib/iron_worker_ng/code/base.rb

@@ -8,43 +8,102 @@ require_relative '../feature/common/merge_dir'
 module IronWorkerNG
   module Code
     class Base
-      attr_reader :features
+      attr_accessor :features
+      attr_accessor :fixators
+
       attr_accessor :base_dir
       attr_accessor :dest_dir
 
-      @@registered_types = []
-    
-      def self.registered_types
-        @@registered_types
-      end
-    
-      def self.register_type(type)
-        @@registered_types << type
-      end
-
-      @@registered_features = []
-    
-      def self.registered_features
-        @@registered_features
-      end
-    
-      def self.register_feature(feature)
-        return if feature[:for_klass].to_s == 'IronWorkerNG::Code::Builder'
-
-        @@registered_features << feature
-      end
+      attr_accessor :inside_builder
 
-      include IronWorkerNG::Code::Initializer::InstanceMethods
+      undef exec
 
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
 
       def initialize(*args, &block)
         @features = []
+        @fixators = []
+
         @base_dir = ''
         @dest_dir = ''
 
-        initialize_code(*args, &block)
+        @runtime = nil
+
+        @name = nil
+        @exec = nil
+
+        @inside_builder = false
+
+        wfiles = []
+
+        if args.length == 1 && args[0].is_a?(String)
+          if args[0].end_with?('.worker') || args[0].end_with?('.workerfile')
+            @name = args[0].gsub(/\.worker$/, '').gsub(/\.workerfile$/, '')
+          else
+            @name = args[0]
+          end
+        elsif args.length == 1 && args[0].is_a?(Hash)
+          @name = args[0][:name] || args[0]['name']
+
+          wfile = args[0][:workerfile] || args[0]['workerfile']
+          wfiles << wfile unless wfile.nil?
+
+          exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
+          unless exec.nil?
+            merge_exec(exec)
+          end
+        end
+
+        if @name.nil? and (not @exec.nil?)
+          @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?
+            IronCore::Logger.info 'IronWorkerNG', "Using workerfile #{wfile}"
+
+            eval(src)
+
+            @base_dir = File.dirname(wfile) == '.' ? '' : File.dirname(wfile) + '/'
+
+            break
+          end
+        end
+
+        unless block.nil?
+          instance_eval(&block)
+        end
+
+        if @name.nil? and (not @exec.nil?)
+          @name = guess_name_for_path(@exec.path)
+        end
+
+        unless @name.nil?
+          @name = File.basename(@name)
+        end
+      end
+
+      def method_missing(name, *args, &block)
+        if @runtime.nil?
+          runtime(:ruby)
+          send(name, *args, &block)
+        else
+          super(name, *args, &block)
+        end
+      end
+
+      def guess_name_for_path(path)
+        File.basename(path).gsub(/File.extname(path)$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
       end
 
       def name(name = nil)
@@ -67,17 +126,44 @@ module IronWorkerNG
         @remote_build_command = remote_build_command
       end
 
-      def runtime(*args)
+      alias :build :remote_build_command
+      alias :build= :remote_build_command=
+
+      def runtime(runtime = nil)
+        return @runtime unless runtime
+
+        unless @runtime.nil?
+          IronCore::Logger.error 'IronWorkerNG', "Runtime is already set to #{@runtime}", IronCore::Error
+        end
+
+        runtime_module = nil
+        runtime = runtime.to_s
+
+        begin
+          runtime_module = IronWorkerNG::Code::Runtime.const_get(runtime.capitalize)
+        rescue
+          begin
+            runtime_module = IronWorkerNG::Code::Runtime.const_get(runtime.upcase)
+          rescue
+          end
+        end
+
+        if runtime_module.nil?
+          IronCore::Logger.error 'IronWorkerNG', "Can't find runtime '#{runtime}'"
+        end
+
+        self.extend(runtime_module)
+
+        @runtime = runtime
       end
 
       def runtime=(runtime)
+        runtime(runtime)
       end
 
       def fixate
-        IronWorkerNG::Code::Base.registered_features.each do |rf|
-          if (rf[:for_klass] == self.class || self.class == IronWorkerNG::Code::Builder) && respond_to?(rf[:name] + '_fixate')
-            send(rf[:name] + '_fixate')
-          end
+        @fixators.each do |f|
+          send(f)
         end
       end
 
@@ -87,16 +173,23 @@ module IronWorkerNG
         Digest::MD5.hexdigest(@features.map { |f| f.hash_string }.join)
       end
 
+      def runtime_bundle(zip)
+      end
+
+      def runtime_run_code
+        ''
+      end
+
       def bundle(zip)
         @features.each do |feature|
           feature.bundle(zip)
         end
 
-        unless self.class == IronWorkerNG::Code::Base
+        unless @inside_builder
           zip.get_output_stream(@dest_dir + '__runner__.sh') do |runner|
             runner.write <<RUNNER
 #!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.full_version}
+# #{IronWorkerNG.full_version}
 
 root() {
   while [ $# -gt 1 ]; do
@@ -111,17 +204,18 @@ root() {
 
 cd "$(root "$@")"
 
-#{run_code}
+#{runtime_run_code}
 RUNNER
           end
         end
+
+        runtime_bundle(zip)
       end
 
       def create_zip
-        unless self.class == IronWorkerNG::Code::Base
-          unless @exec
-            IronCore::Logger.error 'IronWorkerNG', 'No exec specified'
-            raise IronCore::IronError.new('No exec specified')
+        unless @inside_builder
+          if @exec.nil?
+            IronCore::Logger.error 'IronWorkerNG', 'No exec specified', IronCore::Error
           end
 
           if @name.nil?
@@ -149,18 +243,21 @@ RUNNER
             builder.remote_build_command = @remote_build_command
 
             builder.gem('iron_worker_ng')
-            builder.fixate
 
+            builder.fixate
             builder.bundle(zip)
           end
+        end
 
+        if @remote_build_command
+          @dest_dir = ''
         end
 
         zip_name
       end
 
-      def run_code
-        ''
+      def to_s
+        "runtime='#{@runtime}', name='#{@name}', exec='#{@inside_builder ? '' : @exec.path}'"
       end
     end
   end

data/lib/iron_worker_ng/code/binary.rb

@@ -1,19 +1,13 @@
-require_relative '../feature/binary/merge_exec'
+require_relative 'runtime/binary'
 
 module IronWorkerNG
   module Code
     class Binary < IronWorkerNG::Code::Base
-      include IronWorkerNG::Feature::Binary::MergeExec::InstanceMethods
+      def initialize(*args, &block)
+        runtime(:binary)
 
-      def run_code
-        <<RUN_CODE
-chmod +x #{File.basename(@exec.path)}
-
-LD_LIBRARY_PATH=. ./#{File.basename(@exec.path)} "$@"
-RUN_CODE
+        super(*args, &block)
       end
     end
   end
 end
-
-IronWorkerNG::Code::Base.register_type(:name => 'binary', :klass => IronWorkerNG::Code::Binary)

data/lib/iron_worker_ng/code/builder.rb

@@ -2,11 +2,15 @@ require_relative '../feature/ruby/merge_gem'
 
 module IronWorkerNG
   module Code
-    class Builder < IronWorkerNG::Code::Ruby
+    class Builder < IronWorkerNG::Code::Base
       def initialize(*args, &block)
         @features = []
+        @fixators = []
+
         @base_dir = ''
         @dest_dir = ''
+
+        runtime(:ruby)
       end
 
       def bundle(zip)
@@ -16,14 +20,14 @@ module IronWorkerNG
 
         zip.get_output_stream(@dest_dir + '__builder__.sh') do |builder|
           builder.write <<BUILDER_SH
-# iron_worker_ng-#{IronWorkerNG.full_version}
+# #{IronWorkerNG.full_version}
 #{remote_build_command}
 BUILDER_SH
         end
 
         zip.get_output_stream(@dest_dir + '__builder__.rb') do |builder|
           builder.write <<BUILDER_RUBY
-# iron_worker_ng-#{IronWorkerNG.full_version}
+# #{IronWorkerNG.full_version}
 
 require 'iron_worker_ng'
 require 'json'
@@ -33,10 +37,12 @@ exit 1 unless system('cd __build__ && sh ../__builder__.sh && cd ..')
 Dir.chdir('__build__')
 
 code = IronWorkerNG::Code::Base.new
+code.inside_builder = true
+
 code.name params[:code_name]
 code.dir '.'
 
-client = IronWorkerNG::Client.new(:token => params[:iron_token], :project_id => params[:iron_project_id])
+client = IronWorkerNG::Client.new(JSON.parse(params[:client_options]))
 
 res = client.codes.create(code, JSON.parse(params[:codes_create_options]))
 

data/lib/iron_worker_ng/code/java.rb

@@ -1,31 +1,13 @@
-require_relative '../feature/java/merge_jar'
-require_relative '../feature/java/merge_exec'
+require_relative 'runtime/java'
 
 module IronWorkerNG
   module Code
     class Java < IronWorkerNG::Code::Base
-      include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
-      include IronWorkerNG::Feature::Java::MergeExec::InstanceMethods
+      def initialize(*args, &block)
+        runtime(:java)
 
-      def run_code
-        classpath_array = []
-      
-        @features.each do |f|
-          if f.respond_to?(:code_for_classpath)
-            classpath_array << f.send(:code_for_classpath)
-          end
-        end
-
-        classpath = classpath_array.join(':')
-
-        IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
-        
-        <<RUN_CODE
-java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
-RUN_CODE
+        super(*args, &block)
       end
     end
   end
 end
-
-IronWorkerNG::Code::Base.register_type(:name => 'java', :klass => IronWorkerNG::Code::Java)

data/lib/iron_worker_ng/code/mono.rb

@@ -0,0 +1,13 @@
+require_relative 'runtime/mono'
+
+module IronWorkerNG
+  module Code
+    class Mono < IronWorkerNG::Code::Base
+      def initialize(*args, &block)
+        runtime(:mono)
+
+        super(*args, &block)
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/node.rb

@@ -1,17 +1,13 @@
-require_relative '../feature/node/merge_exec'
+require_relative 'runtime/node'
 
 module IronWorkerNG
   module Code
     class Node < IronWorkerNG::Code::Base
-      include IronWorkerNG::Feature::Node::MergeExec::InstanceMethods
+      def initialize(*args, &block)
+        runtime(:node)
 
-      def run_code
-        <<RUN_CODE
-node #{File.basename(@exec.path)} "$@"
-RUN_CODE
+        super(*args, &block)
       end
     end
   end
 end
-
-IronWorkerNG::Code::Base.register_type(:name => 'node', :klass => IronWorkerNG::Code::Node)

data/lib/iron_worker_ng/code/php.rb

@@ -0,0 +1,13 @@
+require_relative 'runtime/php'
+
+module IronWorkerNG
+  module Code
+    class PHP < IronWorkerNG::Code::Base
+      def initialize(*args, &block)
+        runtime(:python)
+
+        super(*args, &block)
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/python.rb

@@ -0,0 +1,13 @@
+require_relative 'runtime/python'
+
+module IronWorkerNG
+  module Code
+    class Python < IronWorkerNG::Code::Base
+      def initialize(*args, &block)
+        runtime(:python)
+
+        super(*args, &block)
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/ruby.rb

@@ -1,98 +1,13 @@
-require_relative '../feature/ruby/merge_gem'
-require_relative '../feature/ruby/merge_gemfile'
-require_relative '../feature/ruby/merge_exec'
+require_relative 'runtime/ruby'
 
 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::MergeExec::InstanceMethods
+      def initialize(*args, &block)
+        runtime(:ruby)
 
-      def bundle(zip)
-        super(zip)
-
-        zip.get_output_stream(@dest_dir + '__runner__.rb') do |runner|
-          runner.write <<RUBY_RUNNER
-# iron_worker_ng-#{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 run_code
-        <<RUN_CODE
-ruby __runner__.rb "$@"
-RUN_CODE
+        super(*args, &block)
       end
     end
   end
 end
-
-IronWorkerNG::Code::Base.register_type(:name => 'ruby', :klass => IronWorkerNG::Code::Ruby)

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

@@ -0,0 +1,19 @@
+require_relative '../../feature/binary/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Binary
+        include IronWorkerNG::Feature::Binary::MergeExec::InstanceMethods
+
+        def runtime_run_code
+          <<RUN_CODE
+chmod +x #{File.basename(@exec.path)}
+
+LD_LIBRARY_PATH=. ./#{File.basename(@exec.path)} "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require_relative '../../feature/java/merge_jar'
+require_relative '../../feature/java/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Java
+        include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
+        include IronWorkerNG::Feature::Java::MergeExec::InstanceMethods
+
+        def runtime_run_code
+          classpath_array = []
+      
+          @features.each do |f|
+            if f.respond_to?(:code_for_classpath)
+              classpath_array << f.send(:code_for_classpath)
+            end
+          end
+
+          classpath = classpath_array.join(':')
+
+          IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
+        
+          <<RUN_CODE
+java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require_relative '../../feature/mono/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Mono
+        include IronWorkerNG::Feature::Mono::MergeExec::InstanceMethods
+
+        def runtime_run_code
+          <<RUN_CODE
+mono #{File.basename(@exec.path)} "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require_relative '../../feature/node/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Node
+        include IronWorkerNG::Feature::Node::MergeExec::InstanceMethods
+
+        def runtime_run_code
+          <<RUN_CODE
+node #{File.basename(@exec.path)} "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+require_relative '../../feature/php/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module PHP
+        include IronWorkerNG::Feature::PHP::MergeExec::InstanceMethods
+
+        def runtime_bundle(zip)
+          zip.get_output_stream(@dest_dir + '__runner__.php') do |runner|
+            runner.write <<PHP_RUNNER
+<?php
+/* #{IronWorkerNG.full_version} */
+
+function getArgs() { 
+  global $argv; 
+
+  $args = array('task_id' => null, 'dir' => null, 'payload' => array());
+
+  foreach ($argv as $k => $v) {
+    if (empty($argv[$k + 1])) continue;
+
+    if ($v == '-id') $args['task_id'] = $argv[$k + 1];
+    if ($v == '-d')  $args['dir']     = $argv[$k + 1];
+
+    if ($v == '-payload' && file_exists($argv[$k + 1])) {
+      $args['payload'] = file_get_contents($argv[$k + 1]);
+
+      $parsed_payload = json_decode($args['payload']);
+
+      if ($parsed_payload != NULL) {
+        $args['payload'] = $parsed_payload;
+      }
+    }
+  }
+
+  return $args;
+}
+
+function getPayload() {
+  $args = getArgs();
+
+  return $args['payload'];
+}
+
+require '#{File.basename(@exec.path)}';
+PHP_RUNNER
+          end
+        end
+
+        def runtime_run_code
+          <<RUN_CODE
+TERM=dumb php __runner__.php "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require_relative '../../feature/python/merge_exec'
+
+module IronWorkerNG
+  module Code
+    module Runtime
+      module Python
+        include IronWorkerNG::Feature::Python::MergeExec::InstanceMethods
+
+        def runtime_run_code
+          <<RUN_CODE
+python #{File.basename(@exec.path)} "$@"
+RUN_CODE
+        end
+      end
+    end
+  end
+end