capistrano3-puma 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea350fc3a6710ad4d8c993d22ba678de9f257b4
-  data.tar.gz: 11a6d44358efac4a923d7d085f9ab2d902a0356e
+  metadata.gz: 9cbc6d0457399e7b44e785e7783a81e963400051
+  data.tar.gz: b430fb5defe9ee2cda9c85be2ac174f3dd84b5b5
 SHA512:
-  metadata.gz: da870baec198029a8918416162ffc2ad8a4eadd73a16a50075f6c9f05d81d70b95241ffbb22862d5a62a6c408a21b2e7ae6244a5b7b6a076e8b2c9ce13fba76a
-  data.tar.gz: 8c7b71aaa0ef4a25b369880172c9f018d9991f8fb9bebfb0d87711b3e5f01780e88ac93775dfebd00a3d7beab6139797d0498a47f593b118b89c29813fc8f759
+  metadata.gz: e72d5bed7faaee8d88f840404fa0d3b062daea20bcacfc4779d53845bea43ce81b75999c12b46f9d2317c9c0ad7c5acd3c93c9e8da5a85000dfedf390bc7c52e
+  data.tar.gz: 4c121dbcf114f565a20c46452a086df61d4618d02942693cc9bba54cd30f6fecc934e5fb1d341ce53436bf53b84932f8400c58777633e694115ac526d9514428

data/README.md

@@ -93,6 +93,7 @@ Ensure that the following directories are shared (via ``linked_dirs``):
     tmp/pids tmp/sockets log
 
 ## Changelog
+- 0.8.2: Start task creates a conf file if none exists @stevemadere
 - 0.8.1: Fixed nginx task @hnatt, support for prune_bundler @behe
 - 0.8.0: Some changes
 - 0.7.0: added Nginx template generator  @dfang
@@ -122,7 +123,6 @@ Ensure that the following directories are shared (via ``linked_dirs``):
 - 0.0.8: puma.rb is automatically generated if not present. Fixed RVM issue.
 - 0.0.7: Gem pushed to rubygems as capistrano3-puma. Support of Redhat based OS for Jungle init script.
 
-## TODO
 
 ## Contributors
 
@@ -131,7 +131,8 @@ Ensure that the following directories are shared (via ``linked_dirs``):
 - [ayaya](https://github.com/ayamomiji)
 - [Shane O'Grady](https://github.com/shaneog)
 - [Jun Lin](https://github.com/linjunpop)
-- [fang duan](https://github.com/dfang/capistrano-puma)
+- [fang duan](https://github.com/dfang)
+- [Steve Madere](https://github.com/stevemadere)
 
 ## Contributing
 

data/lib/capistrano/puma/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Puma
-    VERSION = '0.8.1'
+    VERSION = '0.8.2'
   end
 end

data/lib/capistrano/tasks/nginx.cap

@@ -1,6 +1,6 @@
 namespace :load do
   task :defaults do
-    set :puma_nginx, :web
+    set :puma_nginx, -> { :web }
   end
 end
 

data/lib/capistrano/tasks/puma.cap

@@ -1,3 +1,4 @@
+
 namespace :load do
   task :defaults do
     set :puma_default_hooks, -> { true }
@@ -51,6 +52,11 @@ namespace :puma do
   desc 'Start puma'
   task :start do
     on roles (fetch(:puma_role)) do
+      if test "[ -f #{fetch(:puma_conf)} ]"
+        info "using conf file #{fetch(:puma_conf)}"
+      else
+        invoke 'puma:config'
+      end
       within current_path do
         with rack_env: fetch(:puma_env) do
 
@@ -94,7 +100,7 @@ namespace :puma do
               execute :bundle, 'exec', :pumactl, "-S #{fetch(:puma_state)} #{command}"
             else
               # Puma is not running or state file is not present : Run it
-              execute :bundle, 'exec', :puma, "-C #{fetch(:puma_conf)} --daemon"
+              invoke 'puma:start'
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-puma
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -51,7 +51,6 @@ files:
 - README.md
 - Rakefile
 - capistrano3-puma.gemspec
-- lib/capistrano-puma.rb
 - lib/capistrano/puma.rb
 - lib/capistrano/puma/jungle.rb
 - lib/capistrano/puma/monit.rb
@@ -69,6 +68,7 @@ files:
 - lib/capistrano/templates/puma.rb.erb
 - lib/capistrano/templates/puma_monit.conf.erb
 - lib/capistrano/templates/run-puma.erb
+- lib/capistrano3-puma.rb
 - lib/generators/capistrano/nginx_puma/USAGE
 - lib/generators/capistrano/nginx_puma/config_generator.rb
 homepage: https://github.com/seuros/capistrano-puma
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Puma integration for Capistrano