iron_worker_ng 0.10.2 → 0.10.3

data/lib/iron_worker_ng/code/builder.rb

@@ -14,7 +14,7 @@ module IronWorkerNG
       end
 
       def bundle(container)
-        @exec = IronWorkerNG::Feature::Ruby::MergeExec::Feature.new(self, '__builder__.rb', nil)
+        @exec = IronWorkerNG::Feature::Common::MergeExec::Feature.new(self, '__builder__.rb', {})
 
         super(container)
 
@@ -29,12 +29,13 @@ BUILDER_SH
           builder.write <<BUILDER_RUBY
 # #{IronWorkerNG.full_version}
 
-require 'iron_worker_ng'
 require 'json'
 
+require 'iron_worker_ng'
+
 exit 1 unless system('cd __build__ && sh ../__builder__.sh && cd ..')
 
-Dir.chdir('__build__')
+::Dir.chdir('__build__')
 
 code = IronWorkerNG::Code::Base.new
 code.inside_builder = true

data/lib/iron_worker_ng/code/container/base.rb

@@ -0,0 +1,31 @@
+require 'tmpdir'
+require 'pathname'
+
+module IronWorkerNG
+  module Code
+    module Container
+      class Base
+        attr_reader :name
+
+        def initialize
+          @name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'container')
+        end
+
+        def clear_dest(dest)
+          dest = Pathname.new(dest).cleanpath.to_s unless dest.empty?
+
+          dest
+        end
+
+        def add(dest, src, commit = false)
+        end
+
+        def get_output_stream(dest, &block)
+        end
+
+        def close
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/container/dir.rb

@@ -0,0 +1,31 @@
+require 'fileutils'
+
+module IronWorkerNG
+  module Code
+    module Container
+      class Dir < IronWorkerNG::Code::Container::Base
+        def full_dest(dest)
+          @name + '/' + clear_dest(dest)
+        end
+
+        def add(dest, src, commit = false)
+          FileUtils.mkdir_p(File.dirname(full_dest(dest)))
+
+          if File.directory?(src)
+            FileUtils.mkdir(full_dest(dest))
+          else
+            FileUtils.cp(src, full_dest(dest))
+          end
+        end
+
+        def get_output_stream(dest, &block)
+          FileUtils.mkdir_p(File.dirname(full_dest(dest)))
+
+          file = File.open(full_dest(dest), 'wb')
+          block.call(file)
+          file.close
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/code/container/zip.rb

@@ -0,0 +1,30 @@
+require 'zip/zip'
+
+module IronWorkerNG
+  module Code
+    module Container
+      class Zip < IronWorkerNG::Code::Container::Base
+        def initialize
+          super
+
+          @name = @name + '.zip'
+          @zip = ::Zip::ZipFile.open(@name, ::Zip::ZipFile::CREATE)
+        end
+
+        def add(dest, src, commit = false)
+          @zip.add(clear_dest(dest), src)
+
+          @zip.commit if commit
+        end
+
+        def get_output_stream(dest, &block)
+          @zip.get_output_stream(clear_dest(dest), &block)
+        end
+
+        def close
+          @zip.close
+        end
+      end
+    end
+  end
+end

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/binary/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Binary
-        include IronWorkerNG::Feature::Binary::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/go/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Go
-        include IronWorkerNG::Feature::Go::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,12 +1,11 @@
 require_relative '../../feature/java/merge_jar'
-require_relative '../../feature/java/merge_exec'
 
 module IronWorkerNG
   module Code
     module Runtime
       module Java
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
         include IronWorkerNG::Feature::Java::MergeJar::InstanceMethods
-        include IronWorkerNG::Feature::Java::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           classpath_array = []
@@ -22,7 +21,7 @@ module IronWorkerNG
           IronCore::Logger.info 'IronWorkerNG', "Collected '#{classpath}' classpath"
 
           <<RUN_CODE
-java -cp #{classpath} #{@exec.klass.nil? ? "-jar #{File.basename(@exec.path)}" : @exec.klass} "$@"
+java -cp #{classpath} #{@exec.arg(:class, 0).nil? ? "-jar #{File.basename(@exec.path)}" : @exec.arg(:class, 0)} "$@"
 RUN_CODE
         end
       end

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/mono/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Mono
-        include IronWorkerNG::Feature::Mono::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/node/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Node
-        include IronWorkerNG::Feature::Node::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/perl/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Perl
-        include IronWorkerNG::Feature::Perl::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/php/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module PHP
-        include IronWorkerNG::Feature::PHP::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_bundle(container)
           container.get_output_stream(@dest_dir + '__runner__.php') do |runner|

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

@@ -1,10 +1,8 @@
-require_relative '../../feature/python/merge_exec'
-
 module IronWorkerNG
   module Code
     module Runtime
       module Python
-        include IronWorkerNG::Feature::Python::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
 
         def runtime_run_code(local = false)
           <<RUN_CODE

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

@@ -1,17 +1,17 @@
 require 'tmpdir'
 require 'fileutils'
 
-require_relative '../../feature/ruby/merge_gem'
+require_relative '../../feature/ruby/merge_gem_dependency'
 require_relative '../../feature/ruby/merge_gemfile'
-require_relative '../../feature/ruby/merge_exec'
+require_relative '../../feature/ruby/merge_gem'
 
 module IronWorkerNG
   module Code
     module Runtime
       module Ruby
-        include IronWorkerNG::Feature::Ruby::MergeGem::InstanceMethods
+        include IronWorkerNG::Feature::Common::MergeExec::InstanceMethods
+        include IronWorkerNG::Feature::Ruby::MergeGemDependency::InstanceMethods
         include IronWorkerNG::Feature::Ruby::MergeGemfile::InstanceMethods
-        include IronWorkerNG::Feature::Ruby::MergeExec::InstanceMethods
 
         def runtime_bundle(container)
           container.get_output_stream(@dest_dir + '__runner__.rb') do |runner|
@@ -70,8 +70,8 @@ end
 
 require '#{File.basename(@exec.path)}'
 
-unless #{@exec.klass == nil}
-  exec_class = Kernel.const_get('#{@exec.klass}')
+unless #{@exec.arg(:class, 0) == nil}
+  exec_class = Kernel.const_get('#{@exec.arg(:class, 0)}')
   exec_inst = exec_class.new
 
   params.keys.each do |param|
@@ -95,7 +95,7 @@ RUN_CODE
         end
 
         def install
-          gemfile_dir = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname('iron-worker-ng-', 'gemfile')
+          gemfile_dir = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'gemfile')
 
           FileUtils.mkdir(gemfile_dir)
 
@@ -103,8 +103,10 @@ RUN_CODE
 
           gemfile.puts('source :rubygems')
 
-          @merge_gem_reqs.each do |req|
-            gemfile.puts("gem '#{req.name}', '#{req.requirement.to_s}'")
+          deps = @features.reject { |f| f.class != IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature }
+
+          deps.each do |dep|
+            gemfile.puts("gem '#{dep.name}', '#{dep.version}'")
           end
 
           gemfile.close

data/lib/iron_worker_ng/feature/base.rb

@@ -1,5 +1,3 @@
-require 'fileutils'
-
 module IronWorkerNG
   module Feature
     class Base
@@ -12,26 +10,18 @@ module IronWorkerNG
       end
 
       def container_add(container, dest, src)
-        new_src, clean = IronWorkerNG::Fetcher.fetch(src, true)
-
-        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}'", IronCore::Error
-        end
-
-        src = new_src
-
-        if File.directory?(src)
-          Dir.glob(src + '/**/**') do |path|
-            container.add(@code.dest_dir + dest + path[src.length .. -1], path)
+        IronWorkerNG::Fetcher.fetch_to_file(src) do |local_src|
+          if local_src.nil? || (not File.exists?(local_src))
+            IronCore::Logger.error 'IronWorkerNG', "Can't find src with path='#{src}'", IronCore::Error
           end
-        else
-          container.add(@code.dest_dir + dest, src)
-        end
 
-        unless clean.nil?
-          FileUtils.rm_f(clean)
+          if File.directory?(local_src)
+            ::Dir.glob(local_src + '/**/**') do |path|
+              container.add(@code.dest_dir + dest + path[local_src.length .. -1], path)
+            end
+          else
+            container.add(@code.dest_dir + dest, local_src, IronWorkerNG::Fetcher.remote?(src))
+          end
         end
       end
 
@@ -41,6 +31,10 @@ module IronWorkerNG
 
       def bundle(container)
       end
+
+      def command(remote = false)
+        nil
+      end
     end
   end
 end

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

@@ -1,5 +1,3 @@
-require 'pathname'
-
 module IronWorkerNG
   module Feature
     module Common
@@ -12,14 +10,13 @@ module IronWorkerNG
             super(code)
 
             @path = path
-            @dest = dest
-            @dest = Pathname.new(dest).cleanpath.to_s + '/' unless @dest.empty?
+            @dest = dest + (dest.empty? || dest.end_with?('/') ? '' : '/')
           end
 
           def hash_string
             s = @path + @dest + File.mtime(rebase(@path)).to_i.to_s
 
-            Dir.glob(rebase(@path) + '/**/**') do |path|
+            ::Dir.glob(rebase(@path) + '/**/**') do |path|
               s += path + File.mtime(path).to_i.to_s
             end
 
@@ -31,6 +28,18 @@ module IronWorkerNG
 
             container_add(container, @dest + File.basename(@path), rebase(@path))
           end
+
+          def command(remote = false)
+            if remote
+              if IronWorkerNG::Fetcher.remote?(rebase(@path))
+                "dir '#{rebase(@path)}', '#{@dest}'"
+              else
+                "dir '#{@dest}#{File.basename(@path)}', '#{@dest}'"
+              end
+            else
+              "dir '#{@path}', '#{@dest}'"
+            end
+          end
         end
 
         module InstanceMethods

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

@@ -0,0 +1,79 @@
+module IronWorkerNG
+  module Feature
+    module Common
+      module MergeExec
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+          attr_reader :args
+
+          def initialize(code, path, args)
+            super(code)
+
+            @path = path
+            @args = args
+          end
+
+          def arg(name, i = nil)
+            if @args.is_a?(Hash)
+              return @args[name.to_sym] || @args[name.to_s]
+            elsif @args.is_a?(Array) && (not i.nil?)
+              return @args[i]
+            end
+
+            nil
+          end
+
+          def hash_string
+            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s + args.to_s)
+          end
+
+          def bundle(container)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling exec with path='#{@path}' and args='#{@args.inspect}'"
+
+            container_add(container, File.basename(@path), rebase(@path))
+          end
+
+          def command(remote = false)
+            if remote
+              if IronWorkerNG::Fetcher.remote?(rebase(@path))
+                "exec '#{rebase(@path)}', #{@args.inspect}"
+              else
+                "exec '#{File.basename(@path)}', #{@args.inspect}"
+              end
+            else
+              "exec '#{@path}', #{@args.inspect}"
+            end
+          end
+        end
+
+        module InstanceMethods
+          def merge_exec(path = nil, args = {})
+            @exec ||= nil
+
+            return @exec unless path
+
+            if (not args.is_a?(Hash)) && (not args.is_a?(Array))
+              args = [args]
+            end
+
+            unless @exec.nil?
+              IronCore::Logger.warn 'IronWorkerNG', "Ignoring attempt to merge exec with path='#{path}' and args='#{args.inspect}'"
+              return
+            end
+
+            @exec = IronWorkerNG::Feature::Common::MergeExec::Feature.new(self, path, args)
+
+            IronCore::Logger.info 'IronWorkerNG', "Detected exec with path='#{path}' and args='#{args.inspect}'"
+
+            @features << @exec
+          end
+
+          alias :exec :merge_exec
+
+          alias :merge_worker :merge_exec
+          alias :worker :merge_worker
+        end
+      end
+    end
+  end
+end