luban 0.6.2 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 226a7a454e9e2362810972688ba0c29d44a0efd5
-  data.tar.gz: 773a1081ce6c7ccdc380114d51a3c1f01dae99ac
+  metadata.gz: 3f5385cce19de66d6ae2ca1b7f4651f33881931b
+  data.tar.gz: 5c9b6a5c98b86c9bdd7ac2819d14efd5efcb0679
 SHA512:
-  metadata.gz: 53f78a7483a74750790f11e02440332bafcdb6dadb688deff9ce044ac8fc8d4d344d2d0ef26a48e212f60cf5c9cfaffae0ddfccd9491345ee453b3c0f2b3e881
-  data.tar.gz: 973ba8cce91e3df4d9248c8f6e50c9defeaadd58f1efc38923cbb7296a03fff5c48526b3669cb30389480c985d042cc653f116b1b70af37c02832a1fe83dcaf1
+  metadata.gz: 252e997fc1e0e70acd918045ac5b941c8c21a60a14deb9656da1ed0b91be752d1d7f5b6b0fdb3fc83932e7db4badffedf689f93facf18d04b030fbab11efb715
+  data.tar.gz: 8484026d33e2de99c9de5c61cbdabf9d48e2fb0e2b13750a38f53f396dec4d5ae7e134764d3ec9e687efc2e29f5147d92d5e30d458b519cc379d516759c94e9f

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change log
 
+## Version 0.6.5 (Jul 27, 2016)
+
+New features:
+  * Remade application release handling to manage multiple releases
+    * Supported deployment for multiple releases
+    * Supported release deprecation
+    * supported release summary
+    * Simplified release cleanup
+
+Minor enhancements:
+  * Changed release_tag format for git commit in Git scm strategy
+  * Used attribute :version to unify :branch, :tag and :ref in Git scm strategy
+  * Deprecated parameter #keep_releases
+    * Releases retension is changed to control by manual configurations
+  * Added option #force for command #deploy
+  * Minor code refactor and cleanup
+
+Bug fixes:
+  * Fixed display issue for pgrep under CentOS
+
 ## Version 0.6.2 (Jul 14, 2016)
 
 New features:

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

@@ -9,7 +9,25 @@ module Luban
 
       attr_reader :packages
       attr_reader :services
+      attr_reader :current_app
+      attr_reader :release_opts
+      attr_reader :current_profile
+      attr_reader :profile_opts
 
+      def self.action_on_packages(action, as: action)
+        define_method(action) do |args:, opts:|
+          packages.each_value { |p| p.send(as, args: args, opts: opts) }
+        end
+        protected action
+      end
+
+      def self.action_on_services(action, as: action)
+        define_method(action) do |args:, opts:|
+          services.each_value { |s| s.send(as, args: args, opts: opts) }
+        end
+        protected action
+      end
+      
       def find_project; parent; end
       def find_application(name = nil)
         name.nil? ? self : find_project.apps[name.to_sym]
@@ -20,9 +38,9 @@ module Luban
       def has_packages?; !packages.empty?; end
       def has_services?; !services.empty?; end
 
-      def installable?;  has_source? or has_packages?; end
-      def deployable?;   has_source?  or has_profile? or has_services?; end
-      def controllable?; has_source? or has_profile? or has_services?; end
+      def installable?;  has_packages?; end
+      def deployable?;   has_source?  or has_profile? end
+      def controllable?; has_source? or has_services?; end
 
       def use_package?(package_name, package_version, servers: [])
         package_name = package_name.to_sym
@@ -32,8 +50,8 @@ module Luban
       end
 
       def other_package_users_for(package_name, package_version, servers: [])
-        parent.package_users_for(package_name, package_version, 
-                                 exclude: [name], servers: servers)
+        find_project.package_users_for(package_name, package_version, 
+                                       exclude: [name], servers: servers)
       end
 
       def package(name, version:, **opts)
@@ -50,24 +68,33 @@ module Luban
       end
       alias_method :require_package, :package
 
+      def profile(from = nil, **opts)
+        from.nil? ? @profile : (@profile = opts.merge(type: 'profile', from: from))
+      end
+
+      def profile_release(version, **opts)
+        @current_profile = version if opts[:current]
+        profile_opts[version] = opts.merge(version: version)
+      end
+
       def source(from = nil, **opts)
-        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 
+        from.nil? ? @source : (@source = opts.merge(type: 'app', from: from))
       end
 
-      def source_version
-        @source[:tag] || @source[:branch] || @source[:ref]
+      def release(version, **opts)
+        @current_app = version if opts[:current]
+        release_opts[version] = opts.merge(version: version)
       end
 
-      def profile(from = nil, **opts)
-        from.nil? ? @profile : (@profile = opts.merge(type: 'profile', from: from))
+      def has_version?(version)
+        release_opts.has_key?(version)
       end
 
-      def password_for(user); parent.password_for(user); end
+      def versions; release_opts.keys; end
+      def deprecated_versions; release_opts.select {|r, o| o[:deprecated] }.keys; end
+      def deployable_versions; release_opts.select {|r, o| !o[:deprecated] }.keys; end
+
+      def password_for(user); find_project.password_for(user); end
 
       def promptless_authen(args:, opts:)
         opts = opts.merge(app: self, public_keys: Array(public_key!(args: args, opts: opts)))
@@ -101,63 +128,64 @@ module Luban
       end
       dispatch_task :destroy!, to: :constructor, as: :destroy
 
-      %i(install_all uninstall_all).each do |action|
-        define_method("#{action}!") do |args:, opts:|
-          packages.each_value { |p| p.send(action, args: args, opts: opts) }
+      %i(install_all uninstall_all binstubs which whence).each do |action|
+        define_method(action) do |args:, opts:|
+          show_app_environment
+          send("#{action}!", args: args, opts: opts)
         end
-        protected "#{action}!"
+        action_on_packages("#{action}!", as: action)
+      end
+
+      def cleanup(args:, opts:)
+        show_app_environment
+        cleanup_packages!(args: args, opts: opts)
+        cleanup_application!(args: args, opts: opts)
       end
+      action_on_packages :cleanup_packages!, as: :cleanup
+      dispatch_task :cleanup_application!, to: :constructor, as: :cleanup
 
-      (Luban::Deployment::Command::Tasks::Install::Actions - %i(setup build destroy)).each do |action|
+      %i(show_current show_summary).each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
-          send("#{action}!", args: args, opts: opts)
+          send("#{action}_packages!", args: args, opts: opts)
+          send("#{action}_application", args: args, opts: opts) if has_source?
         end
+        action_on_packages "#{action}_packages!", as: action
+      end
 
-        define_method("#{action}!") do |args:, opts:|
-          packages.each_value { |p| p.send(action, args: args, opts: opts) }
-        end
-        protected "#{action}!"
+      def show_current_application(args:, opts:)
+        print_summary(get_summary(args: args, opts: opts.merge(version: current_app)))
       end
 
-      { show_current: :controller, show_summary: :controller,
-        cleanup: :constructor }.each_pair do |action, worker|
-        alias_method "#{action}_packages!", "#{action}!" 
-        define_method("#{action}!") do |args:, opts:|
-          send("#{action}_application!", args: args, opts: opts) if has_source?
-          send("#{action}_packages!", args: args, opts: opts)
+      def show_summary_application(args:, opts:)
+        versions.each do |version|
+          print_summary(get_summary(args: args, opts: opts.merge(version: version)))
         end
-        protected "#{action}!"
-        dispatch_task "#{action}_application!", to: worker, as: action
       end
+      dispatch_task :get_summary, to: :controller, as: :get_summary
 
       def deploy(args:, opts:)
         show_app_environment
-        if has_source?
-          release = deploy_release(args: args, opts: opts)
-          opts = opts.merge(release: release)
-        end
+        deploy_release(args: args, opts: opts) if has_source?
         deploy_profile(args: args, opts: opts) if has_profile?
       end
 
       Luban::Deployment::Command::Tasks::Control::Actions.each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
-          send("#{action}!", args: args, opts: opts)
-        end
-
-        define_method("#{action}!") do |args:, opts:|
-          send("application_#{action}!", args: args, opts: opts) if has_source?
           send("service_#{action}!", args: args, opts: opts)
+          send("application_#{action}", args: args, opts: opts) if has_source?
         end
-        protected "#{action}!"
-
-        dispatch_task "application_#{action}!", to: :controller, as: action
+        action_on_services "service_#{action}!", as: action
 
-        define_method("service_#{action}!") do |args:, opts:|
-          services.each_value { |s| s.send(action, args: args, opts: opts) }
+        define_method("application_#{action}") do |args:, opts:|
+          if current_app
+            send("application_#{action}!", args: args, opts: opts.merge(version: current_app))
+          else
+            abort "Aborted! No current version of #{display_name} is specified."
+          end
         end
-        protected "service_#{action}!"
+        dispatch_task "application_#{action}!", to: :controller, as: action
       end
 
       def init_profiles(args:, opts:)
@@ -178,7 +206,7 @@ module Luban
         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) }
+          services.each_value { |s| s.init_profile(args: args, opts: opts) }
         end
       end
 
@@ -190,7 +218,9 @@ module Luban
         @packages = {}
         @services = {}
         @source = {}
+        @release_opts = {}
         @profile = {}
+        @profile_opts = {}
       end
 
       def validate_parameters
@@ -214,7 +244,8 @@ module Luban
 
       def set_default_profile
         if config_finder[:application].has_profile?
-          profile(config_finder[:application].stage_profile_path, scm: :rsync) 
+          profile(config_finder[:application].stage_profile_path, scm: :rsync)
+          profile_release(stage, current: true)
         end
       end
 
@@ -246,10 +277,20 @@ module Luban
 
       def compose_task_options(opts)
         super.merge(name: name.to_s, packages: packages).tap do |o|
-          o.merge!(version: source_version) if has_source?
+          version = o[:version]
+          unless version.nil?
+            o.merge!(release: release_opts[version])
+            update_release_tag(o)
+          end
         end
       end
 
+      def update_release_tag(version:, **opts)
+        opts[:release][:tag] ||=
+          release_tag(args: {}, opts: opts.merge(repository: source.merge(version: version)))
+      end
+      dispatch_task :release_tag, to: :repository, as: :release_tag, locally: true
+
       def show_app_environment
         puts "#{display_name} in #{parent.class.name}"
       end
@@ -262,31 +303,52 @@ module Luban
 
       def deploy_profile(args:, opts:)
         update_profile(args: args, opts: opts)
-        deploy_profile!(args: args, opts: opts.merge(repository: profile))
+        deploy_profile!(args: args, opts: opts.merge(repository: profile.merge(version: current_profile)))
       end
 
       def update_profile(args:, opts:)
-        update_profile!(args: args, opts: opts)
+        update_profile!(args: args, opts: opts.merge(version: current_app))
         services.each_value { |s| s.send(:update_profile, args: args, opts: opts) }
       end
       dispatch_task :update_profile!, to: :configurator, as: :update_profile, locally: true
 
       def deploy_release(args:, opts:)
-        deploy_release!(args: args, opts: opts.merge(repository: source)).tap do
-          binstubs!(args: args, opts: opts)
+        deployable_versions.each do |version|
+          deploy_release!(args: args, opts: opts.merge(repository: source.merge(version: version)))
+        end
+        deprecated_versions.each do |version|
+          deprecate_release!(args: args, opts: opts.merge(repository: source.merge(version: version)))
         end
       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))
+        package_release!(args: args, opts: opts)[:release_pack].tap do |pack|
+          unless pack.nil?
+            publish_release!(args: args, opts: opts.merge(release_pack: pack))
           end
         end
       end
       alias_method :deploy_profile!, :deploy_release!
       dispatch_task :package_release!, to: :repository, as: :package, locally: true
       dispatch_task :publish_release!, to: :publisher, as: :publish
