capones_recipes 1.18.0 → 1.19.0

data/CHANGELOG

@@ -1,6 +1,12 @@
+1.19.0
+======
+* Add host_and_port helper from sync:db to sync:fs.
+* Add thinking_sphinx:rebuild task.
+
 1.18.0
 ======
-* Use instance instead of client.domain as bluepill instance name. 
+* No failing in db:sync if db:drop fails.
+* Use instance instead of client.domain as bluepill instance name.
 
 1.17.0
 ======

data/lib/capones_recipes/tasks/database/sync.rb

@@ -43,7 +43,7 @@ Capistrano::Configuration.instance.load do
 
         # Local DB import
         username, password, database, host = database_config('development')
-        run_locally "rake db:drop && rake db:create"
+        run_locally "rake db:drop; rake db:create"
         run_locally "bzip2 -d -c #{filename} | mysql -u #{username} --password='#{password}' #{database}"
         run_locally "rm -f #{filename}"
 

data/lib/capones_recipes/tasks/sync/fs.rb

@@ -42,17 +42,17 @@ Capistrano::Configuration.instance.load do
         server, port = host_and_port
         Array(fetch(:sync_directories, [])).each do |syncdir|
           destination, base = Pathname.new(syncdir).split
-          
+
           unless File.directory? "#{syncdir}"
             logger.info "Create '#{syncdir}' directory"
             run "mkdir -p #{shared_path}/#{syncdir}"
           end
-          
+
           # Make a backup
           logger.info "backup #{syncdir}"
           run "tar cjf #{shared_path}/sync/#{base}.#{Time.now.strftime '%Y-%m-%d_%H:%M:%S'}.tar.bz2 #{shared_path}/#{syncdir}"
           purge_old_backups "#{base}"
-          
+
           # Sync directory up
           logger.info "sync #{syncdir} to #{server}:#{port} from local"
           run_locally "rsync --verbose --archive --compress --keep-dirlinks --delete --stats --rsh='ssh -p #{port}' #{syncdir} #{user}@#{server}:#{shared_path}/#{destination.to_s}"
@@ -60,5 +60,12 @@ Capistrano::Configuration.instance.load do
         logger.important "sync filesystem from local to the stage '#{stage}' finished"
       end
     end
+
+    #
+    # Returns the actual host name to sync and port
+    #
+    def host_and_port
+      return roles[:web].servers.first.host, ssh_options[:port] || roles[:web].servers.first.port || 22
+    end
   end
 end

data/lib/capones_recipes/tasks/thinking_sphinx.rb

@@ -21,5 +21,18 @@ Capistrano::Configuration.instance.load do
       run "ln -nfs #{shared_path}/db/sphinx #{latest_release}/db/sphinx"
       run "ln -nfs #{shared_path}/tmp/sockets #{latest_release}/tmp/sockets"
     end
+
+    desc "Rebuild index"
+    task :rebuild, :roles => :app do
+      run_rake "thinking_sphinx:rebuild"
+    end
+
+    def run_rake(task, options={}, &block)
+      rake = fetch(:rake, "rake")
+      rails_env = fetch(:rails_env, 'production')
+
+      command = "cd #{latest_release} && #{rake} #{task} RAILS_ENV=#{rails_env} ; true"
+      run(command, options, &block)
+    end
   end
 end

data/lib/capones_recipes/version.rb

@@ -1,3 +1,3 @@
 module CaponesRecipes
-  VERSION = "1.18.0"
+  VERSION = "1.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capones_recipes
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85891320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,15 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85891320
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85890940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,15 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85890940
 - !ruby/object:Gem::Dependency
   name: cap-recipes
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85906900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85906900
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85906390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,15 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85906390
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85905910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -86,15 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85905910
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &85905440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -102,12 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *85905440
 description: A collection of usefull capistrano recipes used by CyT GmbH and others.
 email:
 - roman.simecek@cyt.ch
@@ -187,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Some capistrano recipes for use.