capistrano-pumaio 0.0.18 → 3.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d0b0c672da288bee3d70d326acbda3cf7fc7711f
+  data.tar.gz: 9ecea6e95e311556c76033c4713b49c2c2335cc3
+SHA512:
+  metadata.gz: 1b5ae3786a9a677258da54f03ff75f0e752c50f5ee8fd33eaef252d1586403f5ef18e560bca01d2084012734ee3826589d91fe2c9fa9c0a182d2b14930a41ed9
+  data.tar.gz: f6ae8aaafc0a4a1003738e521eb5940233fa4817bb95d696779a13f5cce40e39a4a2ea45525497b4e724ae87bb7683346d5fb32b57225d7223463e31a9de01ce

data/Gemfile

@@ -1,9 +1,10 @@
 source 'http://rubygems.org'
 
-gem "capistrano",     ">= 2.15.5"
-gem 'capistrano-base_helper', ">= 0.0.11"
+gem 'capistrano', '~> 3.4'
+gem 'activesupport', '>= 3.0'
+gem 'capistrano-monit_runit', '~> 3.0.1'
 
 group :development do
-  gem "bundler", ">= 1.3.0"
-  gem "jeweler", "~> 1.8.6"
+  gem 'bundler', '~> 1.7'
+  gem 'jeweler', '~> 2.0'
 end

data/Gemfile.lock

@@ -1,69 +1,82 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.3.7)
     builder (3.2.2)
-    capistrano (2.15.5)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano-base_helper (0.0.11)
-      capistrano (>= 2.15.5)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.5)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    capistrano-monit_runit (3.0.1)
+      activesupport (>= 3.0)
+      capistrano (~> 3.4)
+    colorize (0.7.5)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    jeweler (1.8.6)
+    hashie (3.4.0)
+    highline (1.7.1)
+    i18n (0.7.0)
+    jeweler (2.0.1)
       builder
-      bundler (~> 1.0)
+      bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
+      github_api
       highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.7.7)
-    multi_xml (0.5.4)
-    multipart-post (1.2.0)
-    net-scp (1.1.2)
+    json (1.8.2)
+    jwt (1.4.1)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.6.8)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    net-ssh (2.9.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rack (1.6.0)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.3.0)
-  capistrano (>= 2.15.5)
-  capistrano-base_helper (>= 0.0.11)
-  jeweler (~> 1.8.6)
+  activesupport (>= 3.0)
+  bundler (~> 1.7)
+  capistrano (~> 3.4)
+  capistrano-monit_runit (~> 3.0.1)
+  jeweler (~> 2.0)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Leif Ringstad
+Copyright (c) 2013-2015 Leif Ringstad
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,22 +1,37 @@
 # Capistrano Recipes for Puma
 
-This gem provides recipes for [Puma](http://puma.io) to setup [runit](smarden.org/runit/), [monit](http://mmonit.com/monit) and [nginx](http://nginx.org) for both running and monitoring puma and a nginx site connected to a puma socket
+This gem provides recipes for [Puma](http://puma.io) to setup [runit](http://smarden.org/runit/), [monit](http://mmonit.com/monit) and [nginx](http://nginx.org) for both running and monitoring puma and a nginx site connected to a puma socket
+
+## Versioning
+
+Use 3.x for capistrano 3
+
+For capistrano2, see the capistrano2 branch (will not be updated)
 
 ## Usage
 
 
-Add it to your Gemfile without requiring it
+Add it to your Gemfile in the development section.
 
 ```ruby
-gem 'capistrano-pumaio'
+gem 'capistrano-pumaio', require: false
 ```
 
-In your deploy.rb:
+Now run ```bundle install```
+
+Add this to your Capfile:
 
 ```ruby
 require 'capistrano/puma'
 ```
 
+Create a new file in in /etc/sudoers.d/ and add the output of the following commands:
+
+```
+cap production runit:sudoers
+cap production monit:sudoers
+cap production puma:nginx:sudoers
+```
 
 ### Monit
 
@@ -108,7 +123,7 @@ See nginx.rb for configuration options.
 #### Notes when using nginx
 
 
-puma:nginx:setup is setup to run automatically after deploy:setup, and you will be asked if you want to enable the site.
+You have to run ``` cap production puma:nginx:setup ``` to automatically setup nginx.
 
 If you do not enable the site during setup, be sure to run the following two commands when you want to enable your site:
 

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 require 'rake'
@@ -14,24 +14,26 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "capistrano-pumaio"
-  gem.homepage = "https://github.com/leifcr/capistrano-puma"
-  gem.license = "MIT"
-  gem.summary = %Q{Capistrano recipes for puma using runit and monit}
-  gem.description = %Q{Capistrano recipes for puma using runit and monit.}
-  gem.email = "leifcr@gmail.com"
-  gem.authors = ["Leif Ringstad"]
-  gem.files.exclude ".ruby-*"
+  gem.name = 'capistrano-pumaio'
+  gem.homepage = 'https://github.com/leifcr/capistrano-puma'
+  gem.license = 'MIT'
+  gem.summary = 'Capistrano recipes for puma using runit and monit'
+  gem.description = 'Capistrano recipes for puma using runit and monit. Includes nginx recipes for the app server.'
+  gem.email = 'leifcr@gmail.com'
+  gem.authors = ['Leif Ringstad']
+  gem.files.exclude '.ruby-*'
+  gem.files.exclude '*.sublime-project'
+  gem.files.exclude '.rubocop.yml'
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
 # require 'rdoc/task'
 # Rake::RDocTask.new do |rdoc|
-#   version = File.exist?('VERSION') ? File.read('VERSION') : ""
+#   version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
 #   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title = "capistrano-empty #{version}"
+#   rdoc.title = 'capistrano-empty #{version}'
 #   rdoc.rdoc_files.include('README*')
 #   rdoc.rdoc_files.include('lib/**/*.rb')
 # end

data/VERSION

@@ -1 +1 @@
-0.0.18
+3.0.0

data/capistrano-pumaio.gemspec

@@ -2,15 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: capistrano-pumaio 3.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-pumaio"
-  s.version = "0.0.18"
+  s.version = "3.0.0"
 
   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 = "2013-08-01"
-  s.description = "Capistrano recipes for puma using runit and monit."
+  s.date = "2015-03-26"
+  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 = [
     "LICENSE",
@@ -24,45 +26,51 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "capistrano-pumaio.gemspec",
+    "lib/capistrano/helpers/puma/monit.rb",
+    "lib/capistrano/helpers/puma/nginx.rb",
+    "lib/capistrano/helpers/puma/template_paths.rb",
     "lib/capistrano/puma.rb",
-    "lib/capistrano/puma/config.rb",
-    "lib/capistrano/puma/monit.rb",
-    "lib/capistrano/puma/nginx.rb",
-    "lib/capistrano/puma/runit.rb",
+    "lib/capistrano/tasks/config.rake",
+    "lib/capistrano/tasks/monit.rake",
+    "lib/capistrano/tasks/nginx.rake",
+    "lib/capistrano/tasks/nginx_config.rake",
+    "lib/capistrano/tasks/runit.rake",
     "templates/monit/puma.conf.erb",
     "templates/nginx/application.conf.erb",
     "templates/nginx/htpasswd.erb",
-    "templates/runit/config.rb.erb",
-    "templates/runit/control-q.erb",
+    "templates/puma-config.rb.erb",
+    "templates/runit/control/q.erb",
     "templates/runit/finish.erb",
-    "templates/runit/log-run.erb",
+    "templates/runit/log/run.erb",
     "templates/runit/run.erb"
   ]
   s.homepage = "https://github.com/leifcr/capistrano-puma"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.4.6"
   s.summary = "Capistrano recipes for puma using runit and monit"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capistrano>, [">= 2.15.5"])
-      s.add_runtime_dependency(%q<capistrano-base_helper>, [">= 0.0.11"])
-      s.add_development_dependency(%q<bundler>, [">= 1.3.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.6"])
+      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_development_dependency(%q<bundler>, ["~> 1.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
-      s.add_dependency(%q<capistrano>, [">= 2.15.5"])
-      s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.11"])
-      s.add_dependency(%q<bundler>, [">= 1.3.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
+      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<bundler>, ["~> 1.7"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
-    s.add_dependency(%q<capistrano>, [">= 2.15.5"])
-    s.add_dependency(%q<capistrano-base_helper>, [">= 0.0.11"])
-    s.add_dependency(%q<bundler>, [">= 1.3.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.6"])
+    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<bundler>, ["~> 1.7"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end
 end
 

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

@@ -0,0 +1,20 @@
+module Capistrano
+  module Helpers
+    module Puma
+      ##
+      # Module Monit provides helpers for Monit/Puma combination
+      ##
+      module Monit
+        module_function
+
+        def available_configuration_with_path
+          File.join(fetch(:monit_available_path), "#{fetch(:puma_runit_service_name)}.conf")
+        end
+
+        def available_configuration_file
+          "#{fetch(:puma_runit_service_name)}.conf"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Capistrano
+  module Helpers
+    module Puma
+      module Nginx
+        def default_pw_generator
+          pw = SecureRandom.random_number(36**10).to_s(36).rjust(10, '0')
+          info "Random password generated: #{pw}"
+          pw
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Capistrano
+  module Helpers
+    module Puma
+      ##
+      # Paths for templates
+      #
+      module TemplatePaths
+        module_function
+
+        def template_base_path
+          File.expand_path(File.join(File.dirname(__FILE__), '../../../../templates'))
+        end
+      end
+    end
+  end
+end

data/lib/capistrano/puma.rb

@@ -6,6 +6,16 @@ def try_require(library)
   end
 end
 
-try_require 'capistrano/puma/config'
-try_require 'capistrano/puma/runit'
-try_require 'capistrano/puma/monit'
+# try_require 'tasks/config.rake'
+# try_require 'tasks/monit.rake'
+# try_require 'tasks/runit.rake'
+# try_require 'tasks/nginx_config.rake'
+# try_require 'tasks/nginx.rake'
+# try_require 'tasks/.rake'
+try_require 'capistrano/monit'
+try_require 'capistrano/runit'
+load File.expand_path('../tasks/config.rake', __FILE__)
+load File.expand_path('../tasks/monit.rake', __FILE__)
+load File.expand_path('../tasks/runit.rake', __FILE__)
+load File.expand_path('../tasks/nginx_config.rake', __FILE__)
+load File.expand_path('../tasks/nginx.rake', __FILE__)

data/lib/capistrano/tasks/config.rake

@@ -0,0 +1,68 @@
+require 'capistrano/runit'
+require 'capistrano/helpers/puma/template_paths'
+include Capistrano::DSL::BasePaths
+include Capistrano::DSL::RunitPaths
+include Capistrano::Helpers::Base
+include Capistrano::Helpers::Runit
+
+namespace :load do
+  task :defaults do
+    # Puma Configuration
+    set :puma_runit_service_name, 'puma'
+    set :puma_workers, 2 # Must use a minimum of 1 worker (cluster mode, else restart/stop fails in the state file?)
+    set :puma_min_threads, 8
+    set :puma_max_threads, 8
+
+    set :puma_bin, 'bundle exec puma'
+    set :puma_control, 'bundle exec pumactl'
+
+    # Control files
+    set :puma_socket_file,  proc { "#{File.join(fetch(:sockets_path), 'puma.sock')}" }
+    set :puma_socket_url,   proc { "unix://#{fetch(:puma_socket_file)}" }
+    set :puma_pid_file,     proc { File.join(fetch(:pids_path), 'puma.pid') }
+    set :puma_state_file,   proc { File.join(fetch(:sockets_path), 'puma.state') }
+    set :puma_control_file, proc { "#{File.join(fetch(:sockets_path), 'pumactl.sock')}" }
+    set :puma_control_url,  proc { "unix://#{fetch(:puma_control_file)}" }
+
+    # This must be set to false if phased restarts should be used
+    set :puma_use_preload_app, false
+
+    set :pruma_prune_bundler, true
+
+    set :puma_activate_control_app, true
+
+    set :puma_on_restart_active, true
+
+    # Logging to path
+    set :puma_log_path, proc { runit_var_log_service_single_service_path(fetch(:puma_runit_service_name)) }
+
+    # Configuration files
+    set :puma_config_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'puma-config.rb.erb')
+
+    # The remote location of puma's config file. Used by runit when starting puma
+    set :puma_remote_config_folder, proc { shared_path.join('config') }
+    set :puma_config_file, proc { File.join(fetch(:puma_remote_config_folder), 'puma.rb') }
+
+    # runit defaults
+    set :puma_restart_interval, proc { fetch(:runit_restart_interval) }
+    set :puma_restart_count, proc { fetch(:runit_restart_count) }
+    set :puma_autorestart_clear_interval, proc { fetch(:runit_autorestart_clear_interval) }
+
+    # runit paths
+    set :puma_runit_run_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'runit', 'run.erb')
+    set :puma_runit_finish_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'runit', 'finish.erb') # rubocop:disable Metrics/LineLength
+    set :puma_runit_control_q_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'runit', 'control', 'q.erb') # rubocop:disable Metrics/LineLength
+    set :puma_runit_log_run_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'runit', 'log', 'run.erb') # rubocop:disable Metrics/LineLength
+
+    # monit configuration
+    set :puma_monit_service_name,  proc { "#{user_app_env_underscore}_puma" }
+    set :puma_monit_start_command, proc { "/bin/bash -c '[ ! -h #{runit_service_path(fetch(:puma_runit_service_name))}/run ] || /usr/bin/sv start #{runit_service_path(fetch(:puma_runit_service_name))}'" } # rubocop:disable Metrics/LineLength
+    set :puma_monit_stop_command,  proc { "/usr/bin/sv -w 12 force-stop #{runit_service_path(fetch(:puma_runit_service_name))}" } # rubocop:disable Metrics/LineLength
+    set :puma_monit_memory_alert_threshold, '150.0 MB for 2 cycles'
+    set :puma_monit_memory_restart_threshold, '175.0 MB for 3 cycles'
+    set :puma_monit_cpu_alert_threshold,   '90% for 2 cycles'
+    set :puma_monit_cpu_restart_threshold, '95% for 5 cycles'
+
+    set :puma_monit_config_template, File.join(Capistrano::Helpers::Puma::TemplatePaths.template_base_path, 'monit', 'puma.conf.erb') # rubocop:disable Metrics/LineLength
+  end
+end