capistrano-pumaio 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28f2f643848071b61e0f09c194bf3e64f3e25250
-  data.tar.gz: f4a8f4d268a36ad2c77308fdebc7fd1bf095af1a
+  metadata.gz: 2310240f0a36101268d9c072316f521870c5ad60
+  data.tar.gz: 90536366f4022d84715e0479eaba30538bdc2363
 SHA512:
-  metadata.gz: b44351b1f634e795738d84ff362f5f80eefe505e150bf54791da2385befc7f432898d96bb2749262084d0d528899d42e5b2e5278b8b2e03fd5ffbc1182d5defc
-  data.tar.gz: 9361019cb5ae4339ff18c9d8b2f148a19190e862e287a23449515fa30c9445c1ffc6141b288c7b311111598f80b0d0e29b3b041d0594f8d09fecabc0680c732a
+  metadata.gz: bf465c728b4ed5f49b26e8314ae8b4d39094e313ff691c8cdec6f40c00ae54193eb8ca6b7d315cae99637c082208d2251dc6abf1630f3162a4402744c70d584e
+  data.tar.gz: d779d99dae2027fb0f48ef327bba80eb240b9ca48055b1ee30979e4178eed88e4788d341cce394b0329da514e95535c36b377e13ced189ea447c2ea730aa6cd8

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'capistrano', '~> 3.4'
 gem 'activesupport', '>= 3.0'
-gem 'capistrano-monit_runit', '~> 3.0.1'
+gem 'capistrano-monit_runit', '~> 3.0.2'
 
 group :development do
   gem 'bundler', '~> 1.7'

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capistrano-monit_runit (3.0.1)
+    capistrano-monit_runit (3.0.2)
       activesupport (>= 3.0)
       capistrano (~> 3.4)
     colorize (0.7.5)
@@ -78,5 +78,5 @@ DEPENDENCIES
   activesupport (>= 3.0)
   bundler (~> 1.7)
   capistrano (~> 3.4)
-  capistrano-monit_runit (~> 3.0.1)
+  capistrano-monit_runit (~> 3.0.2)
   jeweler (~> 2.0)

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/capistrano-pumaio.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-pumaio 3.0.1 ruby lib
+# stub: capistrano-pumaio 3.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-pumaio"
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Leif Ringstad"]
-  s.date = "2015-03-26"
+  s.date = "2015-08-06"
   s.description = "Capistrano recipes for puma using runit and monit. Includes nginx recipes for the app server."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -55,20 +55,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, ["~> 3.4"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
       s.add_dependency(%q<capistrano>, ["~> 3.4"])
       s.add_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
       s.add_dependency(%q<bundler>, ["~> 1.7"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
     s.add_dependency(%q<capistrano>, ["~> 3.4"])
     s.add_dependency(%q<activesupport>, [">= 3.0"])
-    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
     s.add_dependency(%q<bundler>, ["~> 1.7"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end

data/lib/capistrano/helpers/puma/nginx.rb

@@ -1,7 +1,12 @@
 module Capistrano
   module Helpers
     module Puma
+      ##
+      # Module Nginx provides helper functions for nginx configuration
+      ##
       module Nginx
+        module_function
+
         def default_pw_generator
           pw = SecureRandom.random_number(36**10).to_s(36).rjust(10, '0')
           info "Random password generated: #{pw}"

data/lib/capistrano/tasks/monit.rake

@@ -1,20 +1,19 @@
 require 'capistrano/helpers/base'
 require 'capistrano/helpers/monit'
-require 'capistrano/helpers/puma/monit'
 require 'capistrano/dsl/base_paths'
-include Capistrano::DSL::BasePaths
-include Capistrano::Helpers::Base
-include Capistrano::Helpers::Monit
-include Capistrano::Helpers::Puma::Monit
+require 'capistrano/helpers/puma/monit'
 
 namespace :puma do
+  include Capistrano::DSL::BasePaths
+  include Capistrano::Helpers::Base
+  include Capistrano::Helpers::Monit
   namespace :monit do
     desc 'MONIT: Setup Puma service'
     task :setup do
       on roles(:app) do |host|
         info "MONIT: Uploading configuration for puma for #{fetch(:application)} on #{host}"
         # Upload configuration
-        upload! template_to_s_io(fetch(:puma_monit_config_template)), available_configuration_with_path
+        upload! template_to_s_io(fetch(:puma_monit_config_template)), Capistrano::Helpers::Puma::Monit.available_configuration_with_path
       end
     end
 
@@ -22,7 +21,7 @@ namespace :puma do
     task :enable do
       on roles(:app) do |host|
         info "MONIT: Enabling service for puma for application #{fetch(:application)} on #{host}"
-        enable_monitor(available_configuration_file )
+        enable_monitor(Capistrano::Helpers::Puma::Monit.available_configuration_file)
       end
     end
 
@@ -30,7 +29,7 @@ namespace :puma do
     task :disable do
       on roles(:app) do |host|
         info "MONIT: Disabling service for puma for application #{fetch(:application)} on #{host}"
-        disable_monitor(available_configuration_file)
+        disable_monitor(Capistrano::Helpers::Puma::Monit.available_configuration_file)
       end
     end
 

data/lib/capistrano/tasks/nginx.rake

@@ -10,7 +10,6 @@ namespace :puma do
     desc 'Get the config needed to add to sudoers for nginx commands'
     task :sudoers do
       run_locally do
-        info '---------------ENTRIES FOR SUDOERS (Nginx)---------------------'
         puts '#---------------ENTRIES FOR SUDOERS (Nginx)---------------------'
         puts "#{fetch(:user)} ALL=NOPASSWD: /bin/mkdir -p #{fetch(:nginx_log_path)}"
         puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown -R #{fetch(:user)}\\:root #{fetch(:nginx_log_path)}"
@@ -18,7 +17,6 @@ namespace :puma do
         puts "#{fetch(:user)} ALL=NOPASSWD: /bin/chown #{fetch(:user)}\\:root #{fetch(:nginx_sites_enabled_path)}"
         puts "#{fetch(:user)} ALL=NOPASSWD: /usr/sbin/service nginx *"
         puts '#---------------------------------------------------------------'
-        info '---------------------------------------------------------------'
       end
       # info "#{fetch(:user)} ALL=NOPASSWD: /bin/chown deploy:root #{monit_monitrc_file}"
     end
@@ -117,3 +115,5 @@ end
 #     nginx.restart # must restart after enable for nginx to pickup new site
 #   end
 # end
+
+after 'sudoers', 'puma:nginx:sudoers'

data/lib/capistrano/tasks/runit.rake

@@ -3,13 +3,12 @@ require 'capistrano/dsl/runit_paths'
 require 'capistrano/helpers/base'
 require 'capistrano/helpers/runit'
 
-include Capistrano::DSL::BasePaths
-include Capistrano::DSL::RunitPaths
-include Capistrano::Helpers::Base
-include Capistrano::Helpers::Runit
-
 # require 'capistrano/runit'
 namespace :puma do
+  include Capistrano::DSL::BasePaths
+  include Capistrano::DSL::RunitPaths
+  include Capistrano::Helpers::Base
+  include Capistrano::Helpers::Runit
   desc 'Setup Puma configuration'
   task :setup do
     on roles(:app) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-pumaio
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement