mina-unicorn 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3060caa6683521e9cdbb43ee4edccc0876895660
-  data.tar.gz: a7812f1216d64276354f93b84fc383b7b7d3f8d6
+  metadata.gz: 78c8bbb22a35b3620cf8239a7c28ffde5564f5da
+  data.tar.gz: ef723c4beef647a3e4a03025b479cabe0219bef3
 SHA512:
-  metadata.gz: a4a2037d08240024a3c652bae17770eb4ada82841d92c714260a482d30d825d3fce57a11aa96fe48d8264cee09035cdbda1fa0cf99ea7302d63955e2c1dfed81
-  data.tar.gz: 340dc91ac2f776c8d3c7a329cfb1718593ac5255fa98fadd9a8cca02485431dc791a5b0a8eb818e8c9ae540414bcf0f0895d9d074fe8cc8df22ce51c800f96fd
+  metadata.gz: d960e7a0a5980d8b06b3b98edf02fd748547ede5e9fb507163e0b207ee30e12fab19bb76bfb118dd72665c0d8e05044bb7e9eb6c6655ec1bfabd2ae9481f05b1
+  data.tar.gz: fc35beaca49cd0387e96bb661226268a5d83f354af8a1e76611656c88a320c72a62d2e4f8f70e901579ab63decb987877501b5c61618b054236e2c19e512d314

data/README.md

@@ -38,9 +38,10 @@ set :shared_paths, ['tmp/sockets', 'tmp/pids']
 You can also set individual config variables to override default values for
 unicorn:
 
-* `unicorn_env`    - set environment, default: depending on `rails_env`: `development` or `deployment` (see: [Rack environment](http://unicorn.bogomips.org/unicorn_1.html#rack-environment))
+* `unicorn_env`    - set unicorn environment, default: depending on `rails_env`: `development` or `deployment` (see: [Rack environment](http://unicorn.bogomips.org/unicorn_1.html#rack-environment))
+* `rails_env`      - set rails environment, default: `production`
 * `unicorn_config` - unicorn config file, default: `config/unicorn.rb`
-* `unicorn_cmd`    - bundle exec unicorn, default: `bundle exec unicorn`
+* `unicorn_cmd`    - bundle exec unicorn, default: `RAILS_ENV=production bundle exec unicorn` (see: [mina/rails](https://github.com/mina-deploy/mina/blob/master/lib%2Fmina%2Frails.rb#L25))
 * `unicorn_pid`    - unicorn pid file, default: `tmp/pids/unicorn.pid`
 
 Then:

data/lib/mina/unicorn/utility.rb

@@ -4,10 +4,17 @@ module Mina
   module Unicorn
     module Utility
 
+      # Run a command as the :unicorn_user user if :unicorn_user is a string.
+      # Otherwise run as default (:user) user.
+      #
+      def try_unicorn_user
+        "sudo -u #{unicorn_user}" if unicorn_user.kind_of?(String)
+      end
+
       # Check if a remote process exists using its pid file
       #
       def remote_process_exists?(pid_file)
-        "[ -e #{pid_file} ] && kill -0 `cat #{pid_file}` > /dev/null 2>&1"
+        "[ -e #{pid_file} ] && #{try_unicorn_user} kill -0 `cat #{pid_file}` > /dev/null 2>&1"
       end
 
       # Stale Unicorn process pid file
@@ -43,7 +50,7 @@ module Mina
       # Send a signal to a unicorn master processes
       #
       def unicorn_send_signal(signal, pid=get_unicorn_pid)
-        "kill -s #{signal} #{pid}"
+        "#{try_unicorn_user} kill -s #{signal} #{pid}"
       end
 
       # Kill Unicorns in multiple ways O_O
@@ -66,16 +73,16 @@ module Mina
       def start_unicorn
         %Q%
           if [ -e "#{unicorn_pid}" ]; then
-            if kill -0 `cat #{unicorn_pid}` > /dev/null 2>&1; then
+            if #{try_unicorn_user} kill -0 `cat #{unicorn_pid}` > /dev/null 2>&1; then
               echo "-----> Unicorn is already running!";
               exit 0;
             fi;
 
-            rm #{unicorn_pid};
+            #{try_unicorn_user} rm #{unicorn_pid};
           fi;
 
           echo "-----> Starting Unicorn...";
-          cd #{deploy_to}/#{current_path} && BUNDLE_GEMFILE=#{bundle_gemfile} #{unicorn_cmd} -c #{unicorn_config} -E #{unicorn_env} -D;
+          cd #{deploy_to}/#{current_path} && #{try_unicorn_user} BUNDLE_GEMFILE=#{bundle_gemfile} #{unicorn_cmd} -c #{unicorn_config} -E #{unicorn_env} -D;
         %
       end
 

data/lib/mina/unicorn/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Unicorn
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mina-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - tab
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler