luban 0.10.13 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2197bc2f1215bc1e7ba625d15b171000605ccb8
-  data.tar.gz: 11600b62a3bab7f21b82b2c6d20bf23540ed88bc
+  metadata.gz: 28913085e6dfeed7d1c4c564666a631a214bad59
+  data.tar.gz: 6db8621b76547ad88298ed2dafc0bab3d680f4ec
 SHA512:
-  metadata.gz: 2b47441615660507a34779ea1dd357f1f0980053bd4ea08de7fb9c1da933975f5d0b2d5978b52f243c2324efe7a0b6724a1ad1853f2865d193ee7bf3c660cdd4
-  data.tar.gz: d0a91157712c0214e88ae92c1edec6a339dc86c27a699bf6422df9d6f681f1870032088158d1d024d49b57c1a27528608f38a088dd4b9b11853276541eef2be9
+  metadata.gz: 667c8e649af0e5c8e6927447cca4d47033dfda63b3ff71fc3083a43ebfe3bd428d68bafa59ed3e5491af202dd83d5ad637ba96d20e0aeb007cd56377cf29c714
+  data.tar.gz: e1b788bdd1192440b8ea611316008281e9a251ecc552acd59cb59057890230f62dc6664488660a9250814d0fe1bd3fcde5884691b6f65d1b5f86957f69db65e6

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Change log
 
+## Version 0.11.0 (Jan 04, 2017)
+
+New features:
+  * Restructured Luban project prepared for containerization with docker support
+    * Relocated packages installation path to luban root
+    * Relocated releases deployment path to luban root
+
+Minor enhancements:
+  * Added convenient util method, #with_clean_env, to cleanup Bundler environment before yielding the given code block
+  * Cleaned up Bundler environment:
+    * In Gem Installer before any gem installations
+    * In Bundler Installer before checking the version for installed Bundler
+    * In Publisher before installing gems from cache
+    * In App Repository before bundling gems required by application
+    * In Service Controller for process control actions
+
+Bug fixes:
+  * Refined SSHKit::Backend::Local and SSHKit::Runner::Abstract to handle local host object properly
+
 ## Version 0.10.13 (Dec 17, 2016)
 
 Minor enhancements:

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

@@ -40,7 +40,7 @@ module Luban
         def bootstrap
           assure_dirs(downloads_path, archived_logs_path, 
                       tmp_path, app_bin_path, app_tmp_path, 
-                      releases_path, shared_path)
+                      releases_path, packages_path, shared_path)
         end
 
         def create_envrc_files

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

@@ -163,11 +163,7 @@ module Luban
           assure_dirs(bundle_config_path, gems_cache_path, bundle_path)
           sync_gems_cache
           sync_locked_gemfile
-          if defined?(Bundler)
-            Bundler.with_clean_env { install_gems_from_cache }
-          else
-            install_gems_from_cache
-          end
+          with_clean_env { install_gems_from_cache }
         end
 
         def sync_gems_cache

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

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

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

@@ -24,7 +24,7 @@ module Luban
         def release_tag; task.opts.release[:tag]; end
 
         def releases_path
-          @releases_path ||= super.join('app')
+          @releases_path ||= super.join(project, application, 'app')
         end
 
         def release_path

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

@@ -41,8 +41,12 @@ module Luban
           @current_bin_path ||= current_path.join('bin')
         end
 
+        def packages_path
+          @packages_path ||= super.join(project)
+        end
+
         def package_path
-          @package_path ||= luban_install_path.join('pkg', package_name)
+          @package_path ||= packages_path.join(package_name)
         end
 
         def package_versions_path

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

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

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

@@ -206,6 +206,11 @@ module Luban
           Time.now().strftime("%d/%m/%Y %H:%M:%S")
         end
 
+        def with_clean_env
+          return unless block_given?
+          defined?(Bundler) ? Bundler.with_clean_env { yield } : yield
+        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)
-            match?("#{bundler_executable} -v", package_version)
+            with_clean_env { match?("#{bundler_executable} -v", package_version) }
           end
 
           protected

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

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

data/lib/luban/deployment/sshkit_refinements.rb

@@ -0,0 +1,15 @@
+class SSHKit::Backend::Local
+  def initialize(host = Host.new(:local), &block)
+    super
+  end
+end
+
+class SSHKit::Runner::Abstract
+  def backend(host, &block)
+    if host.local?
+      SSHKit::Backend::Local.new(host, &block)
+    else
+      SSHKit.config.backend.new(host, &block)
+    end
+  end
+end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.10.13"
+    VERSION = "0.11.0"
   end
 end

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

@@ -17,6 +17,10 @@ module Luban
         end
 
         module Remote
+          def releases_path
+            @releases_path ||= luban_root_path.join('releases')
+          end
+
           def env_path
             @env_path ||= luban_root_path.join('env')
           end
@@ -54,10 +58,6 @@ module Luban
             @app_tmp_path ||= app_path.join('tmp')
           end
 
-          def releases_path
-            @releases_path ||= app_path.join('releases')
-          end
-
           def shared_path
             @shared_path ||= app_path.join('shared')
           end
@@ -70,13 +70,13 @@ module Luban
             @unset_envrc_file ||= app_path.join(".unset_envrc")
           end
 
-          def luban_install_path
-            @luban_install_path ||= project_path.join('.luban')
+          def packages_path
+            @packages_path ||= luban_root_path.join('packages')
           end
 
           def package_install_path(package_name)
-            luban_install_path.join('pkg', package_name.to_s, 'versions',
-                                    packages[package_name.to_sym].current_version)
+            packages_path.join(project, package_name.to_s, 'versions',
+                               packages[package_name.to_sym].current_version)
           end
 
           def package_bin_path(package_name)

data/lib/luban/deployment.rb

@@ -1,5 +1,6 @@
 require_relative 'deployment/version'
 require_relative 'deployment/error'
+require_relative 'deployment/sshkit_refinements'
 require_relative 'deployment/configuration'
 require_relative 'deployment/helpers'
 require_relative 'deployment/parameters'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.10.13
+  version: 0.11.0
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -154,6 +154,7 @@ files:
 - lib/luban/deployment/packages/yaml.rb
 - lib/luban/deployment/parameters.rb
 - lib/luban/deployment/runner.rb
+- lib/luban/deployment/sshkit_refinements.rb
 - lib/luban/deployment/templates/application/config/deploy.rb.erb
 - lib/luban/deployment/templates/application/config/deploy/__stage.rb.erb
 - lib/luban/deployment/templates/application/config/deploy/__stage/env_vars.rb