atech_cloud 1.0.5 → 1.0.6

data/lib/atech_cloud/deploy.rb

@@ -9,6 +9,11 @@ Capistrano::Configuration.instance(:must_exist).load do
     fetch(:deploy_to, nil) || "/opt/apps/#{fetch(:application)}"
   end
   
+  ## Return an array of all environments which should be deployed
+  def environments
+    fetch(:environments, nil) || [fetch(:environment, 'production')]
+  end
+  
   ## Deployment namespace
   namespace :deploy do
     desc 'Deploy the latest revision of the application'
@@ -45,20 +50,6 @@ Capistrano::Configuration.instance(:must_exist).load do
 
     desc 'Setup the repository on the remote server for the first time'
     task :setup, :roles => :app do
-      
-      puts
-      puts "Are you sure you wish to setup this application?"
-      puts "Any applications existing at \e[31m#{deploy_to}\e[0m will be removed immediately and will"
-      puts "become unaccessible."
-      puts
-      puts "If you do not wish this to happen, you have 5 seconds to cancel this request by"
-      puts "pressing CTRL+C..."
-      puts
-      sleep 5
-      puts
-      puts "OK then... here we go..."
-      sleep 1
-      
       run "rm -rf #{deploy_to}"
       run "git clone -n #{fetch(:repository)} #{deploy_to} --branch #{fetch(:branch)}"
       run "cd #{deploy_to} && git branch rollback && git checkout -b deploy && git branch -d #{fetch(:branch)}"
@@ -125,16 +116,22 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :unicorn do
     task :start, :roles => :app  do
       upload_config
-      run "sudo -u app sh -c \"umask 002 && cd #{deploy_to} && bundle exec unicorn_rails -E #{fetch(:environment)} -c #{deploy_to}/config/unicorn.rb -D\""
+      for environment in environments
+        run "sudo -u app sh -c \"umask 002 && cd #{deploy_to} && bundle exec unicorn_rails -E #{environment} -c #{deploy_to}/config/unicorn.rb -D\""
+      end
     end
 
     task :stop, :roles => :app do
-      run "sudo -u app sh -c \"kill `cat #{deploy_to}/tmp/pids/unicorn.pid`\""
+      for environment in environments
+        run "sudo -u app sh -c \"kill `cat #{deploy_to}/tmp/pids/unicorn.#{environment}.pid`\""
+      end
     end
 
     task :restart, :roles => :app do
       upload_config
-      run "sudo -u app sh -c \"kill -USR2 `cat #{deploy_to}/tmp/pids/unicorn.pid`\""
+      for environment in environments
+        run "sudo -u app sh -c \"kill -USR2 `cat #{deploy_to}/tmp/pids/unicorn.#{environment}.pid`\""
+      end
     end
     
     task :upload_config, :roles => :app do

data/lib/atech_cloud/unicorn.rb

@@ -1,3 +1,5 @@
+rails_env = ENV['RAILS_ENV'] || 'production'
+
 ## Directory to use for stuff
 rails_root = File.expand_path('../../', __FILE__)
 FileUtils.mkdir_p(File.join(rails_root, 'tmp', 'sockets'))
@@ -15,11 +17,11 @@ preload_app true
 timeout $TIMEOUT
 
 ## Store the pid file safely away in the pids folder
-logger Logger.new(File.join(rails_root, 'log', 'unicorn.log'))
-pid File.join(rails_root, 'tmp', 'pids', 'unicorn.pid')
+logger Logger.new(File.join(rails_root, 'log', "unicorn.#{rails_env}.log"))
+pid File.join(rails_root, 'tmp', 'pids', "unicorn.#{rails_env}.pid")
 
 ## Listen on a unix data socket
-listen File.join(rails_root, 'tmp', 'sockets', 'unicorn.sock')
+listen File.join(rails_root, 'tmp', 'sockets', "unicorn.#{rails_env}.sock")
 
 before_fork do |server, worker|
   # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
@@ -32,7 +34,7 @@ before_fork do |server, worker|
   #
   # Using this method we get 0 downtime deploys.
 
-  old_pid = File.join(rails_root, 'tmp', 'pids', 'unicorn.pid.oldbin')
+  old_pid = File.join(rails_root, 'tmp', 'pids', "unicorn.#{rails_env}.pid.oldbin")
   if File.exists?(old_pid) && server.pid != old_pid
     begin
       Process.kill("QUIT", File.read(old_pid).to_i)
@@ -49,4 +51,3 @@ after_fork do |server, worker|
   ActiveRecord::Base.establish_connection
   srand
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: atech_cloud
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Adam Cooke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +01:00
 default_executable: 
 dependencies: []