openteam-capistrano 0.0.9 → 0.0.10

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

@@ -13,7 +13,7 @@ class Solr
     end
 
     def replicate
-      if remote.index_version == local.index_version
+      if same_versions?
         puts 'local and remote index versions are same, no need for replication'
       else
         really_replicate
@@ -24,22 +24,21 @@ class Solr
     def really_replicate
       print 'wait while solr replicated '
       local.send_replication_command :fetchindex, :masterUrl => "#{remote.url}/replication"
-      while replicating?
+      while !same_versions?
         print '.'
         sleep 0.5
       end
       puts ' ok'
     end
 
-    def replicating?
-      # FIXME: cann't use details command due https://issues.apache.org/jira/browse/SOLR-3131
-      local.send_replication_command(:filelist, :indexversion => remote.index_version)['status'] == 'invalid indexversion'
-    end
-
     def print(*args)
       STDOUT.print *args
       STDOUT.sync
     end
+
+    def same_versions?
+      remote.index_version == local.index_version
+    end
   end
 
   attr_accessor :url
@@ -49,7 +48,7 @@ class Solr
   end
 
   def index_version
-    send_replication_command(:details)['details']['indexVersion']
+    send_replication_command(:indexversion)['indexversion']
   end
 
   def send_replication_command(command, extra={})

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.9'
+  gem.version       = '0.0.10'
   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.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2643949212493095317
+      hash: 3247049610039427968
 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: 2643949212493095317
+      hash: 3247049610039427968
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24