luban 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8546945428b7a773b5c4488104e348660d4f4a3
-  data.tar.gz: 532c77addbc05dffb963df6352019cc5e0c9a8d8
+  metadata.gz: 0849b76c82b53782709b36c5e7a9fa7d6e150489
+  data.tar.gz: dd9f9ef9b8dc3872a38b3fba9b4b10bd730cb248
 SHA512:
-  metadata.gz: 6c0ba35310c0499275964be69e37a924042aa33407172aace17657e54ce1f5ba52eff724c7eb9605c2066d1e06780c35a94adece80e31a71e311433c1ffc8082
-  data.tar.gz: f5d9a31ad49538f8ccc5f977bda092558e6c052a7f46eb07e92a470a91ae30973e63fbd1d1902d9f1b8211f49c750e5686d9456091c752c7bae900ac843916ac
+  metadata.gz: 3ea498ab032c5cf463d7cb2f3719ba2a96d0921474977ffbaf9889ccb9fae3cfe3402c5e67dcfa3127674204478a2812bb9b6c32a572fcaabddf5eb96ad435b4
+  data.tar.gz: a8606aa61c94693410e1a7d2f5a8c646732c532d29efa43580d02fc87604df0b48516fe6ab9526a0770c37d5be80379bc4620cc4b7812fc63806cecf359403ae

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log
 
+## Version 0.4.0 (May 11, 2016)
+
+Minor enhancements:
+  * Upgraded Bundler for Ruby to version 1.12.3
+  * Used OpenSSL ftp site to download its source code package
+  * Optimized md5 signature generation for both source code package as well as gems downloaded
+
+Bug fixes:
+  * Fixed a bug in md5 calculation for a given file
+  * Fixed broken installer for Bundler
+
 ## Version 0.3.6 (May 09, 2016)
 
 Minor enhancements:

data/lib/luban/deployment/cli/application/repository.rb

@@ -158,9 +158,18 @@ module Luban
                 info "Package gems bundled in Gemfile"
                 execute(:bundle, :package, "--all --quiet")
               end
-              gem_files = capture(:ls, '-xt', gems_cache).split
+              gem_files = capture(:ls, '-xt', gems_cache.join('*.gem')).split
               gem_files.each do |gem_file|
-                gems[gem_file] = md5_for_file(gems_cache.join(gem_file))
+                gem_name = File.basename(gem_file)
+                md5_file = "#{gem_file}.md5"
+                gems[gem_name] =
+                  if file?(md5_file)
+                    gems[gem_name] = capture(:cat, md5_file)
+                  else
+                    md5_for_file(gem_file).tap { |md5|
+                      execute(:echo, "#{md5} > #{md5_file}")
+                    }
+                  end
               end
             end
             bundled_gems[:gems_cache] = workspace_path.join(gems_cache)

data/lib/luban/deployment/cli/package/base.rb

@@ -99,8 +99,8 @@ module Luban
         end
 
         def install(args:, opts:)
-          md5 = download_package(args: args, opts: opts)[:md5]
-          install_package(args: args, opts: opts.merge(src_file_md5: md5))
+          download_package(args: args, opts: opts)
+          install_package(args: args, opts: opts)
         end
 
         def install_all(args:, opts:)

data/lib/luban/deployment/cli/package/installer/core.rb

@@ -67,13 +67,6 @@ module Luban
           end
         end
 
-        def compose_build_env_variables
-          build_env_vars.inject({}) do |vars, (k, v)|
-            vars[k] = "'#{v.join(' ').strip}'" unless v.all?(&:empty?)
-            vars
-          end
-        end
-
         def configure_build_options
           @configure_opts = default_configure_opts | (task.opts.__remaining__ || [])
           @configure_opts.unshift(install_prefix)

data/lib/luban/deployment/cli/package/installer/install.rb

@@ -4,7 +4,9 @@ module Luban
       class Installer
         class InstallFailure < Luban::Deployment::Error; end
 
-        def src_file_md5; task.opts.src_file_md5; end
+        def src_file_md5
+          @src_file_md5 ||= capture(:cat, src_md5_file_path)
+        end
 
         def required_packages
           @required_packages ||= 
@@ -36,13 +38,13 @@ module Luban
         def download
           info "Downloading #{package_full_name}"
           if downloaded?
-            update_result "Skipped! #{package_full_name} has been downloaded ALREADY.",
-                          status: :skipped, md5: md5_for_file(src_file_path)
+            create_src_md5_file unless file?(src_md5_file_path)
+            update_result "Skipped! #{package_full_name} has been downloaded ALREADY."
           else
             download_package!
             if downloaded?
-              update_result "Successfully downloaded #{package_full_name}.",
-                            md5: md5_for_file(src_file_path)
+              create_src_md5_file unless file?(src_md5_file_path)
+              update_result "Successfully downloaded #{package_full_name}."
             else
               update_result "Failed to download #{package_full_name}. " + 
                             "Please check install log for details: #{install_log_file_path}",
@@ -178,6 +180,25 @@ module Luban
             bootstrap_download
             validate_download_url
           end
+          download_required_packages(:before_install)
+        end
+
+        def after_download
+          download_required_packages(:after_install)
+        end
+
+        def download_required_packages(type)
+          manage_required_packages(type, :download)
+        end
+
+        def manage_required_packages(type, cmd)
+          required_packages[type].each do |d|
+            self.class.worker_class(:installer, package: d.name).new(
+              config: config, backend: backend,
+              cmd: cmd, args: {},
+              opts: d.options.merge(name: d.name, version: d.version, current: true, parent: self)
+            ).run
+          end
         end
 
         def before_install
@@ -191,13 +212,7 @@ module Luban
         end
 
         def install_required_packages(type)
-          required_packages[type].each do |d|
-            self.class.worker_class(:installer, package: d.name).new(
-              config: config, backend: backend, 
-              cmd: :install, args: {}, 
-              opts: d.options.merge(name: d.name, version: d.version, current: true, parent: self)
-            ).run
-          end
+          manage_required_packages(type, :install)
         end
 
         def validate_download_url!
@@ -210,12 +225,7 @@ module Luban
         def install!
           upload_package
           uncompress_package
-          within build_path do
-            #with compose_build_env_variables do
-            #  build_package
-            #end
-            build_package
-          end
+          build_package
           cleanup_build!
         end
 
@@ -299,6 +309,10 @@ module Luban
           end
         end
 
+        def create_src_md5_file
+          execute(:echo, "#{md5_for_file(src_file_path)} > #{src_md5_file_path}")
+        end
+
         def upload_package
           info "Uploading #{package_full_name} source package"
           if cached?
@@ -328,9 +342,11 @@ module Luban
         end
 
         def build_package
-          configure_package
-          make_package
-          install_package
+          within build_path do
+            configure_package
+            make_package
+            install_package
+          end
         end
 
         def configure_package

data/lib/luban/deployment/cli/package/installer/paths.rb

@@ -20,6 +20,10 @@ module Luban
           @src_file_path ||= package_downloads_path.join(src_file_name)
         end
 
+        def src_md5_file_path
+          @src_md5_file_path ||= package_downloads_path.join("#{src_file_name}.md5")
+        end
+
         def source_repo
           raise NotImplementedError, "#{self.class.name}#source_repo is an abstract method."
         end

data/lib/luban/deployment/helpers/utils.rb

@@ -78,7 +78,7 @@ module Luban
         end
 
         def md5_for_file(file)
-          capture(:cat, "#{file} 2>/dev/null | openssl md5")
+          capture(:cat, "#{file} 2>/dev/null | openssl md5")[/\h+$/]
         end
 
         def sudo(*args)

data/lib/luban/deployment/packages/bundler.rb

@@ -64,6 +64,7 @@ module Luban
           def uncompress_package; end
           def configure_package; end
           def make_package; end
+          def build_package; install_package; end
           def update_binstubs!; end
 
           def install_package!

data/lib/luban/deployment/packages/openssl.rb

@@ -16,8 +16,7 @@ module Luban
           default_executable 'openssl'
 
           def source_repo
-            #@source_repo ||= "https://www.openssl.org"
-            @source_repo ||= "http://www.openssl.org"
+            @source_repo ||= "ftp://ftp.openssl.org"
           end
 
           def source_url_root

data/lib/luban/deployment/packages/ruby.rb

@@ -47,7 +47,7 @@ module Luban
 
         apply_to :all do
           after_install do
-            depend_on 'bundler', version: '1.11.2'
+            depend_on 'bundler', version: '1.12.3'
           end
         end
         

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.3.6"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli