capistrano3-unicorn 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a77eb91e0e030de22b1618903260853f3ab5ba
-  data.tar.gz: 50e9f0d190b7af8dd2a60929cb9572981b0f738a
+  metadata.gz: 1b168296fd207748bc5d31bfab2290c0f4e88881
+  data.tar.gz: 5b3afbdb6d0009e2890c040e4e36498fc2424102
 SHA512:
-  metadata.gz: fbbdc60a2b0be9d66d97e0e2e9b04354c8b96f07b23425887775dfe61dc411a69eda0eb38857b4ec802fa5bbc614c6c0944746dbc2ca7273098956905d582f67
-  data.tar.gz: 909d0f0ffd24c047aa8af4f7f8a58187cb609872178527d3241f1d41f5958d92593fd223233d07d9d32061742384d416d9b89abc6a52f4fb88d753cff4073990
+  metadata.gz: 2f0e2f664e19886a250c1dce57d529c00f768392cd4500632f47382ff22169c29de2a9b5fccdaa4c55e10ca3bef1e10d54a8a72fbd07713e50d98417fa935e24
+  data.tar.gz: 271607b8f7b817a8d9b4e56d2cb214731bec30d291e57241330e7c2582255a18b2495093c3a91c8f4486d8680d986c2b883c76813af79401bb76a445c1a52ac4

data/CHANGELOG.md

@@ -1,11 +1,22 @@
-### 0.0.6
+# Capistrano3 Unicorn Changelog
+
+## `0.1.0`
+
+- Changed default location of `:unicorn_pid`
+- Depend on capistrano => 3.1.0
+- Added `:unicorn_bundle_gemfile` to override `:bundle_gemfile`
+- Bugfix; use current_path vs release_path
+
+Thanks to @eLod, @mbrictson, and @complistic-gaff
+
+## `0.0.6`
 
 - Buxfix; unicorn -E should be passed a RACK_ENV (not a RAILS_ENV). [More here](http://www.hezmatt.org/~mpalmer/blog/2013/10/13/rack_env-its-not-for-you)
 
-### 0.0.5
+## `0.0.5`
 
 - Added `:unicorn_options`
 
-### 0.0.4
+## `0.0.4`
 
 - Added `:unicorn_roles`

data/README.md

@@ -16,7 +16,7 @@ You can override the defaults by `set :unicorn_example, value` in the `config/de
 
 - `:unicorn_pid`
 
-    Assumes your pid file will be located in the application's shared path `.../shared/pids/unicorn.pid` so that it survives zero-downtime re-deployments
+    Assumes your pid file will be located in `tmp/pids/unicorn.pid` which is symlinked by `:linked_dirs` to survive across deployments
 
 - `:unicorn_config_path`
 
@@ -59,6 +59,7 @@ Invoke Unicorn from your `config/deploy.rb` or `config/deploy/ENVIRONMENT.rb`:
 If `preload_app:true` use:
 
 ```ruby
+after 'deploy:publishing', 'deploy:restart'
 namespace :deploy do
   task :restart do
     invoke 'unicorn:restart'
@@ -69,9 +70,12 @@ end
 Otherwise use:
 
 ```ruby
+after 'deploy:publishing', 'deploy:restart'
 namespace :deploy do
   task :restart do
     invoke 'unicorn:reload'
   end
 end
 ```
+
+Note that presently you must put the `invoke` outside any `on` block since the task handles this for you; otherwise you will get an `undefined method 'verbosity'` error.

data/capistrano3-unicorn.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano3-unicorn"
-  gem.version       = '0.0.6'
+  gem.version       = '0.1.0'
   gem.authors       = ["Matthew Lineen"]
   gem.email         = ["matthew@lineen.com"]
   gem.description   = "Unicorn specific Capistrano tasks"
@@ -15,5 +15,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'capistrano', '>= 3.0.0'
+  gem.add_dependency 'capistrano', '>= 3.1.0'
 end

data/lib/capistrano3/tasks/unicorn.rake

@@ -1,23 +1,24 @@
 namespace :load do
   task :defaults do
-    set :unicorn_pid, -> { File.join(shared_path, "pids", "unicorn.pid") }
+    set :unicorn_pid, -> { File.join(current_path, "tmp", "pids", "unicorn.pid") }
     set :unicorn_config_path, -> { File.join(current_path, "config", "unicorn", "#{fetch(:rails_env)}.rb") }
     set :unicorn_restart_sleep_time, 3
     set :unicorn_roles, -> { :app }
-    set :unicorn_options, -> { '' }
-    set :unicorn_rack_env, -> { fetch(:rails_env) == 'development' ? 'development' : 'deployment' }
+    set :unicorn_options, -> { "" }
+    set :unicorn_rack_env, -> { fetch(:rails_env) == "development" ? "development" : "deployment" }
+    set :unicorn_bundle_gemfile, -> { fetch(:bundle_gemfile, File.join(current_path, "Gemfile")) }
   end
 end
 
 namespace :unicorn do
-  desc 'Start Unicorn'
+  desc "Start Unicorn"
   task :start do
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
-        with rails_env: fetch(:rails_env) do
-          if test("[ -e #{fetch(:unicorn_pid)} ] && kill -0 #{pid}")
-            info "unicorn is running..."
-          else
+      within current_path do
+        if test("[ -e #{fetch(:unicorn_pid)} ] && kill -0 #{pid}")
+          info "unicorn is running..."
+        else
+          with rails_env: fetch(:rails_env), bundle_gemfile: fetch(:unicorn_bundle_gemfile) do
             execute :bundle, "exec unicorn", "-c", fetch(:unicorn_config_path), "-E", fetch(:unicorn_rack_env), "-D", fetch(:unicorn_options)
           end
         end
@@ -25,10 +26,10 @@ namespace :unicorn do
     end
   end
 
-  desc 'Stop Unicorn (QUIT)'
+  desc "Stop Unicorn (QUIT)"
   task :stop do
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
+      within current_path do
         if test("[ -e #{fetch(:unicorn_pid)} ]")
           if test("kill -0 #{pid}")
             info "stopping unicorn..."
@@ -44,22 +45,22 @@ namespace :unicorn do
     end
   end
 
-  desc 'Reload Unicorn (HUP); use this when preload_app: false'
+  desc "Reload Unicorn (HUP); use this when preload_app: false"
   task :reload do
-    invoke 'unicorn:start'
+    invoke "unicorn:start"
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
+      within current_path do
         info "reloading..."
         execute :kill, "-s HUP", pid
       end
     end
   end
 
-  desc 'Restart Unicorn (USR2 + QUIT); use this when preload_app: true'
+  desc "Restart Unicorn (USR2 + QUIT); use this when preload_app: true"
   task :restart do
-    invoke 'unicorn:start'
+    invoke "unicorn:start"
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
+      within current_path do
         info "unicorn restarting..."
         execute :kill, "-s USR2", pid
         execute :sleep, fetch(:unicorn_restart_sleep_time)
@@ -70,20 +71,20 @@ namespace :unicorn do
     end
   end
 
-  desc 'Add a worker (TTIN)'
+  desc "Add a worker (TTIN)"
   task :add_worker do
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
+      within current_path do
         info "adding worker"
         execute :kill, "-s TTIN", pid
       end
     end
   end
 
-  desc 'Remove a worker (TTOU)'
+  desc "Remove a worker (TTOU)"
   task :remove_worker do
     on roles(fetch(:unicorn_roles)) do
-      within release_path do
+      within current_path do
         info "removing worker"
         execute :kill, "-s TTOU", pid
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Matthew Lineen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 description: Unicorn specific Capistrano tasks
 email:
 - matthew@lineen.com