luban 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcaab3a6f85c7700a2a3591f4964bc6588e1d341
-  data.tar.gz: d4d4038ffdf658f4a50bfcf796a5bec5aa23efe2
+  metadata.gz: 1e6d4f9cdf3011d2178e45db658af31c0c177bd3
+  data.tar.gz: 601049ece4a58b0b23cb368cc343009723ac887d
 SHA512:
-  metadata.gz: 90d73c8299cd2c2197ed996532f859d3728a6cfa1f1ef8c099367adfe29ad4b50cb4f63d212b73cd66e1d774c2a4326e53185a18d6fcffe7c0126e6454d611bb
-  data.tar.gz: e17cb7ffc3fe8658d73d2cdadf3d06de1cc016056d9f27170614c11261d7ee7f43bc5d0c95aa3a9ff18bbd448c3b8cb3afbb9b180ce680f7ba9f6eba928183ec
+  metadata.gz: 13b3bdc0260bbb588b730136cd682a51df4c5a3a91efeca7ea9d9cf6084942e1975f7975b1a879a31f916909e39239977de6cd14efd7bc586ed44c5bdb1b909a
+  data.tar.gz: ae4f6b0794889d7eafbb073b34ad2fa842681f64ac99c12aeed7e45102a335bdb1fbdd9a84b69433e7d5d0694a95a949c3390bbf30e53166340948e45290c76c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## Version 0.7.0 (Aug 18, 2016)
+
+New features:
+  * Supported app configuration stored in the environment variables
+
 ## Version 0.6.9 (Aug 15, 2016)
 
 Minor enhancements:

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

@@ -5,6 +5,10 @@ module Luban
         include Luban::Deployment::Worker::Paths::Remote
         include Luban::Deployment::Service::Worker::Base
 
+        def shell_setup_commands
+          super << "cd #{release_path}"
+        end
+
         %i(name full_name version major_version patch_level).each do |method|
           define_method("application_#{method}") { send("target_#{method}") }
         end

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

@@ -31,8 +31,7 @@ module Luban
         end
 
         def parent; task.opts.parent; end
-        def child?; !parent.nil?; end
-        
+        def child?; !parent.nil?; end     
 
         def current_path
           @current_path ||= app_path.join(package_name)

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

@@ -186,11 +186,11 @@ module Luban
           end
 
           def start_process!
-            capture("#{start_command} 2>&1")
+            capture(compose_command(start_command))
           end
 
           def stop_process!
-            capture("#{stop_command} 2>&1")
+            capture(compose_command(stop_command))
           end
 
           def check_process!
@@ -229,15 +229,15 @@ module Luban
           end
 
           def monitor_process!
-            test("#{monitor_command} 2>&1")
+            test(compose_command(monitor_command))
           end
 
           def unmonitor_process!
-            test("#{unmonitor_command} 2>&1")
+            test(compose_command(unmonitor_command))
           end
 
           def reload_monitor_process!
-            test("#{reload_monitor_command} 2>&1")
+            test(compose_command(reload_monitor_command))
           end
         end
         

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

@@ -3,6 +3,14 @@ module Luban
     module Service
       class Worker < Luban::Deployment::Package::Worker
         module Base
+          def shell_setup_commands
+            @shell_setup_commands ||= ["source #{envrc_file}"]
+          end
+
+          def compose_command(cmd)
+            "#{shell_setup_commands.join('; ')}; #{cmd} 2>&1"
+          end
+          
           %i(name full_name version major_version patch_level).each do |method|
             define_method("service_#{method}") { send("target_#{method}") }
           end

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

@@ -161,8 +161,10 @@ module Luban
           def load_stage_configuration
             target.load_configuration_file(stage_config_file)
             if File.directory?(stage_config_path)
-              Dir[stage_config_path.join("{packages}/**/*.rb")].each do |file|
-                target.load_configuration_file(file)
+              ["*.rb", "{packages}/**/*.rb"].each do |pattern|
+                Dir[stage_config_path.join(pattern)].each do |file|
+                  target.load_configuration_file(file)
+                end
               end
             end
           end

data/lib/luban/deployment/parameters.rb

@@ -25,6 +25,7 @@ module Luban
 
         parameter :stages
         parameter :applications
+        parameter :env_vars
 
         parameter :work_dir
         parameter :apps_path
@@ -37,6 +38,7 @@ module Luban
         def set_default_general_parameters
           set_default :luban_roles, %i(app)
           set_default :luban_root_path, DefaultLubanRootPath
+          set_default :env_vars, {}
           set_default :user, ENV['USER']
           set_default :config_finder, {}
         end

data/lib/luban/deployment/templates/application/config/deploy/__stage/env_vars.rb

@@ -0,0 +1,3 @@
+# Environment variables setup for <%= stage %> application <%= application_class_name %>
+
+# env_vars[:key] = "value"

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

@@ -22,6 +22,11 @@ else
   PATH="$LUBAN_ROOT/bin:$PATH"
   export LUBAN_ROOT
   export PATH
-
+  <%- env_vars.each_pair do |name, value| -%>
+  <%= name.upcase %>=<%= value.inspect %>
+  <%- end -%>
+  <%- env_vars.each_key do |name| -%>
+  export <%= name.upcase %>
+  <%- end -%>
   echo_line "Environment <%= env_name %> is activated!"
 fi

data/lib/luban/deployment/templates/project/.gitignore

@@ -2,4 +2,5 @@
 /Gemfile.lock
 .luban/
 vendor/cache/
+env_vars.rb
 .DS_Store

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

@@ -11,6 +11,9 @@ if [ -n "${LUBAN_ROOT:+x}" ]; then
     PATH=${PATH//$LUBAN_ROOT\/bin:/}
     unset LUBAN_ROOT
     export PATH
+    <%- env_vars.each_key do |name| -%>
+    unset <%= name.upcase %>
+    <%- end -%>
     echo_line "Environment <%= env_name %> is de-activated!"
   else
     local current_env=${LUBAN_ROOT##*env/}

data/lib/luban/deployment/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -149,6 +149,7 @@ files:
 - lib/luban/deployment/runner.rb
 - lib/luban/deployment/templates/application/config/deploy.rb.erb
 - lib/luban/deployment/templates/application/config/deploy/__stage.rb.erb
+- lib/luban/deployment/templates/application/config/deploy/__stage/env_vars.rb
 - lib/luban/deployment/templates/application/config/deploy/__stage/packages/.gitkeep
 - lib/luban/deployment/templates/application/config/deploy/__stage/profile/.gitkeep
 - lib/luban/deployment/templates/application/config/deploy/__stage/templates/.gitkeep