sepastian-capistrano3-unicorn 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612300b16394dba9a55347ffec57f3866bdf8438
-  data.tar.gz: 1d843ca1beb43f3b49602f42d3b4c7242ee0b4af
+  metadata.gz: 5b09a6357848435fde3b73c9d029818d29cd75fc
+  data.tar.gz: 121ad6c75fd7b3c25ab861880ff004f1b66e5bc5
 SHA512:
-  metadata.gz: a42ca5a33d585ba405ef28086ba9bf8e40ace62662b211b1033d75b80f154906c5441ce6609a5af5408ecde831dca2ac8b8a9365ab6c934ff149bf3a254c83ba
-  data.tar.gz: dff1cf6dbaa474f5e49078958c1bd404184e921c7489c79eb6cc60d9528805fd47542d01127f2d2a0a65e2d8cec3dc4a76552c8dfcc77fa9c8132a39abb46b86
+  metadata.gz: 6f5a2dbf6f092e61755eee6e8e04a79b2b61665b4470a2eb7f81912cfa6fda37187785135de5c6c5af6366ab5deb0eafb26ed8929c47143115e5a83b616e804d
+  data.tar.gz: 94a46cefcc1373701ebe864793ba7e693dda2b1d056f2f1835fe2c51b81ce3a492ae4f33fb7a0941253b8669af1ecc4d54f18aae37bc0c4b94d1d34ae6b349c9

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 0.5.1 (2014-06-10)
+
+Bugfixes:
+
+- Fix remote_process_exists? SSHKit raises SSHKit::Runner::ExecuteError on error
+- Fix some cases of commands running in $HOME instead of in :app_path
+- Fix starting unicorn under :unicorn_user

data/lib/capistrano/unicorn/utility.rb

@@ -40,7 +40,11 @@ module CapistranoUnicorn
     # Check if a remote process exists using its pid file
     #
     def remote_process_exists?(pid_file)
-      test("[ -e #{pid_file} ]") && execute("#{try_unicorn_user} kill -0 `cat #{pid_file}` > /dev/null 2>&1")
+      begin
+        execute(*try_unicorn_user,  'kill', '-0', get_unicorn_pid) if within(fetch(:app_path)) { test('[', '-e', pid_file, ']') }
+      rescue SSHKit::Command::Failed => e
+        false
+      end
     end
 
     # Stale Unicorn process pid file
@@ -64,20 +68,24 @@ module CapistranoUnicorn
     # Get unicorn master process PID (using the shell)
     #
     def get_unicorn_pid(pid_file=fetch(:unicorn_pid))
-      capture "cat #{pid_file}"
+      within fetch(:app_path) do
+        capture :cat, pid_file
+      end
     end
 
     # Get unicorn master (old) process PID
     #
     def get_old_unicorn_pid
-      get_unicorn_pid(old_unicorn_pid)
+      within fetch(:app_path) do
+        get_unicorn_pid(old_unicorn_pid)
+      end
     end
 
     # Send a signal to a unicorn master processes
     #
     def unicorn_send_signal(signal, pid=get_unicorn_pid)
       sig_prefix = Integer === signal ? '-' : '-s '
-      execute try_unicorn_user, 'kill', sig_prefix, signal, pid
+      execute *try_unicorn_user, 'kill', sig_prefix, signal, pid
     end
 
     # Run a command as the :unicorn_user user if :unicorn_user is a string.
@@ -85,9 +93,9 @@ module CapistranoUnicorn
     #
     def try_unicorn_user
       if unicorn_user = fetch(:unicorn_user)
-        "sudo -u #{unicorn_user}"
+        [:sudo, '-Eu', unicorn_user]
       else
-        ''
+        []
       end
     end
 
@@ -113,7 +121,7 @@ module CapistranoUnicorn
         fail "Config file for \"#{fetch(:unicorn_env)}\" environment was not found at either \"#{fetch(:unicorn_config_file_path)}\" or \"#{fetch(:unicorn_config_stage_file_path)}\""
       end
 
-      if test("[ -e #{fetch(:unicorn_pid)} ]")
+      if test('[', '-e', fetch(:unicorn_pid), ']')
         if unicorn_is_running?
           puts 'Unicorn is already running!'
           return
@@ -126,7 +134,7 @@ module CapistranoUnicorn
 
       within fetch(:app_path) do
         with rails_env: fetch(:rails_env), bundle_gemfile: fetch(:bundle_gemfile) do
-          execute :bundle, 'exec', fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
+          execute *try_unicorn_user, :bundle, 'exec', fetch(:unicorn_bin), '-c', unicorn_config_file_path, '-E', fetch(:unicorn_rack_env), '-D', fetch(:unicorn_options)
         end
       end
     end

data/lib/capistrano/unicorn/version.rb

@@ -1,6 +1,6 @@
 module CapistranoUnicorn
   MAJOR = 0
   MINOR = 5
-  PATCH = 0
+  PATCH = 1
   VERSION = [ MAJOR, MINOR, PATCH ].join('.').freeze
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: sepastian-capistrano3-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Sebastian Gassner, Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Capistrano 3.x plugin that integrates Unicorn server tasks.
@@ -58,9 +58,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - NEWS.md
@@ -87,12 +88,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -102,3 +103,4 @@ signing_key:
 specification_version: 4
 summary: Unicorn integration for Capistrano 3.x
 test_files: []
+has_rdoc: