iron_worker_ng 0.11.3 → 0.12.0

data/README.md

@@ -165,14 +165,6 @@ Runs code package on your local box. Can be useful for testing.
 code.run
 ```
 
-### hash_string()
-
-Return the hash string for the code package. If you want to prevent uploading unchanged code packages, you can use it to check if any changes were made. It's very efficient, so it shouldn't cause any performance impact.
-
-```
-puts code.hash_string
-```
-
 ### merge_file(path, dest = '')
 ### file(path, dest = '')
 

data/lib/iron_worker_ng/code/base.rb

@@ -7,6 +7,7 @@ require_relative '../feature/base'
 require_relative '../feature/common/merge_exec'
 require_relative '../feature/common/merge_file'
 require_relative '../feature/common/merge_dir'
+require_relative '../feature/common/merge_deb'
 
 module IronWorkerNG
   module Code
@@ -22,6 +23,7 @@ module IronWorkerNG
 
       include IronWorkerNG::Feature::Common::MergeFile::InstanceMethods
       include IronWorkerNG::Feature::Common::MergeDir::InstanceMethods
+      include IronWorkerNG::Feature::Common::MergeDeb::InstanceMethods
 
       def initialize(*args, &block)
         @features = []
@@ -176,12 +178,6 @@ module IronWorkerNG
         end
       end
 
-      def hash_string
-        fixate
-
-        Digest::MD5.hexdigest(@features.map { |f| f.hash_string }.join)
-      end
-
       def runtime_bundle(container, local = false)
       end
 
@@ -213,10 +209,10 @@ root() {
 
 cd "$(root "$@")"
 
-LD_LIBRARY_PATH=.
+LD_LIBRARY_PATH=.:./__debs__/usr/lib:./__debs__/usr/lib/x86_64-linux-gnu:./__debs__/lib:./__debs__/lib/x86_64-linux-gnu
 export LD_LIBRARY_PATH
 
-PATH=.:$PATH
+PATH=.:./__debs__/usr/bin:./__debs__/bin:$PATH
 export PATH
 
 #{runtime_run_code(local)}

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

@@ -17,12 +17,15 @@ module IronWorkerNG
           dest
         end
 
-        def add(dest, src, commit = false)
+        def add(dest, src)
         end
 
         def get_output_stream(dest, &block)
         end
 
+	def commit
+	end
+
         def close
         end
       end

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

@@ -8,7 +8,7 @@ module IronWorkerNG
           @name + '/' + clear_dest(dest)
         end
 
-        def add(dest, src, commit = false)
+        def add(dest, src)
           FileUtils.mkdir_p(File.dirname(full_dest(dest)))
 
           if File.directory?(src)

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

@@ -1,5 +1,7 @@
 require 'zip/zip'
 
+Zip.options[:continue_on_exists_proc] = true
+
 module IronWorkerNG
   module Code
     module Container
@@ -11,12 +13,14 @@ module IronWorkerNG
           @zip = ::Zip::ZipFile.open(@name, ::Zip::ZipFile::CREATE)
         end
 
-        def add(dest, src, commit = false)
+        def add(dest, src)
           @zip.add(clear_dest(dest), src)
-
-          @zip.commit if commit
         end
 
+  def commit
+          @zip.commit
+  end
+
         def get_output_stream(dest, &block)
           @zip.get_output_stream(clear_dest(dest), &block)
         end

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

@@ -39,6 +39,7 @@ task_id = nil
 end
 
 ENV['GEM_PATH'] = ([root + '__gems__'] + (ENV['GEM_PATH'] || '').split(':')).join(':')
+ENV['GEM_HOME'] = root + '__gems__'
 
 $:.unshift("\#{root}")
 

data/lib/iron_worker_ng/feature/base.rb

@@ -13,7 +13,7 @@ module IronWorkerNG
         @code.base_dir + path
       end
 
-      def container_add(container, dest, src)
+      def container_add(container, dest, src, commit = false)
         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
@@ -24,13 +24,13 @@ module IronWorkerNG
               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))
+            container.add(@code.dest_dir + dest, local_src)
           end
-        end
-      end
 
-      def hash_string
-        ''
+          if IronWorkerNG::Fetcher.remote?(src) || commit
+            container.commit
+          end
+        end
       end
 
       def bundle(container)

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

@@ -0,0 +1,70 @@
+require 'tmpdir'
+require 'fileutils'
+
+module IronWorkerNG
+  module Feature
+    module Common
+      module MergeDeb
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :path
+
+          def initialize(code, path)
+            super(code)
+
+            @path = path
+          end
+
+          def bundle(container)
+            IronCore::Logger.debug 'IronWorkerNG', "Bundling deb with path='#{@path}'"
+
+            if (not @code.remote_build_command) && (not @code.full_remote_build)
+              IronWorkerNG::Fetcher.fetch_to_file(rebase(@path)) do |deb|
+                if deb.nil? || (not File.exists?(deb))
+                  IronCore::Logger.error 'IronWorkerNG', "Can't find deb with path='#{@path}'"
+                end
+
+                tmp_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname('iron-worker-ng-', 'deb')
+
+                ::Dir.mkdir(tmp_dir_name)
+
+                `dpkg -x #{deb} #{tmp_dir_name}`
+
+                ::Dir.glob(tmp_dir_name) do |path|
+                  container_add(container, '__debs__', path, true)
+                end
+
+                FileUtils.rm_rf(tmp_dir_name)
+              end
+            else
+              if (not @code.full_remote_build) || (not IronWorkerNG::Fetcher.remote?(rebase(@path)))
+                container_add(container, File.basename(@path), rebase(@path))
+              end
+            end
+          end
+
+          def build_command
+            if @code.remote_build_command || @code.full_remote_build
+              if @code.full_remote_build && IronWorkerNG::Fetcher.remote?(rebase(@path))
+                "deb '#{rebase(@path)}'"
+              else
+                "deb '#{@code.dest_dir}#{File.basename(@path)}'"
+              end
+            else
+              nil
+            end
+          end
+        end
+
+        module InstanceMethods
+          def merge_deb(path)
+            IronCore::Logger.info 'IronWorkerNG', "Merging deb with path='#{path}'"
+
+            @features << IronWorkerNG::Feature::Common::MergeDeb::Feature.new(self, path)
+          end
+
+          alias :deb :merge_deb
+        end
+      end
+    end
+  end
+end

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

@@ -13,16 +13,6 @@ module IronWorkerNG
             @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|
-              s += path + File.mtime(path).to_i.to_s
-            end
-
-            Digest::MD5.hexdigest(s)
-          end
-
           def bundle(container)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling dir with path='#{@path}' and dest='#{@dest}'"
 

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

@@ -23,10 +23,6 @@ module IronWorkerNG
             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}'"
 

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

@@ -13,10 +13,6 @@ module IronWorkerNG
             @dest = dest + (dest.empty? || dest.end_with?('/') ? '' : '/')
           end
 
-          def hash_string
-            Digest::MD5.hexdigest(@path + @dest + File.mtime(rebase(@path)).to_i.to_s)
-          end
-
           def bundle(container)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling file with path='#{@path}' and dest='#{@dest}'"
 

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

@@ -11,10 +11,6 @@ module IronWorkerNG
             @path = path
           end
 
-          def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s)
-          end
-
           def bundle(container)
             IronCore::Logger.debug 'IronWorkerNG', "Bundling java jar with path='#{@path}'"
 

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

@@ -31,10 +31,6 @@ module IronWorkerNG
             path
           end
 
-          def hash_string
-            Digest::MD5.hexdigest(@spec.full_name)
-          end
-
           def bundle(container)
             if not @code.full_remote_build
               if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?

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

@@ -15,10 +15,6 @@ module IronWorkerNG
             @version = version
           end
 
-          def hash_string
-            Digest::MD5.hexdigest(@name + @version)
-          end
-
           def build_command
             if @code.full_remote_build
               "gem '#{@name}', '#{@version}'"

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

@@ -14,10 +14,6 @@ module IronWorkerNG
             @path = path
             @groups = groups
           end
-
-          def hash_string
-            Digest::MD5.hexdigest(@path + File.mtime(rebase(@path)).to_i.to_s + (File.exists?(rebase(@path) + '.lock') ? File.mtime(rebase(@path) + '.lock').to_i.to_s : '') + @groups.join)
-          end
         end
 
         module InstanceMethods

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '0.11.3'
+  VERSION = '0.12.0'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -166,6 +166,7 @@ files:
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
 - lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/common/merge_deb.rb
 - lib/iron_worker_ng/feature/common/merge_dir.rb
 - lib/iron_worker_ng/feature/common/merge_exec.rb
 - lib/iron_worker_ng/cli.rb