luban 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d2d7c1be97fb9cf2fc1fd7b6d9db26bb85f1d5e
-  data.tar.gz: 189785ad7216bc3b479367107cfb72558b145d39
+  metadata.gz: cc67bf3d741d713a33e8341b9599277ecfaf4ee1
+  data.tar.gz: bb8332a93f582506fb0644729f198a0140b6c001
 SHA512:
-  metadata.gz: 10d556df4b058dad5e8cd1d34621b91002bf8c20a4d17bd46d0a335e6297a3efb0e05c349f261c077c64d6c1e72c2102adcc8404506dc27f726eeea428d87ebc
-  data.tar.gz: a6e754751cb5ec88079023dae75fcec494fd2d8162729c005cb0aad5f9e86c503ab7f7848a3ae6baf5327273df80bad413c68701a10d2c8393058c08517bda95
+  metadata.gz: 1aeb8d995bb8f820b67b9e6e4e8842eb96e755f551cbf210ae0b18541adda3da0d82ddeae9562015d25014957ef3f868986683d0db14b64819532b9d2c6c991b
+  data.tar.gz: 528e1d5046d8bcb96dcc03ecad0e4e772178abb8f1479e73e1a8f02118be697db59ff5f774f4abfa13721d2436b2a2bc3ffab547fd260bc233c2728e430e4252

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## Version 0.3.2 (Apr 15, 2016)
+
+Minor enhancements:
+  * Revised envrc and unset_envrc resource files
+  * Refactored promptless authen and environment bootstrap to task #setup from task #build
+
+Bug fixes:
+  * Made required package current one to use in order to ensure proper binstubs generation
+  * Fixed revision calculation
+
 ## Version 0.3.1 (Apr 13, 2016)
 
 Minor enhancements:

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

@@ -61,10 +61,14 @@ module Luban
         promptless_authen!(args: args, opts: opts)
       end
 
-      def build(args:, opts:)
+      def setup(args:, opts:)
         show_app_environment
         promptless_authen(args: args, opts: opts)
         build!(args: args, opts: opts)
+      end
+
+      def build(args:, opts:)
+        show_app_environment
         install_all(args: args, opts: opts)
         build_repositories(args: args, opts: opts)
       end

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

@@ -16,6 +16,11 @@ module Luban
 
           def setup_install_tasks
             _self = self
+            task :setup do
+              desc "Setup #{_self.display_name} environment"
+              action! :setup
+            end
+
             task :build do
               desc "Build #{_self.display_name} environment"
               switch :force, "Force to build", short: :f

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

@@ -195,7 +195,7 @@ module Luban
             self.class.worker_class(:installer, package: d.name).new(
               config: config, backend: backend, 
               cmd: :install, args: {}, 
-              opts: d.options.merge(name: d.name, version: d.version, parent: self)
+              opts: d.options.merge(name: d.name, version: d.version, current: true, parent: self)
             ).run
           end
         end

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

@@ -118,7 +118,8 @@ module Luban
         def upload_by_template(file_to_upload:, template_file:, auto_revision: false, **opts)
           template = File.read(template_file)
 
-          if auto_revision and file?(file_to_upload)
+          if auto_revision
+            require 'digest/md5'
             revision = Digest::MD5.hexdigest(template)
             return if revision_match?(file_to_upload, revision)
           end
@@ -130,7 +131,7 @@ module Luban
         end
 
         def revision_match?(file_to_upload, revision)
-          match?("grep \"Revision: \" #{file_to_upload}", revision)
+          file?(file_to_upload) and match?("grep \"Revision: \" #{file_to_upload}", revision)
         end
 
         [:test, :make, :within, :with, :as, :execute, 

data/lib/luban/deployment/templates/envrc.erb

@@ -1,4 +1,5 @@
-# Project environment activation resource file for <%= stage %>.<%= project %>/<%= application %>
+# Luban environment activation resource file
+# Environment: <%= env_name = "#{stage}.#{project}/#{application}" %>
 # Revision: <%= revision %>
 # Created at <%= Time.now().strftime("%d/%m/%Y %H:%M:%S") %>
 
@@ -10,10 +11,10 @@ echo_line() {
 
 if [ -n "${LUBAN_ROOT:+x}" ]; then
   if [[ "$LUBAN_ROOT" == "<%= app_path %>" ]]; then
-    echo_line "Project environment for <%= project %> has ALREADY been activated!"
+    echo_line "Environment <%= env_name %> has ALREADY been activated!"
   else
     local current_env=${LUBAN_ROOT##*env/}
-    echo_line "Project environment $current_env is STILL active!"
+    echo_line "Environment $current_env is STILL active!"
     echo_line "Please de-activate it first:"
     echo_line "\tunset_lubenv $current_env"
     echo_line "\t\tor"
@@ -25,6 +26,5 @@ else
   export LUBAN_ROOT
   export PATH
 
-  echo_line "Project environment <%= stage %>.<%= project %>/<%= application %> is activated!"
+  echo_line "Environment <%= env_name %> is activated!"
 fi
-

data/lib/luban/deployment/templates/unset_envrc.erb

@@ -1,4 +1,5 @@
-# Project environment de-activation resource file for <%= stage %>.<%= project %>/<%= application %>
+# Environment de-activation resource file
+# Environment: <%= env_name = "#{stage}.#{project}/#{application}" %>
 # Revision: <%= revision %>
 # Created at <%= Time.now().strftime("%d/%m/%Y %H:%M:%S") %>
 
@@ -13,16 +14,15 @@ if [ -n "${LUBAN_ROOT:+x}" ]; then
     PATH=${PATH//$LUBAN_ROOT\/bin:/}
     unset LUBAN_ROOT
     export PATH
-    echo_line "Project environment <%= stage %>.<%= project %>/<%= application %> is de-activated!"
+    echo_line "Environment <%= env_name %> is de-activated!"
   else
     local current_env=${LUBAN_ROOT##*env/}
-    echo_line "ACTUALLY, project environment $curent_env is active!"
+    echo_line "ACTUALLY, environment $curent_env is active!"
     echo_line "Please run the following command instead to de-activate it:"
     echo_line "\tunset_lubenv $current_env"
     echo_line "\t\tor"
     echo_line "\tsource $LUBAN_ROOT/.unset_envrc"
   fi
 else
-  echo_line "Project environment <%= stage %>.<%= project %>/<%= application %> has ALREADY been de-activated!"
+  echo_line "Environment <%= env_name %> has ALREADY been de-activated!"
 fi
-

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

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