luban 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8efefadae50e7e28a9576ead9092d2d5d951349d
-  data.tar.gz: e0a8a86b1f33019e2953ca640cb1c5d4121aeb18
+  metadata.gz: 3d493b2d012713f59e25fb1e6e6d7a10775b3ed3
+  data.tar.gz: 8e43f9b7bf5753860763814289f41d1d29672fc7
 SHA512:
-  metadata.gz: 0b79a40a13f3301ff09c114d6ecc8e9e3624f43d2206bc3f1afe96efef323631d66e2972c8686d80479866f847a3d067ad01429b5db382e3d64e2719d3d5f4c0
-  data.tar.gz: bde512704035dfdc76240f7cf05dede43a969c87d7be891db9162d2a2cc79fffa61a4aef7de00009f511f2ee419021314a08a0397b4cf1071668e58fb5fce36c
+  metadata.gz: 960cc4b82033d31b8d6276ef8dd8c6755cf5a67819d5f48dd2310eeab7b3280f622641e265eb0cd376f581de3950eaa4f1a382dd411f92dbce310f882654eac1
+  data.tar.gz: 4f006ad06fa68c930c788a51d8158e113e57c36960c84a2dad35d393b7283224c1c05807cfdbcbf835b8457eb7e9d39ffd2fd848116448c2403992a03e80ffa7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change log
 
+## Version 0.8.8 (Sept 28, 2016)
+
+Minor enhancements:
+  * Applied subcommand grouping for better clarity
+    * As a result, bump up gem dependency of Luban::CLI to version 0.4.6
+
 ## Version 0.8.7 (Sept 27, 2016)
 
 Minor enhancements:

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

@@ -4,7 +4,7 @@ module Luban
       using Luban::CLI::CoreRefinements
       include Luban::Deployment::Parameters::Project
       include Luban::Deployment::Parameters::Application
-      include Luban::Deployment::Command::Tasks::Install
+      include Luban::Deployment::Command::Tasks::Provision
       include Luban::Deployment::Command::Tasks::Deploy
       include Luban::Deployment::Command::Tasks::Control
       include Luban::Deployment::Command::Tasks::Monitor
@@ -55,7 +55,7 @@ module Luban
       def has_packages?; !packages.empty?; end
       def has_services?; !services.empty?; end
 
-      def installable?;  has_packages?; end
+      def provisionable?;  has_packages?; end
       def deployable?;   has_source? or has_profile? end
       def controllable?; has_source? or has_services?; end
 

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

@@ -2,7 +2,7 @@ module Luban
   module Deployment
     class Command < Luban::CLI::Command
       module Tasks
-        module Install
+        module Provision
           Actions = %i(setup build destroy cleanup binstubs
                        show_current show_summary which whence)
           Actions.each do |action|
@@ -11,60 +11,64 @@ module Luban
             end
           end
 
-          def installable?; true; end
+          def provisionable?; true; end
+
+          def provision_tasks; commands[:provision].commands; end
 
           protected
 
-          def setup_install_tasks
+          def setup_provision_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
-              action! :build
-            end
-
-            task :destroy do
-              desc "Destroy #{_self.display_name} environment"
-              switch :force, "Force to destroy", short: :f, required: true
-              action! :destroy
-            end
-
-            task :cleanup do
-              desc "Clean up temporary files during installation"
-              action! :cleanup
-            end
-
-            task :binstubs do
-              desc "Update binstubs for required packages"
-              switch :force, "Force to update binstubs", short: :f
-              action! :binstubs
-            end
-
-            task :version do
-              desc "Show current version for app/required packages"
-              action! :show_current
-            end
-
-            task :versions do
-              desc "Show app/package installation summary"
-              action! :show_summary
-            end
-
-            task :which do
-              desc "Show the real path for the given executable"
-              argument :executable, "Executable to which"
-              action! :which
-            end
-
-            task :whence do
-              desc "List packages with the given executable"
-              argument :executable, "Executable to whence"
-              action! :whence
+            command :provision do
+              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
+                action! :build
+              end
+
+              task :destroy do
+                desc "Destroy #{_self.display_name} environment"
+                switch :force, "Force to destroy", short: :f, required: true
+                action! :destroy
+              end
+
+              task :cleanup do
+                desc "Clean up temporary files during installation"
+                action! :cleanup
+              end
+
+              task :binstubs do
+                desc "Update binstubs for required packages"
+                switch :force, "Force to update binstubs", short: :f
+                action! :binstubs
+              end
+
+              task :version do
+                desc "Show current version for app/required packages"
+                action! :show_current
+              end
+
+              task :versions do
+                desc "Show app/package installation summary"
+                action! :show_summary
+              end
+
+              task :which do
+                desc "Show the real path for the given executable"
+                argument :executable, "Executable to which"
+                action! :which
+              end
+
+              task :whence do
+                desc "List packages with the given executable"
+                argument :executable, "Executable to whence"
+                action! :whence
+              end
             end
           end
         end
@@ -101,37 +105,41 @@ module Luban
 
           def controllable?; true; end
 
+          def control_tasks; commands[:control].commands; end
+
           protected
 
           def setup_control_tasks
-            task :start do
-              desc "Start process"
-              action! :start_process
-            end
-
-            task :stop do
-              desc "Stop process"
-              action! :stop_process
-            end
-
-            task :restart do
-              desc "Restart process"
-              action! :restart_process
-            end
-
-            task :kill do
-              desc "Kill process forcely"
-              action! :kill_process
-            end
-
-            task :status do
-              desc "Check process status"
-              action! :check_process
-            end
-
-            task :process do
-              desc "Show running process if any"
-              action! :show_process
+            command :control do
+              task :start do
+                desc "Start process"
+                action! :start_process
+              end
+
+              task :stop do
+                desc "Stop process"
+                action! :stop_process
+              end
+
+              task :restart do
+                desc "Restart process"
+                action! :restart_process
+              end
+
+              task :kill do
+                desc "Kill process forcely"
+                action! :kill_process
+              end
+
+              task :status do
+                desc "Check process status"
+                action! :check_process
+              end
+
+              task :process do
+                desc "Show running process if any"
+                action! :show_process
+              end
             end
           end
         end
@@ -148,22 +156,26 @@ module Luban
             controllable? and monitor_defined? and !monitor_itself?
           end
 
+          def monitor_tasks; commands[:monitor].commands; end
+
           protected
 
           def setup_monitor_tasks
-            task :monitor_on do
-              desc "Turn on process monitor"
-              action! :monitor_on
-            end
-
-            task :monitor_off do
-              desc "Turn off process monitor"
-              action! :monitor_off
-            end
-
-            task :monitor_reload do
-              desc "Reload monitor configuration"
-              action! :monitor_reload
+            command :monitor do
+              task :on do
+                desc "Turn on process monitor"
+                action! :monitor_on
+              end
+
+              task :off do
+                desc "Turn off process monitor"
+                action! :monitor_off
+              end
+
+              task :reload do
+                desc "Reload monitor configuration"
+                action! :monitor_reload
+              end
             end
           end
         end
@@ -189,6 +201,8 @@ module Luban
             cronjobs << job
           end
 
+          def crontab_tasks; commands[:conjobs].commands; end
+
           protected
 
           def validate_cronjob(job)
@@ -204,15 +218,17 @@ module Luban
           end
 
           def setup_crontab_tasks
-            task :cronjobs_update do
-              desc 'Update cron jobs'
-              action! :update_cronjobs
-            end
-
-            task :cronjobs_list do
-              desc 'List cron jobs'
-              switch :all, "List all cron jobs"
-              action! :list_cronjobs
+            command :cronjobs do
+              task :update do
+                desc 'Update cron jobs'
+                action! :update_cronjobs
+              end
+
+              task :list do
+                desc 'List cron jobs'
+                switch :all, "List all cron jobs"
+                action! :list_cronjobs
+              end
             end
           end
         end
@@ -224,21 +240,10 @@ module Luban
 
       def display_name; @display_name ||= name.camelcase; end
 
-      def installable?;  false; end
-      def deployable?;   false; end
-      def controllable?; false; end
-      def monitorable?;  false; end
-
-      def task(cmd, **opts, &blk)
-        command(cmd, **opts, &blk).tap do |c|
-          add_common_task_options(c)
-          if !c.summary.nil? and c.description.empty?
-            c.long_desc "#{c.summary} in #{self.class.name}"
-          end
-        end
-      end
-
-      alias_method :undef_task, :undef_command
+      def provisionable?; false; end
+      def deployable?;    false; end
+      def controllable?;  false; end
+      def monitorable?;   false; end
 
       class << self
         def inherited(subclass)
@@ -368,7 +373,7 @@ module Luban
       def setup_descriptions; end
 
       def setup_tasks
-        setup_install_tasks if installable?
+        setup_provision_tasks if provisionable?
         setup_deploy_tasks if deployable?
         setup_control_tasks if controllable?
         setup_monitor_tasks if monitorable?

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

@@ -69,7 +69,7 @@ module Luban
 
         include Luban::Deployment::Parameters::Project
         include Luban::Deployment::Parameters::Application
-        include Luban::Deployment::Command::Tasks::Install
+        include Luban::Deployment::Command::Tasks::Provision
 
         def monitorable?; false; end
 
@@ -188,7 +188,7 @@ module Luban
 
         def setup_tasks
           super
-          setup_install_tasks
+          setup_provision_tasks
         end
 
         def compose_task_options(opts)
@@ -206,40 +206,42 @@ module Luban
           long_desc "Manage the deployment of package #{display_name} in #{parent.class.name}"
         end
 
-        def setup_install_tasks
+        def setup_provision_tasks
           super
 
-          undef_task :setup
-          undef_task :build
-          undef_task :destroy
+          commands[:provision].undef_task :setup
+          commands[:provision].undef_task :build
+          commands[:provision].undef_task :destroy
 
           _package = self
-          task :install do
-            desc "Install a given version"
-            option :version, "Version to install", short: :v, required: true,
-                   assure: ->(v){ _package.versions.include?(v) }
-            switch :force, "Force to install", short: :f
-            action! :install
-          end
+          commands[:provision].alter do
+            task :install do
+              desc "Install a given version"
+              option :version, "Version to install", short: :v, required: true,
+                     assure: ->(v){ _package.versions.include?(v) }
+              switch :force, "Force to install", short: :f
+              action! :install
+            end
 
-          task :install_all do
-            desc "Install all versions"
-            switch :force, "Force to install", short: :f
-            action! :install_all
-          end
+            task :install_all do
+              desc "Install all versions"
+              switch :force, "Force to install", short: :f
+              action! :install_all
+            end
 
-          task :uninstall do
-            desc "Uninstall a given version"
-            option :version, "Version to uninstall", short: :v, required: true,
-                    assure: ->(v){ _package.versions.include?(v) }
-            switch :force, "Force to uninstall", short: :f
-            action! :uninstall
-          end
+            task :uninstall do
+              desc "Uninstall a given version"
+              option :version, "Version to uninstall", short: :v, required: true,
+                      assure: ->(v){ _package.versions.include?(v) }
+              switch :force, "Force to uninstall", short: :f
+              action! :uninstall
+            end
 
-          task :uninstall_all do
-            desc "Uninstall all versions"
-            switch :force, "Force to uninstall", short: :f, required: true
-            action! :uninstall_all
+            task :uninstall_all do
+              desc "Uninstall all versions"
+              switch :force, "Force to uninstall", short: :f, required: true
+              action! :uninstall_all
+            end
           end
         end
 

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

@@ -3,7 +3,7 @@ module Luban
     class Project < Luban::Deployment::Command
       using Luban::CLI::CoreRefinements
       include Luban::Deployment::Parameters::Project
-      include Luban::Deployment::Command::Tasks::Install
+      include Luban::Deployment::Command::Tasks::Provision
       include Luban::Deployment::Command::Tasks::Deploy
       include Luban::Deployment::Command::Tasks::Control
 
@@ -30,16 +30,16 @@ module Luban
         end
       end
 
-      %i(installable? deployable? controllable?).each do |method|
+      %i(provisionable? deployable? controllable?).each do |method|
         define_method(method) do
           apps.values.any? { |app| app.send(__method__) }
         end
       end
 
-      (Luban::Deployment::Command::Tasks::Install::Actions | %i(destroy_project)).each do |action|
+      (Luban::Deployment::Command::Tasks::Provision::Actions | %i(destroy_project)).each do |action|
         define_method(action) do |args:, opts:|
           apps.each_value do |app|
-            app.send(__method__, args: args, opts: opts) if app.installable?
+            app.send(__method__, args: args, opts: opts) if app.provisionable?
           end
         end
       end
@@ -145,4 +145,4 @@ module Luban
       end
     end
   end
-end
+end

data/lib/luban/deployment/packages/bundler.rb

@@ -4,9 +4,9 @@ module Luban
       class Bundler < Luban::Deployment::Package::Base
         protected
 
-        def setup_install_tasks
+        def setup_provision_tasks
           super
-          commands[:install].switch :install_doc, "Install Bundler document"
+          provision_tasks[:install].switch :install_doc, "Install Bundler document"
         end
 
         class Installer < Luban::Deployment::Package::Installer

data/lib/luban/deployment/packages/git.rb

@@ -10,9 +10,9 @@ module Luban
 
         protected
 
-        def setup_install_tasks
+        def setup_provision_tasks
           super
-          commands[:install].option :openssl, "OpenSSL version"
+          provision_tasks[:install].option :openssl, "OpenSSL version"
         end
 
         class Installer < Luban::Deployment::Package::Installer

data/lib/luban/deployment/packages/ruby.rb

@@ -66,14 +66,15 @@ module Luban
         
         protected
 
-        def setup_install_tasks
+        def setup_provision_tasks
           super
-          commands[:install].switch :install_doc, "Install Ruby document"
-          commands[:install].switch :install_tcl, "Install with Tcl"
-          commands[:install].switch :install_tk, "Install with Tk"
-          commands[:install].option :rubygems, "Rubygems version (effective for v1.9.2 or below)"
-          commands[:install].option :bundler, "Bundler version"
-          commands[:install].option :openssl, "OpenSSL version (effective for v1.9.3 or above)"
+
+          provision_tasks[:install].switch :install_doc, "Install Ruby document"
+          provision_tasks[:install].switch :install_tcl, "Install with Tcl"
+          provision_tasks[:install].switch :install_tk, "Install with Tk"
+          provision_tasks[:install].option :rubygems, "Rubygems version (effective for v1.9.2 or below)"
+          provision_tasks[:install].option :bundler, "Bundler version"
+          provision_tasks[:install].option :openssl, "OpenSSL version (effective for v1.9.3 or above)"
         end
 
         class Installer < Luban::Deployment::Package::Installer

data/lib/luban/deployment/packages/rubygems.rb

@@ -4,9 +4,9 @@ module Luban
       class Rubygems < Luban::Deployment::Package::Base
         protected
 
-        def setup_install_tasks
+        def setup_provision_tasks
           super
-          commands[:install].switch :install_doc, "Install Rubygems document"
+          provision_tasks[:install].switch :install_doc, "Install Rubygems document"
         end
 
         class Installer < Luban::Deployment::Package::Installer

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.8.7"
+    VERSION = "0.8.8"
   end
 end

data/luban.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.required_ruby_version = ">= 2.1.0"
-  spec.add_runtime_dependency 'luban-cli', ">=0.4.5"
+  spec.add_runtime_dependency 'luban-cli', ">=0.4.6"
   spec.add_runtime_dependency 'sshkit'
   
   spec.add_development_dependency "bundler", "~> 1.9"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Rubyist Lei
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement