luban 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d994ba8e032a835c2f4db5e904ed43d95fe9539
-  data.tar.gz: 39445b62899ebc545b71e73b6f6c9a337b372e87
+  metadata.gz: a9f9b648431a95c66eb7a079013f84a96269b4f9
+  data.tar.gz: 88853e1b771216a81f113edd2386ed1facd16909
 SHA512:
-  metadata.gz: 6a0bcf85fbfa1534bd0dabd52d4d49caccc6855b70caf2aa8b253ac7ddf27684d958b3638d452eaf95f5f295f6706ceb20319a7e7da96df8a3c800d2432c20dd
-  data.tar.gz: 2e704c5e1f3b786721b57de9c523f7f5cc806ffd68ce04bca8dace5238175c530a232278a064c100790c7e834dabb680e8301d3a618f2ac19407e3b5770e0b35
+  metadata.gz: 41bffc8aa7bf3e2312300f502fadac78466d4d3830ac69b0e657b8baa736c75ed62ef6d9dde025c6b4ac10e405a318889bf9b3f0884a88257f78c48f7fc30a1d
+  data.tar.gz: 4140711eeedb8f6e74f2168028caa0a7d71422d5f3a2fbeb1f845871c9f0bce430c5f80dc7be14b5ad82a812307dc311a5e51df3bf9b12ce045266138a723c54

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change log
 
+## Version 0.12.7 (Feb 22, 2017)
+
+Minor enhancements:
+  * Upgraded Curl's dependency on OpenSSL to version 1.1.0e
+  * Upgraded Git's dependency on OpenSSL to version 1.0.2k
+  * Upgraded Ruby's dependency on Rubygems to version 2.6.10
+  * Supported Ruby 2.4.0 installation with OpenSSL 1.1.0e
+    * For Ruby version between 1.9.3 and 2.4.0, Upgraded dependency on OpenSSL to version 1.0.2k
+  * Cleaned up Bundler environment before executing any worker tasks
+  * Deprecated docker build command and used docker compose instead
+  * Separated packages and releases by stage
+    * Although packages and releases are not related to stages directly, there are edge cases that package config and release config could be conflicting between stages; therefore,
+    * decided to put back stage into packages and releases deployment
+  * Added convenient method, #version_match?, to check version requirements easily
+  * Supported OpenSSL 1.1 installation
+    * Optimized OpenSSL configuration parameters for 1.1.x and 1.0.x
+    * Added switch to enable/disable document generation
+    * Decompose OpenSSL version more accurately
+
+Bug fixes:
+  * Disabled rdoc/ri generation gracefully based on actual Rubygems version
+  * Output exception backtrace regardless what output format is specified
+
 ## Version 0.12.6 (Feb 17, 2017)
 
 Minor enhancements:

data/lib/luban/deployment/cli/application/docker/dockerizer.rb

@@ -256,12 +256,6 @@ module Luban
           end
         end
 
-        def build_application!
-          within build[:context] do
-            capture(:docker, :build, "-t", build[:image_tag], ".", "2>&1")
-          end
-        end
-
         def compose_application!
           within build[:path] { capture(:"docker-compose", :build, "2>&1") }
         end

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

@@ -151,7 +151,7 @@ module Luban
           assure_dirs(bundle_config_path, gems_cache_path, bundle_path)
           sync_gems_cache
           sync_locked_gemfile
-          with_clean_env { install_gems_from_cache }
+          install_gems_from_cache
         end
 
         def sync_gems_cache

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

@@ -184,7 +184,7 @@ module Luban
           bundle_path = Pathname.new('vendor').join('bundle')
           if release_with_gemfile?(gemfile_path)
             assure_dirs(gems_path)
-            with_clean_env { bundle_gems!(gemfile_path, gems_cache, bundle_path) }
+            bundle_gems!(gemfile_path, gems_cache, bundle_path)
           else
             {}
           end

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

@@ -29,7 +29,7 @@ module Luban
         def release_tag; task.opts.release[:tag]; end
 
         def releases_path
-          @releases_path ||= releases_root_path.join(project, application, 'app')
+          @releases_path ||= releases_root_path.join("#{stage}.#{project}", application, 'app')
         end
 
         def release_path

data/lib/luban/deployment/cli/command.rb

@@ -309,6 +309,7 @@ module Luban
         task_msg = { cmd: cmd, config: config, local: locally,
                      args: task_args, opts: task_opts}
         result = []
+        exception_raised = false
         mutex = Mutex.new
         run(**run_opts) do |backend|
           begin 
@@ -321,9 +322,9 @@ module Luban
               error: e
             }
           end
-          mutex.synchronize { result << r }
+          mutex.synchronize { result << r; exception_raised = true }
         end
-        print_task_result(result) if opts[:format] == :blackhole
+        print_task_result(result) if opts[:format] == :blackhole or exception_raised
         locally ? result.first[:__return__] : result
       end
 

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

@@ -6,7 +6,7 @@ module Luban
 
         module Base
           def packages_path
-            @packages_path ||= packages_root_path.join(project, application)
+            @packages_path ||= packages_root_path.join("#{stage}.#{project}", application)
           end
 
           def package_install_path(package_name)

data/lib/luban/deployment/cli/service/controller.rb

@@ -199,8 +199,8 @@ module Luban
             succeeded
           end
 
-          def start_process!; with_clean_env { capture(start_command) }; end
-          def stop_process!; with_clean_env { capture(stop_command) }; end
+          def start_process!; capture(start_command); end
+          def stop_process!; capture(stop_command); end
 
           def check_process!
             if pid_file_missing?

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

@@ -211,6 +211,12 @@ module Luban
           defined?(Bundler) ? Bundler.with_clean_env { yield } : yield
         end
 
+        def version_match?(version, version_requirement)
+          with_clean_env do
+            Gem::Requirement.new(version_requirement).satisfied_by?(Gem::Version.new(version))
+          end
+        end
+
         #def method_missing(sym, *args, &blk)
         #  backend.respond_to?(sym) ? backend.send(sym, *args, &blk) : super
         #end

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

@@ -9,7 +9,7 @@ module Luban
 
           def installed?
             return false unless file?(bundler_executable)
-            with_clean_env { match?("#{bundler_executable} -v", package_version) }
+            match?("#{bundler_executable} -v", package_version)
           end
 
           protected

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

@@ -4,7 +4,7 @@ module Luban
       class Curl < Luban::Deployment::Package::Base
         apply_to :all do
           before_install do
-            depend_on 'openssl', version: '1.0.2j'
+            depend_on 'openssl', version: '1.1.0e'
           end
         end
 

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

@@ -58,15 +58,11 @@ module Luban
           end
 
           def install_gem!
-            with_clean_env do
-              test("#{gem_executable} install #{install_opts.join(' ')} #{src_cache_path} >> #{install_log_file_path} 2>&1")
-            end
+            test("#{gem_executable} install #{install_opts.join(' ')} #{src_cache_path} >> #{install_log_file_path} 2>&1")
           end
 
           def uninstall_gem!
-            with_clean_env do
-              test("#{gem_executable} uninstall #{package_name} -a -x -I >> #{install_log_file_path} 2>&1")
-            end
+            test("#{gem_executable} uninstall #{package_name} -a -x -I >> #{install_log_file_path} 2>&1")
           end
         end
       end

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

@@ -4,7 +4,7 @@ module Luban
       class Git < Luban::Deployment::Package::Base
         apply_to :all do
           before_install do
-            depend_on 'openssl', version: '1.0.2j'
+            depend_on 'openssl', version: '1.0.2k'
             depend_on 'curl', version: '7.52.1'
           end
         end

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

@@ -2,15 +2,34 @@ module Luban
   module Deployment
     module Packages
       class Openssl < Luban::Deployment::Package::Base
+        def self.decompose_version(version)
+          major_version, patch_level = version.split('-')
+          if patch_level.nil?
+            major_version = version[/^[0-9.]+/]
+            patch_level = version[/[a-z]+$/]
+          end
+          { major_version: major_version, patch_level: patch_level }
+        end
+
+        protected
+
+        def setup_provision_tasks
+          super
+          provision_tasks[:install].switch :install_doc, "Install OpenSSL document"
+        end
+
         class Installer < Luban::Deployment::Package::Installer
           OSXArchArgs = {
-            x86_64: %w(darwin64-x86_64-cc enable-ec_nistp_64_gcc_128),
+            x86_64: %w(darwin64-x86_64-cc),
             i386:   %w(darwin-i386-cc)
           }
 
+          def install_doc?
+            task.opts.install_doc
+          end
+
           def configure_executable
             @configure_executable = osx? ? './Configure' : './config'
-            
           end
 
           define_executable 'openssl'
@@ -24,7 +43,7 @@ module Luban
           end
 
           def old_source_url_root
-            @old_source_url_root ||= "source/old/#{package_version.gsub(/[a-z]/, '')}"
+            @old_source_url_root ||= "source/old/#{package_major_version}"
           end
 
           def installed?
@@ -33,7 +52,7 @@ module Luban
           end
 
           def default_configure_opts
-            @default_configure_opts ||= %w(no-ssl2 zlib-dynamic shared enable-cms)
+            @default_configure_opts ||= %w(enable-ec_nistp_64_gcc_128 zlib-dynamic shared enable-cms)
           end
 
           protected
@@ -41,6 +60,12 @@ module Luban
           def configure_build_options
             super
             @configure_opts.unshift(OSXArchArgs[hardware_name.to_sym]) if osx?
+            if version_match?(package_major_version, ">=1.1.0")
+              @configure_opts << "-Wl,-rpath -Wl,#{lib_path}"
+              #@configure_opts << "-Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)'"
+            else
+              @configure_opts << "no-ssl2"
+            end
           end
 
           def switch_source_url_root
@@ -60,14 +85,13 @@ module Luban
           end
 
           def make_package!
-            super and test(:make, "depend >> #{install_log_file_path} 2>&1")
+            (version_match?(package_major_version, ">=1.1.0") or 
+             test(:make, :depend, ">> #{install_log_file_path} 2>&1")) and 
+            super
           end
 
-          def cleanup_temp!
-            super
-            # Clean up man pages
-            manpages_path = install_path.join('ssl/man')
-            rmdir(manpages_path) if directory?(manpages_path)
+          def install_package!
+            test(:make, install_doc? ? :install : :install_sw, ">> #{install_log_file_path} 2>&1")
           end
         end
       end

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

@@ -44,19 +44,27 @@ module Luban
           end
         end
 
-        apply_to '>= 1.9.3' do
+        apply_to [">= 1.9.3", "< 2.4.0"] do
+          before_install do
+            depend_on 'openssl', version: '1.0.2k'
+          end
+        end
+
+        apply_to '>= 2.4.0' do
           before_install do
-            depend_on 'openssl', version: '1.0.2j'
-            #depend_on 'yaml', version: '0.1.6'
+            depend_on 'openssl', version: '1.1.0e'
           end
+        end
+
+        apply_to '>= 1.9.3' do
           after_install do
-            depend_on 'rubygems', version: '2.6.8'
+            depend_on 'rubygems', version: '2.6.10'
           end
         end
 
         apply_to :all do
           after_install do
-            depend_on 'bundler', version: '1.13.6'
+            depend_on 'bundler', version: '1.14.4'
           end
         end
         

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

@@ -52,7 +52,11 @@ module Luban
           def configure_build_options
             super
             unless install_doc?
-              @configure_opts.push('--no-rdoc', '--no-ri')
+              if version_match?(package_version, ">=2.0.0")
+                @configure_opts.push("--no-document")
+              else
+                @configure_opts.push('--no-rdoc', '--no-ri')
+              end
             end
           end
 

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.12.6"
+    VERSION = "0.12.7"
   end
 end

data/lib/luban/deployment/worker/base.rb

@@ -35,7 +35,9 @@ module Luban
         def packages; task.opts.packages; end
 
         def run
-          update_result(__return__: @run_blk ? run_with_block : run_with_command).to_h
+          with_clean_env do
+            update_result(__return__: @run_blk ? run_with_block : run_with_command).to_h
+          end
         end
 
         def method_missing(sym, *args, &blk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli