iron_worker_ng 0.10.2 → 0.10.3

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

@@ -1,5 +1,3 @@
-require 'pathname'
-
 module IronWorkerNG
   module Feature
     module Common
@@ -12,8 +10,7 @@ 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
@@ -25,6 +22,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))
+                "file '#{rebase(@path)}', '#{@dest}'"
+              else
+                "file '#{@dest}#{File.basename(@path)}', '#{@dest}'"
+              end
+            else
+              "file '#{@path}', '#{@dest}'"
+            end
+          end
         end
 
         module InstanceMethods

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

@@ -21,6 +21,18 @@ module IronWorkerNG
             container_add(container, File.basename(@path), rebase(@path))
           end
 
+          def command(remote = false)
+            if remote
+              if IronWorkerNG::Fetcher.remote?(rebase(@path))
+                "jar '#{rebase(@path)}'"
+              else
+                "jar '#{File.basename(@path)}'"
+              end
+            else
+              "jar '#{@path}'"
+            end
+          end
+
           def code_for_classpath
             File.basename(@path)
           end

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

@@ -1,5 +1,3 @@
-require 'bundler'
-
 module IronWorkerNG
   module Feature
     module Ruby
@@ -41,64 +39,22 @@ module IronWorkerNG
             if @spec.extensions.length == 0 || IronWorkerNG::Feature::Ruby::MergeGem.merge_binary?
               IronCore::Logger.debug 'IronWorkerNG', "Bundling ruby gem with name='#{@spec.name}' and version='#{@spec.version}'"
 
-              container_add(container, '__gems__/gems/' + @spec.full_name, gem_path)
-              container_add(container, "__gems__/specifications/#{@spec.full_name}.gemspec", gem_path + '/../../specifications/' + @spec.full_name + '.gemspec')
+              if File.exists? @spec.full_gem_path
+                container_add(container, '__gems__/gems/' + @spec.full_name, gem_path)
+              else # local gem
+                from_dir = File.dirname @spec.loaded_from
+                @spec.files.each do |fname|
+                  to = '__gems__/gems/' + @spec.full_name + '/' + fname
+                  from = from_dir + '/' + fname
+                  container_add(container, to, from) if File.file? from
+                end
+              end
+              container_add(container, "__gems__/specifications/#{@spec.full_name}.gemspec", @spec.loaded_from)
             else
               IronCore::Logger.warn 'IronWorkerNG', "Skipping ruby gem with name='#{@spec.name}' and version='#{@spec.version}' as it contains native extensions"
             end
           end
         end
-
-        module InstanceMethods
-          attr_reader :merge_gem_reqs
-
-          def merge_gem(name, version = '>= 0')
-            IronCore::Logger.info 'IronWorkerNG', "Adding ruby gem dependency with name='#{name}' and version='#{version}'"
-
-            @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
-
-          def merge_gem_fixate
-            IronCore::Logger.info 'IronWorkerNG', 'Fixating gems dependencies'
-
-            @merge_gem_reqs ||= []
-
-            @features.reject! do |f|
-              f.class == IronWorkerNG::Feature::Ruby::MergeGem::Feature
-            end
-
-            if @merge_gem_reqs.length > 0
-              reqs = @merge_gem_reqs.map { |req| Bundler::DepProxy.new(req, Gem::Platform::RUBY) }
-
-              source = nil
-              begin
-                source = Bundler::Source::Rubygems.new
-              rescue Bundler::GemfileNotFound
-                ENV['BUNDLE_GEMFILE'] = 'Gemfile'
-                source = Bundler::Source::Rubygems.new
-              end
-
-              index = Bundler::Index.build { |index| index.use source.specs }
-
-              spec_set = Bundler::Resolver.resolve(reqs, index)
-
-              spec_set.to_a.each do |spec|
-                spec.__materialize__
-
-                IronCore::Logger.info 'IronWorkerNG', "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
-
-                @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(self, spec)
-              end
-            end
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,76 @@
+require 'bundler'
+
+module IronWorkerNG
+  module Feature
+    module Ruby
+      module MergeGemDependency
+        class Feature < IronWorkerNG::Feature::Base
+          attr_reader :name
+          attr_reader :version
+
+          def initialize(code, name, version)
+            super(code)
+
+            @name = name
+            @version = version
+          end
+
+          def hash_string
+            Digest::MD5.hexdigest(@name + @version)
+          end
+
+          def command(remote = false)
+            "gem '#{@name}', '#{@version}'"
+          end
+        end
+
+        module InstanceMethods
+          def merge_gem(name, version = '>= 0')
+            IronCore::Logger.info 'IronWorkerNG', "Adding ruby gem dependency with name='#{name}' and version='#{version}'"
+
+            @features << IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature.new(self, name, version)
+
+            unless @fixators.include?(:merge_gem_dependency_fixate)
+              @fixators << :merge_gem_dependency_fixate
+            end
+          end
+
+          alias :gem :merge_gem
+
+          def merge_gem_dependency_fixate
+            IronCore::Logger.info 'IronWorkerNG', 'Fixating gems dependencies'
+
+            @features.reject! { |f| f.class == IronWorkerNG::Feature::Ruby::MergeGem::Feature }
+
+            deps = @features.reject { |f| f.class != IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature }
+
+            if deps.length > 0
+              deps = deps.map { |dep| Bundler::DepProxy.new(Bundler::Dependency.new(dep.name, dep.version.split(', ')), Gem::Platform::RUBY) }
+
+              source = nil
+
+              begin
+                source = Bundler::Source::Rubygems.new
+              rescue Bundler::GemfileNotFound
+                ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+                source = Bundler::Source::Rubygems.new
+              end
+
+              index = Bundler::Index.build { |index| index.use source.specs }
+
+              spec_set = Bundler::Resolver.resolve(deps, index)
+
+              spec_set.to_a.each do |spec|
+                spec.__materialize__
+
+                IronCore::Logger.info 'IronWorkerNG', "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
+
+                @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(self, spec)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iron_worker_ng/fetcher.rb

@@ -1,11 +1,16 @@
 require 'net/http'
 require 'net/https'
 require 'tmpdir'
+require 'fileutils'
 
 module IronWorkerNG
   class Fetcher
-    def self.fetch(url, to_file = false)
-      if url.start_with?('http://') || url.start_with?('https://')
+    def self.remote?(url)
+      url.start_with?('http://') || url.start_with?('https://')
+    end
+
+    def self.fetch(url, &block)
+      if IronWorkerNG::Fetcher.remote?(url)
         uri = URI.parse(url)
 
         http = Net::HTTP.new(uri.host, uri.port)
@@ -18,32 +23,48 @@ module IronWorkerNG
         response = http.request(Net::HTTP::Get.new(uri.request_uri))
 
         if response.kind_of?(Net::HTTPRedirection)
-          return IronWorkerNG::Fetcher.fetch(response['location'], to_file)
+          IronWorkerNG::Fetcher.fetch(response['location'], &block)
+
+          return
         end
 
-        if to_file
-          tmp_dir_name = Dir.tmpdir + '/' + Dir::Tmpname.make_tmpname("iron-worker-ng-", "http")
+        block.call(response.body) unless block.nil?
+      else
+        unless File.exists?(url)
+          block.call(nil) unless block.nil?
 
-          Dir.mkdir(tmp_dir_name)
+          return
+        end
 
-          File.open(tmp_dir_name + '/' + File.basename(url), 'wb') do |f|
-            f.write(response.body)
-          end
+        block.call(File.read(url)) unless block.nil?
+      end
+    end
+
+    def self.fetch_to_file(url, &block)
+      if IronWorkerNG::Fetcher.remote?(url)
+        IronWorkerNG::Fetcher.fetch(url) do |data|
+          unless data.nil?
+            tmp_dir_name = ::Dir.tmpdir + '/' + ::Dir::Tmpname.make_tmpname("iron-worker-ng-", "http")
+
+            ::Dir.mkdir(tmp_dir_name)
+
+            File.open(tmp_dir_name + '/' + File.basename(url), 'wb') do |f|
+              f.write(data)
+            end
 
-          [tmp_dir_name + '/' + File.basename(url), tmp_dir_name]
-        else
-          [response.body, nil]
+            block.call(tmp_dir_name + '/' + File.basename(url)) unless block.nil?
+
+            FileUtils.rm_rf(tmp_dir_name)
+          end
         end
       else
         unless File.exists?(url)
-          return [nil, nil]
-        end
+          block.call(nil) unless block.nil?
 
-        if to_file
-          [url, nil]
-        else
-          [File.read(url), nil]
+          return
         end
+
+        block.call(url) unless block.nil?
       end
     end
   end

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -45,21 +45,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
+        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: minitest
+  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: 1.0.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +116,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/iron_worker
 - lib/3rdparty/hashie/indifferent_access.rb
 - lib/3rdparty/hashie/merge_initializer.rb
 - lib/iron_worker_ng/fetcher.rb
@@ -96,7 +127,6 @@ files:
 - lib/iron_worker_ng/code/node.rb
 - lib/iron_worker_ng/code/base.rb
 - lib/iron_worker_ng/code/java.rb
-- lib/iron_worker_ng/code/dir_container.rb
 - lib/iron_worker_ng/code/runtime/python.rb
 - lib/iron_worker_ng/code/runtime/ruby.rb
 - lib/iron_worker_ng/code/runtime/mono.rb
@@ -109,27 +139,25 @@ files:
 - lib/iron_worker_ng/code/perl.rb
 - lib/iron_worker_ng/code/builder.rb
 - lib/iron_worker_ng/code/binary.rb
+- lib/iron_worker_ng/code/container/zip.rb
+- lib/iron_worker_ng/code/container/dir.rb
+- lib/iron_worker_ng/code/container/base.rb
 - lib/iron_worker_ng/code/php.rb
 - lib/iron_worker_ng/code/go.rb
-- lib/iron_worker_ng/feature/mono/merge_exec.rb
-- lib/iron_worker_ng/feature/php/merge_exec.rb
-- lib/iron_worker_ng/feature/node/merge_exec.rb
 - lib/iron_worker_ng/feature/base.rb
-- lib/iron_worker_ng/feature/go/merge_exec.rb
-- lib/iron_worker_ng/feature/python/merge_exec.rb
 - lib/iron_worker_ng/feature/java/merge_jar.rb
-- lib/iron_worker_ng/feature/java/merge_exec.rb
-- lib/iron_worker_ng/feature/perl/merge_exec.rb
+- lib/iron_worker_ng/feature/ruby/merge_gem_dependency.rb
 - lib/iron_worker_ng/feature/ruby/merge_gem.rb
 - lib/iron_worker_ng/feature/ruby/merge_gemfile.rb
-- lib/iron_worker_ng/feature/ruby/merge_exec.rb
 - lib/iron_worker_ng/feature/common/merge_file.rb
 - lib/iron_worker_ng/feature/common/merge_dir.rb
-- lib/iron_worker_ng/feature/binary/merge_exec.rb
+- lib/iron_worker_ng/feature/common/merge_exec.rb
+- lib/iron_worker_ng/cli.rb
 - lib/iron_worker_ng/api_client.rb
 - lib/iron_worker_ng.rb
 - README.md
 - LICENSE
+- bin/iron_worker
 homepage: https://github.com/iron-io/iron_worker_ruby_ng
 licenses: []
 post_install_message: 

data/lib/iron_worker_ng/code/dir_container.rb

@@ -1,33 +0,0 @@
-require 'fileutils'
-
-module IronWorkerNG
-  module Code
-    class DirContainer
-      def initialize(dir)
-        @dir = dir
-      end
-
-      def full_dest(dest)
-        @dir + '/' + dest
-      end
-
-      def add(dest, src)
-        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')
-        yield file
-        file.close
-      end
-    end
-  end
-end