engineyard-eycap 0.4.12 → 0.4.14

data/History.txt

@@ -1,3 +1,12 @@
+== 0.4.14 / 2009-08-31
+  * restored functionality to remove temporary compressed sql file after db:clone_prod_to_staging
+  * renamed gz extension files to bz2 in db:clone_to_local
+  * memcached: fix netcat not hanging up on a flush
+
+== 0.4.13 / 2009-07-30
+  * changed Gemfile to absolute path
+  * merged changes from square/master for unshared_remote_cache cached deploy strategy
+
 == 0.4.12 / 2009-06-26
   * removed condition for dbhost that was useless and tested db:clone_prod_to_staging
 

data/Manifest.txt

@@ -3,13 +3,14 @@ Manifest.txt
 README.txt
 Rakefile
 lib/capistrano/recipes/deploy/strategy/filtered_remote_cache.rb
-lib/capistrano/recipes/deploy/strategy/remote_cache.rb
+lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb
 lib/eycap.rb
 lib/eycap/lib/ey_logger.rb
 lib/eycap/lib/ey_logger_hooks.rb
 lib/eycap/recipes.rb
 lib/eycap/recipes/backgroundrb.rb
 lib/eycap/recipes/database.rb
+lib/eycap/recipes/bundler.rb
 lib/eycap/recipes/deploy.rb
 lib/eycap/recipes/ferret.rb
 lib/eycap/recipes/juggernaut.rb

data/lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb

@@ -0,0 +1,21 @@
+require 'capistrano/recipes/deploy/strategy/remote_cache'
+
+module Capistrano
+  module Deploy
+    module Strategy
+      class UnsharedRemoteCache < RemoteCache
+        def check!
+          super.check do |d|
+            d.remote.writable(repository_cache)
+          end
+        end
+
+        private
+
+        def repository_cache
+          configuration[:repository_cache]
+        end
+      end
+    end
+  end
+end

data/lib/eycap.rb

@@ -1,3 +1,3 @@
 module Eycap
-  VERSION = '0.4.12'
+  VERSION = '0.4.14'
 end

data/lib/eycap/recipes.rb

@@ -15,11 +15,10 @@ require 'eycap/recipes/tomcat'
 require 'eycap/recipes/juggernaut'
 require 'eycap/recipes/passenger'
 require 'eycap/recipes/apache'
+require 'eycap/recipes/bundler'
 
 Capistrano::Configuration.instance(:must_exist).load do
-  
   default_run_options[:pty] = true if respond_to?(:default_run_options)
   set :keep_releases, 3
   set :runner, defer { user }
-  
 end

data/lib/eycap/recipes/database.rb

@@ -36,7 +36,7 @@ Capistrano::Configuration.instance(:must_exist).load do
            ch.send_data "#{dbpass}\n" if out=~ /^Password/
         end
       end
-      run "rm -f #{backup_file}"
+      run "rm -f #{backup_file}.bz2"
     end
   
     desc "Backup your MySQL or PostgreSQL database to shared_path+/db_backups"
@@ -60,12 +60,12 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :clone_to_local, :roles => :db, :only => {:primary => true} do
       backup_name
       dump
-      get "#{backup_file}.bz2", "/tmp/#{application}.sql.gz"
+      get "#{backup_file}.bz2", "/tmp/#{application}.sql.bz2"
       development_info = YAML.load_file("config/database.yml")['development']
       if development_info['adapter'] == 'mysql'
-        run_str = "bzcat /tmp/#{application}.sql.gz | mysql -u #{development_info['username']} --password='#{development_info['password']}' -h #{development_info['host']} #{development_info['database']}"
+        run_str = "bzcat /tmp/#{application}.sql.bz2 | mysql -u #{development_info['username']} --password='#{development_info['password']}' -h #{development_info['host']} #{development_info['database']}"
       else
-        run_str = "PGPASSWORD=#{development_info['password']} bzcat /tmp/#{application}.sql.gz | psql -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}"
+        run_str = "PGPASSWORD=#{development_info['password']} bzcat /tmp/#{application}.sql.bz2 | psql -U #{development_info['username']} -h #{development_info['host']} #{development_info['database']}"
       end
       %x!#{run_str}!
     end

data/lib/eycap/recipes/memcached.rb

@@ -14,7 +14,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     end        
     desc "Flush memcached - this assumes memcached is on port 11211"
     task :flush, :roles => [:app], :only => {:memcached => true} do
-      sudo "echo 'flush_all' | nc localhost 11211"
+      sudo "echo 'flush_all' | nc -q 1 localhost 11211"
     end        
     desc "Symlink the memcached.yml file into place if it exists"
     task :symlink_configs, :roles => [:app], :only => {:memcached => true }, :except => { :no_release => true } do

data/lib/eycap/recipes/mongrel.rb

@@ -24,5 +24,33 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :stop, :roles => [:app], :except => {:mongrel => false} do
       sudo "/usr/bin/monit stop all -g #{monit_group}"
     end
-  end
-end
+
+    desc <<-DESC
+    Start mongrels in a loop, with a defer of [default] 30 seconds between each single mongrel restart. 
+    DESC
+    task :rolling_restart, :roles => [:app], :except => {:mongrel => false} do
+
+      set :mongrel_restart_delay, 30
+
+      # need a script due to weird escapes run by sudo "X".
+        script = File.open("/tmp/rolling.reboot", 'w+')
+        script.puts "#!/bin/bash"
+        script.puts "export monit_group=#{monit_group}" 
+        script.puts "export mongrel_restart_delay=#{mongrel_restart_delay}" 
+        # here's the need for single quoted - sed ? - (no escaping).
+        script.puts 'for port in $(monit summary | grep mongrel | sed -r \'s/[^0-9]*([0-9]+).*/\1/\'); do echo "Executing monit restart mongrel_${monit_group}_${port}"; /usr/bin/monit restart mongrel_${monit_group}_${port}; echo "sleeping $mongrel_restart_delay"; sleep ${mongrel_restart_delay}; done'
+        script.close
+
+        upload(script.path, script.path, :via=> :scp)
+
+        #it's in the script, on the remote server, execute it.
+        sudo "chmod +x #{script.path}"
+        sudo "#{script.path}"
+        #cleanup 
+        sudo "rm #{script.path}"
+        require 'fileutils' ; FileUtils.rm(script.path)
+        puts "Done."
+    end
+
+  end #namespace
+end #Capistrano::Configuration

data/lib/eycap/recipes/nginx.rb

@@ -31,14 +31,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       sudo "/etc/init.d/nginx configtest"
     end
 
-    desc "Tail the nginx access logs for this application"
-    task :tail, :roles => :app do
-      run "tail -f /var/log/engineyard/nginx/#{application}.access.log" do |channel, stream, data|
-        puts "#{channel[:server]}: #{data}" unless data =~ /^10\.[01]\.0/ # skips lb pull pages
-        break if stream == :err    
-      end
-    end
-
     desc "Tail the nginx error logs on the app slices"
     task :tail_error, :roles => :app do
       run "tail -f /var/log/engineyard/nginx/error.log" do |channel, stream, data|

data/lib/eycap/recipes/sphinx.rb

@@ -10,35 +10,35 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
       run "/engineyard/bin/searchd #{application} reindex"
     end
-      
+
     desc "Start Sphinx Searchd"
     task :start, :roles => [:app], :only => {:sphinx => true} do
       sudo "/usr/bin/monit start all -g sphinx_#{application}"
     end
-    
+
     desc "Stop Sphinx Searchd"
     task :stop, :roles => [:app], :only => {:sphinx => true} do
       sudo "/usr/bin/monit stop all -g sphinx_#{application}"
     end
-    
+
     desc "Restart Sphinx Searchd"
     task :restart, :roles => [:app], :only => {:sphinx => true} do
       sudo "/usr/bin/monit restart all -g sphinx_#{application}"
     end
-            
+
     task :symlink, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/ultrasphinx ]; then mv #{latest_release}/config/ultrasphinx #{latest_release}/config/ultrasphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/ultrasphinx #{latest_release}/config/ultrasphinx"
     end  
   end
-  
+
   namespace :acts_as_sphinx do
     desc "After update_code you to to reindex"
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
       run "/engineyard/bin/acts_as_sphinx_searchd #{application} reindex"
     end
   end
-  
+
   namespace :thinking_sphinx do
     desc "After update_code you want to configure, then reindex"
     task :configure, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
@@ -49,7 +49,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :reindex, :roles => [:app], :only => {:sphinx => true} do
       run "/engineyard/bin/thinking_sphinx_searchd #{application} reindex"
     end
-    
+
     task :symlink, :roles => [:app], :only => {:sphinx => true}, :except => {:no_release => true} do
       run "if [ -d #{latest_release}/config/thinkingsphinx ]; then mv #{latest_release}/config/thinkingsphinx #{latest_release}/config/thinkingsphinx.bak; fi"
       run "ln -nfs #{shared_path}/config/thinkingsphinx #{latest_release}/config/thinkingsphinx"
@@ -73,4 +73,4 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "ln -nfs #{shared_path}/config/ultrasphinx #{latest_release}/config/ultrasphinx"
     end    
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard-eycap
 version: !ruby/object:Gem::Version 
-  version: 0.4.12
+  version: 0.4.14
 platform: ruby
 authors: 
 - Engine Yard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,7 +48,7 @@ files:
 - README.txt
 - Rakefile
 - lib/capistrano/recipes/deploy/strategy/filtered_remote_cache.rb
-- lib/capistrano/recipes/deploy/strategy/remote_cache.rb
+- lib/capistrano/recipes/deploy/strategy/unshared_remote_cache.rb
 - lib/eycap.rb
 - lib/eycap/lib/ey_logger.rb
 - lib/eycap/lib/ey_logger_hooks.rb
@@ -73,6 +73,7 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/engineyard/eycap/tree/master
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: eycap
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Capistrano tasks for Engine Yard slices

data/lib/capistrano/recipes/deploy/strategy/remote_cache.rb

@@ -1,56 +0,0 @@
-require 'capistrano/recipes/deploy/strategy/remote'
-
-module Capistrano
-  module Deploy
-    module Strategy
-
-      # Implements the deployment strategy that keeps a cached checkout of
-      # the source code on each remote server. Each deploy simply updates the
-      # cached checkout, and then does a copy from the cached copy to the
-      # final deployment location.
-      class RemoteCache < Remote
-        # Executes the SCM command for this strategy and writes the REVISION
-        # mark file to each host.
-        def deploy!
-          update_repository_cache
-          copy_repository_cache
-        end
-
-        def check!
-          super.check do |d|
-            d.remote.writable(shared_path)
-          end
-        end
-
-        private
-
-          def repository_cache
-            File.join(configuration[:repository_cache] || "cached-copy")
-          end
-
-          def update_repository_cache
-            logger.trace "updating the cached checkout on all servers"
-            command = "if [ -d #{repository_cache} ]; then " +
-              "#{source.sync(revision, repository_cache)}; " +
-              "else #{source.checkout(revision, repository_cache)}; fi"
-            scm_run(command)
-          end
-
-          def copy_repository_cache
-            logger.trace "copying the cached version to #{configuration[:release_path]}"
-            if copy_exclude.empty? 
-              run "cp -RPp #{repository_cache} #{configuration[:release_path]} && #{mark}"
-            else
-              exclusions = copy_exclude.map { |e| "--exclude=\"#{e}\"" }.join(' ')
-              run "rsync -lrp #{exclusions} #{repository_cache}/* #{configuration[:release_path]} && #{mark}"
-            end
-          end
-          
-          def copy_exclude
-            @copy_exclude ||= Array(configuration.fetch(:copy_exclude, []))
-          end
-      end
-
-    end
-  end
-end