capobvious 0.1.6 → 0.1.7

data/bin/capobvious

@@ -44,7 +44,7 @@ load 'config/deploy' # remove this line to skip loading any of the default tasks
 require 'capistrano/ext/capobvious'
 FILE
 
-  "config/deploy.rb" => <<FILE
+  "config/deploy.rb" => <<FILE,
 # -*- encoding : utf-8 -*-
 set :rvm_ruby_string, '1.9.3'
 set :application, "appname"
@@ -64,6 +64,51 @@ set :auto_migrate, true
 role :app, serv
 role :web, serv
 role :db, serv, :primary => true
+FILE
+  "config/unicorn.rb" => <<FILE
+# -*- encoding : utf-8 -*-
+APP_PATH = File.expand_path(File.dirname(File.dirname(__FILE__)))
+SHARED_PATH = File.expand_path(APP_PATH+"/../shared")
+
+  working_directory APP_PATH
+  
+  pid_file   = SHARED_PATH + "/pids/unicorn.pid"
+  socket_file= SHARED_PATH + "/pids/unicorn.sock"
+  log_file   = APP_PATH + "/log/unicorn.log"
+  err_log    = APP_PATH + "/log/unicorn.stderr.log"
+  old_pid    = pid_file + '.oldbin'
+
+
+  timeout 30
+  worker_processes 2
+  preload_app true
+  listen socket_file, :backlog => 1024
+  pid pid_file
+  stderr_path err_log
+  stdout_path log_file
+
+  GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
+
+
+before_exec do |server|
+  ENV["BUNDLE_GEMFILE"] = APP_PATH}+"/Gemfile"
+end
+
+before_fork do |server, worker|
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
+
+  if File.exists?(old_pid) && server.pid != old_pid
+    begin
+      #sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+      Process.kill("QUIT", File.read(old_pid).to_i)
+    rescue Errno::ENOENT, Errno::ESRCH
+    end
+  end
+end
+
+after_fork do |server, worker|
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
+end
 FILE
 }
 

data/capobvious.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "capistrano"
+  s.add_dependency "capistrano", "~> 2.12.0"
   s.add_dependency "rvm-capistrano"
 
   # specify any dependencies here; for example:

data/lib/capistrano/ext/capobvious.rb

@@ -80,7 +80,7 @@ Capistrano::Configuration.instance.load do
     end
     desc "Assets precompile"
     task :precompile, :roles => :web, :except => { :no_release => true } do
-      run("cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} RAILS_GROUPS=assets assets:precompile")
+      run("cd #{latest_release} && bundle exec rake RAILS_ENV=#{rails_env} assets:precompile")
     end
     task :symlink, :roles => :web, :except => { :no_release => true } do
       run <<-CMD

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70327825390440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327825390440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
-  requirement: &70327825389040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,13 +37,17 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70327825389040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Capfile that we use every day
 email:
 - donotsendhere@gmail.com
 executables:
 - capobvious
-- unicorn.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -47,7 +56,6 @@ files:
 - README.markdown
 - Rakefile
 - bin/capobvious
-- bin/unicorn.rb
 - capobvious.gemspec
 - lib/capistrano/ext/capobvious.rb
 - lib/capobvious/version.rb
@@ -71,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: capobvious
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cap recipes

data/bin/unicorn.rb

@@ -1,43 +0,0 @@
-# -*- encoding : utf-8 -*-
-APP_PATH = File.expand_path(File.dirname(File.dirname(__FILE__)))
-SHARED_PATH = File.expand_path(APP_PATH+"/../shared")
-
-  working_directory APP_PATH
-  
-  pid_file   = SHARED_PATH + "/pids/unicorn.pid"
-  socket_file= SHARED_PATH + "/pids/unicorn.sock"
-  log_file   = APP_PATH + "/log/unicorn.log"
-  err_log    = APP_PATH + "/log/unicorn.stderr.log"
-  old_pid    = pid_file + '.oldbin'
-
-
-  timeout 30
-  worker_processes 4
-  preload_app true
-  listen socket_file, :backlog => 1024
-  pid pid_file
-  stderr_path err_log
-  stdout_path log_file
-
-  GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=)
-
-
-before_exec do |server|
-  ENV["BUNDLE_GEMFILE"] = "#{APP_PATH}/Gemfile"
-end
-
-before_fork do |server, worker|
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
-
-  if File.exists?(old_pid) && server.pid != old_pid
-    begin
-      #sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
-      Process.kill("QUIT", File.read(old_pid).to_i)
-    rescue Errno::ENOENT, Errno::ESRCH
-    end
-  end
-end
-
-after_fork do |server, worker|
-  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
-end