magic_recipes_two 0.0.31 → 0.0.32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWVhMzk1NzEzYTA3NTMyYzZhNzk4NjhhMjVkNjA5MTVjODY0MzRjMg==
-  data.tar.gz: !binary |-
-    YzExOTY3MDAzYWNkZTM2Y2I4NjE2MjQyYzc4MWI1ZjhlYTQ5MTIxMg==
+SHA1:
+  metadata.gz: 551ef2c39850350a2085c4a5a0a2bf89b1546547
+  data.tar.gz: 597fde89844bf4b562a3403f6007b27ebba3e8c4
 SHA512:
-  metadata.gz: !binary |-
-    NDUwYWM0NzE2MWUxZWNlMjMzMTBiODRiOTYxM2JkN2Q3MmYxYzgxMGZhMGRh
-    NzU4Yjc5YzllYzlkODg3NWJkYmJkZmFmNGY0ZmUyZmI2ODNjNzI3NDQwN2Yx
-    M2Q1MmRjZGQxNzA0MWM3ODM2NjUyMjMxMzZlMzBjZjg4NjRkOTU=
-  data.tar.gz: !binary |-
-    ZTk1NjNmYmE4MmMzNGExYjg5OTg2N2Q1ZTFlY2Q2Y2M3Yjk5M2ExZjY2Mjk2
-    OTRiYmZjODE2NjFlZDY3ZTE3ZDVmNmM0MGY1YzA3MTc2OGI4MGYwNjZkZWQx
-    MWFhNjZkMzA3OTIwODg1OWRhY2NlZjNkNDc4YjcxZjUxNGI2ZTY=
+  metadata.gz: b264e3fc3d6a8726551bb4689d4016a48aa52d8f762a04c0784f1d9e8231c9f66fa0566b0bf0a06623231eb00c0ec1e49f83d8a980b56ce28cc13dc420bcf152
+  data.tar.gz: 02f97e3d04239c8fceb7247f0e7efef4aec1dce873827e46d3974ccd755025da595365b11ea312725cace35b20bb5264cd3effc27eedf6768bc61ee1d5ae365e

data/lib/capistrano/magic_recipes/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MagicRecipes
-    VERSION = "0.0.31"
+    VERSION = "0.0.32"
   end
 end

data/lib/capistrano/tasks/monit.rake

@@ -72,22 +72,23 @@ namespace :monit do
   
   
   %w[nginx postgresql redis sidekiq thin].each do |process|
-    if Array(fetch(:monit_processes)).include?(process)
       
       %w[monitor unmonitor start stop restart].each do |command|
         desc "#{command} monit-service for: #{process}"
         task "#{command}_#{process}" do
-          on roles(fetch(:sidekiq_roles)) do
-            if process == "sidekiq"
-              fetch(:sidekiq_processes).times do |idx|
-                sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
+          if Array(fetch(:monit_processes)).include?(process)
+            on roles(fetch("#{process}_roles".to_sym)) do
+              if process == "sidekiq"
+                fetch(:sidekiq_processes).times do |idx|
+                  sudo "#{fetch(:monit_bin)} #{command} #{sidekiq_service_name(idx)}"
+                end
+              elsif process == "thin"
+                fetch(:app_instances).times do |idx|
+                  sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_thin_#{idx}"
+                end
+              else
+                sudo "#{fetch(:monit_bin)} #{command} #{process}"
               end
-            elsif process == "thin"
-              fetch(:app_instances).times do |idx|
-                sudo "#{fetch(:monit_bin)} #{command} #{fetch(:application)}_#{fetch(:stage)}_thin_#{idx}"
-              end
-            else
-              sudo "#{fetch(:monit_bin)} #{command} #{process}"
             end
           end
         end
@@ -97,21 +98,24 @@ namespace :monit do
         ## Server specific tasks (gets overwritten by other environments!)
         desc "Upload Monit #{process} config file (server specific)"
         task "configure_#{process}" do
-          on release_roles fetch("#{process}_roles".to_sym) do |role|
-            monit_config( process, nil, role )
+          if Array(fetch(:monit_processes)).include?(process)
+            on release_roles fetch("#{process}_roles".to_sym) do |role|
+              monit_config( process, nil, role )
+            end
           end
         end
       elsif %w[sidekiq thin].include?(process)
         ## App specific tasks (unique for app and environment)
         desc "Upload Monit #{process} config file (app specific)"
         task "configure_#{process}" do
-          on release_roles fetch("#{process}_roles".to_sym) do |role|
-            monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+          if Array(fetch(:monit_processes)).include?(process)
+            on release_roles fetch("#{process}_roles".to_sym) do |role|
+              monit_config process, "/etc/monit/conf.d/#{fetch(:application)}_#{fetch(:stage)}_#{process}.conf", role
+            end
           end
         end
       end
       
-    end
   end
   
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magic_recipes_two
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
 platform: ruby
 authors:
 - Torsten Wetzel
@@ -14,56 +14,56 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: capistrano-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: capistrano-postgresql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: MagicRecipesTwo contains our most used deployment recipes for Capistrano-3.
@@ -165,17 +165,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Some recipes for rails-4 and capistrano-3.