foreman-capistrano 0.52.6 → 0.53.0

data/lib/foreman/capistrano.rb

@@ -1,9 +1,9 @@
 if defined?(Capistrano)
   Capistrano::Configuration.instance(:must_exist).load do
 
-    namespace :foreman do
+    namespace :deploy do
       desc <<-DESC
-        Export the Procfile to upstart.  Will use sudo if available.
+        Export the Procfile and restart application.
 
         You can override any of these defaults by setting the variables shown below.
 
@@ -15,7 +15,7 @@ if defined?(Capistrano)
         set :foreman_log,         "\#{shared_path}/log"
         set :foreman_concurrency, false
       DESC
-      task :export, :roles => :app do
+      task :restart, :roles => :web, :max_hosts => 1 do
         bundle_cmd          = fetch(:bundle_cmd, "bundle")
         foreman_format      = fetch(:foreman_format, "upstart")
         foreman_location    = fetch(:foreman_location, "/etc/init")
@@ -33,34 +33,17 @@ if defined?(Capistrano)
         args << "-l #{foreman_log}"
         args << "-p #{foreman_port}"
         args << "-c #{foreman_concurrency}" if foreman_concurrency
-        run "cd #{current_path} && #{bundle_cmd} exec foreman export #{args.join(' ')}"
-      end
-
-      desc "Start the application services"
-      task :start, :roles => :app do
-        if fetch(:foreman_format, "upstart") == 'upstart'
-          run "#{sudo} start #{application}"
-        elsif fetch(:foreman_format, "upstart") == 'monit'
-          run "monit start -g #{application}"
-        end
-      end
-
-      desc "Stop the application services"
-      task :stop, :roles => :app do
-        if fetch(:foreman_format, "upstart") == 'upstart'
-          run "#{sudo} stop #{application}"
-        elsif fetch(:foreman_format, "upstart") == 'monit'
-          run "monit stop -g #{application}"
-        end
-      end
-
-      desc "Restart the application services"
-      task :restart, :roles => :app do
-        if fetch(:foreman_format, "upstart") == 'upstart'
-          run "#{sudo} start #{application} || #{sudo} restart #{application}"
-        elsif fetch(:foreman_format, "upstart") == 'monit'
-          run "monit reload; sleep 1; monit restart -g #{application}"
-        end
+        export_cmd = "cd #{current_path} && #{bundle_cmd} exec foreman export #{args.join(' ')}"
+        run ["sudo /etc/init.d/puppet stop",
+            "sudo /etc/init.d/monit stop",  
+            "sudo /etc/init.d/nginx stop",
+            "monit stop -g #{application}", 
+            export_cmd, 
+            "monit start -g #{application}",
+            "sleep 20", 
+            "sudo /etc/init.d/nginx start",
+            "sudo /etc/init.d/monit start", 
+            "sudo /etc/init.d/puppet start"].join('; ')
       end
     end
   end

data/lib/foreman/version.rb

@@ -1,5 +1,5 @@
 module Foreman
 
-  VERSION = "0.52.6"
+  VERSION = "0.53.0"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.52.6
+  version: 0.53.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor