es_dump_restore 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41b36d15cadba5a35d1423fedd27d1463a704948
-  data.tar.gz: 0d760d14fdef576ab1100895b154b8549f4b8c7c
+  metadata.gz: 86d387c4543740231133cf902eb7ef3ccc4b8032
+  data.tar.gz: f713de78847fab41c950625668dbfbfb3bc64241
 SHA512:
-  metadata.gz: 7127d8bd50ab03b7e1f0001cbd351e8deaa23df753e1aab756c66a736b1da3e3129ed5db5272423bb21268cf53f861bd48743bb6b4aecdbe8d9e7aeaef685887
-  data.tar.gz: a73c67371af3dadf4c11db3440e0c5610c6c98bb1052a1621383d65e40bd4e47cceb72f2cd619853b2c44a1167f8645061ef3e7eab11e9c999af4d8010539535
+  metadata.gz: 0b4c08c8beac9653c832bd34b4fa544934f932eb1f7a06c124d6a824a9287e85f3efbe07b386e1880c2cff1ce47da57eecacf6f7595bf5789bacdf7ab9cc7fb5
+  data.tar.gz: 92889a08a395f142596394637b886fac7cd1baa7b23f09873ee69f70007f69fcaee5ba5743888a7d96d3bc2b9da5648fd45c538927ba88091de7a5069e309e0a

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Version 0.0.13 - April 10, 2015
+
+* Fix a regression introduced for ES version 0.90.x by the previous release (thanks again Richard Boulton!)
+
+# Version 0.0.12 - April 10, 2015 - YANKED
+
+* Handle null values for settings and mappings; useful in the case of trying to dump an alias (thanks Richard Boulton!)
+* Handle the case of ES losing the scroll context mid-dump (thanks again Richard Boulton!)
+
 # Version 0.0.11 - March 4, 2015
 
 * Make it possible to load on older versions of Ruby (thanks Alex Tomlins!)

data/es_dump_restore.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'thor'
   gem.add_dependency 'rubyzip', ">= 1.0.0"
   gem.add_dependency 'progress_bar'
+  gem.add_dependency 'rake'
 end

data/lib/es_dump_restore/es_client.rb

@@ -16,11 +16,29 @@ module EsDumpRestore
     end
 
     def mappings
-      request(:get, "#{@path_prefix}/_mapping")[index_name]
+      data = request(:get, "#{@path_prefix}/_mapping")
+      if data.values.size != 1
+        raise "Unexpected response: #{data}"
+      end
+      mappings = data.values.first
+      if mappings["mappings"].nil?
+        mappings
+      else
+        mappings["mappings"]
+      end
     end
 
     def settings
-      request(:get, "#{@path_prefix}/_settings")[index_name]
+      data = request(:get, "#{@path_prefix}/_settings")
+      if data.values.size != 1
+        raise "Unexpected response: #{data}"
+      end
+      settings = data.values.first
+      if settings["settings"].nil?
+        settings
+      else
+        settings["settings"]
+      end
     end
 
     def start_scan(&block)
@@ -34,6 +52,7 @@ module EsDumpRestore
     end
 
     def each_scroll_hit(scroll_id, &block)
+      done = 0
       loop do
         batch = request(:get, '_search/scroll', {query: {
           scroll: '10m', scroll_id: scroll_id
@@ -47,6 +66,10 @@ module EsDumpRestore
         hits.each do |hit|
           yield hit
         end
+
+        total = batch_hits["total"]
+        done += hits.size
+        break if done >= total
       end
     end
 

data/lib/es_dump_restore/version.rb

@@ -1,3 +1,3 @@
 module EsDumpRestore
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_dump_restore
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A utility for dumping the contents of an ElasticSearch index to a compressed
   file and restoring the dumpfile back to an ElasticSearch server
 email:
@@ -126,4 +140,3 @@ signing_key:
 specification_version: 4
 summary: Dump ElasticSearch indexes to files and restore them back
 test_files: []
-has_rdoc: