luban 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4ff5719088dde2272d1acffdb8f0929872f02c
-  data.tar.gz: a02e072d9d3760b30c3c6f22f3029cf69b6a95e0
+  metadata.gz: 22f7040c1da873d1aa03672d4918506c4c6eef8d
+  data.tar.gz: 6df3eeefecd1377d4e0b6db086f57859f08cc5d1
 SHA512:
-  metadata.gz: 54678b14d233074638fd1f03950dc37fb3598c71bedd45c3a1426adc8acbcc8c58f1613357dc4e7c87a790bfa66fd960ce6b0e87c968940b204ff43d6f33bb22
-  data.tar.gz: c93eb97c9383c8e88b1020affe8318cdbe4ad6ae36e7ef3bc2691feb3fd49cab3f874b6f35e3582b567e46b11695e52242b54d2fed8d3a990389fa8f078aee17
+  metadata.gz: 299133650c4099b5f8e61f45998d91388b87edfb168676eee5ad07eda8c5e2652c358984e464551bea814826ae01b87eca6326ccaf77ad881e29d63a428c3e05
+  data.tar.gz: 9dcb174a692218a5f921af3e58c1b017ec1362b220b9bc19bfecaa13ae6fc1ecb95b6a89d64760f1cbed84bcdcb7ddac46cf3a32ad4108a436461972354b7698

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change log
 
+## Version 0.5.5 (WIP)
+
+Minor enhancements:
+  * Refactored app/service profile templates initialization
+  * Refactored Service::Worker to abstract general behavior for Service/Application
+  * Refactored Service::Configurator to abstract general configuration for Service/Application
+  * Refactored Service::Controller to abstract general control for Service/Application
+  * Changed attribute :name to :type in Application::Repository for better naming
+  * Changed attribute :release_name to :release_type in Application::Publisher for better naming
+  * Removed deploy commands in Service because deploy commands exist ONLY in application level
+  * Renamed application Builder to Constructor for better naming convention in Luban
+  * Minor refactoring
+
 ## Version 0.5.1 (Jun 24, 2016)
 
 Minor enhancements:

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

@@ -46,11 +46,20 @@ module Luban
       alias_method :require_package, :package
 
       def source(from = nil, **opts)
-        from.nil? ? @source : (@source = opts.merge(name: 'app', from: from))
+        return @source if from.nil?
+        @source = opts.merge(type: 'app', from: from)
+        if source_version.nil?
+          abort "Aborted! Please specify the source version with :tag, :branch or :ref." 
+        end
+        @source 
+      end
+
+      def source_version
+        @source[:tag] || @source[:branch] || @source[:ref]
       end
 
       def profile(from = nil, **opts)
-        from.nil? ? @profile : (@profile = opts.merge(name: 'profile', from: from))
+        from.nil? ? @profile : (@profile = opts.merge(type: 'profile', from: from))
       end
 
       def password_for(user); parent.password_for(user); end
@@ -64,7 +73,7 @@ module Luban
       def setup(args:, opts:)
         show_app_environment
         promptless_authen(args: args, opts: opts)
-        build!(args: args, opts: opts)
+        setup!(args: args, opts: opts)
       end
 
       def build(args:, opts:)
@@ -118,22 +127,23 @@ module Luban
 
       def init_profiles(args:, opts:)
         show_app_environment
-        if opts[:app]
-          init_profile(args: args, opts: opts)
-        elsif opts[:service].nil?
-          init_profile(args: args, opts: opts)
-          init_service_profiles(args: args, opts: opts)
-        elsif opts[:service].is_a?(TrueClass)
-          init_service_profiles(args: args, opts: opts)
-        else
-          services[opts[:service]].init_profile(args: args, opts: opts)
-        end
+        init_profile(args: args, opts: opts)
+        init_service_profiles(args: args, opts: opts)
       end
 
-      def init_profile(args:, opts:); end
+      def init_profile(args:, opts:)
+        if opts[:app] or opts[:service].nil?
+          init_profile!(args: args, opts: opts.merge(default_templates: default_templates))
+        end
+      end
 
       def init_service_profiles(args:, opts:)
-        services.values.each { |s| s.init_profile(args: args, opts: opts) }
+        return if opts[:app]
+        if services.has_key?(opts[:service])
+          services[opts[:service]].init_profile(args: args, opts: opts)
+        else
+          services.values.each { |s| s.init_profile(args: args, opts: opts) }
+        end
       end
 
       protected
@@ -184,8 +194,8 @@ module Luban
 
       def setup_init_profiles
         _services = services.keys
-        command :init do
-          desc 'Initialize deployment application/service profiles'
+        task :init do
+          desc 'Initialize deployment app/service profiles'
           switch :app, "Application profile ONLY", short: :a
           option :service, "Service profile ONLY", short: :s, nullable: true, 
                                                    within: _services.push(nil), type: :symbol
@@ -193,12 +203,18 @@ module Luban
         end
       end
 
+      def compose_task_options(opts)
+        super.merge(name: 'app').tap do |o|
+          o.merge!(version: source_version) if has_source?
+        end
+      end
+
       def show_app_environment
         puts "#{display_name} in #{parent.class.name}"
       end
 
-      %i(build destroy cleanup).each do |task|
-        dispatch_task "#{task}!", to: :builder, as: task
+      %i(setup destroy cleanup).each do |task|
+        dispatch_task "#{task}!", to: :constructor, as: task
       end
 
       def build_repositories(args:, opts:)
@@ -207,11 +223,12 @@ module Luban
       end
 
       def deploy_profile(args:, opts:)
-        update_profile!(args: args, opts: opts)
+        update_profile(args: args, opts: opts)
         deploy_profile!(args: args, opts: opts.merge(repository: profile))
       end
 
-      def update_profile!(args:, opts:)
+      def update_profile(args:, opts:)
+        update_profile!(args: args, opts: opts)
         services.each_value { |s| s.send(:update_profile, args: args, opts: opts) }
       end
 
@@ -230,6 +247,8 @@ module Luban
 
       dispatch_task :promptless_authen!, to: :authenticator, as: :promptless_authen
       dispatch_task :public_key!, to: :authenticator, as: :public_key, locally: true
+      dispatch_task :init_profile!, to: :configurator, as: :init_profile, locally: true
+      dispatch_task :update_profile!, to: :configurator, as: :update_profile, locally: true
       dispatch_task :build_repository!, to: :repository, as: :build, locally: true
       dispatch_task :package_release!, to: :repository, as: :package, locally: true
       dispatch_task :publish_release!, to: :publisher, as: :publish

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

@@ -0,0 +1,9 @@
+module Luban
+  module Deployment
+    class Application
+      class Configurator < Worker
+        include Luban::Deployment::Service::Configurator::Base
+      end
+    end
+  end
+end

data/lib/luban/deployment/cli/application/{builder.rb → constructor.rb}

@@ -1,9 +1,7 @@
 module Luban
   module Deployment
     class Application
-      class Builder < Luban::Deployment::Worker::Base
-        include Luban::Deployment::Worker::Paths::Remote
-
+      class Constructor < Worker
         def envrc_template_file
           @envrc_template_file ||= find_template_file("envrc.erb")
         end
@@ -12,7 +10,7 @@ module Luban
           @unset_envrc_template_file ||= find_template_file("unset_envrc.erb")
         end
 
-        def build
+        def setup
           bootstrap
           create_envrc_files
         end

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

@@ -0,0 +1,9 @@
+module Luban
+  module Deployment
+    class Application
+      class Controller < Worker
+        include Luban::Deployment::Service::Controller::Base
+      end
+    end
+  end
+end

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

@@ -1,10 +1,8 @@
 module Luban
   module Deployment
     class Application
-      class Publisher < Luban::Deployment::Worker::Base
-        include Luban::Deployment::Worker::Paths::Remote
-
-        def release_name; task.opts.release[:name]; end
+      class Publisher < Worker
+        def release_type; task.opts.release[:type]; end
         def release_tag; task.opts.release[:tag]; end
         def release_package_path; task.opts.release[:path]; end
         def release_md5; task.opts.release[:md5]; end
@@ -13,15 +11,15 @@ module Luban
         def gems_source; bundled_gems[:gems_cache]; end
         def gems; bundled_gems[:gems]; end
 
-        def publish_app?; release_name == 'app'; end
-        def publish_profile?; release_name == 'profile'; end
+        def publish_app?; release_type == 'app'; end
+        def publish_profile?; release_type == 'profile'; end
 
         def display_name
-          @display_name ||= "#{application} #{release_name} (release: #{release_tag})"
+          @display_name ||= "#{application} #{release_type} (release: #{release_tag})"
         end
 
         def releases_path
-          @releases_path ||= super.join(release_name)
+          @releases_path ||= super.join(release_type)
         end
 
         def release_path
@@ -119,7 +117,7 @@ module Luban
         end
 
         def create_symlinks
-          send("create_#{release_name}_symlinks")
+          send("create_#{release_type}_symlinks")
           create_shared_symlinks_for(:directory, linked_dirs)
           create_shared_symlinks_for(:directory, bundle_linked_dirs) if file?(gemfile)
         end
@@ -136,7 +134,7 @@ module Luban
         end
 
         def create_release_symlink(target_dir)
-          assure_symlink(release_path, target_dir.join(release_name))
+          assure_symlink(release_path, target_dir.join(release_type))
         end
 
         def create_shared_symlinks_for(type, linked_paths)

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

@@ -7,7 +7,7 @@ module Luban
 
         DefaultRevisionSize = 12
 
-        attr_reader :name
+        attr_reader :type
         attr_reader :from
         attr_reader :scm
         attr_reader :revision
@@ -23,11 +23,11 @@ module Luban
         end
 
         def clone_path
-          @clone_path ||= workspace_path.join('repositories').join(name)
+          @clone_path ||= workspace_path.join('repositories').join(type)
         end
 
         def releases_path
-          @releases_path ||= workspace_path.join('releases').join(name)
+          @releases_path ||= workspace_path.join('releases').join(type)
         end
 
         def release_package_path
@@ -47,7 +47,7 @@ module Luban
         end
 
         def release_prefix
-          @release_prefix ||= "#{stage}-#{project}-#{application}-#{name}"
+          @release_prefix ||= "#{stage}-#{project}-#{application}-#{type}"
         end
 
         def release_tag
@@ -75,17 +75,17 @@ module Luban
           assure_dirs(clone_path, releases_path)
           if cloned? and !force?
             update_revision
-            update_result "Skipped! Local #{name} repository has been built ALREADY.", status: :skipped
+            update_result "Skipped! Local #{type} repository has been built ALREADY.", status: :skipped
           else
             if available?
               if build!
                 update_revision
-                update_result "Successfully built local #{name} repository."
+                update_result "Successfully built local #{type} repository."
               else
-                update_result "FAILED to build local #{name} repository!", status: :failed, level: :error
+                update_result "FAILED to build local #{type} repository!", status: :failed, level: :error
               end
             else
-              update_result "Aborted! Remote #{name} repository is NOT available.", status: :failed, level: :error
+              update_result "Aborted! Remote #{type} repository is NOT available.", status: :failed, level: :error
             end
           end
         end
@@ -94,16 +94,16 @@ module Luban
           if cloned?
             if package!
               cleanup_releases
-              update_result "Successfully package local #{name} repository to #{release_package_path}.", 
-                            release: { name: name, tag: release_tag,
+              update_result "Successfully package local #{type} repository to #{release_package_path}.", 
+                            release: { type: type, tag: release_tag,
                                        path: release_package_path, 
                                        md5: md5_for_file(release_package_path),
                                        bundled_gems: bundle_gems }
             else
-              update_result "FAILED to package local #{name} repository!", status: :failed, level: :error
+              update_result "FAILED to package local #{type} repository!", status: :failed, level: :error
             end
           else
-            update_result "Aborted! Local #{name} package is NOT built yet!", status: :failed, level: :error
+            update_result "Aborted! Local #{type} package is NOT built yet!", status: :failed, level: :error
           end
         end
 

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

@@ -0,0 +1,22 @@
+module Luban
+  module Deployment
+    class Application
+      class Worker < Luban::Deployment::Worker::Base
+        include Luban::Deployment::Worker::Paths::Remote
+        include Luban::Deployment::Service::Worker::Base
+
+        def service_name
+          @service_name ||= task.opts.name
+        end
+
+        def service_version
+          @service_version ||= task.opts.version
+        end
+
+        def service_full_name
+          @service_full_name ||= "#{service_name}-#{service_version}"
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,9 @@
 require_relative 'application/base'
+require_relative 'application/worker'
 require_relative 'application/authenticator'
-require_relative 'application/builder'
+require_relative 'application/constructor'
 require_relative 'application/repository'
 require_relative 'application/publisher'
+require_relative 'application/configurator'
+require_relative 'application/controller'
+

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

@@ -208,6 +208,12 @@ module Luban
         locally ? result.first[:__return__] : result
       end
 
+      def default_templates_path; end
+
+      def default_templates
+        default_templates_path.nil? ? [] : default_templates_path.children
+      end
+
       protected
 
       def on_configure
@@ -217,6 +223,7 @@ module Luban
         load_configuration
         validate_parameters
         load_libraries
+        include_default_templates_path unless default_templates_path.nil?
         setup_cli
       end
 
@@ -249,6 +256,14 @@ module Luban
 
       def load_libraries; end
 
+      def include_default_templates_path
+        if default_templates_path.is_a?(Pathname)
+          default_templates_paths.unshift(default_templates_path)
+        else
+          abort "Aborted! Default templates path for #{self.class.name} MUST be a Pathname."
+        end
+      end
+
       def setup_cli
         setup_descriptions
         setup_tasks

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

@@ -2,11 +2,10 @@ module Luban
   module Deployment
     module Service
       class Base < Luban::Deployment::Package::Base
-        include Luban::Deployment::Command::Tasks::Deploy
         include Luban::Deployment::Command::Tasks::Control
 
-        def self.service_action(name, dispatch_to: nil, locally: false, &blk)
-          define_method(name) do |args:, opts:|
+        def self.service_action(action, dispatch_to: nil, as: action, locally: false, &blk)
+          define_method(action) do |args:, opts:|
             if current_version
               send("#{__method__}!", args: args, opts: opts.merge(version: current_version))
             else
@@ -14,64 +13,30 @@ module Luban
             end
           end
           unless dispatch_to.nil?
-            dispatch_task "#{name}!", to: dispatch_to, as: name, locally: locally, &blk
-            protected "#{name}!"
+            dispatch_task "#{action}!", to: dispatch_to, as: as, locally: locally, &blk
+            protected "#{action}!"
           end
         end
 
         Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
           service_action action, dispatch_to: :controller
         end
-        service_action :update_profile, dispatch_to: :configurator, locally: true
-
-        def has_templates?
-          respond_to?(:default_templates_path, true)
+        %i(init_profile update_profile).each do |action| 
+          service_action action, dispatch_to: :configurator, locally: true
         end
 
+        alias_method :orig_init_profile, :init_profile
+
         def init_profile(args:, opts:)
-          return unless has_templates?
-          require 'fileutils'
-          puts "  Initializing #{name} profile"
-          templates_path = config_finder[:application].profile_templates_path.join(name.to_s)
-          profile_path = config_finder[:application].stage_profile_path.join(name.to_s)
-          [templates_path, profile_path].each { |p| FileUtils.mkdir(p) unless p.directory? }
-          init_profile_templates.each do |src_path|
-            next unless src_path.file?
-            dst_path = (src_path.extname == '.erb' ? templates_path : profile_path).
-                       join(src_path.basename)
-            print "    - #{dst_path.basename}"
-            if dst_path.file?
-              puts " [skipped]"
-            else
-              FileUtils.cp(src_path, dst_path)
-              puts " [created]"
-            end
-          end
+          orig_init_profile(args: args, opts: opts.merge(default_templates: default_templates))
         end
 
         protected
 
-        def on_configure
-          super
-          include_default_templates_path if has_templates?
-        end
-
-        def include_default_templates_path
-          if default_templates_path.is_a?(Pathname)
-            default_templates_paths.unshift(default_templates_path)
-          else
-            abort "Aborted! Default templates path for #{self.class.name} MUST be a Pathname."
-          end
-        end
-
         def set_parameters
           super
           linked_dirs.push('log', 'pids')
         end
-
-        def init_profile_templates
-          default_templates_path.children
-        end
       end
     end
   end

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

@@ -2,55 +2,87 @@ module Luban
   module Deployment
     module Service
       class Configurator < Worker
-        def stage_profile_path
-          @stage_profile_path ||= 
-            config_finder[:application].stage_profile_path.join(service_name)
-        end
+        module Base
+          def stage_profile_path
+            @stage_profile_path ||= 
+              config_finder[:application].stage_profile_path.join(service_name)
+          end
 
-        def profile_templates_path
-          @profile_templates_path ||= 
-            config_finder[:application].profile_templates_path.join(service_name)
-        end
+          def profile_templates_path
+            @profile_templates_path ||= 
+              config_finder[:application].profile_templates_path.join(service_name)
+          end
 
-        def stage_profile_templates_path
-          @stage_profile_templates_path ||= 
-            config_finder[:application].stage_profile_templates_path.join(service_name)
-        end
+          def stage_profile_templates_path
+            @stage_profile_templates_path ||= 
+              config_finder[:application].stage_profile_templates_path.join(service_name)
+          end
 
-        def profile_templates(format: "erb")
-          return @profile_templates unless @profile_templates.nil?
-          @profile_templates = []
-          [profile_templates_path, stage_profile_templates_path].each do |path|
-            Dir.chdir(path) { @profile_templates |= Dir["**/*.#{format}"] } if path.directory?
+          def profile_templates(format: "erb")
+            return @profile_templates unless @profile_templates.nil?
+            @profile_templates = []
+            [profile_templates_path, stage_profile_templates_path].each do |path|
+              Dir.chdir(path) { @profile_templates |= Dir["**/*.#{format}"] } if path.directory?
+            end
+            @profile_templates
           end
-          @profile_templates
-        end
 
-        def update_profile
-          assure_dirs(stage_profile_path)
-          render_profile
-          update_logrotate_files
-        end
+          def default_templates; task.opts.default_templates; end
 
-        protected
+          def init_profile
+            return if default_templates.empty?
+            puts "  Initializing #{service_name} profile"
+            assure_dirs(profile_templates_path, stage_profile_path)
+            upload_profile_templates
+          end
 
-        def render_profile
-          profile_templates.each { |template_file| render_profile_by_template(template_file) }
-        end
+          def update_profile
+            assure_dirs(stage_profile_path)
+            render_profile
+            update_logrotate_files
+          end
 
-        def render_profile_by_template(template_file)
-          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)),
-                             auto_revision: true)
-        end
+          protected
 
-        def update_logrotate_files
-          if file?(stage_profile_path.join(logrotate_file_name))
-            logrotate_files.push(logrotate_file_path)
+          def upload_profile_templates
+            default_templates.each do |src_path|
+              next unless file?(src_path)
+              basename = src_path.basename
+              dst_path = if src_path.extname == '.erb'
+                           profile_templates_path
+                         else
+                           stage_profile_path
+                         end.join(basename)
+              print "    - #{basename}"
+              if file?(dst_path)
+                puts " [skipped]"
+              else
+                upload!(src_path, dst_path)
+                puts " [created]"
+              end
+            end
+          end
+
+          def render_profile
+            profile_templates.each { |template_file| render_profile_by_template(template_file) }
+          end
+
+          def render_profile_by_template(template_file)
+            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)),
+                               auto_revision: true)
+          end
+
+          def update_logrotate_files
+            if file?(stage_profile_path.join(logrotate_file_name))
+              logrotate_files.push(logrotate_file_path)
+            end
           end
         end
+
+        include Base
       end
     end
   end

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

@@ -2,210 +2,214 @@ module Luban
   module Deployment
     module Service
       class Controller < Worker
-        def pid
-          capture(:cat, "#{pid_file_path} 2>/dev/null")
-        end
-
-        def process_started?
-          !!process_grep.keys.first
-        end
-
-        def process_stopped?
-          !process_started?
-        end
-
-        def pid_file_orphaned?
-          process_stopped? and pid_file_exists?
-        end
+        module Base
+          def pid
+            capture(:cat, "#{pid_file_path} 2>/dev/null")
+          end
 
-        def pid_file_missing?
-          process_started? and !pid_file_exists?
-        end
+          def process_started?
+            !!process_grep.keys.first
+          end
 
-        def pid_file_exists?
-          file?(pid_file_path, "-s") # file is NOT zero size
-        end
+          def process_stopped?
+            !process_started?
+          end
 
-        %i(process_pattern start_command stop_command).each do |m|
-          define_method(m) do
-            raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+          def pid_file_orphaned?
+            process_stopped? and pid_file_exists?
           end
-        end
 
-        def monitor_executable
-          @monitor_executable ||= env_path.join("#{stage}.#{process_monitor[:env]}").
-                                                join('bin').join(process_monitor[:name])
-        end
+          def pid_file_missing?
+            process_started? and !pid_file_exists?
+          end
 
-        def monitor_command
-          @monitor_command ||= "#{monitor_executable} monitor #{service_entry}"
-        end
+          def pid_file_exists?
+            file?(pid_file_path, "-s") # file is NOT zero size
+          end
 
-        def unmonitor_command
-          @unmonitor_command ||= "#{monitor_executable} unmonitor #{service_entry}"
-        end
+          %i(process_pattern start_command stop_command).each do |m|
+            define_method(m) do
+              raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+            end
+          end
 
-        def start_process
-          if process_started?
-            update_result "Skipped! Already started #{package_full_name}", status: :skipped
-            return
+          def monitor_executable
+            @monitor_executable ||= env_path.join("#{stage}.#{process_monitor[:env]}").
+                                                  join('bin').join(process_monitor[:name])
           end
 
-          output = start_process!
-          if check_until { process_started? }
-            update_result "Start #{package_full_name}: [OK] #{output}"
-            monitor_process
-          else
-            remove_orphaned_pid_file
-            update_result "Start #{package_full_name}: [FAILED] #{output}", 
-                          status: :failed, level: :error
+          def monitor_command
+            @monitor_command ||= "#{monitor_executable} monitor #{service_entry}"
           end
-        end
 
-        def stop_process
-          if process_stopped?
-            update_result "Skipped! Already stopped #{package_full_name}", status: :skipped
-            return
+          def unmonitor_command
+            @unmonitor_command ||= "#{monitor_executable} unmonitor #{service_entry}"
           end
 
-          unmonitor_process
-          output = stop_process! || 'OK'
-          if check_until { process_stopped? }
-            update_result "Stop #{package_full_name}: [OK] #{output}"
-          else
-            remove_orphaned_pid_file
-            update_result "Stop #{package_full_name}: [FAILED] #{output}",
-                          status: :failed, level: :error
+          def start_process
+            if process_started?
+              update_result "Skipped! Already started #{service_full_name}", status: :skipped
+              return
+            end
+
+            output = start_process!
+            if check_until { process_started? }
+              update_result "Start #{service_full_name}: [OK] #{output}"
+              monitor_process
+            else
+              remove_orphaned_pid_file
+              update_result "Start #{service_full_name}: [FAILED] #{output}", 
+                            status: :failed, level: :error
+            end
           end
-        end
 
-        def restart_process
-          if process_started?
+          def stop_process
+            if process_stopped?
+              update_result "Skipped! Already stopped #{service_full_name}", status: :skipped
+              return
+            end
+
             unmonitor_process
-            output = stop_process!
+            output = stop_process! || 'OK'
             if check_until { process_stopped? }
-              info "Stop #{package_full_name}: [OK] #{output}"
+              update_result "Stop #{service_full_name}: [OK] #{output}"
             else
               remove_orphaned_pid_file
-              update_result "Stop #{package_full_name}: [FAILED] #{output}",
+              update_result "Stop #{service_full_name}: [FAILED] #{output}",
                             status: :failed, level: :error
-              return
             end
           end
 
-          output = start_process!
-          if check_until { process_started? }
-            update_result "Restart #{package_full_name}: [OK] #{output}"
-            monitor_process
-          else
-            remove_orphaned_pid_file
-            update_result "Restart #{package_full_name}: [FAILED] #{output}", 
-                          status: :failed, level: :error
-          end
-        end
-
-        def check_process
-          update_result check_process!
-        end
+          def restart_process
+            if process_started?
+              unmonitor_process
+              output = stop_process!
+              if check_until { process_stopped? }
+                info "Stop #{service_full_name}: [OK] #{output}"
+              else
+                remove_orphaned_pid_file
+                update_result "Stop #{service_full_name}: [FAILED] #{output}",
+                              status: :failed, level: :error
+                return
+              end
+            end
 
-        def kill_process
-          if process_stopped?
-            update_result "Skipped! Already stopped #{package_full_name}", status: :skipped
-            return
+            output = start_process!
+            if check_until { process_started? }
+              update_result "Restart #{service_full_name}: [OK] #{output}"
+              monitor_process
+            else
+              remove_orphaned_pid_file
+              update_result "Restart #{service_full_name}: [FAILED] #{output}", 
+                            status: :failed, level: :error
+            end
           end
 
-          unmonitor_process
-          output = kill_process!
-          if check_until { process_stopped? }
-            remove_orphaned_pid_file
-            update_result "Kill #{package_full_name}: [OK] #{output}"
-          else
-            update_result "Kill #{package_full_name}: [FAILED] #{output}"
+          def check_process
+            update_result check_process!
           end
-        end
 
-        def process_monitor_defined?
-          !process_monitor[:name].nil?
-        end
+          def kill_process
+            if process_stopped?
+              update_result "Skipped! Already stopped #{service_full_name}", status: :skipped
+              return
+            end
 
-        def monitor_process
-          if process_monitor_defined?
-            if monitor_process!
-              info "Turned on process monitor for #{service_entry}"
+            unmonitor_process
+            output = kill_process!
+            if check_until { process_stopped? }
+              remove_orphaned_pid_file
+              update_result "Kill #{service_full_name}: [OK] #{output}"
             else
-              info "Failed to turn on process monitor for #{service_entry}"
+              update_result "Kill #{service_full_name}: [FAILED] #{output}"
             end
           end
-        end
 
-        def unmonitor_process
-          if process_monitor_defined?
-            if unmonitor_process!
-              info "Turned off process monitor for #{service_entry}"
-            else
-              info "Failed to turn off process monitor for #{service_entry}"
+          def process_monitor_defined?
+            !process_monitor[:name].nil?
+          end
+
+          def monitor_process
+            if process_monitor_defined?
+              if monitor_process!
+                info "Turned on process monitor for #{service_entry}"
+              else
+                info "Failed to turn on process monitor for #{service_entry}"
+              end
+            end
+          end
+
+          def unmonitor_process
+            if process_monitor_defined?
+              if unmonitor_process!
+                info "Turned off process monitor for #{service_entry}"
+              else
+                info "Failed to turn off process monitor for #{service_entry}"
+              end
             end
           end
-        end
 
-        def default_pending_seconds; 30; end
-        def default_pending_interval; 1; end
+          def default_pending_seconds; 30; end
+          def default_pending_interval; 1; end
 
-        protected
+          protected
 
-        def check_until(pending_seconds: default_pending_seconds, 
-                        pending_interval: default_pending_interval)
-          succeeded = false
-          (pending_seconds/pending_interval).times do
-            sleep pending_interval
-            break if (succeeded = yield)
+          def check_until(pending_seconds: default_pending_seconds, 
+                          pending_interval: default_pending_interval)
+            succeeded = false
+            (pending_seconds/pending_interval).times do
+              sleep pending_interval
+              break if (succeeded = yield)
+            end
+            succeeded
           end
-          succeeded
-        end
 
-        def start_process!
-          capture("#{start_command} 2>&1")
-        end
+          def start_process!
+            capture("#{start_command} 2>&1")
+          end
 
-        def stop_process!
-          capture("#{stop_command} 2>&1")
-        end
+          def stop_process!
+            capture("#{stop_command} 2>&1")
+          end
 
-        def check_process!
-          if pid_file_missing?
-            "#{package_full_name}: started but PID file does NOT exist - #{pid_file_path}"
-          elsif process_started?
-            "#{package_full_name}: started (PID #{pid})"
-          elsif pid_file_orphaned?
-            "#{package_full_name}: stopped but PID file exists - #{pid_file_path}"
-          else
-            "#{package_full_name}: stopped"
+          def check_process!
+            if pid_file_missing?
+              "#{service_full_name}: started but PID file does NOT exist - #{pid_file_path}"
+            elsif process_started?
+              "#{service_full_name}: started (PID #{pid})"
+            elsif pid_file_orphaned?
+              "#{service_full_name}: stopped but PID file exists - #{pid_file_path}"
+            else
+              "#{service_full_name}: stopped"
+            end
           end
-        end
 
-        def kill_process!(pattern = process_pattern)
-          capture(:pkill, "-9 -f \"#{pattern}\"")
-        end
+          def kill_process!(pattern = process_pattern)
+            capture(:pkill, "-9 -f \"#{pattern}\"")
+          end
 
-        def process_grep(pattern = process_pattern)
-          capture(:pgrep, "-l -f \"#{pattern}\" 2>/dev/null").split.inject({}) do |h, p|
-            pid, pname = p.split(' ', 2)
-            h[pid] = pname
-            h
+          def process_grep(pattern = process_pattern)
+            capture(:pgrep, "-l -f \"#{pattern}\" 2>/dev/null").split.inject({}) do |h, p|
+              pid, pname = p.split(' ', 2)
+              h[pid] = pname
+              h
+            end
           end
-        end
 
-        def remove_orphaned_pid_file
-          rm(pid_file_path) if pid_file_orphaned?
-        end
+          def remove_orphaned_pid_file
+            rm(pid_file_path) if pid_file_orphaned?
+          end
 
-        def monitor_process!
-          test("#{monitor_command} 2>&1")
-        end
+          def monitor_process!
+            test("#{monitor_command} 2>&1")
+          end
 
-        def unmonitor_process!
-          test("#{unmonitor_command} 2>&1")
+          def unmonitor_process!
+            test("#{unmonitor_command} 2>&1")
+          end
         end
+
+        include Base
       end
     end
   end

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

@@ -2,8 +2,8 @@ module Luban
   module Deployment
     module Service
       class Installer < Luban::Deployment::Package::Installer
-        include Paths
+        include Worker::Base
       end
     end
   end
-end
+end

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

@@ -1,40 +1,70 @@
 module Luban
   module Deployment
     module Service
-      module Paths
-        include Luban::Deployment::Worker::Paths::Remote::Service
+      class Worker < Luban::Deployment::Package::Worker
+        module Base
+          def service_name
+            @service_name ||= package_name
+          end
 
-        def service_name
-          @service_name ||= package_name.downcase
-        end
+          def service_version
+            @service_version ||= package_version
+          end
 
-        def service_entry
-          @service_entry ||= "#{env_name.gsub('/', '.')}.#{service_name}"
-        end
+          def service_full_name
+            @service_full_name ||= package_full_name
+          end
 
-        def profile_path
-          @profile_path ||= super.join(service_name)
-        end
+          def service_entry
+            @service_entry ||= "#{env_name.gsub('/', '.')}.#{service_name}"
+          end
 
-        def control_file_name
-          @control_file_name ||= "#{service_name}.conf"
-        end
+          def profile_path
+            @profile_path ||= shared_path.join('profile').join(service_name)
+          end
 
-        def logrotate_file_name
-          @logrotate_file_name ||= "#{service_name}.logrotate"
-        end
+          def log_path
+            @log_path ||= shared_path.join('log')
+          end
 
-        def pid_file_name
-          @pid_file_name ||= "#{service_name}.pid"
-        end
+          def log_file_path
+            @log_file_path ||= log_path.join(log_file_name)
+          end
+
+          def log_file_name
+            @log_file_name ||= "#{service_name}.log"
+          end
 
-        def log_file_name
-          @log_file_name ||= "#{service_name}.log"
+          def pids_path
+            @pids_path ||= shared_path.join('pids')
+          end
+
+          def pid_file_path
+            @pid_file_path ||= pids_path.join(pid_file_name)
+          end
+
+          def pid_file_name
+            @pid_file_name ||= "#{service_name}.pid"
+          end
+
+          def control_file_path
+            @control_file_path ||= profile_path.join(control_file_name)
+          end
+
+          def control_file_name
+            @control_file_name ||= "#{service_name}.conf"
+          end
+
+          def logrotate_file_path
+            @logrotate_file_path ||= profile_path.join(logrotate_file_name)
+          end
+
+          def logrotate_file_name
+            @logrotate_file_name ||= "#{service_name}.logrotate"
+          end
         end
-      end
 
-      class Worker < Luban::Deployment::Package::Worker
-        include Paths
+        include Base
       end
     end
   end

data/lib/luban/deployment/cli.rb

@@ -1,5 +1,5 @@
 require_relative 'cli/command'
 require_relative 'cli/project'
-require_relative 'cli/application'
 require_relative 'cli/package'
 require_relative 'cli/service'
+require_relative 'cli/application'

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

@@ -6,9 +6,43 @@ module Luban
       module Generator
         using Luban::CLI::CoreRefinements
 
+        module Utils
+          def mkdir(path)
+            if path.directory?
+              puts " [skipped]"
+            else
+              FileUtils.mkdir(path)
+              puts " [created]"
+            end
+          end
+
+          def copy_file(src_path, dst_path)
+            if dst_path.file?
+              puts " [skipped]"
+            else
+              FileUtils.cp(src_path, dst_path)
+              puts " [created]"
+            end
+          end
+
+          def render_file(template_path, output_path, context: binding)
+            if output_path.file?
+              puts " [skipped]"
+            else
+              require 'erb'
+              File.open(output_path, 'w') do |f|
+                f.write ERB.new(File.read(template_path), nil, '<>').result(context)
+              end
+              puts " [created]"
+            end
+          end
+        end
+
         module Base
           protected
 
+          include Utils
+
           def skeletons_path
             @skeletons_path ||= 
               Pathname.new(__FILE__).dirname.join('..').join('templates').realpath
@@ -52,36 +86,6 @@ module Luban
             end
           end
 
-          def mkdir(path)
-            if path.directory?
-              puts " [skipped]"
-            else
-              FileUtils.mkdir(path)
-              puts " [created]"
-            end
-          end
-
-          def copy_file(src_path, dst_path)
-            if dst_path.file?
-              puts " [skipped]"
-            else
-              FileUtils.cp(src_path, dst_path)
-              puts " [created]"
-            end
-          end
-
-          def render_file(template_path, output_path, context: binding)
-            if output_path.file?
-              puts " [skipped]"
-            else
-              require 'erb'
-              File.open(output_path, 'w') do |f|
-                f.write ERB.new(File.read(template_path), nil, '<>').result(context)
-              end
-              puts " [created]"
-            end
-          end
-
           def placeholder?(basename)
             basename.to_s =~ /^__stage/
           end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.5.1"
+    VERSION = "0.5.5"
   end
 end

data/lib/luban/deployment/worker/paths.rb

@@ -72,52 +72,6 @@ module Luban
           def luban_install_path
             @luban_install_path ||= project_path.join('.luban')
           end
-
-          module Service
-            def profile_path
-              @profile_path ||= shared_path.join('profile')
-            end
-
-            def log_path
-              @log_path ||= shared_path.join('log')
-            end
-
-            def log_file_path
-              @log_file_path ||= log_path.join(log_file_name)
-            end
-
-            def log_file_name
-              raise NotImplementedError, "#{self.class.name}#log_file_name is an abstract method."
-            end
-
-            def pids_path
-              @pids_path ||= shared_path.join('pids')
-            end
-
-            def pid_file_path
-              @pid_file_path ||= pids_path.join(pid_file_name)
-            end
-
-            def pid_file_name
-              raise NotImplementedError, "#{self.class.name}#pid_file_name is an abstract method."
-            end
-
-            def control_file_path
-              @control_file_path ||= profile_path.join(control_file_name)
-            end
-
-            def control_file_name
-              raise NotImplementedError, "#{self.class.name}#control_file_name is an abstract method."
-            end
-
-            def logrotate_file_path
-              @logrotate_file_path ||= profile_path.join(logrotate_file_name)
-            end
-
-            def logrotate_file_name
-              raise NotImplementedError, "#{self.class.name}#logrotate_file_name is an abstract method."
-            end
-          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -103,11 +103,14 @@ files:
 - lib/luban/deployment/cli/application.rb
 - lib/luban/deployment/cli/application/authenticator.rb
 - lib/luban/deployment/cli/application/base.rb
-- lib/luban/deployment/cli/application/builder.rb
+- lib/luban/deployment/cli/application/configurator.rb
+- lib/luban/deployment/cli/application/constructor.rb
+- lib/luban/deployment/cli/application/controller.rb
 - lib/luban/deployment/cli/application/publisher.rb
 - lib/luban/deployment/cli/application/repository.rb
 - lib/luban/deployment/cli/application/scm/git.rb
 - lib/luban/deployment/cli/application/scm/rsync.rb
+- lib/luban/deployment/cli/application/worker.rb
 - lib/luban/deployment/cli/command.rb
 - lib/luban/deployment/cli/package.rb
 - lib/luban/deployment/cli/package/base.rb