luban 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d711bbdde3319889d6851b02c652b1420f98fba5
-  data.tar.gz: 6d91b1ab03f54730ad59255d25ef8a659d811029
+  metadata.gz: 77cb6b05848cfa60305de26ee0962a064a001f68
+  data.tar.gz: 375494b42b12ca2a917b2432bbac689b979d64d3
 SHA512:
-  metadata.gz: 3eb285d74e5c6a5cec47efb0130bebca1fc744b47815636f7bf8bdd25c1b2a71df745fd15db3d401b83954e7a45c3c18e9749fe7745b71a9b3da0fcb10c7b820
-  data.tar.gz: a2882bac46666c2cbd9c86a204cb507789de5870f8c7b1a6bbab2953565b5a6c4e86af0be88e08c22afa7386bb8bacc5d365a3e5c93984bd3c8e0c5a8eb3bc9c
+  metadata.gz: 7ae1e7277dcd129b2f2ad2e21b46fdcd9779820aa9077506a61df285404cc7b0b781ae751b0a63f08aa99586de50b480f7b01ec1e20e4fce01c60d4a8fdb495c
+  data.tar.gz: 64600972a5b28ccefc5dcc4423f7262b35e0b274d9341bd280accd80f83dd72f10adbd6070c7631fa6aa75a006b7b411d2544d04ead9fc179a6a4395a7985905

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change log
 
+## Version 0.3.5 (May 06, 2016)
+
+New features:
+  * Created Luban::Deployment::Service::Base to handle service package deployment
+  * Added logrotate support
+  * Generated profile locally before publishing to remote servers for a given service package
+
+Minor enhancements:
+  * Renamed Luban::Deployment::Package::Binary to Luban::Deployment::Package::Base for clarity
+  * Added convenient class method #default_executable to define executable method for a given package
+  * Minor code refactoring and cleanup
+
+Bug fixes:
+  * Fixed a bug in md5 calculation on a given folder
+
 ## Version 0.3.3 (Apr 18, 2016)
 
 Bug fixes:
@@ -19,7 +34,7 @@ Bug fixes:
 ## Version 0.3.1 (Apr 13, 2016)
 
 Minor enhancements:
-  * Add SSH auth method "password" in addition to "keyboard-interactive"
+  * Added SSH auth method "password" in addition to "keyboard-interactive"
   * Removed support for production stages
 
 Bug fixes:

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

@@ -40,7 +40,7 @@ module Luban
                 command(name, base: Luban::Deployment::Package::Base.package_class(name))
               end
         pkg.update_package_options(version, opts)
-        services[name] = pkg if pkg.is_a?(Luban::Deployment::Package::Service)
+        services[name] = pkg if pkg.is_a?(Luban::Deployment::Service::Base)
         packages[name] = pkg
       end
       alias_method :require_package, :package
@@ -84,7 +84,8 @@ module Luban
         end
       end
 
-      %i(cleanup binstubs show_current show_summary which whence).each do |action|
+      (Luban::Deployment::Command::Tasks::Install::Actions - 
+       %i(setup build destroy)).each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
           packages.each_value { |p| p.send(__method__, args: args, opts: opts) }
@@ -104,7 +105,15 @@ module Luban
 
       def deploy(args:, opts:)
         show_app_environment
-        deploy_releases(args: args, opts: opts)
+        deploy_profile(args: args, opts: opts) if has_profile?
+        deploy_release(args: args, opts: opts) if has_source?
+      end
+
+      Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
+        define_method(action) do |args:, opts:|
+          show_app_environment
+          services.each_value { |s| s.send(__method__, args: args, opts: opts) }
+        end
       end
 
       protected
@@ -133,8 +142,9 @@ module Luban
       end
 
       def set_default_profile
-        profile_path = config_finder[:application].stage_config_path.join('profile')
-        profile(profile_path, scm: :rsync) if profile_path.directory?
+        if config_finder[:application].has_profile?
+          profile(config_finder[:application].stage_profile_path, scm: :rsync) 
+        end
       end
 
       def load_configuration
@@ -151,8 +161,8 @@ module Luban
         puts "#{display_name} in #{parent.class.name}"
       end
 
-      %i(build destroy cleanup).each do |m|
-        define_task_method("#{m}!", task: m, worker: :builder)
+      %i(build destroy cleanup).each do |task|
+        dispatch_task "#{task}!", to: :builder, as: task
       end
 
       def build_repositories(args:, opts:)
@@ -160,24 +170,33 @@ module Luban
         build_repository!(args: args, opts: opts.merge(repository: source)) if has_source?
       end
 
-      def deploy_releases(args:, opts:)
-        deploy_release(args: args, opts: opts.merge(repository: profile)) if has_profile?
-        deploy_release(args: args, opts: opts.merge(repository: source)) if has_source?
+      def deploy_profile(args:, opts:)
+        update_profile!(args: args, opts: opts)
+        deploy_profile!(args: args, opts: opts.merge(repository: profile))
+      end
+
+      def update_profile!(args:, opts:)
+        services.each_value { |s| s.send(:update_profile, args: args, opts: opts) }
       end
 
       def deploy_release(args:, opts:)
+        deploy_release!(args: args, opts: opts.merge(repository: source))
+      end
+
+      def deploy_release!(args:, opts:)
         package_release!(args: args, opts: opts)[:release].tap do |release|
           unless release.nil?
             publish_release!(args: args, opts: opts.merge(release: release))
           end
         end
       end
+      alias_method :deploy_profile!, :deploy_release!
 
-      define_task_method("promptless_authen!", task: :promptless_authen, worker: :authenticator)
-      define_task_method("public_key!", task: :public_key, worker: :authenticator, locally: true)
-      define_task_method("build_repository!", task: :build, worker: :repository, locally: true)
-      define_task_method("package_release!", task: :package, worker: :repository, locally: true)
-      define_task_method("publish_release!", task: :publish, worker: :publisher)
+      dispatch_task :promptless_authen!, to: :authenticator, as: :promptless_authen
+      dispatch_task :public_key!, to: :authenticator, as: :public_key, 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
     end
   end
 end

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

@@ -41,8 +41,8 @@ module Luban
         protected
 
         def bootstrap
-          assure_dirs(etc_path, tmp_path, downloads_path,
-                      app_bin_path, app_tmp_path, 
+          assure_dirs(logrotate_path, downloads_path,
+                      tmp_path, app_bin_path, app_tmp_path, 
                       releases_path, shared_path)
           assure_linked_dirs
         end

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

@@ -120,18 +120,18 @@ module Luban
 
         def create_symlinks
           send("create_#{release_name}_symlinks")
+          create_shared_symlinks_for(:directory, linked_dirs)
+          create_shared_symlinks_for(:directory, bundle_linked_dirs) if file?(gemfile)
         end
 
         def create_profile_symlinks
           create_release_symlink(shared_path)
-          create_shared_symlinks_for(:directory, linked_dirs)
-          create_shared_symlinks_for(:directory, bundle_linked_dirs) if file?(gemfile)
+          create_etc_symlinks
         end
 
         def create_app_symlinks
           create_release_symlink(app_path)
-          create_shared_symlinks_for(:directory, linked_dirs | %w(profile))
-          create_shared_symlinks_for(:directory, bundle_linked_dirs) if file?(gemfile)
+          create_shared_symlinks_for(:directory, %w(profile))
           create_shared_symlinks_for(:file, linked_files)
         end
 
@@ -148,6 +148,17 @@ module Luban
           end
         end
 
+        def create_etc_symlinks
+          create_logrotate_symlinks
+        end
+
+        def create_logrotate_symlinks
+          logrotate_files.each do |path|
+            target_file = "#{stage}.#{project}.#{application}.#{path.basename}"
+            assure_symlink(path, logrotate_path.join(target_file))
+          end
+        end
+
         def update_releases_log
           execute %{echo "[$(date -u)][#{user}] #{release_log_message}" >> #{releases_log_path}}
         end

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

@@ -20,7 +20,7 @@ module Luban
 
             def fetch_revision
               # Use MD5 as the revision
-              capture(:tar, "-cf - #{clone_path} 2>/dev/null | openssl md5")[0, rev_size]
+              capture(:tar, "-cf - #{clone_path} 2>/dev/null | openssl md5")[/\h+$/][0, rev_size]
             end
 
             def clone

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

@@ -3,8 +3,9 @@ module Luban
     class Command < Luban::CLI::Command
       module Tasks
         module Install
-          %i(build destroy cleanup binstubs
-             show_current show_summary which whence).each do |action|
+          Actions = %i(setup build destroy cleanup binstubs
+                       show_current show_summary which whence)
+          Actions.each do |action|
             define_method(action) do |args:, opts:|
               raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
             end
@@ -69,7 +70,8 @@ module Luban
         end
 
         module Deploy
-          %i(deploy).each do |action| 
+          Actions = %i(deploy)
+          Actions.each do |action|
             define_method(action) do |args:, opts:|
               raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
             end
@@ -88,9 +90,10 @@ module Luban
         end
 
         module Control
-          %i(start_process stop_process restart_process
-             show_process_status test_process 
-             monitor_process unmonitor_process).each do |action|
+          Actions = %i(start_process stop_process kill_process
+                       restart_process check_process
+                       monitor_process unmonitor_process)
+          Actions.each do |action|
             define_method(action) do |args:, opts:|
               raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
             end
@@ -116,14 +119,14 @@ module Luban
               action! :restart_process
             end
 
-            task :status do
-              desc "Show process status"
-              action! :show_process_status
+            task :kill do
+              desc "Kill process forcely"
+              action! :kill_process
             end
 
-            task :test do
-              desc "Test process"
-              action! :test_process
+            task :status do
+              desc "Check process status"
+              action! :check_process
             end
 
             task :monitor do
@@ -151,7 +154,7 @@ module Luban
 
       def task(cmd, **opts, &blk)
         command(cmd, **opts, &blk).tap do |c|
-        add_common_task_options(c)
+          add_common_task_options(c)
           if !c.summary.nil? and c.description.empty?
             c.long_desc "#{c.summary} in #{self.class.name}"
           end
@@ -174,10 +177,10 @@ module Luban
           end
         end
 
-        def define_task_method(method, task: method, worker:, locally: false, &blk)
-          define_method(method) do |args:, opts:|
-            run_task(cmd: task, args: args, opts: opts, locally: locally,
-                     worker_class: self.class.worker_class(worker), &blk)
+        def dispatch_task(task, to:, as: task, locally: false, &blk)
+          define_method(task) do |args:, opts:|
+            run_task(cmd: as, args: args, opts: opts, locally: locally,
+                     worker_class: self.class.worker_class(to), &blk)
           end
         end
       end
@@ -198,6 +201,7 @@ module Luban
             r = worker_class.new(task_msg.merge(backend: backend), &blk).run
           rescue StandardError => e
             r = {
+              hostname: backend.host.hostname,
               status: :failed,
               message: backtrace ? "#{e.message}\n#{e.backtrace.join("\n")}" : e.message,
               error: e
@@ -263,8 +267,8 @@ module Luban
         setup_control_tasks if controllable?
       end
 
-      %i(install deploy control).each do |operation|
-        define_method("setup_#{operation}_tasks") do
+      %i(install deploy control).each do |action|
+        define_method("setup_#{action}_tasks") do
           raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
         end
       end
@@ -339,9 +343,12 @@ module Luban
           sshkit.backend.configure do |backend|
             backend.pty                = pty
             backend.connection_timeout = connection_timeout
-            backend.ssh_options        = 
-              backend.ssh_options.merge(user: user).merge!(ssh_options)
+            if backend.respond_to?(:ssh_options)
+              backend.ssh_options        = 
+                backend.ssh_options.merge(user: user).merge!(ssh_options)
+            end
           end
+          #bundle_bins.each { |cmd| sshkit.command_map.prefix[cmd.to_sym].push("bundle exec") }
         end
 
         configure_airbrussh if format == :airbrussh

data/lib/luban/deployment/cli/package/{binary.rb → base.rb}

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Package
-      class Binary < Luban::Deployment::Command
+      class Base < Luban::Deployment::Command
         using Luban::CLI::CoreRefinements
 
         class << self
@@ -90,12 +90,12 @@ module Luban
 
         def versions; package_options.keys; end
 
-        define_task_method("download_package", task: :download, worker: :installer, locally: true)
-        define_task_method("install_package", task: :install, worker: :installer)
+        dispatch_task :download_package, to: :installer, as: :download, locally: true
+        dispatch_task :install_package, to: :installer, as: :install
 
         %i(uninstall cleanup_all update_binstubs
-           get_summary which_current whence_origin).each do |m| 
-          define_task_method(m, worker: :installer)
+           get_summary which_current whence_origin).each do |task|
+          dispatch_task task, to: :installer
         end
 
         def install(args:, opts:)
@@ -200,6 +200,7 @@ module Luban
         def setup_install_tasks
           super
 
+          undef_task :setup
           undef_task :build
           undef_task :destroy
 
@@ -242,8 +243,6 @@ module Luban
           end
         end
       end
-
-      Base = Binary
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Package
-      class Installer < Worker
+      class Installer
         # Shared library file extension name based on OS
         LibExtensions = { 
           Linux:  'so',   # Linux

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

@@ -32,14 +32,6 @@ module Luban
           @download_url ||= File.join(source_repo, source_url_root, src_file_name)
         end
 
-        def install_path
-          @install_path ||= package_versions_path.join(package_version)
-        end
-
-        def bin_path
-          @bin_path ||= install_path.join('bin')
-        end
-
         def lib_path
           @lib_path ||= install_path.join('lib')
         end

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

@@ -1,3 +1,11 @@
+module Luban
+  module Deployment
+    module Package
+      class Installer < Worker; end
+    end
+  end
+end
+
 require_relative 'installer/core'
 require_relative 'installer/paths'
 require_relative 'installer/install'

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

@@ -12,6 +12,12 @@ module Luban
           def worker_class(worker, **opts)
             Luban::Deployment::Package::Base.worker_class(worker, **opts)
           end
+
+          def default_executable(name)
+            define_method("#{name}_executable") do
+              @default_executable ||= bin_path.join(name)
+            end
+          end
         end
 
         def package_name; task.opts.name; end
@@ -40,6 +46,14 @@ module Luban
           @package_versions_path ||= package_path.join('versions')
         end
 
+        def install_path
+          @install_path ||= package_versions_path.join(package_version)
+        end
+
+        def bin_path
+          @bin_path ||= install_path.join('bin')
+        end
+
         def package_tmp_path
           @package_tmp_path ||= package_path.join('tmp')
         end

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

@@ -1,6 +1,5 @@
 require_relative 'package/dependency'
 require_relative 'package/dependency_set'
-require_relative 'package/binary'
-require_relative 'package/service'
+require_relative 'package/base'
 require_relative 'package/worker'
 require_relative 'package/installer'

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

@@ -36,9 +36,7 @@ module Luban
         end
       end
 
-      %i(build destroy_project cleanup binstubs
-         show_current show_summary which whence
-        ).each do |action|
+      (Luban::Deployment::Command::Tasks::Install::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?
@@ -48,6 +46,22 @@ module Luban
 
       alias_method :destroy, :destroy_project
 
+      Luban::Deployment::Command::Tasks::Deploy::Actions.each do |action|
+        define_method(action) do |args:, opts:|
+          apps.each_value do |app|
+            app.send(__method__, args: args, opts: opts) if app.deployable?
+          end
+        end
+      end
+
+      Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
+        define_method(action) do |args:, opts:|
+          apps.each_value do |app|
+            app.send(__method__, args: args, opts: opts) if app.controllable?
+          end
+        end
+      end
+
       protected
 
       def validate_parameters

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

@@ -0,0 +1,49 @@
+module Luban
+  module Deployment
+    module Service
+      class Base < Luban::Deployment::Package::Base
+        include Luban::Deployment::Command::Tasks::Deploy
+        include Luban::Deployment::Command::Tasks::Control
+
+        ControlActions = Luban::Deployment::Command::Tasks::Control::Actions
+        ProfileActions = %i(update_profile)
+
+        (ControlActions | ProfileActions).each do |m|
+          define_method(m) do |args:, opts:|
+            if current_version
+              send("#{__method__}!", args: args, opts: opts.merge(version: current_version))
+            else
+              abort "Aborted! No current version of #{display_name} is specified."
+            end
+          end
+        end
+
+        protected
+
+        def on_configure
+          super
+          include_default_templates_path if respond_to?(:default_templates_path, true)
+        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
+
+        ControlActions.each do |task|
+          dispatch_task "#{task}!", to: :controller, as: task
+        end
+
+        dispatch_task :update_profile!, to: :configurator, as: :update_profile, locally: true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,57 @@
+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
+
+        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 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
+
+        def update_profile
+          assure_dirs(stage_profile_path)
+          render_profile
+          update_logrotate_files
+        end
+
+        protected
+
+        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
+    end
+  end
+end

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

@@ -0,0 +1,99 @@
+module Luban
+  module Deployment
+    module Service
+      class Controller < Worker
+        %i(process_stopped? process_started?
+           monitor_process unmonitor_process).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
+          end
+
+          output = start_process!
+          if check_until { process_started? }
+            update_result "Successfully started #{package_full_name}: #{output}"
+          else
+            update_result "Failed to start #{package_full_name}: #{output}", 
+                          status: :failed, level: :error
+          end
+        end
+
+        def stop_process
+          if process_stopped?
+            update_result "Skipped! Already stopped #{package_full_name}", status: :skipped
+            return
+          end
+
+          output = stop_process!
+          if check_until { process_stopped? }
+            update_result "Successfully stopped #{package_full_name}: #{output}"
+          else
+            update_result "Failed to stop #{package_full_name}: #{output}",
+                          status: :failed, level: :error
+          end
+        end
+
+        def restart_process
+          if process_started?
+            output = stop_process!
+            unless check_until { process_stopped? }
+              update_result "Failed to stop #{package_full_name}: #{output}",
+                            status: :failed, level: :error
+              return
+            end
+          end
+
+          output = start_process!
+          if check_until { process_started? }
+            update_result "Successfully restarted #{package_full_name}: #{output}"
+          else
+            update_result "Failed to restart #{package_full_name}: #{output}", 
+                          status: :failed, level: :error
+          end
+        end
+
+        def check_process
+          update_result check_process!
+        end
+
+        def kill_process
+          output = kill_process!
+          if check_until { process_stopped? }
+            update_result "Successfully kill processs (#{output})."
+          else
+            update_result "Failed to kill process: #{output}"
+          end
+        end
+
+        def check_until(pending_seconds = 30)
+          succeeded = false
+          pending_seconds.times do
+            sleep 1
+            break if (succeeded = yield)
+          end
+          succeeded
+        end
+
+        protected
+
+        %i(start_process! stop_process! check_process!).each do |m|
+          define_method(m) do
+            raise NotImplementedError, "#{self.class.name}##{__method__} is an abstract method."
+          end
+        end
+
+        def kill_process!
+          pid = capture(pid_file_path)
+          output = capture(:kill, "-9 #{pid}")
+          output.empty? ? pid : output
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Luban
+  module Deployment
+    module Service
+      class Installer < Luban::Deployment::Package::Installer
+        include Paths
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Luban
+  module Deployment
+    module Service
+      module Paths
+        include Luban::Deployment::Worker::Paths::Remote::Service
+
+        def service_name
+          @service_name = package_name.downcase
+        end
+
+        def profile_path
+          @profile_path ||= super.join(service_name)
+        end
+
+        def control_file_name
+          @control_file_name ||= "#{service_name}.conf"
+        end
+
+        def logrotate_file_name
+          @logrotate_file_name ||= "#{service_name}.logrotate"
+        end
+
+        def pid_file_name
+          @pid_file_name ||= "#{service_name}.pid"
+        end
+
+        def log_file_name
+          @log_file_name ||= "#{service_name}.log"
+        end
+      end
+
+      class Worker < Luban::Deployment::Package::Worker
+        include Paths
+      end
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+require_relative 'service/base'
+require_relative 'service/worker'
+require_relative 'service/installer'
+require_relative 'service/configurator'
+require_relative 'service/controller'

data/lib/luban/deployment/cli.rb

@@ -2,3 +2,4 @@ require_relative 'cli/command'
 require_relative 'cli/project'
 require_relative 'cli/application'
 require_relative 'cli/package'
+require_relative 'cli/service'

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

@@ -70,11 +70,13 @@ module Luban
 
         def find_template_file(file_name)
           path = find_template_file_by_config_finder(file_name) ||
-                 find_default_template_file(file_name)
+                 Finder.find_default_template_file(file_name)
           raise RuntimeError, "Template file is NOT found: #{file_name}." if path.nil?
           path
         end
 
+        def default_templates_paths; Finder.default_templates_paths; end
+
         protected
 
         def find_template_file_by_config_finder(file_name)
@@ -82,19 +84,48 @@ module Luban
                  config_finder[:project].find_template_file(file_name)
         end
 
-        def find_default_template_file(file_name)
-          path = File.expand_path(File.join(File.dirname(__FILE__), '..', 
-                                            'templates', file_name))
-          return path if File.file?(path)
-        end
-
         class Finder
+          def self.default_templates_paths
+            @default_templates_paths ||= 
+              [Pathname.new(File.join(File.dirname(__FILE__), '..', 'templates')).realpath]
+          end
+
+          def self.find_default_template_file(file_name)
+            path = default_templates_paths.find { |p| p.join(file_name).file? }
+            return path.join(file_name) unless path.nil?
+          end
+
           class Project < Finder
             def base_path; base_path ||= target.work_dir; end
           end
 
           class Application < Finder
+            attr_reader :profile_templates_path
+            attr_reader :stage_profile_path
+            attr_reader :stage_profile_templates_path
+
             def base_path; base_path ||= target.apps_path.join(target.application); end
+
+            def has_profile?
+              stage_profile_templates_path.directory? or
+              stage_profile_path.directory? or
+              profile_templates_path.directory?
+            end
+
+            def find_template_file(file_name)
+              return file_path if (file_path = stage_profile_templates_path.join(file_name)).file?
+              return file_path if (file_path = profile_templates_path.join(file_name)).file?
+              super
+            end
+
+            protected
+
+            def set_config_paths
+              super
+              @profile_templates_path = @templates_path.join('profile')
+              @stage_profile_path = @stage_config_path.join('profile')
+              @stage_profile_templates_path = @stage_templates_path.join('profile')
+            end
           end
 
           def self.project(target); Project.new(target); end
@@ -137,8 +168,8 @@ module Luban
           end
 
           def find_template_file(file_name)
-            return file_path if File.file?(file_path = stage_templates_path.join(file_name))
-            return file_path if File.file?(file_path = templates_path.join(file_name))
+            return file_path if (file_path = stage_templates_path.join(file_name)).file?
+            return file_path if (file_path = templates_path.join(file_name)).file?
           end
 
           protected

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

@@ -131,7 +131,7 @@ module Luban
         end
 
         def revision_match?(file_to_upload, revision)
-          file?(file_to_upload) and match?("grep \"Revision: \" #{file_to_upload}", revision)
+          file?(file_to_upload) and match?("grep \"Revision: \" #{file_to_upload}; true", revision)
         end
 
         [:test, :make, :within, :with, :as, :execute, 
@@ -142,7 +142,7 @@ module Luban
         end
 
         def capture(*args, &blk)
-          backend.capture(*args, &blk).chomp
+          backend.capture(*args, raise_on_non_zero_exit: false, &blk).chomp
         end
 
         def md5_matched?(file_path, md5)

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Bundler < Luban::Deployment::Package::Binary
+      class Bundler < Luban::Deployment::Package::Base
         protected
 
         def setup_install_tasks
@@ -26,9 +26,7 @@ module Luban
             parent.install_path
           end
 
-          def bundler_executable
-            @bundler_executable ||= bin_path.join('bundle')
-          end
+          default_executable 'bundler'
 
           def gem_executable
             parent.gem_executable

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Git < Luban::Deployment::Package::Binary
+      class Git < Luban::Deployment::Package::Base
         apply_to :all do
           before_install do
             depend_on 'openssl', version: '1.0.2g'
@@ -9,9 +9,7 @@ module Luban
         end
 
         class Installer < Luban::Deployment::Package::Installer
-          def git_executable
-            @git_executable ||= bin_path.join('git')
-          end
+          default_executable 'git'
 
           def source_repo
             @source_repo ||= "https://www.kernel.org"

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Openssl < Luban::Deployment::Package::Binary
+      class Openssl < Luban::Deployment::Package::Base
         class Installer < Luban::Deployment::Package::Installer
           OSXArchArgs = {
             x86_64: %w(darwin64-x86_64-cc enable-ec_nistp_64_gcc_128),
@@ -13,9 +13,7 @@ module Luban
             
           end
 
-          def openssl_executable
-            @openssl_executable ||= bin_path.join('openssl')
-          end
+          default_executable 'openssl'
 
           def source_repo
             #@source_repo ||= "https://www.openssl.org"

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Ruby < Luban::Deployment::Package::Binary
+      class Ruby < Luban::Deployment::Package::Base
         apply_to '1.8.6' do
           after_install do
             depend_on 'rubygems', version: '1.3.7'
@@ -73,9 +73,7 @@ module Luban
             task.opts.install_doc
           end
 
-          def ruby_executable
-            @ruby_executable ||= bin_path.join('ruby')
-          end
+          default_executable 'ruby'
 
           def gem_executable
             @gem_executable ||= bin_path.join('gem')

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Rubygems < Luban::Deployment::Package::Binary
+      class Rubygems < Luban::Deployment::Package::Base
         protected
 
         def setup_install_tasks
@@ -22,10 +22,8 @@ module Luban
             parent.install_path
           end
           
-          def rubygems_executable
-            @rubygems_executable ||= bin_path.join('gem')
-          end
-
+          default_executable 'gem'
+          
           def ruby_executable
             parent.ruby_executable
           end
@@ -44,8 +42,8 @@ module Luban
           end
 
           def installed?
-            return false unless file?(rubygems_executable)
-            match?("#{rubygems_executable} -v", package_version)
+            return false unless file?(gem_executable)
+            match?("#{gem_executable} -v", package_version)
           end
 
           protected

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

@@ -1,7 +1,7 @@
 module Luban
   module Deployment
     module Packages
-      class Yaml < Luban::Deployment::Package::Binary
+      class Yaml < Luban::Deployment::Package::Base
         class Installer < Luban::Deployment::Package::Installer
           def header_file
             @header_file ||= include_path.join('yaml.h')

data/lib/luban/deployment/parameters.rb

@@ -108,6 +108,7 @@ module Luban
         parameter :keep_releases
         parameter :linked_dirs
         parameter :linked_files
+        parameter :logrotate_files
 
         protected
 
@@ -116,6 +117,7 @@ module Luban
           set_default :keep_releases, 3
           set_default :linked_dirs, []
           set_default :linked_files, []
+          set_default :logrotate_files, []
 
           setup_default_application_config_finder
         end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.3.3"
+    VERSION = "0.3.5"
   end
 end

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

@@ -60,7 +60,7 @@ module Luban
           task.result.tap do |r|
             r.status = status
             r.level = level
-            r.message = message unless message.nil?
+            r.message = message unless message.nil? or !r.message.nil?
             attrs.each_pair { |k, v| r.send("#{k}=", v) }
             send(level, message) unless message.nil? or message.empty?  
           end

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

@@ -25,6 +25,10 @@ module Luban
             @etc_path ||= luban_root_path.join('etc')
           end
 
+          def logrotate_path
+            @logrotate_path = etc_path.join('logrotate')
+          end
+
           def tmp_path
             @tmp_path ||= luban_root_path.join('tmp')
           end
@@ -68,6 +72,52 @@ 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.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli
@@ -110,16 +110,21 @@ files:
 - lib/luban/deployment/cli/application/scm/rsync.rb
 - lib/luban/deployment/cli/command.rb
 - lib/luban/deployment/cli/package.rb
-- lib/luban/deployment/cli/package/binary.rb
+- lib/luban/deployment/cli/package/base.rb
 - lib/luban/deployment/cli/package/dependency.rb
 - lib/luban/deployment/cli/package/dependency_set.rb
 - lib/luban/deployment/cli/package/installer.rb
 - lib/luban/deployment/cli/package/installer/core.rb
 - lib/luban/deployment/cli/package/installer/install.rb
 - lib/luban/deployment/cli/package/installer/paths.rb
-- lib/luban/deployment/cli/package/service.rb
 - lib/luban/deployment/cli/package/worker.rb
 - lib/luban/deployment/cli/project.rb
+- lib/luban/deployment/cli/service.rb
+- lib/luban/deployment/cli/service/base.rb
+- lib/luban/deployment/cli/service/configurator.rb
+- lib/luban/deployment/cli/service/controller.rb
+- lib/luban/deployment/cli/service/installer.rb
+- lib/luban/deployment/cli/service/worker.rb
 - lib/luban/deployment/configuration.rb
 - lib/luban/deployment/configuration/core.rb
 - lib/luban/deployment/configuration/filter.rb
@@ -166,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby framework for server automation and application deployment

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

@@ -1,17 +0,0 @@
-module Luban
-  module Deployment
-    module Package
-      class Service < Binary
-        include Luban::Deployment::Command::Tasks::Deploy
-        include Luban::Deployment::Command::Tasks::Control
-
-        %i(deploy).each do |m|
-          define_task_method(m, worker: :deployer)
-        end
-
-        protected
-
-      end
-    end
-  end
-end