luban 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a53e2d718858e794fad9039bd3dca3b3ea47e7
-  data.tar.gz: cd42f481001b9d32968f8eb09c6044ffbb1d4aef
+  metadata.gz: fcaab3a6f85c7700a2a3591f4964bc6588e1d341
+  data.tar.gz: d4d4038ffdf658f4a50bfcf796a5bec5aa23efe2
 SHA512:
-  metadata.gz: 11730020832c5dbb29887320fde4f872dfc967d952e59d7d52c64671474fc2ed80d284c4fa1f7ff3980d78d28b486f57d5334ab6d8df3486c0c97199b4fe6fee
-  data.tar.gz: 8d2dc731d74bb014c3c594dd1a88757351f1aafb92d62eb28c9223f1e3f02a3e35f17c4f6cd898c22a3e9996b5f5c21041c767deecc3d36a04528568de69c20d
+  metadata.gz: 90d73c8299cd2c2197ed996532f859d3728a6cfa1f1ef8c099367adfe29ad4b50cb4f63d212b73cd66e1d774c2a4326e53185a18d6fcffe7c0126e6454d611bb
+  data.tar.gz: e17cb7ffc3fe8658d73d2cdadf3d06de1cc016056d9f27170614c11261d7ee7f43bc5d0c95aa3a9ff18bbd448c3b8cb3afbb9b180ce680f7ba9f6eba928183ec

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.6.9 (Aug 15, 2016)
+
+Minor enhancements:
+  * Set parameter #project in Lubanfile template used in project initiation
+  * Added suffix ".deploy" as extension to project target path as a convention
+
+Bug fixes:
+  * Handled bundle_without properly based on the deployment stage
+
 ## Version 0.6.8 (Aug 05, 2016)
 
 Bug fixes:

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

@@ -201,7 +201,9 @@ module Luban
             options << "--gemfile #{gemfile}"
             options << "--path #{bundle_path}"
             unless test(bundle_cmd, :check, *options)
-              options << "--without #{bundle_without.join(' ')}"
+              unless bundle_without.include?(stage.to_s)
+                options << "--without #{bundle_without.join(' ')}"
+              end
               options << bundle_flags.join(' ')
               execute(bundle_cmd, :install, *options)
             end

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

@@ -170,8 +170,14 @@ module Luban
           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}")
-              unless test(:bundle, :check, "--path #{bundle_path}")
-                execute(:bundle, :install, "--path #{bundle_path} --without #{bundle_without.join(' ')} --quiet")
+              options = []
+              options << "--path #{bundle_path}"
+              unless test(:bundle, :check, *options)
+                unless bundle_without.include?(stage.to_s)
+                  options << "--without #{bundle_without.join(' ')}"
+                end
+                options << "--quiet"
+                execute(:bundle, :install, *options)
                 info "Package gems bundled in Gemfile"
                 execute(:bundle, :package, "--all --quiet")
               end

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

@@ -103,7 +103,7 @@ module Luban
           end
 
           def project_target_path
-            @project_target_path ||= (work_dir or Pathname.pwd.join(project))
+            @project_target_path ||= (work_dir or Pathname.pwd.join("#{project}.deploy"))
           end
 
           def create_project_skeleton

data/lib/luban/deployment/templates/project/Lubanfile.rb.erb

@@ -1 +1,2 @@
-stages %w(<%= stages.join(' ') %>)
+stages %w(<%= stages.join(' ') %>)
+project <%= project.inspect %>

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.6.8"
+    VERSION = "0.6.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli