capsum 0.6.1 → 0.7.0

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0

data/lib/capsum/bundler.rb

@@ -18,7 +18,7 @@ Capistrano::Configuration.instance(true).load do
       args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
       cmd = "bundle install #{args.join(' ')}"
       
-      run "cd #{release_path}; if [ -f Gemfile ]; then #{cmd}; fi"
+      run "cd #{release_path}; [ -f Gemfile ] && #{cmd}"
     end
   end
 

data/lib/capsum/daemons.rb

@@ -5,39 +5,109 @@ Capistrano::Configuration.instance(true).load do
   namespace :daemons do
     desc "Start daemons process" 
     task :start, :roles => :app do
-      daemons = fetch(:daemons, [])
       find_servers(:roles => :app).each do |server|
-        daemons_settings = server.options[:daemons]
-        
-        daemons.each do |daemon|
-          runnable = daemons_settings
-          runnable = daemons_settings.match(daemon) if daemons_settings.respond_to?(:match)
-          
-          run("cd #{current_path}; if [ -e #{daemon} ]; then RAILS_ENV=#{rails_env} #{daemon} start; fi", :hosts => server.host) if runnable
+        matcher = server.options[:daemons]
+        daemon_list.each do |daemon|
+          run "cd #{current_path}; #{daemon[:start]}", :hosts => server.host if match(matcher, daemon)
         end
-        
       end
     end
-
+    
     desc "Stop daemons process" 
     task :stop, :roles => :app do
-      daemons = fetch(:daemons, [])
-      daemons.each do |daemon|
-        run "cd #{current_path}; if [ -e #{daemon} ]; then RAILS_ENV=#{rails_env} #{daemon} stop; fi" 
+      daemon_list.each do |daemon|
+        run "cd #{current_path}; #{daemon[:stop]}" 
       end
     end
 
     desc "Restart daemons process" 
     task :restart, :roles => :app do
       daemons.stop
-      sleep(4)
+      sleep(3)
       daemons.start
     end
-  end
+    
+    desc "install daemons to cron"
+    task :update_cron, :roles => :app do
+      find_servers(:roles => :app).each do |server|
+        
+        identifier = "#{deploy_to}#daemons"
+        schedule_file_path = "%{schedule_dir}/schedule.daemons.rb"
+        
+        whenever_clear_command  = "type whenever > /dev/null 2>&1 && whenever --clear-crontab #{identifier} --load-file /dev/null"
+        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
+        end
+        
+        run (command % { :schedule_dir => release_path }), :hosts => server.host
+      end
+    end
+    
+    after "deploy: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"
+    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)
+      
+      !!matcher # to boolean
+    end
+    
+    def daemon_list
+      settings = fetch(:daemons, [])
+      
+      case settings
+      when Array
+        settings.map { |setting| parse_daemon(setting) }
+      when Hash
+        settings.map { |pair| parse_daemon(pair[1], :name => pair[0] )}
+      else
+        [ parse_daemon(settings) ]
+      end
+    end
+    
+    def parse_daemon(source, options = {})
+      daemon = {}
+      
+      case source
+      when Array
+        daemon[:start] = source.first
+        daemon[:stop] = source.last
+      when Hash
+        daemon = options.merge(source)
+      else
+        command = source.to_s
+        daemon[:start] = "#{command} start RAILS_ENV=#{rails_env}"
+        daemon[:stop] = "#{command} stop RAILS_ENV=#{rails_env}"
+      end
+      
+      daemon[:name] = daemon[:start] if daemon[:name].nil?
+      daemon
+    end
+  end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capsum
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-09-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70259402442100 !ruby/object:Gem::Requirement
+  requirement: &70303967986700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70259402442100
+  version_requirements: *70303967986700
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &70259402441620 !ruby/object:Gem::Requirement
+  requirement: &70303967986220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70259402441620
+  version_requirements: *70303967986220
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70259402441160 !ruby/object:Gem::Requirement
+  requirement: &70303967985760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70259402441160
+  version_requirements: *70303967985760
 - !ruby/object:Gem::Dependency
   name: capistrano-helpers
-  requirement: &70259402489580 !ruby/object:Gem::Requirement
+  requirement: &70303967985300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70259402489580
+  version_requirements: *70303967985300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70259402489200 !ruby/object:Gem::Requirement
+  requirement: &70303967984920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259402489200
+  version_requirements: *70303967984920
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70259402488740 !ruby/object:Gem::Requirement
+  requirement: &70303967984460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259402488740
+  version_requirements: *70303967984460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70259402488320 !ruby/object:Gem::Requirement
+  requirement: &70303967984040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259402488320
+  version_requirements: *70303967984040
 description: Collect gems and recipes related capistrano.
 email:
 - Sunteya@gmail.com
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2838886094001922798
+      hash: 2977824992252183760
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2838886094001922798
+      hash: 2977824992252183760
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.7