openteam-capistrano 0.0.11 → 0.0.12

data/lib/openteam/capistrano/dependencies.rb

@@ -5,5 +5,19 @@ require 'rvm/capistrano'
 
 require 'capistrano-db-tasks' if use_db?
 require 'capistrano-unicorn'
-begin; require 'airbrake/capistrano'; rescue LoadError; end
+
+# airbrake
+begin
+  require 'airbrake/capistrano'
+rescue LoadError
+  STDERR.puts '!!! WARNING: airbrake not detected, deployment notifications has been disabled !!!'
+end
+
+
+# delayed job
+begin
+  require 'delayed/recipes'
+  Capistrano::Configuration.instance.load { after 'deploy:restart', 'delayed_job:restart' }
+rescue LoadError
+end
 

data/lib/openteam/capistrano/solr/solr.rb

@@ -5,7 +5,7 @@ require 'tmpdir'
 
 class Solr
   class Replicator
-    attr_accessor :remote, :local
+    attr_accessor :remote, :local, :base_local_index_version
 
     def initialize(options)
       self.remote = Solr.new options[:remote]
@@ -13,7 +13,8 @@ class Solr
     end
 
     def replicate
-      if same_versions?
+      self.base_local_index_version = local.index_version
+      if base_local_index_version == remote.index_version
         puts 'local and remote index versions are same, no need for replication'
       else
         really_replicate
@@ -24,7 +25,7 @@ class Solr
     def really_replicate
       print 'wait while solr replicated '
       local.send_replication_command :fetchindex, :masterUrl => "#{remote.url}/replication"
-      while !same_versions?
+      while base_local_index_version == local.index_version
         print '.'
         sleep 0.5
       end
@@ -35,10 +36,6 @@ class Solr
       STDOUT.print *args
       STDOUT.sync
     end
-
-    def same_versions?
-      remote.index_version == local.index_version
-    end
   end
 
   attr_accessor :url
@@ -48,7 +45,7 @@ class Solr
   end
 
   def index_version
-    send_replication_command(:indexversion)['indexversion']
+    send_replication_command(:indexversion)['indexversion'].to_i
   end
 
   def send_replication_command(command, extra={})

data/lib/openteam/capistrano/tagging.rb

@@ -5,19 +5,29 @@ Capistrano::Configuration.instance.load do
   namespace :tagging do
     def tag_name(options={})
       formatted_local_time = DateTime.strptime(options[:for], '%Y%m%d%H%M%S').to_time.strftime("%Y.%m.%d-%H%M")
-      "#{fetch(:stage)}-#{formatted_local_time}"
+      "#{stage}-#{formatted_local_time}"
     end
 
     def create_tag(tag_name)
       run_locally "git tag -a #{tag_name} -m 'Deployed by #{fetch(:local_user)}' origin/#{fetch(:branch)}"
-      run_locally "git push origin --tags"
+      run_locally "git push origin #{tag_name}"
     end
 
-    def remove_tag(tag_name)
-      run_locally "git tag -d #{tag_name} || true"
-      run_locally "git push origin :refs/tags/#{tag_name}"
+    def remove_tags(tags)
+      tag_refs = tags.map{|tag| ":refs/tags/#{tag}"}
+      run_locally "git tag -d #{tags.join(' ')}"
+      run_locally "git push origin #{tag_refs.join(' ')}"
     end
 
+    set(:stage_tags) do
+      run_locally('git fetch --tags')
+      run_locally("git tag -l | grep ^#{stage}-").chomp.split("\n")
+    end
+    set(:kept_releases_count) { fetch(:keep_releases, 5) }
+    set(:kept_releases) { releases.last(kept_releases_count) }
+    set(:kept_tags) { kept_releases.map{|release| tag_name(:for => release)} }
+    set(:rotten_tags) { stage_tags - kept_tags }
+
     desc "Create release tag in local and origin repo"
     task :deploy do
       logger.info "tag current release"
@@ -26,16 +36,11 @@ Capistrano::Configuration.instance.load do
 
     desc "Remove release tag from local and origin repo"
     task :cleanup do
-      run_locally 'git fetch --tags'
-      count = fetch(:keep_releases, 5)
-
-      if count >= releases.size
-        logger.important "no old release tags to clean up"
+      if rotten_tags.any?
+        logger.info "keeping #{kept_releases_count} of #{stage} #{stage_tags.size} stage tags"
+        remove_tags(rotten_tags)
       else
-        logger.info "keeping #{count} of #{releases.size} release tags"
-        releases.first(releases.size - count).map do |release|
-          remove_tag tag_name(:for => release)
-        end
+        logger.important "no old release tags to clean up"
       end
     end
   end

data/openteam-capistrano.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'openteam-capistrano'
-  gem.version       = '0.0.11'
+  gem.version       = '0.0.12'
   gem.authors       = ["OpenTeam developers"]
   gem.email         = ["developers@openteam.ru"]
   gem.description   = %q{OpenTeam common capistrano recipe}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openteam-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-db-tasks
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3709530121711528520
+      hash: -694622114785548101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3709530121711528520
+      hash: -694622114785548101
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24