luban 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5546cfa5d73a014152bd5bd7976308d1c76b7b2b
-  data.tar.gz: 97f680b036efb2cd730657570249f2039d18a507
+  metadata.gz: 93ecbda71bada5b128218f57976e2e8b9d1d9201
+  data.tar.gz: aaf09dbbd997fb09063cf17066ad9d98cfd8f785
 SHA512:
-  metadata.gz: f04d10b3b45fb86fd0f3d6f0210b2a9ed6c20da71da97ee614d5039fd01daec2102ba3cef672d391c75b39f5006b0ae1f79a0577e7ed376b69692d699c79faf2
-  data.tar.gz: a9343ab5e0cbeccf9404f6850267dd7849b19b27ee8cc260609ab16465b0d06a749d602386a17924244dd21d1a568fc754f1e47de9d77b69a602690642b85744
+  metadata.gz: 5370c3b1c9d1d3ec4c837e70c9e487edfa7db5a4a48af13fe51af60a2250af2524c8b375fb93d5701b4d44f44f366dd0dc76d26b6717aa37f0c8bc3b726deef7
+  data.tar.gz: 05ddf1e4d27d6fcf6ecaa93af51beee45991b58f40ad39dc324dccca124309b4b16cfababa0eaac1dbfbac3456fcb8cb267110b50a26272b812758cc05711075

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.7.8 (Aug 31, 2016)
+
+Minor enhancements:
+  * Refactored to use #profile_name to define the name of the profile folder for applications and services to avoid profile collision between applications and services.
+  * Cleanedup leftover from last install if any
+
 ## Version 0.7.7 (Aug 31, 2016)
 
 Minor enhancements:

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

@@ -26,9 +26,7 @@ module Luban
           @package_bin_path ||= package_path(package_name).join('bin')
         end
 
-        def service_entry
-          @service_entry ||= "#{env_name.gsub('/', '.')}.app"
-        end
+        def profile_name; 'app'; end
 
         def release_tag; task.opts.release[:tag]; end
 

data/lib/luban/deployment/cli/package/installer/install.rb

@@ -227,6 +227,7 @@ module Luban
         end
 
         def install!
+          cleanup_build! # Cleanup leftover from last install if any
           upload_package
           uncompress_package
           build_package

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

@@ -5,17 +5,17 @@ module Luban
         module Base
           def stage_profile_path
             @stage_profile_path ||= 
-              config_finder[:application].stage_profile_path.join(service_name)
+              config_finder[:application].stage_profile_path.join(profile_name)
           end
 
           def profile_templates_path
             @profile_templates_path ||= 
-              config_finder[:application].profile_templates_path.join(service_name)
+              config_finder[:application].profile_templates_path.join(profile_name)
           end
 
           def stage_profile_templates_path
             @stage_profile_templates_path ||= 
-              config_finder[:application].stage_profile_templates_path.join(service_name)
+              config_finder[:application].stage_profile_templates_path.join(profile_name)
           end
 
           def profile_templates(format: "erb")
@@ -75,7 +75,7 @@ module Luban
             profile_file = stage_profile_path.join(template_file).sub_ext('')
             assure_dirs(profile_file.dirname)
             upload_by_template(file_to_upload: profile_file,
-                               template_file: find_template_file(File.join(service_name, template_file)),
+                               template_file: find_template_file(File.join(profile_name, template_file)),
                                auto_revision: true)
           end
 

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

@@ -15,12 +15,14 @@ module Luban
             define_method("service_#{method}") { send("target_#{method}") }
           end
 
+          def profile_name; service_name; end
+
           def service_entry
-            @service_entry ||= "#{env_name.gsub('/', '.')}.#{service_name}"
+            @service_entry ||= "#{env_name.gsub('/', '.')}.#{profile_name}"
           end
 
           def profile_path
-            @profile_path ||= shared_path.join('profile', service_name)
+            @profile_path ||= shared_path.join('profile', profile_name)
           end
 
           def log_path

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.7.7"
+    VERSION = "0.7.8"
   end
 end

metadata

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