luban 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b48ab79759b45ca7eb28235f9fc0304494de75a1
-  data.tar.gz: 1fdd55e4c8908e2beeb10a3b8ac7e96a03de8de2
+  metadata.gz: 33000a33b27913c0433ef4a5c597ea5586b111cf
+  data.tar.gz: 1ce53ac76b5ad8fe85c6ec3552b0506db817223c
 SHA512:
-  metadata.gz: 48eeeed19d760c788ac0430214ff36033eaf94db0d42db075949f07fb9491ee8417fbe1d2c9fd2388883a6cf1388611eedb58a98d71edd61f13bafcd0b2c0700
-  data.tar.gz: 2bdc3adacaad25386a30be00d59667c41cb5c011b85e25d6bcedc0fc474b98dd5c45e8aa07c75424591e5b9894ab36a5be2c507c6a400706813ceade898ea6fb
+  metadata.gz: 90e6d4a88b8336bea742037a7415dacaa0955e3aff0be3c4f64246e395211559b689fecd80bab9dd47dd404deec7c0247a731731a3ab524579e0fa785efdbb27
+  data.tar.gz: 90ef31818a038040f3d784fe310aaa6bafb6a6da0b0d5e214b6e63ffdb1bfd401f254f023b23b5b0a26f5b6c98bf05deba4ffa1485f2190896a3ebfce348064c

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## Version 0.9.15 (Nov 06, 2016)
+
+Minor enhancements:
+  * Refactored md5 calculation utilities
+
+Bug fixes:
+  * Properly synced git-based bundled gems to app servers
+
 ## Version 0.9.14 (Oct 31, 2016)
 
 Minor enhancements:

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

@@ -85,7 +85,7 @@ module Luban
 
         def after_publish
           create_symlinks
-          bundle_gems unless gems.empty?
+          bundle_gems unless locked_gemfile.nil?
         end
 
         protected
@@ -167,13 +167,14 @@ module Luban
         end
 
         def sync_gems_cache
-          capture(:ls, '-xt', gems_cache_path).split.each do |gem_name|
-            rm(gems_cache_path.join(gem_name)) unless gems.has_key?(gem_name)
-          end
           gems.each_pair do |gem_name, md5|
             gem_path = gems_cache_path.join(gem_name)
             unless md5_matched?(gem_path, md5)
-              upload!(gems_source.join(gem_name).to_s, gem_path.to_s)
+              if file?(gem_file = gems_source[:path].join(gem_name))
+                upload!(gem_file.to_s, gem_path.to_s)
+              else
+                upload!("#{gem_file.to_s}/", gem_path.to_s, recursive: true)
+              end
             end
           end
         end

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

@@ -23,6 +23,10 @@ module Luban
           @workspace_path ||= app_path.join('.luban')
         end
 
+        def gems_path
+          @gems_path ||= workspace_path.join('gems')
+        end
+
         def clone_path
           @clone_path ||= workspace_path.join('repositories', type)
         end
@@ -170,46 +174,58 @@ module Luban
           end
         end
 
+        def release_with_gemfile?(gemfile_path)
+          test(:tar, "-tzf #{release_package_path} #{gemfile_path} > /dev/null 2>&1")
+        end
+
         def bundle_gems
           gemfile_path = Pathname.new(release_tag).join('Gemfile')
           gems_cache = Pathname.new('vendor').join('cache')
           bundle_path = Pathname.new('vendor').join('bundle')
+          if release_with_gemfile?(gemfile_path)
+            assure_dirs(gems_path)
+            bundle_gems!(gemfile_path, gems_cache, bundle_path)
+          else
+            {}
+          end
+        end
+
+        def bundle_gems!(gemfile_path, gems_cache, bundle_path)
           bundled_gems = {}
           gems = bundled_gems[:gems] = {}
-          if test(:tar, "-tzf #{release_package_path} #{gemfile_path} > /dev/null 2>&1")
-            within(workspace_path) do
-              paths_to_extract = [gemfile_path, "#{gemfile_path}.lock", "#{release_tag}/vendor/gems"]
-              execute(:tar, "--strip-components=1 -xzf #{release_package_path} #{paths_to_extract.join(' ')} > /dev/null 2>&1; true")
-              options = []
-              options << "--path #{bundle_path}"
-              unless test(bundle_cmd, :check, *options)
-                unless bundle_without.include?(stage.to_s)
-                  options << "--without #{bundle_without.join(' ')}"
-                end
-                options << "--quiet"
-                execute(bundle_cmd, :install, *options)
-                info "Package gems bundled in Gemfile"
-                execute(bundle_cmd, :package, "--all --quiet")
-              end
-              gem_files = capture(:ls, '-xt', gems_cache.join('*.gem')).split
-              gem_files.each do |gem_file|
-                gem_name = File.basename(gem_file)
-                md5_file = "#{gem_file}.md5"
-                gems[gem_name] =
-                  if file?(workspace_path.join(md5_file))
-                    gems[gem_name] = capture(:cat, md5_file)
-                  else
-                    md5_for_file(gem_file).tap { |md5|
-                      execute(:echo, "#{md5} > #{md5_file}")
-                    }
-                  end
+          within(gems_path) do
+            paths_to_extract = [gemfile_path, "#{gemfile_path}.lock", "#{release_tag}/vendor/gems"]
+            execute(:tar, "--strip-components=1 -xzf #{release_package_path} #{paths_to_extract.join(' ')} > /dev/null 2>&1; true")
+            options = []
+            options << "--path #{bundle_path}"
+            unless test(bundle_cmd, :check, *options)
+              unless bundle_without.include?(stage.to_s)
+                options << "--without #{bundle_without.join(' ')}"
               end
+              options << "--quiet"
+              execute(bundle_cmd, :install, *options)
+              info "Package gems bundled in Gemfile"
+              execute(bundle_cmd, :package, "--all --quiet")
             end
-            bundled_gems[:gems_cache] = workspace_path.join(gems_cache)
-            workspace_path.join('Gemfile.lock').tap do |p|
-              bundled_gems[:locked_gemfile] = { path: p, md5: md5_for_file(p) }
+
+            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"
+              gems[gem_name] =
+                if file?(md5_file)
+                  gems[gem_name] = capture(:cat, md5_file)
+                else
+                  md5_for(gem_file).tap { |md5| execute(:echo, "#{md5} > #{md5_file}") }
+                end
             end
           end
+          gems_path.join(gems_cache).tap do |p|
+            bundled_gems[:gems_cache] = { path: p, md5: md5_for_dir(p) }
+          end
+          gems_path.join('Gemfile.lock').tap do |p|
+            bundled_gems[:locked_gemfile] = { path: p, md5: md5_for_file(p) }
+          end
           bundled_gems
         end
       end

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

@@ -88,10 +88,19 @@ module Luban
           capture("$(type -p readlink greadlink|head -1) #{source_file}") 
         end
 
+        def md5_for(path)
+          file?(path) ? md5_for_file(path) : md5_for_dir(path)
+        end
+
         def md5_for_file(file)
           capture(:cat, "#{file} 2>/dev/null | openssl md5")[/\h+$/]
         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+$/]
+        end
+
         def sudo(*args)
           execute(:sudo, *args)
         end
@@ -165,8 +174,8 @@ module Luban
           backend.capture(*args, raise_on_non_zero_exit: false, &blk).chomp
         end
 
-        def md5_matched?(file_path, md5)
-          file?(file_path) and md5 == md5_for_file(file_path)
+        def md5_matched?(path, md5)
+          file?(path) ? md5 == md5_for_file(path) : md5 == md5_for_dir(path)
         end
 
         #def execute(*args, &blk)

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.14"
+    VERSION = "0.9.15"
   end
 end

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

@@ -43,7 +43,7 @@ module Luban
           end
 
           def current_app_path
-            @app_symlink ||= app_path.join('app')
+            @current_app_path ||= app_path.join('app')
           end
 
           def app_bin_path

metadata

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