+
+      def deprecate_release!(args:, opts:)
+        deprecate_packaged_release!(args: args, opts: opts)[:release_pack].tap do |pack|
+          unless pack.nil?
+            deprecate_published_release!(args: args, opts: opts.merge(release_pack: pack))
+          end
+        end
+      end
+      dispatch_task :deprecate_packaged_release!, to: :repository, as: :deprecate, locally: true
+      dispatch_task :deprecate_published_release!, to: :publisher, as: :deprecate
+
+      def print_summary(result)
+        result.each do |entry|
+          s = entry[:summary]
+          puts "  [#{entry[:hostname]}] #{s[:status]} #{s[:name]} (#{s[:published]})"
+          puts "  [#{entry[:hostname]}]    #{s[:alert]}" unless s[:alert].nil?
+        end
+      end
     end
   end
 end

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

@@ -3,13 +3,6 @@ module Luban
     class Application
       class Configurator < Worker
         include Luban::Deployment::Service::Configurator::Base
-
-        def release_type; task.opts.release[:type]; end
-        def release_tag; task.opts.release[:tag]; end
-
-        def release_path
-          @release_path ||= releases_path.join(release_type, release_tag)
-        end
       end
     end
   end

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

@@ -4,52 +4,45 @@ module Luban
       class Controller < Worker
         include Luban::Deployment::Service::Controller::Base
 
-        def current_release?(_release_tag)
-          _release_tag =~ /^#{Regexp.escape(application_version)}/
-        end
-
-        def current_symlinked?(_release_tag)
-          _release_tag == release_tag
-        end
-
-        def release_path
-          @release_path ||= Pathname.new(readlink(current_app_path))
-        end
-
-        def releases_path
-          @releases_path ||= release_path.dirname
-        end
-
-        def release_tag
-          @release_tag ||= release_path.basename.to_s
-        end
-
-        def show_current
-          update_result get_summary(release_tag)
-        end
-
-        def show_summary
-          update_result get_summary(*get_releases)
-        end
+        def current_configured?; !!task.opts.release[:current]; end
+        alias_method :current?, :current_configured?
 
-        def get_releases
-          capture(:ls, '-xt', releases_path).split
+        def current_symlinked?
+          release_tag == current_release_tag
         end
 
-        protected
-
-        def get_status(tag)
-          if current_symlinked?(tag)
-            current_release?(tag) ? " *" : "s*"
+        def current_release_tag
+          if symlink?(current_app_path)
+            File.basename(readlink(current_app_path))
           else
-            (current_release?(tag) and !current_release?(release_tag)) ? "c*" : "  "
+            nil
           end
         end
 
-        def get_summary(*release_tags)
-          release_tags.inject([]) do |r, tag|
-            r.push "#{get_status(tag)} #{application_name}:#{tag} (published)"
-          end.join("\n")
+        def published?; directory?(release_path); end
+        def deprecated?; !!task.opts.release[:deprecated]; end
+
+        def get_summary
+          status = if current_symlinked?
+                     current? ? " *" : "s*"
+                   else
+                     current? ? "c*" : (deprecated? ? " d" : "  ")
+                   end
+
+          if published?
+            published = 'published'
+            alert = case status
+                    when "s*"
+                      "Alert! #{application_name}:#{release_tag} is not the current version but symlinked IMPROPERLY. "
+                    when "c*"
+                      "Alert! #{application_name}:#{release_tag} is set as current version but NOT symlinked properly. "
+                    end
+          else
+            published = 'NOT published'
+            alert = nil
+          end
+          update_result summary: { name: "#{application_name}:#{release_tag}", published: published,
+                                   status: status, alert: alert }
         end
       end
     end

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

@@ -2,11 +2,12 @@ module Luban
   module Deployment
     class Application
       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
-        def bundled_gems; task.opts.release[:bundled_gems]; end
+        def release_type; task.opts.release_pack[:type]; end
+        def release_version; task.opts.release_pack[:version]; end
+        def release_tag; task.opts.release_pack[:tag]; end
+        def release_package_path; task.opts.release_pack[:path]; end
+        def release_md5; task.opts.release_pack[:md5]; end
+        def bundled_gems; task.opts.release_pack[:bundled_gems]; end
         def locked_gemfile; bundled_gems[:locked_gemfile]; end
         def gems_source; bundled_gems[:gems_cache]; end
         def gems; bundled_gems[:gems]; end
@@ -14,16 +15,12 @@ module Luban
         def publish_app?; release_type == 'app'; end
         def publish_profile?; release_type == 'profile'; end
 
-        def display_name
-          @display_name ||= "#{application} #{release_type} (release: #{release_tag})"
+        def release_name
+          @release_name ||= "#{application}:#{release_type}:#{release_tag}"
         end
 
         def releases_path
-          @releases_path ||= super.join(release_type)
-        end
-
-        def release_path
-          @release_path ||= releases_path.join(release_tag)
+          @releases_path ||= super.dirname.join(release_type)
         end
 
         def releases_log_path
@@ -62,9 +59,7 @@ module Luban
           @bundle_linked_dirs ||= %w(.bundle vendor/cache vendor/bundle)
         end
 
-        def published?
-          get_releases.include?(release_tag)
-        end
+        def published?; directory?(release_path); end
 
         def publish
           assure_dirs(releases_path)
@@ -72,7 +67,7 @@ module Luban
             if force?
               publish!
             else
-              update_result "Skipped! #{display_name} has been published ALREADY.", status: :skipped
+              update_result "Skipped! ALREADY published #{release_name}.", status: :skipped
               return
             end
           else
@@ -80,9 +75,16 @@ module Luban
           end
 
           if published?
-            update_result "Successfully published #{display_name}."
+            update_result "Successfully published #{release_name}."
           else
-            update_result "Failed to publish #{display_name}", status: :failed, level: :error
+            update_result "FAILED to publish #{release_name}.", status: :failed, level: :error
+          end
+        end
+
+        def deprecate
+          if directory?(release_path)
+            rmdir(release_path)
+            update_result "Successfully deprecated published release #{release_name}."
           end
         end
 
@@ -93,10 +95,6 @@ module Luban
 
         protected
 
-        def get_releases
-          capture(:ls, '-xt', releases_path).split
-        end
-
         def publish!
           rollout_release
           cleanup_releases
@@ -161,23 +159,13 @@ module Luban
         end
 
         def release_log_message
-          "Release #{display_name} in #{stage} #{project} is published successfully."
+          "#{release_name} in #{stage} #{project} is published successfully."
         end
 
-        def cleanup_releases
-          releases = get_releases
-          if releases.count > keep_releases
-            releases_to_keep = releases.first(keep_releases)
-            unless releases_to_keep.include?(release_tag)
-              releases_to_keep[-1] = release_tag
-            end
-            releases_to_remove = releases - releases_to_keep
-            releases_to_remove.each do |release| 
-              rmdir(releases_path.join(release))
-            end
-            info "Removed #{releases_to_remove.count} old releases."
-          else
-            info "No old releases to remove (keeping most recent #{keep_releases} releases)."
+        def cleanup_releases(keep_releases = 1)
+          files = capture(:ls, '-xtd', releases_path.join("#{release_version}-*")).split(" ")
+          if files.count > keep_releases
+            files.last(files.count - keep_releases).each { |f| rmdir(f) }
           end
         end
 

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

@@ -12,6 +12,7 @@ module Luban
         attr_reader :scm
         attr_reader :revision
         attr_reader :rev_size
+        attr_reader :version
 
         def scm_module
           require_relative "scm/#{scm}"
@@ -51,7 +52,11 @@ module Luban
         end
 
         def release_tag
-          @release_tag ||= "#{stage}-#{revision}"
+          @release_tag ||= "#{version}-#{revision}"
+        end
+
+        def release_name
+          @release_name ||= "#{application}:#{type}:#{release_tag}"
         end
 
         def bundle_without
@@ -74,45 +79,65 @@ module Luban
         def build
           assure_dirs(clone_path, releases_path)
           if cloned? and !force?
-            update_revision
-            update_result "Skipped! Local #{type} repository has been built ALREADY (#{revision}).", 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 #{type} repository (#{revision})."
-              else
-                update_result "FAILED to build local #{type} repository!", status: :failed, level: :error
-              end
+            abort "Aborted! Remote #{type} repository is NOT available." unless available?
+            if build!
+              update_result "Successfully built local #{type} repository."
             else
-              update_result "Aborted! Remote #{type} repository is NOT available.", status: :failed, level: :error
+              abort "FAILED to build local #{type} repository!"
             end
           end
         end
 
+        def packaged?; file?(release_package_path); end
+
         def package
-          if cloned?
-            if package!
-              cleanup_releases
-              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 #{type} repository!", status: :failed, level: :error
-            end
+          abort "Aborted! Local #{type} repository is NOT built yet!" unless cloned?
+          abort "Aborted! FAILED to update local #{type} repository!" unless update
+          update_revision
+          abort "Aborted! Version to package is MISSING!" if version.nil?
+          release_package = ->{ { type: type, version: version, tag: release_tag,
+                                  path: release_package_path, 
+                                  md5: md5_for_file(release_package_path),
+                                  bundled_gems: bundle_gems } }
+          if packaged?
+              if force?
+                release
+              else
+                update_result "Skipped! ALREADY packaged #{release_name}.", status: :skipped,
+                              release_pack: release_package.call
+              end
           else
-            update_result "Aborted! Local #{type} package is NOT built yet!", status: :failed, level: :error
+            release
+            cleanup_releases
           end
+
+          if packaged?
+            update_result "Successfully packaged #{release_name} to #{release_package_path}."
+          else
+            abort "Aborted! FAILED to package #{release_name}!"
+          end
+          update_result release_pack: release_package.call
+        end
+
+        def deprecate
+          abort "Aborted! Local #{type} repository is NOT built yet!" unless cloned?
+          abort "Aborted! Version to deprecate is MISSING!" if version.nil?
+          if file?(release_package_path)
+            rm(release_package_path)
+            update_result "Successfully deprecated packaged release #{release_name}."
+          end
+          update_result release_pack: { type: type, version: version, tag: release_tag }
         end
 
         protected
 
         def init
           @rev_size = DefaultRevisionSize
-          task.opts.repository.each_pair { |name, value| instance_variable_set("@#{name}", value) }
+          task.opts.repository.each_pair { |k, v| instance_variable_set("@#{k}", v) }
           load_scm
+          update_revision if cloned? and !version.nil?
         end
 
         def load_scm
@@ -124,23 +149,15 @@ module Luban
           clone
         end
 
-        def package!
-          if update
-            update_revision
-            release
-          end
-        end
-
         def update_revision
           @revision = fetch_revision
         end
 
-        def cleanup_releases
-          files = capture(:ls, '-xt', releases_path).split
+        def cleanup_releases(keep_releases = 1)
+          path = releases_path.join("#{release_prefix}-#{version}-*.#{release_package_extname}")
+          files = capture(:ls, '-xt', path).split(" ")
           if files.count > keep_releases
-            within(releases_path) do
-              files.last(files.count - keep_releases).each { |f| rm(f) }
-            end
+            files.last(files.count - keep_releases).each { |f| rm(f) }
           end
         end
 

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

@@ -4,15 +4,8 @@ module Luban
       class Repository
         module SCM
           module Git
-            attr_reader :tag
-            attr_reader :branch
-
             def git_cmd; :git; end
 
-            def ref
-              tag || branch || @ref
-            end
-
             def available?
               test(git_cmd, 'ls-remote --heads', from)
             end
@@ -22,8 +15,8 @@ module Luban
             end
 
             def fetch_revision
-              within(clone_path) { capture(git_cmd, "rev-parse --short=#{rev_size} #{ref} 2>/dev/null") }
-              #within(clone_path) { capture(git_cmd, "rev-list --max-count=1 --abbrev-commit --abbrev=rev_size #{ref}") }
+              within(clone_path) { capture(git_cmd, "rev-parse --short=#{rev_size} #{version} 2>/dev/null") }
+              #within(clone_path) { capture(git_cmd, "rev-list --max-count=1 --abbrev-commit --abbrev=rev_size #{version}") }
             end
 
             def clone
@@ -35,11 +28,23 @@ module Luban
             end
 
             def release
-              within(clone_path) { test(git_cmd, :archive, ref, "--prefix=#{release_tag}/ -o #{release_package_path}") }
+              within(clone_path) { test(git_cmd, :archive, version, "--prefix=#{release_tag}/ -o #{release_package_path}") }
+            end
+
+            def branch?
+              within(clone_path) { test(git_cmd, :"show-ref", "--quite --verify refs/heads/#{version}") }
+            end
+
+            def tag?
+              within(clone_path) {test(git_cmd, :"show-ref", "--quite --verify refs/tags/#{version}") }
+            end
+
+            def commit?
+              version =~ /^\h+/ and !revision.nil?
             end
 
             def release_tag
-              @release_tag ||= "#{ref}-#{revision}"
+              @release_tag ||= commit? ? "ref-#{revision}" : super
             end
           end
         end

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

@@ -25,6 +25,16 @@ module Luban
         def service_entry
           @service_entry ||= "#{env_name.gsub('/', '.')}.app"
         end
+
+        def release_tag; task.opts.release[:tag]; end
+
+        def releases_path
+          @releases_path ||= super.join('app')
+        end
+
+        def release_path
+          @release_path ||= releases_path.join(release_tag)
+        end
       end
     end
   end

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

@@ -84,6 +84,7 @@ module Luban
           def setup_deploy_tasks
             task :deploy do
               desc "Run deployment"
+              switch :force, "Force to deploy", short: :f
               action! :deploy
             end
           end

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

@@ -81,7 +81,7 @@ module Luban
         def package_options; @package_options ||= {}; end
 
         def update_package_options(version, **opts)
-          unless package_options.has_key?(version)
+          unless has_version?(version)
             package_options[version] = 
               { name: name.to_s }.merge!(self.class.decompose_version(version))
           end
@@ -242,7 +242,7 @@ module Luban
         def print_summary(result)
           result.each do |entry|
             s = entry[:summary]
-            puts "  [#{entry[:hostname]}] #{s[:status]} #{s[:name]} #{s[:installed]}"
+            puts "  [#{entry[:hostname]}] #{s[:status]} #{s[:name]} (#{s[:installed]})"
             puts "  [#{entry[:hostname]}]      #{s[:executable]}" unless s[:executable].nil?
             puts "  [#{entry[:hostname]}]    #{s[:alert]}" unless s[:alert].nil?
           end

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

@@ -119,7 +119,7 @@ module Luban
                     end
 
           if installed?
-            installed = '(installed)'
+            installed = 'installed'
             alert = case status
                     when "s*"
                       "Alert! #{package_full_name} is not the current version but symlinked IMPROPERLY. " +
@@ -129,7 +129,7 @@ module Luban
                       "Run \"binstubs\" to fix it."
                     end
           else
-            installed = '(NOT installed)'
+            installed = 'NOT installed'
             alert = nil
           end
           update_result summary: { name: package_full_name, installed: installed, 

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

@@ -210,7 +210,7 @@ module Luban
           end
 
           def process_grep(pattern = process_pattern)
-            capture(:pgrep, "-l -f \"#{pattern}\" 2>/dev/null").split("\n").inject({}) do |h, p|
+            capture(:pgrep, "-l -f -a \"#{pattern}\" 2>/dev/null").split("\n").inject({}) do |h, p|
               pid, pname = p.split(' ', 2)
               h[pid] = pname
               h

data/lib/luban/deployment/parameters.rb

@@ -109,7 +109,6 @@ module Luban
 
         parameter :application
         parameter :scm_role
-        parameter :keep_releases
         parameter :linked_dirs
         parameter :linked_files
         parameter :logrotate_files
@@ -118,7 +117,6 @@ module Luban
 
         def set_default_application_parameters
           set_default :scm_role, :scm
-          set_default :keep_releases, 3
           set_default :linked_dirs, []
           set_default :linked_files, []
           set_default :logrotate_files, []

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.6.2"
+    VERSION = "0.6.5"
   end
 end

metadata

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