luban 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a417d4a92ea8a9f0d9b14b2f448e8471d66650a2
-  data.tar.gz: f362a94f11454579846f9288b87757022fd3b2f6
+  metadata.gz: 9b5c23cf9c92a7106234e16b34d3ba5578f118cb
+  data.tar.gz: f29d25e7aeba87e5eb29380f531d924de2a17462
 SHA512:
-  metadata.gz: b342062f582d1f037926279b0a5a8da8ec3e7086b2fa4f50c53ef1a8b667b9d006841241ea8958697bd02dcf289afd75760aa06c604574c6faab2a35f023b605
-  data.tar.gz: 757fcdddf336eeac8da076bf7e2b94daf14088d35542304dc0d4c93fe453acdf8b68adec379b4bd609820d3d86c0cccfe50b228dd4ca270e37e1b01b81960f4d
+  metadata.gz: 36fe14118bc72ce657456638ca97f3083e59b6ec7814769a87eb6f771cac1f9222ccdab882a6ade9cdedf71271f32840e815cbe5c45d408faaceebc418325ddf
+  data.tar.gz: b6a547c3ce745235956c4c400ff9e1457152d3c2829f14d2628a480f99df41308d953fe8ec6397122cd8ebcf8b008a43a95f73f05ab2908dbbedc990aa2d4c2a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 
+## Version 0.6.7 (Aug 02, 2016)
+
+Minor enhancements:
+  * Added convenient class method #applcation_action
+  * Removed support for Cluster in Service::Controller
+    * Support for Cluster has been moved to Rack::Controller (luban-rack)
+  * Added exclude filter, #exclude_template?, for #profile_templates in Service::Configurator
+    * Facilitate template filtering during profile rendering
+
 ## Version 0.6.6 (Jul 27, 2016)
 
 Bug fixes:

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

@@ -27,6 +27,20 @@ module Luban
         end
         protected action
       end
+
+      def self.application_action(action, dispatch_to: nil, as: action, locally: false, &blk)
+          define_method(action) do |args:, opts:|
+            if current_app
+              send("#{__method__}!", args: args, opts: opts.merge(version: current_app))
+            else
+              abort "Aborted! No current version of #{display_name} is specified."
+            end
+          end
+          unless dispatch_to.nil?
+            dispatch_task "#{action}!", to: dispatch_to, as: as, locally: locally, &blk
+            protected "#{action}!"
+          end
+        end
       
       def find_project; parent; end
       def find_application(name = nil)
@@ -177,15 +191,7 @@ module Luban
           send("application_#{action}", args: args, opts: opts) if has_source?
         end
         action_on_services "service_#{action}!", as: action
-
-        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
-        dispatch_task "application_#{action}!", to: :controller, as: action
+        application_action "application_#{action}", dispatch_to: :controller, as: action
       end
 
       def init_profiles(args:, opts:)

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

@@ -24,9 +24,13 @@ module Luban
             [profile_templates_path, stage_profile_templates_path].each do |path|
               Dir.chdir(path) { @profile_templates |= Dir["**/*.#{format}"] } if path.directory?
             end
-            @profile_templates
+            @profile_templates.tap do |templates| 
+              templates.reject! { |t| exclude_template?(t) }
+            end
           end
 
+          def exclude_template?(template); false; end
+
           def default_templates; task.opts.default_templates; end
 
           def init_profile

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

@@ -240,46 +240,7 @@ module Luban
             test("#{reload_monitor_command} 2>&1")
           end
         end
-
-        module Cluster
-          def pid_file_pattern
-            raise NotImplementedError, "#{self.class.name}#pid_file_pattern is an abstract method."
-          end
-
-          def pid_files_path
-            pids_path.join(pid_file_pattern)
-          end
-
-          def pid_files
-            capture(:ls, "-A #{pid_files_path} 2>/dev/null").split.map do |f|
-              Pathname.new(f)
-            end
-          end
-
-          def pids
-            pid_files.collect { |pid_file| capture(:cat, "#{pid_file} 2>/dev/null") }
-          end
-
-          def pid; pids; end
-
-          def pid_file_exists?
-            # Any pid file is NOT zero size
-            pid_files.any? { |pid_file| file?(pid_file, "-s") }
-          end
-
-          def remove_orphaned_pid_file
-            rm(pid_files_path) if pid_file_orphaned?
-          end
-
-          def monitor_command
-            @monitor_command ||= "#{monitor_executable} monitor -g #{service_entry}"
-          end
-
-          def unmonitor_command
-            @unmonitor_command ||= "#{monitor_executable} unmonitor -g #{service_entry}"
-          end
-        end
-
+        
         include Base
       end
     end

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.6.6"
+    VERSION = "0.6.7"
   end
 end

metadata

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