mina-puma 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af9f8cd34d7ef22a969cd570647da2f111327368
-  data.tar.gz: ac6df3fa3d29f4ff42e4fe9881dbcd999075e598
+  metadata.gz: ffb5c8a885cccb123942b259db41dd99aa613d77
+  data.tar.gz: f389dafb16b8d3027861c2496f46143166eed20c
 SHA512:
-  metadata.gz: dfd33110d2af4e327bbd2ee9961bf2b1bd7e96833dbef50772cd18ab1efd68beb5ef2b9348b999248d1b577a885299501bbc1483085a7dc37e26adda94b25fdf
-  data.tar.gz: 69421ec3febad20a175e4e1e3c590433fdc731d7acc5128e3b2bb12c747132dbd69ce26a4bc66366559b3523ab119d6d163f248b32f87baa1ee27e23a31de319
+  metadata.gz: 37d58ac13d159452dbb392816b9a8e0379b4a48785bb80ebe525835119df348845ef3c8ab8a94127a88c96899fb4ee52557ef00268a3e41b9653c2ccaa4216aa
+  data.tar.gz: f71195b5edca9e1ae111a6fcdeffd31ce9582f0484181e66649a11bdd3d47dbd5ffc54b3c1db91f3e62d93cf6d8f93c8c3f675b5b6b928f36709cb1c4eb37b4a

data/README.md

@@ -25,7 +25,7 @@ And then execute:
 Or install it yourself as:
 
     $ gem install mina-puma
-    
+
 Note: by just including this gem, does not mean your development server will be Puma, for that, you need explicitly add `gem 'puma'` to your Gemfile.
 
 ## Usage
@@ -49,6 +49,7 @@ OR you can set other directories by setting follow variables:
 * `puma_pid` - puma pid file, default `shared/tmp/pids/puma.pid`
 * `puma_state` - puma state file, default `shared/tmp/sockets/puma.state`
 * `pumactl_socket` - pumactl socket file, default `shared/tmp/sockets/pumactl.sock`
+* `puma_root_path` - puma command execute root path, default `current`
 
 Then:
 
@@ -62,10 +63,10 @@ require 'mina/puma'
 
 task :setup => :environment do
   # Puma needs a place to store its pid file and socket file.
-  queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/sockets")
-  queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/sockets")
-  queue! %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/pids")
-  queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/pids")
+  command %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/sockets")
+  command %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/sockets")
+  command %(mkdir -p "#{deploy_to}/#{shared_path}/tmp/pids")
+  command %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/pids")
 
   ...
 

data/lib/mina/puma/tasks.rake

@@ -4,28 +4,30 @@ require 'mina/rails'
 namespace :puma do
   set :web_server, :puma
 
-  set_default :puma_role,      -> { user }
-  set_default :puma_env,       -> { fetch(:rails_env, 'production') }
-  set_default :puma_config,    -> { "#{deploy_to}/#{shared_path}/config/puma.rb" }
-  set_default :puma_socket,    -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock" }
-  set_default :puma_state,     -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.state" }
-  set_default :puma_pid,       -> { "#{deploy_to}/#{shared_path}/tmp/pids/puma.pid" }
-  set_default :puma_cmd,       -> { "#{bundle_prefix} puma" }
-  set_default :pumactl_cmd,    -> { "#{bundle_prefix} pumactl" }
-  set_default :pumactl_socket, -> { "#{deploy_to}/#{shared_path}/tmp/sockets/pumactl.sock" }
+  set :puma_role,      -> { fetch(:user) }
+  set :puma_env,       -> { fetch(:rails_env, 'production') }
+  set :puma_config,    -> { "#{fetch(:shared_path)}/config/puma.rb" }
+  set :puma_socket,    -> { "#{fetch(:shared_path)}/tmp/sockets/puma.sock" }
+  set :puma_state,     -> { "#{fetch(:shared_path)}/tmp/sockets/puma.state" }
+  set :puma_pid,       -> { "#{fetch(:shared_path)}/tmp/pids/puma.pid" }
+  set :puma_cmd,       -> { "#{fetch(:bundle_prefix)} puma" }
+  set :pumactl_cmd,    -> { "#{fetch(:bundle_prefix)} pumactl" }
+  set :pumactl_socket, -> { "#{fetch(:shared_path)}/tmp/sockets/pumactl.sock" }
+  set :puma_root_path, -> { fetch(:current_path) }
 
   desc 'Start puma'
   task :start => :environment do
-    puma_port_option = "-p #{puma_port}" if puma_port
+    puma_port_option = "-p #{fetch(:puma_port)}" if set?(:puma_port)
 
-    queue! %[
-      if [ -e '#{pumactl_socket}' ]; then
+    comment "Starting Puma..."
+    command %[
+      if [ -e '#{fetch(:pumactl_socket)}' ]; then
         echo 'Puma is already running!';
       else
-        if [ -e '#{puma_config}' ]; then
-          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -C #{puma_config}
+        if [ -e '#{fetch(:puma_config)}' ]; then
+          cd #{fetch(:puma_root_path)} && #{fetch(:puma_cmd)} -q -d -e #{fetch(:puma_env)} -C #{fetch(:puma_config)}
         else
-          cd #{deploy_to}/#{current_path} && #{puma_cmd} -q -d -e #{puma_env} -b 'unix://#{puma_socket}' #{puma_port_option} -S #{puma_state} --pidfile #{puma_pid} --control 'unix://#{pumactl_socket}'
+          cd #{fetch(:puma_root_path)} && #{fetch(:puma_cmd)} -q -d -e #{fetch(:puma_env)} -b 'unix://#{fetch(:puma_socket)}' #{puma_port_option} -S #{fetch(:puma_state)} --pidfile #{fetch(:puma_pid)} --control 'unix://#{fetch(:pumactl_socket)}'
         fi
       fi
     ]
@@ -33,42 +35,48 @@ namespace :puma do
 
   desc 'Stop puma'
   task stop: :environment do
+    comment "Stopping Puma..."
     pumactl_command 'stop'
-    queue! %[rm -f '#{pumactl_socket}']
+    command %[rm -f '#{fetch(:pumactl_socket)}']
   end
 
   desc 'Restart puma'
   task restart: :environment do
+    comment "Restart Puma...."
     pumactl_command 'restart'
   end
 
   desc 'Restart puma (phased restart)'
   task phased_restart: :environment do
+    comment "Restart Puma -- phased..."
     pumactl_command 'phased-restart'
   end
 
   desc 'Restart puma (hard restart)'
   task hard_restart: :environment do
+    comment "Restart Puma -- hard..."
     invoke 'puma:stop'
     invoke 'puma:start'
   end
-  
+
   desc 'Get status of puma'
   task status: :environment do
+    comment "Puma status..."
     pumactl_command 'status'
   end
 
   def pumactl_command(command)
-    queue! %[
-      if [ -e '#{pumactl_socket}' ]; then
-        if [ -e '#{puma_config}' ]; then
-          cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -F #{puma_config} #{command}
+    cmd =  %{
+      if [ -e '#{fetch(:pumactl_socket)}' ]; then
+        if [ -e '#{fetch(:puma_config)}' ]; then
+          cd #{fetch(:puma_root_path)} && #{fetch(:pumactl_cmd)} -F #{fetch(:puma_config)} #{command}
         else
-          cd #{deploy_to}/#{current_path} && #{pumactl_cmd} -S #{puma_state} -C 'unix://#{pumactl_socket}' --pidfile #{puma_pid} #{command}
+          cd #{fetch(:puma_root_path)} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} -C 'unix://#{fetch(:pumactl_socket)}' --pidfile #{fetch(:puma_pid)} #{command}
         fi
       else
         echo 'Puma is not running!';
       fi
-    ]
+    }
+    command cmd
   end
 end

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "0.3.2"
+    VERSION = "1.0.0"
   end
 end

data/mina-puma.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'mina', '< 1.0.0'
+  spec.add_dependency 'mina', '~> 1.0.0'
   spec.add_dependency 'puma', '>= 2.13'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mina-puma
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency