iron_worker_ng 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14ba1843d8e0b87e267154dd0b8a62934c5d1176
-  data.tar.gz: e6ec6cb7310ebfe92c2edf22f3d37cf2da1f7f71
+  metadata.gz: eac318a56ff54032909607e2e0830aa394e9f429
+  data.tar.gz: 6476cd2c649e6a2793349ef459c328b9c683789d
 SHA512:
-  metadata.gz: 24782f8a3dffe6f358284751b8fafb7e617fa5acb4443950fca3f6506349ec51d58597c7f3433744943fc88f606533c254c1a8d9ba51c2f02f591a2e1b22d305
-  data.tar.gz: 5f154138d150ca7121e066a82ac9161466018368f3a38589ae27dde9002a8c97fdf5414c801dc404aece9fd2e7c9ea248cfb0053f222496c3941f26b0bb16cd0
+  metadata.gz: bf3df9f5bf9ba572a4b92f7bc214e94afccba715b89b40ea2f1993d28b3e9d9a965d965ffd71d633e567c73b2db1f053b18ecf83acb1295cf484de7617b2559e
+  data.tar.gz: fe4200eacdcd5381076d1eed7191702e5df77c99c9a41edeea75b3182307945d33df1ee9a70503943deec9c5fc5956bc5158f1a8cb682747b5438d910969eec8

data/lib/iron_worker_ng/code/base.rb

@@ -24,6 +24,7 @@ module IronWorkerNG
       attr_accessor :zip_package
 
       attr_accessor :use_local_iron_worker_ng
+      attr_accessor :use_build_cache
       attr_accessor :fix_params
 
       undef exec
@@ -145,6 +146,8 @@ module IronWorkerNG
       def stack(stack_name = nil)
         @stack = stack_name if stack_name
 
+        @use_local_iron_worker_ng = true if @stack == 'ruby-2.1'
+
         @stack
       end
 
@@ -298,6 +301,7 @@ RUNNER
             builder.builder_remote_build_command = @remote_build_command
 
             builder.use_local_iron_worker_ng = @use_local_iron_worker_ng
+            builder.stack(@stack)
 
             if @use_local_iron_worker_ng
               builder.gem('iron_worker_ng')

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

@@ -18,7 +18,7 @@ module IronWorkerNG
 
             @spec = spec
 
-            if @spec.name == 'nokogiri' && @spec.version.to_s.start_with?('1.6.')
+            if @spec.name == 'nokogiri' && @spec.version.to_s.start_with?('1.6.') && (not code.use_build_cache)
               IronCore::Logger.warn 'IronWorkerNG', "WARNING: Building nokogiri version #{@spec.version} will take a lot of time. Switching to version '~> 1.5.9' should fix this"
             end
           end

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

@@ -44,6 +44,7 @@ module IronWorkerNG
               IronCore::Logger.info 'IronWorkerNG', 'Fixating gems dependencies'
 
               @features.reject! { |f| f.class == IronWorkerNG::Feature::Ruby::MergeGem::Feature }
+              @features.reject! { |f| f.class == IronWorkerNG::Feature::Common::MergeZip::Feature && f.path.start_with?('http://s3.amazonaws.com/iron_worker_ng_gems') }
 
               deps = @features.reject { |f| f.class != IronWorkerNG::Feature::Ruby::MergeGemDependency::Feature }
 
@@ -66,6 +67,18 @@ module IronWorkerNG
                 spec_set.to_a.each do |spec|
                   spec.__materialize__
 
+                  if @use_build_cache
+                    cache_url = "http://s3.amazonaws.com/iron_worker_ng_gems#{@stack.nil? ? '' : '-' + @stack}/#{spec.name}-#{spec.version}.zip"
+
+                    if IronWorkerNG::Fetcher.exists?(cache_url)
+                      IronCore::Logger.info 'IronWorkerNG', "Merging cached ruby gem with name='#{spec.name}' and version='#{spec.version}'"
+
+                      @features << IronWorkerNG::Feature::Common::MergeZip::Feature.new(self, cache_url, '')
+
+                      next
+                    end
+                  end
+
                   IronCore::Logger.info 'IronWorkerNG', "Merging ruby gem with name='#{spec.name}' and version='#{spec.version}'"
 
                   @features << IronWorkerNG::Feature::Ruby::MergeGem::Feature.new(self, spec)

data/lib/iron_worker_ng/fetcher.rb

@@ -9,6 +9,31 @@ module IronWorkerNG
       url.start_with?('http://') || url.start_with?('https://')
     end
 
+    def self.exists?(url)
+      if IronWorkerNG::Fetcher.remote?(url)
+        url = IronWorkerNG::Fetcher.fix_github_url(url)
+
+        uri = URI.parse(url)
+
+        http = Net::HTTP.new(uri.host, uri.port)
+
+        if uri.scheme == 'https'
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+
+        response = http.request(Net::HTTP::Head.new(uri.request_uri))
+
+        if response.kind_of?(Net::HTTPRedirection)
+          return IronWorkerNG::Fetcher.exists?(response['location'])
+        end
+
+        return response.code.to_i == 200
+      else
+        File.exists?(url)
+      end
+    end
+
     def self.fix_github_url(url)
       if url.start_with?('http://github.com/') || url.start_with?('https://github.com/')
         fixed_url = url.sub('//github.com/', '//raw.github.com/').sub('/blob/', '/')

data/lib/iron_worker_ng/version.rb

@@ -1,5 +1,5 @@
 module IronWorkerNG
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker_ng
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Andrew Kirilenko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -175,48 +175,48 @@ extra_rdoc_files: []
 files:
 - lib/3rdparty/hashie/indifferent_access.rb
 - lib/3rdparty/hashie/merge_initializer.rb
-- lib/iron_worker_ng/api_client.rb
-- lib/iron_worker_ng/cli.rb
+- lib/iron_worker_ng/fetcher.rb
+- lib/iron_worker_ng/compat.rb
 - 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/builder.rb
-- lib/iron_worker_ng/code/container/base.rb
-- lib/iron_worker_ng/code/container/dir.rb
-- lib/iron_worker_ng/code/container/zip.rb
-- lib/iron_worker_ng/code/go.rb
-- lib/iron_worker_ng/code/java.rb
-- lib/iron_worker_ng/code/mono.rb
-- lib/iron_worker_ng/code/node.rb
-- lib/iron_worker_ng/code/perl.rb
-- lib/iron_worker_ng/code/php.rb
+- lib/iron_worker_ng/version.rb
 - lib/iron_worker_ng/code/python.rb
 - lib/iron_worker_ng/code/ruby.rb
-- lib/iron_worker_ng/code/runtime/binary.rb
-- lib/iron_worker_ng/code/runtime/go.rb
-- lib/iron_worker_ng/code/runtime/java.rb
+- lib/iron_worker_ng/code/mono.rb
+- 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/runtime/python.rb
+- lib/iron_worker_ng/code/runtime/ruby.rb
 - lib/iron_worker_ng/code/runtime/mono.rb
 - lib/iron_worker_ng/code/runtime/node.rb
+- lib/iron_worker_ng/code/runtime/java.rb
 - lib/iron_worker_ng/code/runtime/perl.rb
+- lib/iron_worker_ng/code/runtime/binary.rb
 - lib/iron_worker_ng/code/runtime/php.rb
-- lib/iron_worker_ng/code/runtime/python.rb
-- lib/iron_worker_ng/code/runtime/ruby.rb
-- lib/iron_worker_ng/compat.rb
+- lib/iron_worker_ng/code/runtime/go.rb
+- 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/base.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/feature/common/merge_file.rb
-- lib/iron_worker_ng/feature/common/merge_zip.rb
-- lib/iron_worker_ng/feature/common/set_env.rb
-- lib/iron_worker_ng/feature/java/merge_jar.rb
 - lib/iron_worker_ng/feature/python/merge_pip.rb
 - lib/iron_worker_ng/feature/python/merge_pip_dependency.rb
-- lib/iron_worker_ng/feature/ruby/merge_gem.rb
+- lib/iron_worker_ng/feature/java/merge_jar.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/fetcher.rb
-- lib/iron_worker_ng/version.rb
+- lib/iron_worker_ng/feature/common/set_env.rb
+- lib/iron_worker_ng/feature/common/merge_file.rb
+- lib/iron_worker_ng/feature/common/merge_zip.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
+- lib/iron_worker_ng/api_client.rb
 - lib/iron_worker_ng.rb
 - README.md
 - LICENSE