luban 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1869e9e885d7001c5da72cb20649de3efe0373aa
-  data.tar.gz: 4fa710ce988a9dd6abe9b7ab099504851b25f8da
+  metadata.gz: aad609d3b76333f4673f7851c43f1d5412d36edd
+  data.tar.gz: 45e4da3e1f8f785320562b414f62fff7d100e048
 SHA512:
-  metadata.gz: dc8d972f086c40b6bab462d389d685263d56bc44925ca41789ab963defe7c04a6f0348beeffeceb748d5ec8b7e298e676d3a51542ef98bb50b695a08d411862d
-  data.tar.gz: a657dfb9403ffaeee93f2abe34c1dee081058d7a84053422f6ec2bf700c09b1ae54a2890ec082b305374f1562f9f489e2ecd6eae739d1b005ee5b9983b236eac
+  metadata.gz: 8cc42f3e6cf39cb53af1e1ff023d4e883358e3243bafaa44666f09350b1be4e7daccfc90e27d9a8636c74a559b64d3112b26a726b66521b75e60125ffb712ddc
+  data.tar.gz: c687a78ff0a2f69ba6765fc821c982a4a62850bfffb081041455f6d126b40383e6d75928adb35bf043509ab55ac8c9f0791a516ac30b17b488d4879c3ebb71e8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change log
 
+## Version 0.6.1 (Jul 11, 2016)
+
+New features:
+  * Added subcommand #process to grep and show running service/application processes
+  * Subcommands #version and #versions now also show the release info for application
+  * Used group to monitor/unmonitor service for cluster mode
+
 ## Version 0.6.0 (Jul 08, 2016)
 
 New features:

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

@@ -115,13 +115,16 @@ module Luban
         protected "#{action}!"
       end
 
-      alias_method :cleanup_packages!, :cleanup!
-      def cleanup!(args:, opts:)
-        cleanup_packages!(args: args, opts: opts)
-        cleanup_application!(args: args, opts: opts)
+      { show_current: :controller, show_summary: :controller,
+        cleanup: :constructor }.each_pair do |action, worker|
+        alias_method "#{action}_packages!", "#{action}!" 
+        define_method("#{action}!") do |args:, opts:|
+          send("#{action}_application!", args: args, opts: opts)
+          send("#{action}_packages!", args: args, opts: opts)
+        end
+        protected "#{action}!"
+        dispatch_task "#{action}_application!", to: worker, as: action
       end
-      protected :cleanup!
-      dispatch_task :cleanup_application!, to: :constructor, as: :cleanup
 
       def deploy(args:, opts:)
         show_app_environment

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

@@ -3,6 +3,54 @@ module Luban
     class Application
       class Controller < Worker
         include Luban::Deployment::Service::Controller::Base
+
+        def current_release?(_release_tag)
+          _release_tag =~ /^#{Regexp.escape(application_version)}/
+        end
+
+        def current_symlinked?(_release_tag)
+          _release_tag == release_tag
+        end
+
+        def release_path
+          @release_path ||= Pathname.new(readlink(app_path.join('app')))
+        end
+
+        def releases_path
+          @releases_path ||= release_path.dirname
+        end
+
+        def release_tag
+          @release_tag ||= release_path.basename.to_s
+        end
+
+        def show_current
+          update_result get_summary(release_tag)
+        end
+
+        def show_summary
+          update_result get_summary(*get_releases)
+        end
+
+        def get_releases
+          capture(:ls, '-xt', releases_path).split
+        end
+
+        protected
+
+        def get_status(tag)
+          if current_symlinked?(tag)
+            current_release?(tag) ? " *" : "s*"
+          else
+            (current_release?(tag) and !current_release?(release_tag)) ? "c*" : "  "
+          end
+        end
+
+        def get_summary(*release_tags)
+          release_tags.inject([]) do |r, tag|
+            r.push "#{get_status(tag)} #{application_name}:#{tag} (published)"
+          end.join("\n")
+        end
       end
     end
   end

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

@@ -21,6 +21,10 @@ module Luban
         def package_bin_path(package_name)
           @package_bin_path ||= package_path(package_name).join('bin')
         end
+
+        def service_entry
+          @service_entry ||= "#{env_name.gsub('/', '.')}.app"
+        end
       end
     end
   end

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

@@ -46,12 +46,12 @@ module Luban
             end
 
             task :version do
-              desc "Show current version for required packages"
+              desc "Show current version for app/required packages"
               action! :show_current
             end
 
             task :versions do
-              desc "Show package installation summary"
+              desc "Show app/package installation summary"
               action! :show_summary
             end
 
@@ -91,7 +91,7 @@ module Luban
 
         module Control
           Actions = %i(start_process stop_process kill_process
-                       restart_process check_process)
+                       restart_process check_process show_process)
           Actions.each do |action|
             define_method(action) do |args:, opts:|
               raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
@@ -133,6 +133,11 @@ module Luban
               desc "Check process status"
               action! :check_process
             end
+
+            task :process do
+              desc "Show running process if any"
+              action! :show_process
+            end
           end
         end
       end

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

@@ -108,6 +108,10 @@ module Luban
             update_result check_process!
           end
 
+          def show_process
+            update_result show_process!
+          end
+
           def kill_process
             if process_stopped?
               update_result "Skipped! Already stopped #{service_full_name}", status: :skipped
@@ -188,13 +192,20 @@ module Luban
           end
 
           def process_grep(pattern = process_pattern)
-            capture(:pgrep, "-l -f \"#{pattern}\" 2>/dev/null").split.inject({}) do |h, p|
+            capture(:pgrep, "-l -f \"#{pattern}\" 2>/dev/null").split("\n").inject({}) do |h, p|
               pid, pname = p.split(' ', 2)
               h[pid] = pname
               h
             end
           end
 
+          def show_process!
+            result = process_grep.inject("") do |s, (pid, cmd)|
+                       s += "#{pid} : #{cmd}\n"
+                     end
+            result.empty? ? "No processes are found up and running." : result
+          end
+
           def remove_orphaned_pid_file
             rm(pid_file_path) if pid_file_orphaned?
           end
@@ -237,6 +248,14 @@ module Luban
           def remove_orphaned_pid_file
             rm(pid_files_path) if pid_file_orphaned?
           end
+
+          def monitor_command
+            @monitor_command ||= "#{monitor_executable} monitor -g #{service_entry}"
+          end
+
+          def unmonitor_command
+            @unmonitor_command ||= "#{monitor_executable} unmonitor -g #{service_entry}"
+          end
         end
 
         include Base

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

@@ -139,7 +139,7 @@ module Luban
         def render_template(template_file, context: binding)
           require 'erb'
           template = File.read(template_file)
-          ERB.new(template, nil, '<>').result(context)
+          ERB.new(template, nil, '-').result(context)
         end
 
         def revision_match?(file_to_upload, revision)

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
   end
 end

metadata

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