luban 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ea293a8aab808284fa5ced1439db9c3d52cbb0a
-  data.tar.gz: 3db8526f0bc44ecc32fe2ce750492d5cff2a5561
+  metadata.gz: 965accf9f688c3645de9f50c82c60c9cc892e586
+  data.tar.gz: 8d63a832e8afbeb809ddf81ddc7ed28a91d93ae3
 SHA512:
-  metadata.gz: 0d0258e4ae2419f4e523a60ce27fbc8718ae83517b8a64388accea1d4c339dc2b4f2961a214b9add9828a147232d9d917ad27b520e4af8c62dd946868682ea55
-  data.tar.gz: c9b4c780fc0ee5b5922149edca89b26146063854dc2b578a0fc81fd44db33e4fab60b6f62957a0b0e5b6506a040c4de21c87d8725741fc1e32ace9486a71fa59
+  metadata.gz: 02830ccd54bfed7f6eb99a1306ac86576473f08b1f38cb538e20fe28670bbd9c43a5fe029d9b0f7ae73ee4f41f5ac1834cb58e5de5249e5d4aec49c397de3362
+  data.tar.gz: 866dd03727416032e174471cd431dbe055c620800d0b67caf70a4cb504b77ce3b7c4928ac37b603fadcae8028b85ce82a83fb0cddd9c69c0510c5d9369193c81

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.7.11 (Sept 01, 2016)
+
+Minor enhancements:
+  * Supported shell command prefix
+  * Minor code refactoring
+
 ## Version 0.7.10 (Sept 01, 2016)
 
 Bug fixes:

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

@@ -29,14 +29,6 @@ module Luban
           @releases_log_path ||= app_path.join('releases.log')
         end
 
-        def gemfile
-          @gemfile ||= release_path.join('Gemfile')
-        end
-
-        def bundle_cmd
-          @bundle_cmd ||= app_bin_path.join('bundle')
-        end
-
         def bundle_config_path
           @bundle_config_path ||= shared_path.join('.bundle')
         end
@@ -119,7 +111,7 @@ module Luban
 
         def create_symlinks
           send("create_#{release_type}_symlinks")
-          if file?(gemfile)
+          if has_gemfile?
             create_linked_dirs(bundle_linked_dirs, from: shared_path, to: release_path)
           end
         end
@@ -204,12 +196,12 @@ module Luban
           options = []
           options << "--gemfile #{gemfile}"
           options << "--path #{bundle_path}"
-          unless test(bundle_cmd, :check, *options)
+          unless test(bundle_executable, :check, *options)
             unless bundle_without.include?(stage.to_s)
               options << "--without #{bundle_without.join(' ')}"
             end
             options << bundle_flags.join(' ')
-            execute(bundle_cmd, :install, *options)
+            execute(bundle_executable, :install, *options)
           end
         end
       end

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

@@ -5,8 +5,14 @@ module Luban
         include Luban::Deployment::Worker::Paths::Remote
         include Luban::Deployment::Service::Worker::Base
 
+        def gemfile
+          @gemfile ||= release_path.join('Gemfile')
+        end
+
+        def has_gemfile?; file?(gemfile); end
+
         def shell_setup_commands
-          super << "cd #{release_path}"
+          @shell_setup_commands ||= super << "cd #{release_path}"
         end
 
         %i(name full_name version major_version patch_level).each do |method|
@@ -24,6 +30,14 @@ module Luban
         def release_path
           @release_path ||= releases_path.join(release_tag)
         end
+
+        def ruby_bin_path
+          @ruby_bin_path ||= package_bin_path('ruby')
+        end
+
+        def bundle_executable
+          @bundle_executable ||= ruby_bin_path.join('bundle')
+        end
       end
     end
   end

data/lib/luban/deployment/cli/command.rb

@@ -380,7 +380,6 @@ module Luban
                 backend.ssh_options.merge(user: user).merge!(ssh_options)
             end
           end
-          #bundle_bins.each { |cmd| sshkit.command_map.prefix[cmd.to_sym].push("bundle exec") }
         end
 
         configure_airbrussh if format == :airbrussh

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

@@ -7,7 +7,12 @@ module Luban
             @shell_setup_commands ||= ["source #{envrc_file}"]
           end
 
+          def shell_command_prefix
+            @shell_command_prefix ||= []
+          end
+
           def compose_command(cmd)
+            cmd = "#{shell_command_prefix.join(' ')} #{cmd}" unless shell_command_prefix.empty?
             "#{shell_setup_commands.join(' && ')} && #{cmd} 2>&1"
           end
           

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.7.10"
+    VERSION = "0.7.11"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Rubyist Lei