mina-puma 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64507fce87b0467be63a81f7acfb952d19476e66
-  data.tar.gz: 7f57c5e069b956d7e9c8834fbbc3ca4a7cb8b90b
+  metadata.gz: 7dec73c6a879f7fbe406f1320381b4af3a642c7e
+  data.tar.gz: 7cc245b86271c1d7563af03c03e5906e8d5cf969
 SHA512:
-  metadata.gz: 143ce3a9acbc2274afe6e3605fc5254afdca9a349bda0d6120435fd794b811d8b49026b1b92668ef8900a4a56b864bf8dc3b5a260b84118444a32580e7091e61
-  data.tar.gz: 919a68331f02d374be14c005156129fb67f59f75bb6de319ae7048b86870fd04a251cc9070d5c07151b8a3814ffa1aa0b1864142cf365310db51584e4047cf24
+  metadata.gz: e5ea8367bb5ce02bd36dba509fed62db67a8cf44d57090e4fcbda402b9f294e4ab4ee6336a313671282c4f24a30ebe0f3f11575daee5dfaabf4a2015c12adc22
+  data.tar.gz: 69a982baf39e9def2d856f2cc25afd7895f62185bff9af04c56b1e206941b0b50bfdf553a33780199d5f47582d5b56fcef8c8827ee24e787d0bd2df41bb8390c

data/README.md

@@ -1,52 +1,84 @@
-# Mina::Puma
+# Mina Puma
 
-Puma tasks for Mina deployment.
+[Mina](https://github.com/nadarei/mina) tasks for handle with
+[Puma](https://github.com/puma/puma).
+
+This gem provides several mina tasks:
+
+    mina puma:restart         # Restart puma
+    mina puma:start           # Start puma
+    mina puma:stop            # Stop puma
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'mina-puma', require: false
+    gem 'mina-puma', :require => false
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install mina-puma
 
 ## Usage
 
-    # config/deploy.rb
-    ...
+Add this to your `config/deploy.rb` file:
+
     require 'mina/puma'
 
-    # Add pids and sockets to shared paths
-    set :shared_paths, %w(log tmp/sockets config/database.yml)
+Make sure the following settings are set in your `config/deploy.rb`:
+
+* `deploy_to`   - deployment path
+
+Make sure the following directories exists on your server:
+
+* `shared/tmp/sockets` - directory for socket files.
+* `shared/tmp/pids` - direcotry for pid files.
+
+OR you can set other directories by setting follow variables:
+
+* `puma_socket` - puma socket file, default is `shared/tmp/sockets/puma.sock`
+* `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`
+
+Then:
+
+```
+$ mina puma:start
+```
+
+## Example
+
+    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! %(#{deploy_to}/#{shared_path}/tmp/pids")
+      queue! %(chmod g+rx,u+rwx "#{deploy_to}/#{shared_path}/tmp/pids")
 
-    ...
-    task :setup do
       ...
-      queue! %[mkdir -p "{deploy_to}/shared/tmp/sockets/"]
+
     end
 
     task :deploy do
       deploy do
         invoke :'git:clone'
+        invoke :'deploy:link_shared_paths'
         ...
 
         to :launch do
-         ...
-         invoke :'puma:restart'
+          ...
+          invoke :'puma:restart'
         end
       end
     end
 
-Available commands:
-
-    mina puma:start
-    mina puma:stop
-    mina puma:restart
-
-Default settings:
-
-    set :puma_socket, -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock" }
-    set :puma_ctl,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/pumactl.sock" }
-    set :puma_state,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.state" }
-
 ## Contributing
 
 1. Fork it

data/lib/mina/puma/tasks.rake

@@ -1,35 +1,56 @@
-set_default :puma_socket, -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.sock" }
-set_default :puma_ctl,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/pumactl.sock" }
-set_default :puma_state,  -> { "#{deploy_to}/#{shared_path}/tmp/sockets/puma.state" }
-
+require 'mina/bundler'
+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" }
+
   desc 'Start puma'
-  task start: :environment do
-    queue %[cd #{deploy_to}/#{current_path} && bundle exec puma #{start_options}]
+  task :start => :environment do
+    in_directory "#{deploy_to}/#{current_path}" do
+      queue! %(#{puma_cmd} #{start_options})
+    end
   end
 
   desc 'Stop puma'
   task stop: :environment do
-    queue %[cd #{deploy_to}/#{current_path} && bundle exec pumactl -S #{puma_state} stop]
+    in_directory "#{deploy_to}/#{current_path}" do
+      queue! %(#{pumactl_cmd} -S #{puma_state} stop)
+    end
   end
 
   desc 'Restart puma'
   task restart: :environment do
-    queue %[
-      if [ -f #{puma_ctl} ]; then
-        cd #{deploy_to}/#{current_path}  && bundle exec pumactl -S #{puma_state} restart
+    in_directory "#{deploy_to}/#{current_path}" do
+      if check_exists?(pumactl_socket)
+        queue! %(#{pumactl_cmd} -S #{puma_state} restart)
       else
-        cd #{deploy_to}/#{current_path} && bundle exec puma #{start_options}
-      fi
-    ]
+        queue! %(#{puma_cmd} #{start_options})
+      end
+    end
   end
-end
 
-def start_options
-  if File.exists?("./config/puma.rb")
-    "-q -d -e #{rails_env} -C ./config/puma.rb"
-  else
-    "-q -d -e #{rails_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{puma_ctl}'"
-  end
-end
+  private
+
+    def start_options
+      if check_exists?(puma_config)
+        "-q -d -e #{puma_env} -C #{puma_config}"
+      else
+        "-q -d -e #{puma_env} -b 'unix://#{puma_socket}' -S #{puma_state} --control 'unix://#{pumactl_socket}'"
+      end
+    end
+
+    def check_exists?(file)
+      boolean = capture("if [ -a '#{file}' ]; then echo 'yes'; else echo 'no'; fi").chomp
+      boolean == 'yes' ? true : false
+    end
+end

data/lib/mina/puma/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Puma
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-puma
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mina