sepastian-capistrano3-unicorn 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d1dc0e6289b917bcbae1648d1fedcaff467238
-  data.tar.gz: 0f5282cc61626dcdfa6b7378ae07b2f1ee84d361
+  metadata.gz: 612300b16394dba9a55347ffec57f3866bdf8438
+  data.tar.gz: 1d843ca1beb43f3b49602f42d3b4c7242ee0b4af
 SHA512:
-  metadata.gz: 3ca58dac9f898fc86b6e62ac1b821c7cd4fa0810396847bc62a4c0fbfa412979740997758148e4152044a703a9dd332f5938356b79bac4a21549383c03a3c4f5
-  data.tar.gz: e40915fbde9a38cd9b9d513aebfd79220d762b210a3e26703b426719f4db091f08782522c46d0af83fe73905b56489b4f7ad782a991738b1e29c2a914d3d37c1
+  metadata.gz: a42ca5a33d585ba405ef28086ba9bf8e40ace62662b211b1033d75b80f154906c5441ce6609a5af5408ecde831dca2ac8b8a9365ab6c934ff149bf3a254c83ba
+  data.tar.gz: dff1cf6dbaa474f5e49078958c1bd404184e921c7489c79eb6cc60d9528805fd47542d01127f2d2a0a65e2d8cec3dc4a76552c8dfcc77fa9c8132a39abb46b86

data/README.md

@@ -25,7 +25,7 @@ group :development do
 end
 ```
 
-And load it into your deployment script `config/deploy.rb`:
+And require it in your `Capfile`:
 
 ```ruby
 require 'capistrano/unicorn'

data/lib/capistrano/tasks/unicorn.cap

@@ -1,4 +1,3 @@
-require 'capistrano'
 require 'capistrano/unicorn/utility'
 
 include CapistranoUnicorn::Utility
@@ -12,21 +11,21 @@ namespace :load do
     set :unicorn_env     , Proc.new{ fetch(:rails_env, 'production') }
     # Following recommendations from http://unicorn.bogomips.org/unicorn_1.html
     set :unicorn_rack_env, Proc.new{ fetch(:rails_env) == 'development' ? 'development' : 'deployment' }
-    
+
     # Execution
     set :unicorn_user              , nil
     set :unicorn_bundle            , Proc.new{ fetch(:bundle_cmd, "bundle") }
     set :unicorn_bin               , "unicorn"
     set :unicorn_options           , ''
     set :unicorn_restart_sleep_time, 2
-    
+
     # Relative paths
     set :app_subdir                        , ''
     set :unicorn_config_rel_path           , "config"
     set :unicorn_config_filename           , "unicorn.rb"
     set :unicorn_config_rel_file_path      , Proc.new{ File.join(fetch(:unicorn_config_rel_path), fetch(:unicorn_config_filename)) }
     set :unicorn_config_stage_rel_file_path, Proc.new{ File.join(fetch(:unicorn_config_rel_path), 'unicorn', "#{fetch(:unicorn_env)}.rb") }
-    
+
     # Absolute paths
     # If you find the following confusing, try running 'cap unicorn:show_vars' -
     # it might help :-)
@@ -86,84 +85,70 @@ namespace :unicorn do
 
   desc 'Start Unicorn master process'
   task :start do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
       execute start_unicorn
     end
   end
-  
+
   desc 'Stop Unicorn'
   task :stop do
-    on roles unicorn_roles, :except => {:no_release => true} do
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
       execute kill_unicorn('QUIT')
     end
   end
-  
+
   desc 'Immediately shutdown Unicorn'
   task :shutdown do
-    on roles unicorn_roles, :except => {:no_release => true} do
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
       execute kill_unicorn('TERM')
     end
   end
-  
+
   desc 'Restart Unicorn'
   task :restart do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      execute duplicate_unicorn
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+      duplicate_unicorn
       execute :sleep, fetch(:unicorn_restart_sleep_time)
-      execute "if #{old_unicorn_is_running?}; then #{unicorn_send_signal('QUIT', get_old_unicorn_pid)}; fi;"
+
+      if old_unicorn_is_running?
+        unicorn_send_signal('QUIT', get_old_unicorn_pid)
+      end
     end
   end
 
   desc 'Duplicate Unicorn'
   task :duplicate do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      execute duplicate_unicorn()
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+      duplicate_unicorn
     end
   end
