luban 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbca715d836e07f8facc579abd81a6ad4d14ebcd
-  data.tar.gz: 68945ffab8742dae123414b20631d6f15915ee93
+  metadata.gz: 25350f60e02f4ad3fdb32ef96e950ebd2bc06f68
+  data.tar.gz: 7a290c7c19c41bc551d629d84eb1ab289b84be5c
 SHA512:
-  metadata.gz: d61488ad6cadfa12ce43fc4507297eafd2c1b08d15b5e022db482ea14dde6f98da896920fdffa17e3142cf4d82116416384ef77a3b9d8bf9a5a103b802f81da6
-  data.tar.gz: 06aa49374f03b99287598e9c036c3110bae09baf1e621752be52cf6651d1e11fc9096722b25285dff56b64f17f1be708b4d56921e41b866b5dcb9e0aed10b89c
+  metadata.gz: f17055fec2a3d3daf4cda59716b6e480f0122a80ee97ca3b9b6f798667ed3389bace1b0a26e9f9154493dbced804cebc9a1086338dc04e4860d7b50e13bb45d8
+  data.tar.gz: 68326cb893360e365623305212ddba81eb06355b46ec7ec77d95a2527b72ac8cb48431049b9687ab4a42d1e7b6fef246c50a8e24d9cd15a023d6cb1850cdb8fe

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## Version 0.7.5 (Aug 30, 2016)
+
+Minor enhancements:
+  * Extracted linked_dirs/linked_files handling into LinkedPaths module
+  * Used LinkedPaths module to change linked_dirs/linked_files into worker level instance variables instead of global configuration to better cope with different linked paths requirements among different worker classes from Application and Service, like Publisher and Installer
+
+Bug fixes:
+  * Correctly composed the bundle command when installing gems from cache in Publisher
+  * Extracted Gemfile.lock in addition to Gemfile if any from the release tarball to ensure deploy the exact same set of gems specified from the Gemfile.lock in code repository
+
 ## Version 0.7.4 (Aug 26, 2016)
 
 Bug fixes:

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

@@ -259,11 +259,6 @@ module Luban
         set_default_profile
       end
 
-      def set_default_application_parameters
-        super
-        linked_dirs.push('log', 'pids')
-      end
-
       def set_default_source
         source(default_source_path, scm: :rsync)
         release(stage, current: true)

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

@@ -42,15 +42,6 @@ module Luban
           assure_dirs(logrotate_path, downloads_path,
                       tmp_path, app_bin_path, app_tmp_path, 
                       releases_path, shared_path)
-          assure_linked_dirs
-        end
-
-        def assure_linked_dirs
-          return if linked_dirs.empty?
-          linked_dirs.each do |dir|
-            linked_dir = shared_path.join(dir)
-            assure(:directory, linked_dir) { mkdir(linked_dir) }
-          end
         end
 
         def create_envrc_files

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

@@ -2,6 +2,8 @@ module Luban
   module Deployment
     class Application
       class Publisher < Worker
+        include Luban::Deployment::Helpers::LinkedPaths
+
         def release_type; task.opts.release_pack[:type]; end
         def release_version; task.opts.release_pack[:version]; end
         def release_tag; task.opts.release_pack[:tag]; end
@@ -118,8 +120,7 @@ module Luban
         def create_symlinks
           send("create_#{release_type}_symlinks")
           if file?(gemfile)
-            create_shared_symlinks_for(bundle_linked_dirs, type: :directory,
-                                       from: linked_dirs_from, to: linked_dirs_to)
+            create_linked_dirs(bundle_linked_dirs, from: shared_path, to: release_path)
           end
         end
 
@@ -130,39 +131,23 @@ module Luban
 
         def create_app_symlinks
           create_release_symlink(app_path)
-          create_shared_symlinks_for_linked_dirs
-          create_shared_symlinks_for_linked_files
+          assure_linked_dirs
+          create_symlinks_for_linked_dirs
+          create_symlinks_for_linked_files
         end
 
         def create_release_symlink(target_dir)
           assure_symlink(release_path, target_dir.join(release_type))
         end
 
-        def create_shared_symlinks_for_linked_dirs
-          create_shared_symlinks_for(linked_dirs, type: :directory, 
-                                     from: linked_dirs_from, to: linked_dirs_to)
+        def create_symlinks_for_linked_dirs
+          create_linked_dirs(linked_dirs, from: shared_path, to: release_path)
         end
 
-        def create_shared_symlinks_for_linked_files
-          create_shared_symlinks_for(linked_files, type: :file, 
-                                     from: linked_files_from, to: linked_files_to)
+        def create_symlinks_for_linked_files
+          create_linked_files(linked_files, from: profile_path, to: release_path.join('config'))
         end
 
-        def create_shared_symlinks_for(linked_paths, type:, from:, to:)
-          linked_paths.each do |path|
-            target_path = to.join(path)
-            assure_dirs(target_path.dirname)
-            rm('-r', target_path) if send("#{type}?", target_path)
-            source_path = from.join(path)
-            assure_symlink(source_path, target_path) if send("#{type}?", source_path)
-          end
-        end
-
-        def linked_dirs_from; shared_path; end
-        def linked_dirs_to; release_path; end
-        def linked_files_from; profile_path; end
-        def linked_files_to; release_path.join('config'); end
-
         def create_etc_symlinks
           create_logrotate_symlinks
         end
@@ -216,17 +201,15 @@ module Luban
         end
 
         def install_gems_from_cache
-          within(release_path) do
-            options = []
-            options << "--gemfile #{gemfile}"
-            options << "--path #{bundle_path}"
-            unless test(bundle_cmd, :check, *options)
-              unless bundle_without.include?(stage.to_s)
-                options << "--without #{bundle_without.join(' ')}"
-              end
-              options << bundle_flags.join(' ')
-              execute(bundle_cmd, :install, *options)
+          options = []
+          options << "--gemfile #{gemfile}"
+          options << "--path #{bundle_path}"
+          unless test(bundle_cmd, :check, *options)
+            unless bundle_without.include?(stage.to_s)
+              options << "--without #{bundle_without.join(' ')}"
             end
+            options << bundle_flags.join(' ')
+            execute(bundle_cmd, :install, *options)
           end
         end
       end

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

@@ -169,7 +169,7 @@ module Luban
           gems = bundled_gems[:gems] = {}
           if test(:tar, "-tzf #{release_package_path} #{gemfile_path} > /dev/null 2>&1")
             within(workspace_path) do
-              execute(:tar, "--strip-components=1 -xzf #{release_package_path} #{gemfile_path}")
+              execute(:tar, "--strip-components=1 -xzf #{release_package_path} #{gemfile_path} #{gemfile_path}.lock > /dev/null 2>&1")
               options = []
               options << "--path #{bundle_path}"
               unless test(:bundle, :check, *options)

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

@@ -30,13 +30,6 @@ module Luban
         def init_profile(args:, opts:)
           orig_init_profile(args: args, opts: opts.merge(default_templates: default_templates))
         end
-
-        protected
-
-        def set_parameters
-          super
-          linked_dirs.push('log', 'pids')
-        end
       end
     end
   end

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

@@ -3,6 +3,28 @@ module Luban
     module Service
       class Installer < Luban::Deployment::Package::Installer
         include Worker::Base
+        include Luban::Deployment::Helpers::LinkedPaths
+
+        protected
+
+        def bootstrap_install
+          super
+          assure_linked_dirs
+        end
+
+        def create_symlinks!
+          super
+          create_symlinks_for_linked_dirs
+          create_symlinks_for_linked_files
+        end
+
+        def create_symlinks_for_linked_dirs
+          create_linked_dirs(linked_dirs, from: shared_path, to: install_path)
+        end
+
+        def create_symlinks_for_linked_files
+          create_linked_files(linked_files, from: profile_path, to: install_path.join('config'))
+        end
       end
     end
   end

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

@@ -0,0 +1,42 @@
+module Luban
+  module Deployment
+    module Helpers
+      module LinkedPaths
+        def linked_dirs; @linked_dirs ||= []; end
+        def linked_files; @linked_files ||= []; end
+
+        protected
+
+        def init
+          super
+          linked_dirs.push('log', 'pids')
+        end
+
+        def assure_linked_dirs
+          return if linked_dirs.empty?
+          assure_dirs(linked_dirs.collect { |dir| shared_path.join(dir) })
+        end
+
+        def create_linked_dirs(dirs, from:, to:)
+          dirs.each do |path|
+            target_path = to.join(path)
+            assure_dirs(target_path.dirname)
+            rmdir(target_path) if directory?(target_path)
+            source_path = from.join(path)
+            assure_symlink(source_path, target_path) #if directory?(source_path)
+          end
+        end
+
+        def create_linked_files(files, from:, to:)
+          files.each do |path|
+            target_path = to.join(path)
+            assure_dirs(target_path.dirname)
+            rm(target_path) if file?(target_path)
+            source_path = from.join(path)
+            assure_symlink(source_path, target_path) #if file?(source_path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/luban/deployment/helpers.rb

@@ -1,3 +1,4 @@
 require_relative 'helpers/configuration'
+require_relative 'helpers/linked_paths'
 require_relative 'helpers/utils'
 require_relative 'helpers/generator'

data/lib/luban/deployment/parameters.rb

@@ -111,16 +111,12 @@ module Luban
 
         parameter :application
         parameter :scm_role
-        parameter :linked_dirs
-        parameter :linked_files
         parameter :logrotate_files
 
         protected
 
         def set_default_application_parameters
           set_default :scm_role, :scm
-          set_default :linked_dirs, []
-          set_default :linked_files, []
           set_default :logrotate_files, []
 
           setup_default_application_config_finder

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -138,6 +138,7 @@ files:
 - lib/luban/deployment/helpers.rb
 - lib/luban/deployment/helpers/configuration.rb
 - lib/luban/deployment/helpers/generator.rb
+- lib/luban/deployment/helpers/linked_paths.rb
 - lib/luban/deployment/helpers/utils.rb
 - lib/luban/deployment/packages/bundler.rb
 - lib/luban/deployment/packages/git.rb