luban 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1386501b0b0e2a9483089453c5c009650655097
-  data.tar.gz: fa8b1ffbe8e0e553d5b9e0f8f4ddae622b334b25
+  metadata.gz: b6c8d8264eb67e64d12b8898d1d3f6be9d9bae49
+  data.tar.gz: ac0c9be4be0449a4f4d8d0460785b3aef5fd98f3
 SHA512:
-  metadata.gz: 5ee4acb1e7cd29517bbedef6c53db64e1d8ec84712427779287974178b53658dd96df0fb3e600fef79c29f78d42d4c1ae2e64a17f522c648e1f04b15be2f59f9
-  data.tar.gz: 169b0790ec7a43078499ae14d1e73c153625a0d6b31cebedd950456baa54836599b8607a81295287f1a723d950a2b53a9d9fcaf3dd10477ab399f0e252850e14
+  metadata.gz: 4e8cca593188e1ed1eaec53681f13e0ba51fa7119ee616a02e0f58e4d9b9fd3793d2fb0f1ee525e250de0b40d81910e48844c8bad4018f93eeeaafaf3a7af584
+  data.tar.gz: a5885b65c1431c4f5a35b8dc62226b27e88c59cd0c50da0fd3dc4928dcc7b4674de82e4c86fe55c20c7d2a5c71a60409a20bf959c5373678766da2d74765f06e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log
 
+## Version 0.8.4 (Sept 22, 2016)
+
+Minor enhancements:
+  * Added #bundle_via to specify Ruby version to bundle gems with
+    * This is useful for bundling gems that requires specific Ruby version
+  * Forced bundler using the gems already present in vendor/cache thru option "--local"
+
+Bug fixes:
+  * Added source release to cronjob deployment if source is provided
+  * Properly update cronjob if the crontab contains other unrelated entries
+
 ## Version 0.8.3 (Sept 21, 2016)
 
 Minor enhancements:

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

@@ -84,6 +84,12 @@ module Luban
       end
       alias_method :require_package, :package
 
+      def bundle_via(ruby:)
+        bundle_cmd = luban_root_path.join("env", "#{stage}.#{project}", ".luban", "pkg",
+                                          "ruby", "versions", ruby.to_s.downcase, 'bin', 'bundle')
+        set :bundle_via, bundle_cmd
+      end
+
       def profile(from = nil, **opts)
         from.nil? ? @profile : (@profile = opts.merge(type: 'profile', from: from))
       end
@@ -194,7 +200,6 @@ module Luban
         deploy_profile(args: args, opts: opts) if has_profile?
         deploy_cronjobs(args: args, opts: opts)
       end
-      dispatch_task :deploy_cronjobs, to: :crontab, as: :deploy_cronjobs
 
       Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
         define_method(action) do |args:, opts:|
@@ -379,6 +384,12 @@ module Luban
       dispatch_task :deprecate_packaged_release!, to: :repository, as: :deprecate, locally: true
       dispatch_task :deprecate_published_release!, to: :publisher, as: :deprecate
 
+      def deploy_cronjobs(args:, opts:)
+        opts = opts.merge(version: current_app) if has_source?
+        deploy_cronjobs!(args: args, opts: opts)
+      end
+      dispatch_task :deploy_cronjobs!, to: :crontab, as: :deploy_cronjobs
+
       def print_summary(result)
         result.each do |entry|
           s = entry[:summary]

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

@@ -109,21 +109,18 @@ module Luban
         def update_cronjobs!
           crontab = capture(:crontab, "-l")
           new_crontab = capture(:cat, crontab_file_path, "2>/dev/null")
-          old = false
+          found = false
           crontab = crontab.split("\n").inject([]) do |lines, line|
-            if old || line == crontab_open
-              lines << new_crontab unless (old = line != crontab_close)
+            if found || line == crontab_open
+              lines << new_crontab unless (found = line != crontab_close)
             else
               lines << line
             end
             lines
           end
-          if crontab.empty?
-            test(:crontab, crontab_file_path, "2>&1")
-          else
-            upload!(StringIO.new(crontab.join("\n")), tmp_crontab_file_path)
-            test(:crontab, tmp_crontab_file_path, "2>&1")
-          end
+          crontab << new_crontab unless found
+          upload!(StringIO.new(crontab.join("\n")), tmp_crontab_file_path)
+          test(:crontab, tmp_crontab_file_path, "2>&1")
         ensure
           rm(tmp_crontab_file_path)
         end
@@ -132,11 +129,11 @@ module Luban
           crontab = capture(:crontab, "-l")
           return crontab if all
 
-          old = false
+          found = false
           crontab.split("\n").inject([]) do |lines, line|
-            if old || line == crontab_open
+            if found || line == crontab_open
               lines << line
-              old = line != crontab_close
+              found = line != crontab_close
             end
             lines
           end.join("\n")

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

@@ -198,6 +198,7 @@ module Luban
           options << "--gemfile #{gemfile}"
           options << "--path #{bundle_path}"
           unless test(bundle_executable, :check, *options)
+            options << "--local"
             unless bundle_without.include?(stage.to_s)
               options << "--without #{bundle_without.join(' ')}"
             end

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

@@ -162,6 +162,7 @@ module Luban
         end
 
         def bundle_gems
+          bundle_cmd = fetch(:bundle_via, :bundle)
           gemfile_path = Pathname.new(release_tag).join('Gemfile')
           gems_cache = Pathname.new('vendor').join('cache')
           bundle_path = Pathname.new('vendor').join('bundle')
@@ -173,14 +174,14 @@ module Luban
               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, :check, *options)
+              unless test(bundle_cmd, :check, *options)
                 unless bundle_without.include?(stage.to_s)
                   options << "--without #{bundle_without.join(' ')}"
                 end
                 options << "--quiet"
-                execute(:bundle, :install, *options)
+                execute(bundle_cmd, :install, *options)
                 info "Package gems bundled in Gemfile"
-                execute(:bundle, :package, "--all --quiet")
+                execute(bundle_cmd, :package, "--all --quiet")
               end
               gem_files = capture(:ls, '-xt', gems_cache.join('*.gem')).split
               gem_files.each do |gem_file|

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.8.3"
+    VERSION = "0.8.4"
   end
 end

metadata

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