dark-capistrano-recipes 0.6.11 → 0.6.12.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 11
+:patch: 12
 :major: 0
-:build: 
+:build: 0
 :minor: 6

data/dark-capistrano-recipes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dark-capistrano-recipes}
-  s.version = "0.6.11"
+  s.version = "0.6.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phil Misiowiec", "Leonardo Bighetti"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-07}
   s.description = %q{Extend the Capistrano gem with these useful recipes}
   s.email = %q{leonardobighetti@gmail.com}
   s.extra_rdoc_files = [

data/lib/helpers.rb

@@ -21,11 +21,11 @@ def is_using_nginx
 end
 
 def is_using_passenger
-  is_using('passenger',:server)
+  is_using('passenger',:app_server)
 end
 
 def is_using_unicorn
-  is_using('unicorn',:server)
+  is_using('unicorn',:app_server)
 end
 
 def is_using_god
@@ -56,6 +56,14 @@ def parse_config(file)
   return ERB.new(template).result(binding)   # parse it
 end
 
+
+# Prompts the user for a message to agree/decline,
+# 
+def ask(message, default=true)
+  Capistrano::CLI.ui.agree(message)
+
+end
+
 # Generates a configuration file parsing through ERB
 # Fetches local file and uploads it to remote_file
 # Make sure your user has the right permissions.

data/lib/recipes/application.rb

@@ -6,9 +6,9 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   
   # Server settings
-  set :server, :unicorn   unless exists?(:server)
-  set :web_server, :nginx unless exists?(:web_server)
-  set :runner, user       unless exists?(:runner)
+  set :app_server, :unicorn   unless exists?(:app_server)
+  set :web_server, :nginx     unless exists?(:web_server)
+  set :runner, user           unless exists?(:runner)
   
   # The port to listen to, normally we default to 80
   set :application_port, 80 unless exists?(:application_port)

data/lib/recipes/bundler.rb

@@ -11,7 +11,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     
     # [internal] runs bundle install on the app server
     task :install, :roles => :app, :except => { :no_release => true } do
-      run "cd #{current_path} && bundle install --deployment"
+      run "cd #{current_path} && bundle install --deployment --without=development test"
     end
   end  
     

data/lib/recipes/god.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
     _cset(:bin_god) { defined?(:rvm_ruby_string) ? 'bootup_god' : 'god' }
-    _cset(:server_name)    { "#{application}-#{server}" }
+    _cset(:server_name)    { "#{application}-#{app_server}" }
     _cset(:god_init_local) { "#{docs_path}/god/god.init" }
     _cset :god_init_temp,   '/tmp/god.init'
     _cset :god_init_remote, '/etc/init.d/god'
@@ -72,10 +72,19 @@ Capistrano::Configuration.instance(:must_exist).load do
       puts "God is no more."
     end
     
-    task :restart_unicorn, :roles => :app do
-      sudo "#{bin_god} restart #{server_name}"
+    desc "Restarts everything"
+    namespace :restart do
+      task :default, :roles => :app, :except => { :no_release => true } do
+        sudo "#{bin_god} restart #{application}"
+      end
+      
+      desc "Restarts the app server"
+      task :app, :roles => :app, :except => { :no_release => true } do
+        sudo "#{bin_god} restart #{server-name}"
+      end
     end
     
+    desc "Fetches the log for the whole group"
     task :log, :roles => :app do
       sudo "#{bin_god} log #{application}"
     end
@@ -111,6 +120,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
   after 'deploy:setup' do
-    god.setup if is_using_god && Capistrano::CLI.ui.agree("Create app.god in app's shared path? [Yn]")
-  end
+    god.setup if Capistrano::CLI.ui.agree("Create app.god in app's shared path? [Yn]")
+  end if is_using_god
 end

data/lib/recipes/nginx.rb

@@ -48,7 +48,9 @@ Capistrano::Configuration.instance(:must_exist).load do
     
   end
   
-  after 'deploy:setup', 'nginx:setup' if is_using_nginx && Capistrano::CLI.ui.agree("Create nginx configuration file? [Yn]")
+  after 'deploy:setup' do
+    nginx.setup if Capistrano::CLI.ui.agree("Create nginx configuration file? [Yn]")
+  end if is_using_nginx
     
 end
 

data/lib/recipes/symlinks.rb

@@ -1,12 +1,15 @@
 Capistrano::Configuration.instance(:must_exist).load do
   # These are set to the same structure in shared <=> current
   set :normal_symlinks, %w(
+    tmp
+    log
     config/database.yml
   ) unless exists?(:normal_symlinks)
   
   # Weird symlinks go somewhere else. Weird.
   set :weird_symlinks, {
-     'bundle' => 'vendor/bundle'
+     'bundle' => 'vendor/bundle',
+     'pids'   => 'tmp/pids'
   } unless exists?(:weird_symlinks)
 
   namespace :symlinks do

data/lib/recipes/unicorn.rb

@@ -47,21 +47,19 @@ Capistrano::Configuration.instance(:must_exist).load do
   # Unicorn 
   #------------------------------------------------------------------------------
   namespace :unicorn do    
-    desc "Start unicorn"    
+    desc "Starts unicorn directly"    
     task :start, :roles => :app do
       run unicorn_start_cmd
     end  
     
-    desc "Stop unicorn"    
-    task :stop, :roles => :app do    
+    desc "Stops unicorn directly"    
+    task :stop, :roles => :app do
       run unicorn_stop_cmd
     end  
     
-    desc "Restart unicorn"    
-    task :restart, :roles => :app do    
-      run unicorn_restart_cmd do |ch, stream, out|
-        
-      end
+    desc "Restarts unicorn directly"    
+    task :restart, :roles => :app do
+      run unicorn_restart_cmd
     end
     
     desc <<-EOF
@@ -71,13 +69,19 @@ Capistrano::Configuration.instance(:must_exist).load do
     EOF
     task :setup, :roles => :app , :except => { :no_release => true } do
       # TODO: refactor this to a more generic setup task once we have more socket tasks.
-      sudo "mkdir -p #{sockets_path}" 
-      sudo "chown #{user}:#{group} #{sockets_path} -R"
+      commands = []
+      commands << "mkdir -p #{sockets_path}"
+      commands << "chown #{user}:#{group} #{sockets_path} -R" 
+      commands << "chmod +rw #{sockets_path}"
+      
+      run commands.join(" && ")
       generate_config(unicorn_local_config,unicorn_remote_config)
     end
   end
   
-  after 'deploy:setup', 'unicorn:setup' if is_using_unicorn && Capistrano::CLI.ui.agree("Create unicorn configuration file? [Yn]")
+  after 'deploy:setup' do
+    unicorn.setup if Capistrano::CLI.ui.agree("Create unicorn configuration file? [Yn]")
+  end if is_using_unicorn
   
 end
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dark-capistrano-recipes
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 6
-  - 11
-  version: 0.6.11
+  - 12
+  - 0
+  version: 0.6.12.0
 platform: ruby
 authors: 
 - Phil Misiowiec
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -03:00
+date: 2010-10-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency