luban 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55aba9574e332f5a608c7176ec441d73fd4e03f4
-  data.tar.gz: 547945f3dc755960590af2589663b75412a8ad94
+  metadata.gz: a5d01d98fc1561dd61bcf2d415ca796c29a54801
+  data.tar.gz: 90e2b6151e3ba31d770bba1d38a4ff0f83b50cf2
 SHA512:
-  metadata.gz: f1c6d8e7f8edf67288c2198462beb0d255712aefe04c0c8dc799ac42794cc2ffe46796dbd96d596799d8bb7cdde716e9007fbfde6ffd5520afd528fb5b6f8563
-  data.tar.gz: a2977dfa28743cf5049367e04cd9af8022a0be5616375a77b0d659d51e529a9599f82a9c1640c853d4102b24f76fecafff7c708601e5d7949d1a0a46eae195d0
+  metadata.gz: 6f8003df0b31ecec8fc9f50446da675c5f5dd06b45c35fefe2eed976e21a047a719fcaa13879fcc97e70b2ca1bdf2182a3a11fb2200b24bba63b9dee478ba594
+  data.tar.gz: c65e5d86585134818411f3d97f32b1f4aa8c643ebf264a18d20d5f22b2b7e5dac6a774255be992a481b5e8bc0c911576d4e625da76d468f78f1f2eaf6688aaf7

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## Version 0.10.4 (Nov 24, 2016)
+
+Minor enhancements:
+  * Enhanced linked_files become a convention instead of a configuration
+  * Checked md5 for gem cache directory before actually sync each gem in gem cache
+
+Bug fixes:
+  * Excluded *.md5 files, if any, when calculating md5 for a given directory
+  * Corrected the md5_file path when calculating md5 for each Ruby gem
+
 ## Version 0.10.3 (Nov 22, 2016)
 
 Minor enhancements:

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

@@ -113,7 +113,7 @@ module Luban
         def create_symlinks
           send("create_#{release_type}_symlinks")
           if has_gemfile?
-            create_linked_dirs(bundle_linked_dirs, from: shared_path, to: release_path)
+            create_linked_dirs(bundle_linked_dirs, to: release_path)
           end
         end
 
@@ -134,11 +134,11 @@ module Luban
         end
 
         def create_symlinks_for_linked_dirs
-          create_linked_dirs(linked_dirs, from: shared_path, to: release_path)
+          create_linked_dirs(to: release_path)
         end
 
         def create_symlinks_for_linked_files
-          create_linked_files(linked_files, from: profile_path, to: release_path.join('config'))
+          create_linked_files(to: release_path)
         end
 
         def update_releases_log
@@ -171,6 +171,7 @@ module Luban
         end
 
         def sync_gems_cache
+          return if md5_matched?(gems_cache_path, gems_source[:md5])
           gems.each_pair do |gem_name, md5|
             gem_path = gems_cache_path.join(gem_name)
             unless md5_matched?(gem_path, md5)

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

@@ -217,7 +217,7 @@ module Luban
             gem_files = capture(:ls, '-xtd', "#{gems_cache.join('*')} | grep -v \"md5$\"").split
             gem_files.each do |gem_file|
               gem_name = File.basename(gem_file)
-              md5_file = "#{gem_file}.md5"
+              md5_file = gems_path.join("#{gem_file}.md5")
               gems[gem_name] =
                 if file?(md5_file)
                   gems[gem_name] = capture(:cat, md5_file)

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

@@ -45,7 +45,7 @@ module Luban
             return if default_templates.empty?
             puts "  Initializing #{service_name} profile"
             assure_dirs(profile_templates_path, stage_profile_path)
-            upload_profile_templates
+            upload_profile_templates(default_templates)
           end
 
           def update_profile
@@ -56,16 +56,26 @@ module Luban
 
           protected
 
-          def upload_profile_templates
-            default_templates.each do |src_path|
-              next unless file?(src_path)
+          def upload_profile_templates(templates, dirs: Pathname.new(''), depth: 2)
+            indent = '  ' * depth
+            templates.each do |src_path|
               basename = src_path.basename
+              print indent + "- #{basename}"
+
+              if directory?(src_path)
+                [profile_templates_path, stage_profile_path].each do |p|
+                  assure_dirs(p.join(dirs).join(basename))
+                end
+                puts
+                upload_profile_templates(src_path.children, dirs: dirs.join(basename), depth: depth + 1)
+                next
+              end
+
               dst_path = if src_path.extname == '.erb'
                            profile_templates_path
                          else
                            stage_profile_path
-                         end.join(basename)
-              print "    - #{basename}"
+                         end.join(dirs).join(basename)
               if file?(dst_path)
                 puts " [skipped]"
               else

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

@@ -20,11 +20,11 @@ module Luban
         end
 
         def create_symlinks_for_linked_dirs
-          create_linked_dirs(linked_dirs, from: shared_path, to: install_path)
+          create_linked_dirs(to: install_path)
         end
 
         def create_symlinks_for_linked_files
-          create_linked_files(linked_files, from: profile_path, to: install_path.join('config'))
+          create_linked_files(to: install_path)
         end
       end
     end

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

@@ -50,7 +50,7 @@ module Luban
 
           def copy_dir(src_path, dst_path, stages: [], depth: 1)
             indent = '  ' * depth
-            print  indent + "- #{dst_path.basename}"
+            print indent + "- #{dst_path.basename}"
             mkdir(dst_path)
             src_files = []
             src_path.each_child do |p|

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

@@ -5,19 +5,42 @@ module Luban
         def linked_dirs; @linked_dirs ||= []; end
         def linked_files; @linked_files ||= []; end
 
+        def linked_files_dir
+          @linked_files_dir ||= 'config'
+        end
+
+        def linked_files_root
+          @linked_files_root ||= config_finder[:application].stage_profile_path.join(profile_name)
+        end
+
+        def linked_files_from
+          @linked_files_from ||= linked_files_root.join(linked_files_dir)
+        end
+
         protected
 
         def init
           super
+          init_linked_dirs
+          init_linked_files
+        end
+
+        def init_linked_dirs
           linked_dirs.push('log', 'pids')
         end
 
+        def init_linked_files
+          Dir.chdir(linked_files_from) do
+            linked_files.concat(Pathname.glob("**/*").select { |f| f.file? })
+          end
+        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:)
+        def create_linked_dirs(dirs = linked_dirs, from: shared_path, to:)
           dirs.each do |path|
             target_path = to.join(path)
             assure_dirs(target_path.dirname)
@@ -27,9 +50,9 @@ module Luban
           end
         end
 
-        def create_linked_files(files, from:, to:)
+        def create_linked_files(files = linked_files, from: profile_path, to:)
           files.each do |path|
-            target_path = to.join(path)
+            target_path = to.join(linked_files_dir).join(path)
             assure_dirs(target_path.dirname)
             rm(target_path) if file?(target_path)
             source_path = from.join(path)

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

@@ -101,8 +101,7 @@ module Luban
         end
 
         def md5_for_dir(dir)
-          #capture(:tar, "-cf - #{dir} 2>/dev/null | openssl md5")[/\h+$/]
-          capture(:find, "#{dir} -type f 2>/dev/null | LC_ALL=C sort -u | xargs cat | openssl md5")[/\h+$/]
+          capture(:find, "#{dir} -type f ! -name '*.md5' 2>/dev/null | LC_ALL=C sort -u | xargs cat | openssl md5")[/\h+$/]
         end
 
         def sudo(*args)

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.10.3"
+    VERSION = "0.10.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-22 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli