luban 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a851ff43f9f30fc9505528691dce2583094b2df4
-  data.tar.gz: e41e631b827d2aec83411a094fd031ab42eae1f4
+  metadata.gz: b48ab79759b45ca7eb28235f9fc0304494de75a1
+  data.tar.gz: 1fdd55e4c8908e2beeb10a3b8ac7e96a03de8de2
 SHA512:
-  metadata.gz: 798ed949d9b1a81b56f77cbb12522da456e56fa8034d5e5685ed29b73f970996ed059ec96dd43c6cb0c5825850f314c7e4ee052351007331700b31c210c33f92
-  data.tar.gz: 5d9562a0e1767d106f55b09d58a088aec362c6351693cb8e647049788c5af3522a97a63418363b5fe5c2a54b7e860b80c12b18d73114937c939424b488fb5ffd
+  metadata.gz: 48eeeed19d760c788ac0430214ff36033eaf94db0d42db075949f07fb9491ee8417fbe1d2c9fd2388883a6cf1388611eedb58a98d71edd61f13bafcd0b2c0700
+  data.tar.gz: 2bdc3adacaad25386a30be00d59667c41cb5c011b85e25d6bcedc0fc474b98dd5c45e8aa07c75424591e5b9894ab36a5be2c507c6a400706813ceade898ea6fb

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change log
 
+## Version 0.9.14 (Oct 31, 2016)
+
+Minor enhancements:
+  * Assigned cronjobs to each host after configuration is loaded
+
+Bug fixes:
+  * Ensured only one controller from service or application controller can be executed
+    * Rolledback the last change and
+    * Enforced the logic in the control/monitor actions instead
+
 ## Version 0.9.13 (Oct 28, 2016)
 
 New features:

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

@@ -197,11 +197,8 @@ module Luban
       %i(show_current show_summary).each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
-          if has_services?
-            send("#{action}_packages!", args: args, opts: opts)
-          elsif has_source?
-            send("#{action}_application", args: args, opts: opts)
-          end
+          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
@@ -228,8 +225,11 @@ module Luban
        Luban::Deployment::Command::Tasks::Monitor::Actions).each do |action|
         define_method(action) do |args:, opts:|
           show_app_environment
-          send("service_#{action}!", args: args, opts: opts)
-          send("application_#{action}", args: args, opts: opts) if has_source?
+          if has_services?
+            send("service_#{action}!", args: args, opts: opts)
+          elsif has_source?
+            send("application_#{action}", args: args, opts: opts)
+          end
         end
         action_on_services "service_#{action}!", as: action
         application_action "application_#{action}", dispatch_to: :controller, as: action
@@ -321,6 +321,11 @@ module Luban
         setup_crontab_tasks
       end
 
+      def after_configure
+        super
+        assign_cronjobs if has_cronjobs?
+      end
+
       def add_service_parameters(service)
         service.class.parameters.each_pair do |param, default|
           singleton_class.send(:parameter, param, default: default)

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

@@ -203,12 +203,8 @@ module Luban
 
           def has_cronjobs?; !cronjobs.empty?; end
 
-          def cronjob(roles: luban_roles, hosts: nil, **job)
+          def cronjob(**job)
             validate_cronjob(job)
-            roles = Array(roles)
-            hosts = Array(hosts)
-            servers = select_servers(roles, hosts)
-            servers.each { |s| server(s, cronjob: job) }
             cronjobs << job
           end
 
@@ -228,6 +224,17 @@ module Luban
             end
           end
 
+          def assign_cronjobs
+            cronjobs.each { |job| assign_cronjob(**job) }
+          end
+
+          def assign_cronjob(roles: luban_roles, hosts: nil, **job)
+            roles = Array(roles)
+            hosts = Array(hosts)
+            servers = select_servers(roles, hosts)
+            servers.each { |s| server(s, cronjob: job) }
+          end
+
           def setup_crontab_tasks
             command :cronjobs do
               desc "Run crontab tasks"

data/lib/luban/deployment/version.rb

@@ -1,5 +1,5 @@
 module Luban
   module Deployment
-    VERSION = "0.9.13"
+    VERSION = "0.9.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luban
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Rubyist Lei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: luban-cli