simple-capistrano-unicorn 0.0.3 → 0.0.4

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p327

data/CHANGELOG.md

@@ -1,11 +1,10 @@
-## v 0.0.3: Better documentation.
+## v 0.0.4: Removal of unused variables, and making sure that we don't try to delete pids that aren't there.
 
+## v 0.0.3: Better documentation.
 Added better (correct!) documentation, and added possibility to use a different unicorn.stderr.log
 
 ## v 0.0.2: Initial release.
-
 Added better Capistrano bindings
 
 ## v 0.0.1: Initial release.
-
 :)

data/README.md

@@ -2,6 +2,8 @@
 
 Contains a namespace with methods for administrating the unicorn server through capistrano recipes.
 
+This gem is composed from the gems `capistrano-unicorn-methods` and `capistrano-unicorn`. It is roughly the structure of `capistrano-unicorn-methods` with clever ideas from `capistrano-unicorn`.
+
 ## Setup
 
 ### 1. Require this gem in deploy.rb
@@ -20,11 +22,19 @@ You should place this line in `RAILS_ROOT/config/deploy.rb`:
 after :deploy, "unicorn:restart"
 ```
 
-### 3. Extra step only for multi-stage setup
+### 3. Add unicorn.rb (only for single-stage setup)
+
+Grab the sample Unicorn configuration here: http://unicorn.bogomips.org/examples/unicorn.conf.rb
+
+And place it here: `RAILS_ROOT/config/unicorn.rb`
+
+### 4. Add unicorn stage files (only for multi-stage setup)
 
 Make sure that you are using the multi-stage extension for Capistrano ( https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension )
 
-You should create different Unicorn files to use for each of your environments. The most common setup is to place the Unicorn files in `RAILS_ROOT/config/unicorn/{staging|beta|production}.rb`.
+You can get a sample of the Unicorn configuration here: http://unicorn.bogomips.org/examples/unicorn.conf.rb
+
+You should create different Unicorn files to use for each of your different environments. The most common setup is to place the Unicorn configuration files in `RAILS_ROOT/config/unicorn/{staging|beta|production}.rb`.
 
 You can then override the `unicorn_config`-variable that this gem is listening for, by placing this in `RAILS_ROOT/config/deploy.rb`:
 
@@ -57,8 +67,6 @@ You can customize the gems behavior by setting any (or all) of the following opt
 * `unicorn_pid` indicates the path for the pid file. Defaults to `"#{shared_path}/pids/unicorn.pid"`.
 * `unicorn_old_pid` indicates the path for the old pid file, which Unicorn creates when forking a new master. Defaults to `#{shared_path}/pids/unicorn.pid.oldbin`.
 * `unicorn_config` the path to the unicorn config file. Defaults to `"#{current_path}/config/unicorn.rb"`.
-* `unicorn_socket` indicates the place that Unicorn should place its socket file. Defaults to `"#{shared_path}/system/unicorn.sock"`.
 * `unicorn_log` the path where unicorn places its STDERR-log. Defaults to `"#{shared_path}/log/unicorn.stderr.log"`.
-* `unicorn_port` defines the port that unicorn should listen on. Defaults to `"3000"`.
 * `use_bundler` defines whether Unicorn should start with `bundle exec` or not. Default to `true`.
 * `rails_env` sets the environment that the server will run in. Defaults to `"production"`.

data/lib/simple-capistrano-unicorn/namespace.rb

@@ -9,9 +9,7 @@ module SimpleCapistranoUnicorn
         _cset(:unicorn_pid)     { "#{shared_path}/pids/unicorn.pid" }
         _cset(:unicorn_old_pid) { "#{shared_path}/pids/unicorn.pid.oldbin" }
         _cset(:unicorn_config)  { "#{current_path}/config/unicorn.rb" }
-        _cset(:unicorn_socket)  { "#{shared_path}/system/unicorn.sock" }
         _cset(:unicorn_log)     { "#{shared_path}/log/unicorn.stderr.log" }
-        _cset(:unicorn_port)    { '3000' }
         _cset(:use_bundler)     { true }
         _cset(:rails_env)       { "production" }
 
@@ -37,13 +35,13 @@ module SimpleCapistranoUnicorn
         end
 
         def start_unicorn(server)
-          run "cd #{current_path}; #{'bundle exec' if use_bundler} unicorn -c #{unicorn_config} -E #{rails_env}#{" -p #{unicorn_port}" if unicorn_port} -D", :hosts => [server]
+          run "cd #{current_path}; #{'bundle exec' if use_bundler} unicorn -c #{unicorn_config} -E #{rails_env} -D", :hosts => [server]
         end
 
         def clean_old_unicorn(server)
           if old_unicorn_is_running?(server)
             run "kill -s QUIT `cat #{unicorn_old_pid}`", :hosts => [server]
-            run "if [ -e #{unicorn_pid} ]; then rm #{unicorn_old_pid}; fi", :hosts => [server]
+            run "if [ -e #{unicorn_old_pid} ]; then rm #{unicorn_old_pid}; fi", :hosts => [server]
             logger.info nice_output("Cleaned up old Unicorn", server)
           end
         end
@@ -74,7 +72,7 @@ module SimpleCapistranoUnicorn
             find_servers(:roles => :app).each do |server|
               if unicorn_is_running?(server)
                 run "kill -s QUIT `cat #{unicorn_pid}`", :hosts => [server]
-                run "rm #{unicorn_pid}", :hosts => [server]
+                run "if [ -e #{unicorn_pid} ]; then rm #{unicorn_pid}; fi", :hosts => [server]
                 logger.info nice_output("Stopped Unicorn!", server)
               else
                 logger.info nice_output("Unicorn _not_ running, nothing to stop!", server)
@@ -96,7 +94,7 @@ module SimpleCapistranoUnicorn
                 logger.info nice_output("Restarted Unicorn!", server)
               else
                 start_unicorn(server)
-                logger.info nice_output("Unicorn wasn't running, starting it!", server)
+                logger.info nice_output("Unicorn wasn't running, started it!", server)
               end
             end
           end

data/lib/simple-capistrano-unicorn/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Unicorn
     module Methods
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/simple-capistrano-unicorn.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.version     = Capistrano::Unicorn::Methods::VERSION
   gem.authors     = ["Kasper Grubbe"]
   gem.email       = ["kaspergrubbe@gmail.com"]
-  gem.homepage    = "http://kaspergrubbe.dk"
+  gem.homepage    = "http://github.com/kaspergrubbe/simple-capistrano-unicorn"
   gem.summary     = %q{Contains a collection of simple tasks to manage Unicorn with Capistrano.}
   gem.description = %q{Contains a collection of simple tasks to manage Unicorn with Capistrano.}
 

metadata

@@ -1,75 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: simple-capistrano-unicorn
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Kasper Grubbe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: unicorn
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: capistrano
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Contains a collection of simple tasks to manage Unicorn with Capistrano.
-email: 
+email:
 - kaspergrubbe@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .ruby-version
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -78,38 +76,28 @@ files:
 - lib/simple-capistrano-unicorn/namespace.rb
 - lib/simple-capistrano-unicorn/version.rb
 - simple-capistrano-unicorn.gemspec
-homepage: http://kaspergrubbe.dk
+homepage: http://github.com/kaspergrubbe/simple-capistrano-unicorn
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: simple-capistrano-unicorn
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Contains a collection of simple tasks to manage Unicorn with Capistrano.
 test_files: []
-