-  
+
   desc 'Reload Unicorn'
   task :reload do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('HUP')}; else #{start_unicorn} fi;"
-      # run <<-END
-      #   if #{unicorn_is_running?}; then
-      #     echo "Reloading Unicorn...";
-      #       #{unicorn_send_signal('HUP')};
-      #     else
-      #       #{start_unicorn}
-      #     fi;
-      # END
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+      if unicorn_is_running?
+        unicorn_send_signal('HUP')
+      else
+        start_unicorn
+      end
     end
   end
 
   desc 'Add a new worker'
   task :add_worker do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('TTIN')}; fi;"
-      # run <<-END
-      #   if #{unicorn_is_running?}; then
-      #     echo "Adding a new Unicorn worker...";
-      #     #{unicorn_send_signal('TTIN')};
-      #   else
-      #     echo "Unicorn is not running.";
-      #   fi;
-      # END
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+      if unicorn_is_running?
+        unicorn_send_signal('TTIN')
+      end
     end
   end
 
   desc 'Remove amount of workers'
   task :remove_worker do
-    on roles unicorn_roles, :except => {:no_release => true} do
-      execute "if #{unicorn_is_running?}; then #{unicorn_send_signal('TTOU')}; fi;"
-      # run <<-END
-      #   if #{unicorn_is_running?}; then
-      #     echo "Removing a Unicorn worker...";
-      #     #{unicorn_send_signal('TTOU')};
-      #   else
-      #     echo "Unicorn is not running.";
-      #   fi;
-      # END
+    on roles unicorn_roles, reject: lambda { |h| h.properties.no_release } do
+      if unicorn_is_running?
+        unicorn_send_signal('TTOU')
+      end
     end
   end
 end

data/lib/capistrano/unicorn/utility.rb

@@ -3,21 +3,6 @@ require 'tempfile'
 module CapistranoUnicorn
   module Utility
     # In Capistrano 3, shell scripts must be invoked with SSHKit's execute, instead of run.
-    # SSHKit will "sanitize" all multi-line commands (here docs), replacing "\n" with ";".
-    # Sanitizing renders some shell scripts illegal, for instance:
-    #
-    #   if [ -e FILE ]; then
-    #     echo "Found."
-    #   fi
-    # 
-    # This would become
-    #
-    #   if [ -e FILE ]; then; echo "Found."; fi;
-    #
-    # which is illegal because of the ';' after 'then'.
-    #
-    # To avoid errors, replace all "\n" with " " in shell scripts,
-    # before SSHKit gets a chance to replace "\n" with ";"
     def local_unicorn_config
       if File.exist? fetch(:unicorn_config_rel_file_path)
         fetch(:unicorn_config_rel_file_path)
@@ -55,7 +40,7 @@ module CapistranoUnicorn
     # Check if a remote process exists using its pid file
     #
     def remote_process_exists?(pid_file)
-      "[ -e #{pid_file} ] && #{unicorn_send_signal(0, get_unicorn_pid(pid_file))} > /dev/null 2>&1"
+      test("[ -e #{pid_file} ]") && execute("#{try_unicorn_user} kill -0 `cat #{pid_file}` > /dev/null 2>&1")
     end
 
     # Stale Unicorn process pid file
@@ -67,7 +52,7 @@ module CapistranoUnicorn
     # Command to check if Unicorn is running
     #
     def unicorn_is_running?
-      remote_process_exists?(fetch :unicorn_pid)
+      remote_process_exists?(fetch(:unicorn_pid))
     end
 
     # Command to check if stale Unicorn is running
@@ -79,7 +64,7 @@ module CapistranoUnicorn
     # Get unicorn master process PID (using the shell)
     #
     def get_unicorn_pid(pid_file=fetch(:unicorn_pid))
-      "`cat #{pid_file}`"
+      capture "cat #{pid_file}"
     end
 
     # Get unicorn master (old) process PID
@@ -92,76 +77,70 @@ module CapistranoUnicorn
     #
     def unicorn_send_signal(signal, pid=get_unicorn_pid)
       sig_prefix = Integer === signal ? '-' : '-s '
-      "#{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.
     # Otherwise run as default (:user) user.
     #
     def try_unicorn_user
-      "#{sudo :as => fetch(:unicorn_user).to_s}" if fetch(:unicorn_user).kind_of?(String)
+      if unicorn_user = fetch(:unicorn_user)
+        "sudo -u #{unicorn_user}"
+      else
+        ''
+      end
     end
 
     # Kill Unicorns in multiple ways O_O
     #
     def kill_unicorn(signal)
-      script = <<-END
-        if #{unicorn_is_running?}; then
-          echo "Stopping Unicorn...";
-          #{unicorn_send_signal(signal)};
-        else
-          echo "Unicorn is not running.";
-        fi;
-      END
-      script.split.join(' ')
+      if unicorn_is_running?
+        puts 'Stopping unicorn...'
+        unicorn_send_signal(signal)
+      else
+        puts 'Unicorn is not running'
+      end
     end
 
     # Start the Unicorn server
     #
     def start_unicorn
-      %Q%
-        if [ -e "#{fetch :unicorn_config_file_path}" ]; then
-          UNICORN_CONFIG_PATH=#{fetch :unicorn_config_file_path};
+      if test("[ -e #{fetch(:unicorn_config_file_path)} ]")
+        unicorn_config_file_path = fetch(:unicorn_config_file_path)
+      elsif test("[ -e #{fetch(:unicorn_config_stage_file_path)} ]")
+        unicorn_config_file_path = fetch(:unicorn_config_stage_file_path)
+      else
+        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 unicorn_is_running?
+          puts 'Unicorn is already running!'
+          return
         else
-          if [ -e "#{fetch :unicorn_config_stage_file_path}" ]; then
-            UNICORN_CONFIG_PATH=#{fetch :unicorn_config_stage_file_path};
-          else
-            echo "Config file for "#{fetch :unicorn_env}" environment was not found at either "#{fetch :unicorn_config_file_path}" or "#{fetch :unicorn_config_stage_file_path}"";
-            exit 1;
-          fi;
-        fi;
-
-        if [ -e "#{fetch :unicorn_pid}" ]; then
-          if #{try_unicorn_user} kill -0 `cat #{fetch :unicorn_pid}` > /dev/null 2>&1; then
-            echo "Unicorn is already running!";
-            exit 0;
-          fi;
-
-          #{try_unicorn_user} rm #{fetch :unicorn_pid};
-        fi;
-
-        echo "Starting Unicorn...";
-        cd #{fetch :app_path} && #{try_unicorn_user} RAILS_ENV=#{fetch :rails_env} BUNDLE_GEMFILE=#{fetch :bundle_gemfile} #{fetch :unicorn_bundle} exec #{fetch :unicorn_bin} -c $UNICORN_CONFIG_PATH -E #{fetch :unicorn_rack_env} -D #{fetch :unicorn_options};
-      %.split.join(' ')
+          execute :rm, fetch(:unicorn_pid)
+        end
+      end
+
+      puts 'Starting unicorn...'
+
+      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)
+        end
+      end
     end
 
     def duplicate_unicorn
-      script = <<-END
-        if #{unicorn_is_running?}; then
-          echo "Duplicating Unicorn...";
-          #{unicorn_send_signal('USR2')};
-        else
-          #{start_unicorn}
-        fi;
-      END
-      script.split.join(' ')
+      if unicorn_is_running?
+        unicorn_send_signal('USR2')
+      else
+        start_unicorn
+      end
     end
 
     def unicorn_roles
-      # TODO proc necessary here?
-      Proc.new{ fetch(:unicorn_roles, :app) }.call
-      #defer{ fetch(:unicorn_roles, :app) }
+      fetch(:unicorn_roles, :app)
     end
-
   end
 end

data/lib/capistrano/unicorn/version.rb

@@ -1,6 +1,6 @@
 module CapistranoUnicorn
   MAJOR = 0
-  MINOR = 4
+  MINOR = 5
   PATCH = 0
   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.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sebastian Gassner, Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-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,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - NEWS.md
@@ -87,19 +87,18 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Unicorn integration for Capistrano 3.x
 test_files: []
-has_rdoc: