es_dump_restore 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b8f8d2c2f59f52f984d2fadbd629977f89d00f
-  data.tar.gz: ceabcfcc74883b3661b9d032743783d1e09aa365
+  metadata.gz: 08fa2b9eb215b8ff28dc83c19a9c4b1e952d32ff
+  data.tar.gz: febbb67ee5b1faf6157d65323da09177e7e50a91
 SHA512:
-  metadata.gz: 191dbeb2a56e3e4ff754f0d9afa8ab673fac01a8c685f499e74dde58ef325c8736a14622a77ca6289898dfb80b6500267c3ba785de1dc8bc7dad715f14effb39
-  data.tar.gz: b894f31f696b91dd24096eebd7094d679f304b924fc8b30ee073460a2f9b12cfa2bd6011a4fa04cfaa379762d41e380d9726c77951d23b0e4dc1547ae43bb2ae
+  metadata.gz: ee784a1b7992d131ebcabd70f7be9d6740597c6ab0339a55db6423cb140a05468113fba1e081cdf3d5fcb51ace39b102077ac24bd9d95f1cb9bae898985ddce5
+  data.tar.gz: 108636726d2ee7780cdd350e2e39c5218b3c9d557680cc4eb30c17ce36e11f99aba734cffbe25741efa64d7e8c57cdbf9c171191e2bbb96b7eabcbbed0ac51f4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# Version 0.0.10 - December 3, 2014
+
+* Fixes a bug introduced in 0.0.9 (thanks again to Noa Resare for the fix!)
+
+# Version 0.0.9 - December 2, 2014 - YANKED
+
+* Makes it possible to use ES instances not located at server root (thanks Noa Resare for the patch!)
+
 # Version 0.0.8 - September 9, 2014
 
 * Added --noprogressbar option for easier usage with cron (thanks Marco Dickert for the patch!)

data/lib/es_dump_restore/app.rb

@@ -8,6 +8,7 @@ module EsDumpRestore
   class App < Thor
     
     option :noprogressbar, :type => :boolean # switch for showing progress bar
+    option :verbose, :type => :boolean # add some additional output
 
     desc "dump URL INDEX_NAME FILENAME", "Creates a dumpfile based on the given ElasticSearch index"
     def dump(url, index_name, filename)

data/lib/es_dump_restore/es_client.rb

@@ -11,19 +11,20 @@ module EsDumpRestore
       @httpclient = HTTPClient.new
       @index_name = index_name
 
-      @base_uri = type.nil? ? URI.parse(base_uri + "/" + index_name + "/") : URI.parse(base_uri + "/" + index_name + "/" + type + "/")
+      @es_uri = base_uri
+      @path_prefix = type.nil? ? index_name : index_name + "/" + type
     end
 
     def mappings
-      request(:get, '_mapping')[index_name]
+      request(:get, "#{@path_prefix}/_mapping")[index_name]
     end
 
     def settings
-      request(:get, '_settings')[index_name]
+      request(:get, "#{@path_prefix}/_settings")[index_name]
     end
 
     def start_scan(&block)
-      scroll = request(:get, '_search',
+      scroll = request(:get, "#{@path_prefix}/_search",
         query: { search_type: 'scan', scroll: '10m', size: 500 },
         body: MultiJson.dump({ query: { match_all: {} } }) )
       total = scroll["hits"]["total"]
@@ -34,9 +35,9 @@ module EsDumpRestore
 
     def each_scroll_hit(scroll_id, &block)
       loop do
-        batch = request(:get, '/_search/scroll', query: {
+        batch = request(:get, '_search/scroll', {query: {
           scroll: '10m', scroll_id: scroll_id
-        })
+        }}, [404])
 
         batch_hits = batch["hits"]
         break if batch_hits.nil?
@@ -59,10 +60,19 @@ module EsDumpRestore
 
     private
 
-    def request(method, path, options={})
-      request_uri = @base_uri + path
-      response = @httpclient.request(method, request_uri, options)
-      MultiJson.load(response.content)
+    def request(method, path, options={}, extra_allowed_exitcodes=[])
+      request_uri = @es_uri + "/" + path
+      begin
+        response = @httpclient.request(method, request_uri, options)
+        unless response.ok? or extra_allowed_exitcodes.include? response.status
+          raise "Request failed with status #{response.status}: #{response.reason}"
+        end
+        MultiJson.load(response.content)
+      rescue Exception => e
+        puts "Exception caught issuing HTTP request to #{request_uri}"
+        puts "options: #{options}"
+        raise e
+      end
     end
   end
-end
+end

data/lib/es_dump_restore/version.rb

@@ -1,3 +1,3 @@
 module EsDumpRestore
-  VERSION = "0.0.8"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_dump_restore
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json