capsum 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474181d7fcc90d4c85d4f958e6f0280693dc9497
-  data.tar.gz: 7e7873cfafb18e5d9179368225b5074ea8ab1306
+  metadata.gz: ec67b573af714877258fb710ad60c5a71ae75744
+  data.tar.gz: 3a6eb08c0689f689d62245b40c4ca54455326cd4
 SHA512:
-  metadata.gz: 618c907205af578f7532c3063d297be84bf180b96608258610ef86ae8f9cd32fca3b10609768b776c20921832446e8010865f1561deeb52c16223ac40341d8b6
-  data.tar.gz: 909ed7705e5b31604b8b9801170941f3df025224b02ee3803cbff59c8f2160a0f4eb31f012c63c2d6e751b32c0c49e093d1317377ac08219dd50fd8ef89b1416
+  metadata.gz: 6ac3efa87dd7875444a0b3e84867504ad0093d57803df51447192f6ef454fcefa4f4311e8d0d1a48fdda97a856466dc0baff767d770591c50c5bba27883bace7
+  data.tar.gz: e1cc5be6b0ff43510bd2ba7c51d23b73f9b9425cd3d22ab896d907e3a02ce1709d50dc1438ac926c5a914844962776627758c5f60fe832902ca232d0a6d947e1

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.9.0

data/lib/capsum/autostart.rb

@@ -0,0 +1,44 @@
+require File.expand_path("../../capsum.rb", __FILE__)
+require File.expand_path("../whenever.rb", __FILE__)
+
+Capistrano::Configuration.instance(true).load do
+
+  _cset(:autostart_server_commands, {})
+  _cset(:autostart_schedule_file) { "schedule.daemons.rb" }
+  _cset(:autostart_identifier) { "#{deploy_to}#daemons" }
+  _cset(:autostart_whenever_update_command) { "#{whenever_command} --update-crontab #{autostart_identifier} --load-file #{autostart_schedule_file}" }
+  _cset(:autostart_whenever_clear_command)  { "#{whenever_command} --clear-crontab  #{autostart_identifier} --load-file /dev/null; true" }
+  _cset(:autostart_whenever_command) { "if [ -e #{autostart_schedule_file} ]; then #{autostart_whenever_update_command}; else #{autostart_whenever_clear_command}; fi" }
+
+  namespace :autostart do
+    task :update_crontab do
+      on_rollback do
+        if fetch(:previous_release)
+          run "cd #{previous_release} && #{autostart_whenever_command}"
+        else
+          run "cd #{release_path} && #{autostart_whenever_clear_command}"
+        end
+      end
+
+      autostart_server_commands.each_pair do |server, commands|
+        next if commands.empty?
+        schedule_content=<<-EOF
+          every(:reboot) do
+            #{commands.map{ |cmd| "  command #{cmd.inspect}" }.join("\n")}
+          end
+        EOF
+
+        top.put schedule_content, File.join(release_path, autostart_schedule_file), hosts: server.host
+      end
+      run "cd #{release_path} && #{autostart_whenever_command}"
+    end
+
+    task :rollback do
+      run "cd #{previous_release} && #{autostart_whenever_command}"
+    end
+  end
+
+  before "deploy:finalize_update", "autostart:update_crontab"
+  after "deploy:rollback", "autostart:rollback"
+end
+

data/lib/capsum/daemons.rb

@@ -1,4 +1,5 @@
 require File.expand_path("../../capsum.rb", __FILE__)
+require File.expand_path("../autostart.rb", __FILE__)
 
 Capistrano::Configuration.instance(true).load do
   
@@ -27,48 +28,19 @@ Capistrano::Configuration.instance(true).load do
       daemons.start
     end
     
-    desc "install daemons to cron"
-    task :update_cron, :roles => :app do
+    desc "setup daemons to autostart"
+    task :setup_autostart, :roles => :app do
+      autostart_server_commands = fetch(:autostart_server_commands)
+
       find_servers(:roles => :app).each do |server|
+        autostart_server_commands[server] ||= []
         
-        identifier = "#{deploy_to}#daemons"
-        schedule_file_path = "%{schedule_dir}/schedule.daemons.rb"
-        
-        whenever_clear_command  = "if [ type whenever > /dev/null 2>&1 ]; then whenever --clear-crontab #{identifier} --load-file /dev/null; fi"
-        whenever_update_command = "whenever --update-crontab #{identifier} --load-file #{schedule_file_path}"
-        
-        command = "if [ -e #{schedule_file_path} ]; then #{whenever_update_command}; else #{whenever_clear_command}; fi"
-        
-        # on_rollback do
-        #   schedule_dir = fetch(:previous_release) || release_path
-        #   run (command % { :schedule_dir => schedule_dir }), :hosts => server.host
-        # end
-        
-        matcher = server.options[:daemons]
-        daemon_commands = daemon_list.map do |daemon|
-          "cd #{current_path}; #{daemon[:start]}" if match(matcher, daemon)
-        end.compact
-        
-        if !daemon_commands.empty?
-          schedule_content=<<-EOF
-every(:reboot) do
-#{daemon_commands.map{ |cmd| "  command #{cmd.inspect}" }.join("\n")}
-end
-EOF
-          top.put schedule_content, (schedule_file_path % { :schedule_dir => release_path }), :hosts => server.host
+        daemon_list.each do |daemon|
+          autostart_server_commands[server] << "cd #{current_path}; #{daemon[:start]}" if match(matcher, daemon)
         end
-        
-        run (command % { :schedule_dir => release_path }), :hosts => server.host
       end
     end
     
-    after "deploy:create_symlink", "daemons:update_cron" 
-    after "deploy:rollback", "daemons:update_cron"
-    
-    after "deploy:start", "daemons:start" 
-    after "deploy:stop", "daemons:stop" 
-    after "deploy:restart", "daemons:restart"
-    
     def match(matcher, daemon)
       return matcher.call(daemon[:name]) if matcher.respond_to?(:call)
       return matcher.match(daemon[:name]) if matcher.respond_to?(:match)
@@ -109,5 +81,10 @@ EOF
     end
   end
 
+  before "autostart:update_crontab", "daemons:setup_autostart" 
+
+  after "deploy:start", "daemons:start" 
+  after "deploy:stop", "daemons:stop" 
+  after "deploy:restart", "daemons:restart"
 end
 

data/lib/capsum/sidekiq.rb

@@ -0,0 +1,23 @@
+require File.expand_path("../../capsum.rb", __FILE__)
+require File.expand_path("../autostart.rb", __FILE__)
+require 'sidekiq/capistrano'
+
+
+Capistrano::Configuration.instance(true).load do
+  namespace :sidekiq do
+
+    desc "setup sidekiq daemon to autostart"
+    task :setup_autostart do
+      autostart_server_commands = fetch(:autostart_server_commands)
+      rails_env = fetch(:rails_env, "production")
+      find_servers(roles: fetch(:sidekiq_role)).each do |server|
+        autostart_server_commands[server] ||= []
+        for_each_process do |pid_file, idx|
+          autostart_server_commands[server] << "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &"
+        end
+      end
+    end
+  end
+
+  before "autostart:update_crontab", "sidekiq:setup_autostart" 
+end

data/lib/capsum/whenever.rb

@@ -1,38 +1,13 @@
 require File.expand_path("../../capsum.rb", __FILE__)
 
-Capistrano::Configuration.instance(true).load do
-  namespace :whenever do
-    desc 'Update the crontab'
-    task :update do
-      identifier = fetch(:whenever_identifier, deploy_to)
-      find_servers(:roles => :app).each do |server|
-        whenever_settings = server.options[:whenever]
-        if whenever_settings
-          variables = whenever_settings.to_s
-          if whenever_settings.is_a?(Hash)
-            variables = whenever_settings.map{ |key, value| "#{key}=#{value}" }.join("&")
-          end
-
-          command = "if [ -e #{current_path}/config/schedule.rb ]; then cd #{current_path}; RAILS_ENV=#{rails_env} #{whenever_bin} --update-crontab #{identifier} --set \"environment=#{rails_env}&%s\"; fi"
-          run (command % variables), :hosts => server.host
-        end
-      end
-    end
-    
-    desc 'Cleanup the crontab'
-    task :cleanup, :roles => :app do
-      identifier = fetch(:whenever_identifier, deploy_to)
-      run "if [ -e #{current_path}/config/schedule.rb ]; then cd #{current_path}; RAILS_ENV=#{rails_env} #{whenever_bin} --update-crontab #{identifier} --load-file /dev/null; fi"
-    end
+begin
+  require "whenever/capistrano"
+rescue LoadError => e
+  # skip
+end
 
-    def whenever_bin
-      if fetch(:use_bundle, false)
-        "bundle exec whenever"
-      else
-        "whenever"
-      end
-    end
-  end
-  
-  after "deploy:create_symlink", "whenever:update"
+Capistrano::Configuration.instance(true).load do
+  set(:whenever_command) { fetch(:use_bundle, false) ? "#{fetch(:bundle_cmd, 'bundle')} exec whenever" : "whenever" }
+  set(:whenever_options) { { roles: fetch(:whenever_roles), only: { whenever: true } } }
+  set(:whenever_identifier) { deploy_to }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsum
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Sunteya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -81,6 +81,7 @@ files:
 - VERSION
 - capsum.gemspec
 - lib/capsum.rb
+- lib/capsum/autostart.rb
 - lib/capsum/bundler.rb
 - lib/capsum/cache.rb
 - lib/capsum/daemons.rb
@@ -89,6 +90,7 @@ files:
 - lib/capsum/passenger.rb
 - lib/capsum/setup.rb
 - lib/capsum/shared.rb
+- lib/capsum/sidekiq.rb
 - lib/capsum/typical.rb
 - lib/capsum/whenever.rb
 homepage: http://github.com/sunteya/capsum