iron_worker_ng 0.4.3 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/bin/iron_worker

@@ -74,9 +74,13 @@ if command == 'codes.create'
     exit 1
   end
 
-  runtime = 'ruby' if runtime.nil?
+  code = nil
 
-  code = runtimes.find { |r| r[:name] == runtime }[:klass].new(:name => name)
+  if runtime.nil?
+    code = IronWorkerNG::Code::Creator.create(:name => name)
+  else
+    code = runtimes.find { |r| r[:name] == runtime }[:klass].new(:name => name)
+  end
 
   execute_features.each do |f|
     code.send(f[:name], *f[:args])

data/lib/iron_worker_ng.rb

@@ -1,7 +1,3 @@
 require_relative 'iron_worker_ng/version'
 require_relative 'iron_worker_ng/client'
-require_relative 'iron_worker_ng/code/base'
-require_relative 'iron_worker_ng/code/ruby'
-require_relative 'iron_worker_ng/code/java'
-require_relative 'iron_worker_ng/code/node'
-require_relative 'iron_worker_ng/code/binary'
+require_relative 'iron_worker_ng/code/creator'

data/lib/iron_worker_ng/client.rb

@@ -57,7 +57,7 @@ module IronWorkerNG
 
     def codes_create(code)
       zip_file = code.create_zip
-      res = @api.codes_create(code.name, zip_file, code.runtime, code.runner)
+      res = @api.codes_create(code.name, zip_file, 'sh', '__runner__.sh')
       File.unlink(zip_file)
 
       OpenStruct.new(res)

data/lib/iron_worker_ng/code/base.rb

@@ -30,52 +30,19 @@ module IronWorkerNG
         @@registered_features << feature
       end
 
+      def self.guess_name_for_path(path)
+        File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
+      end
+
+      include IronWorkerNG::Code::Initializer::InstanceMethods
+
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
 
       def initialize(*args, &block)
-        @name = nil
         @features = []
 
-        if args.length == 1 && args[0].class == String
-          merge_exec(args[0])
-        elsif args.length == 1 && args[0].class == Hash
-          @name = args[0][:name] || args[0]['name']
-
-          exec = args[0][:exec] || args[0]['exec'] ||
-            args[0][:worker] || args[0]['worker']
-          merge_exec(exec) unless exec.nil?
-        end
-
-        if args.length == 1 and (opts = args[0]).is_a? Hash and wfile = opts[:workerfile] || opts['workerfile']
-          eval(File.read(File.expand_path wfile))
-        end
-
-        unless @exec.nil?
-          @name ||= guess_name(@exec.path)
-        end
-
-        wfiles = ['Workerfile']
-
-        unless @name.nil?
-          wfiles << @name + '.worker'
-          wfiles << @name + '.workerfile'
-        end
-
-        wfiles.each do |wfile|
-          if File.exists? wfile
-            eval(File.read wfile)
-            IronCore::Logger.info 'IronWorkerNG', "Processing workerfile #{wfile}"
-          end
-        end
-
-        unless block.nil?
-          instance_eval(&block)
-        end
-
-        unless @exec.nil?
-          @name ||= guess_name(@exec.path)
-        end
+        initialize_code(*args, &block)
       end
 
       def name(*args)
@@ -88,8 +55,16 @@ module IronWorkerNG
         @name = name
       end
 
-      def guess_name(path)
-        File.basename(path).gsub(/\..*$/, '').capitalize.gsub(/_./) { |x| x[1].upcase }
+      def runtime(*args)
+      end
+
+      def runtime=(runtime)
+      end
+
+      def guess_name
+        if @name.nil? && (not @exec.nil?)
+          @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec.path)
+        end
       end
 
       def fixate
@@ -128,17 +103,33 @@ module IronWorkerNG
 
         Zip::ZipFile.open(zip_name, Zip::ZipFile::CREATE) do |zip|
           bundle(zip)
-          create_runner(zip)
+
+          zip.get_output_stream('__runner__.sh') do |runner|
+            runner.write <<RUNNER
+#!/bin/sh
+# iron_worker_ng-#{IronWorkerNG.full_version}
+
+root() {
+  while [ $# -gt 0 ]; do
+    if [ "$1" = "-d" ]; then
+      printf "%s\n" "$2"
+      break
+    fi
+  done
+}
+
+cd "$(root "$@")"
+
+#{run_code}
+RUNNER
+          end
         end
 
         zip_name
       end
 
-      def create_runner(zip)
-      end
-
-      def runner
-        nil
+      def run_code
+        ''
       end
     end
   end

data/lib/iron_worker_ng/code/binary.rb

@@ -5,36 +5,12 @@ module IronWorkerNG
     class Binary < IronWorkerNG::Code::Base
       include IronWorkerNG::Feature::Binary::MergeExec::InstanceMethods
 
-      def create_runner(zip)
-        zip.get_output_stream(runner) do |runner|
-          runner.write <<RUNNER
-#!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.full_version}
-
-root() {
-  while [ $# -gt 0 ]; do
-    if [ "$1" = "-d" ]; then
-      printf "%s\n" "$2"
-      break
-    fi
-  done
-}
-
-cd "$(root "$@")"
-
+      def run_code
+        <<RUN_CODE
 chmod +x #{File.basename(@exec.path)}
 
 LD_LIBRARY_PATH=. ./#{File.basename(@exec.path)} "$@"
-RUNNER
-        end
-      end
-
-      def runtime(runtime = nil)
-        'sh'
-      end
-
-      def runner
-        '__runner__.sh'
+RUN_CODE
       end
     end
   end

data/lib/iron_worker_ng/code/creator.rb

@@ -0,0 +1,60 @@
+require_relative 'initializer'
+require_relative 'base'
+require_relative 'ruby'
+require_relative 'java'
+require_relative 'node'
+require_relative 'binary'
+
+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(*args)
+        @name = args[0] if args.length == 1
+
+        @name
+      end
+
+      def name=(name)
+        @name = name
+      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 = path
+
+        if @name.nil? && (not @exec.nil?)
+          @name = IronWorkerNG::Code::Base.guess_name_for_path(@exec)
+        end
+      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

@@ -0,0 +1,42 @@
+module IronWorkerNG
+  module Code
+    module Initializer
+      module InstanceMethods
+        def initialize_code(*args, &block)
+          @name = nil
+          @exec = nil
+
+          if args.length == 1 && args[0].class == String
+            merge_exec(args[0])
+          elsif args.length == 1 && args[0].class == Hash
+            @name = args[0][:name] || args[0]['name']
+
+            exec = args[0][:exec] || args[0]['exec'] || args[0][:worker] || args[0]['worker']
+            merge_exec(exec) unless exec.nil?
+          end
+
+          if args.length == 1 and (opts = args[0]).is_a? Hash and wfile = opts[:workerfile] || opts['workerfile']
+            eval(File.read(File.expand_path wfile))
+          end
+
+          wfiles = ['Workerfile']
+
+          unless @name.nil?
+            wfiles << @name + '.worker'
+            wfiles << @name + '.workerfile'
+          end
+
+          wfiles.each do |wfile|
+            if File.exists?(wfile)
+              eval(File.read(wfile))
+            end
+          end
+
+          unless block.nil?
+            instance_eval(&block)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/java.rb

@@ -7,7 +7,7 @@ module IronWorkerNG
       include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
       include IronWorkerNG::Feature::Java::MergeExec::InstanceMethods
 
-      def create_runner(zip)
+      def run_code
         classpath_array = []
       
         @features.each do |f|
@@ -19,34 +19,10 @@ module IronWorkerNG
         classpath = classpath_array.join(':')
 
         IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
-      
-        zip.get_output_stream(runner) do |runner|
-          runner.write <<RUNNER
-#!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.full_version}
-
-root() {
-  while [ $# -gt 0 ]; do
-    if [ "$1" = "-d" ]; then
-      printf "%s\n" "$2"
-      break
-    fi
-  done
-}
-
-cd "$(root "$@")"
-
+        
+        <<RUN_CODE
 java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
-RUNNER
-        end
-      end
-
-      def runtime(runtime = nil)
-        'sh'
-      end
-
-      def runner
-        '__runner__.sh'
+RUN_CODE
       end
     end
   end

data/lib/iron_worker_ng/code/node.rb

@@ -5,34 +5,10 @@ module IronWorkerNG
     class Node < IronWorkerNG::Code::Base
       include IronWorkerNG::Feature::Node::MergeExec::InstanceMethods
 
-      def create_runner(zip)
-        zip.get_output_stream(runner) do |runner|
-          runner.write <<RUNNER
-#!/bin/sh
-# iron_worker_ng-#{IronWorkerNG.full_version}
-
-root() {
-  while [ $# -gt 0 ]; do
-    if [ "$1" = "-d" ]; then
-      printf "%s\n" "$2"
-      break
-    fi
-  done
-}
-
-cd "$(root "$@")"
-
+      def run_code
+        <<RUN_CODE
 node #{File.basename(@exec.path)} "$@"
-RUNNER
-        end
-      end
-
-      def runtime(runtime = nil)
-        'sh'
-      end
-
-      def runner
-        '__runner__.sh'
+RUN_CODE
       end
     end
   end

data/lib/iron_worker_ng/code/ruby.rb

@@ -9,7 +9,9 @@ module IronWorkerNG
       include IronWorkerNG::Feature::Ruby::MergeGemfile::InstanceMethods
       include IronWorkerNG::Feature::Ruby::MergeExec::InstanceMethods
 
-      def create_runner(zip)
+      def bundle(zip)
+        super(zip)
+
         gempath_code_array = []
       
         @features.each do |f|
@@ -20,8 +22,8 @@ module IronWorkerNG
 
         gempath_code = gempath_code_array.join("\n")
 
-        zip.get_output_stream(runner) do |runner|
-          runner.write <<RUNNER
+        zip.get_output_stream('__runner__.rb') do |runner|
+          runner.write <<RUBY_RUNNER
 # iron_worker_ng-#{IronWorkerNG.full_version}
 
 module IronWorkerNG
@@ -91,16 +93,14 @@ unless #{@exec.klass == nil}
 
   exec_inst.run
 end
-RUNNER
+RUBY_RUNNER
         end
       end
 
-      def runtime(runtime = nil)
-        'ruby'
-      end
-
-      def runner
-        '__runner__.rb'
+      def run_code
+        <<RUN_CODE
+ruby __runner__.rb "$@"
+RUN_CODE
       end
     end
   end

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

@@ -39,6 +39,8 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging binary exec with path='#{path}'"
 
             @features << @exec
+
+            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -45,6 +45,8 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging java exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
+
+            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -39,6 +39,8 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging node exec with path='#{path}'"
 
             @features << @exec
+
+            guess_name
           end
 
           alias :exec :merge_exec

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

@@ -41,6 +41,8 @@ module IronWorkerNG
             IronCore::Logger.info 'IronWorkerNG', "Merging ruby exec with path='#{path}' and class='#{klass}'"
 
             @features << @exec
+
+            guess_name
           end
 
           alias :exec :merge_exec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -60,6 +60,22 @@ dependencies:
     - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler2
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +112,8 @@ files:
 - lib/iron_worker_ng/client.rb
 - lib/iron_worker_ng/code/base.rb
 - lib/iron_worker_ng/code/binary.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/node.rb
 - lib/iron_worker_ng/code/ruby.rb
@@ -124,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -200243437
+      hash: 833770483
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: