es_dump_restore 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45b3f41110e68aa160d81d3094501b4db2d914a
-  data.tar.gz: 127abfad968e31cfd7fb1ea1d933dd55d9497839
+  metadata.gz: 4fd3daa61667baf72f9f0c62fe8b6f71e0e5c5de
+  data.tar.gz: a9d1eb03b685529be48895e92a856443e8cec280
 SHA512:
-  metadata.gz: 7a888f720b201ec78d4a6b1c2ca75033f2fd98e07838282a3180fe3a3488d8d39faa4971073f4e5b027049e0f01ec038ef0a274cf710a89f07856241e4c564e4
-  data.tar.gz: ca426d7becd4d7f59d2708d926a38aae42a56a23a4bd9b2b7657f65c5f860897e4da5578175cbe971b04fd48d3898b5de19ff7d2a1fe3c40ff5e8fcc5f2d88cb
+  metadata.gz: 2a5728d62cfd999870e6d19b3ba4ad8350dce18d8ec860616c39d475cd01d39f27bf85fa429e4da75f6c2fb5d7c6d339c6a89289cc0a808f2aeaf67bc4d6e5d3
+  data.tar.gz: 6076595aba9cb8c3beec6259fd70fef81917ea8841115c7fb1c76e2e858c531b25f06d92fb0d785cf582c89095629e0387adaae34a63c6e5ef3591bd26b82c28

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# Version 2.0.0 - July 1, 2015
+
+Thanks to Alex Tomlins for this feature contribution
+
+* Make progress bar options globally available
+* VERY MINOR BREAKING CHANGE: Invert the `--noprogressbar` option, which is now `--progressbar` or `--no-progress-bar`
+
 # Version 1.2.0 - June 24, 2015
 
 * Allow overriding the batch size on the command line (thanks to Richard Boulton once again!)

data/lib/es_dump_restore/app.rb

@@ -6,8 +6,11 @@ require "multi_json"
 
 module EsDumpRestore
   class App < Thor
-    
-    option :noprogressbar, :type => :boolean # switch for showing progress bar
+    class_option :progressbar,
+      type: :boolean,
+      default: $stderr.isatty,
+      desc: "Whether to show the progress bar. Defaults to true if STDERR is a TTY, false otherwise."
+
     option :verbose, :type => :boolean # add some additional output
 
     desc "dump URL INDEX_NAME FILENAME", "Creates a dumpfile based on the given ElasticSearch index"
@@ -22,13 +25,13 @@ module EsDumpRestore
 
         client.start_scan do |scroll_id, total|
           dumpfile.num_objects = total
-          bar = ProgressBar.new(total) unless options[:noprogressbar]
+          bar = ProgressBar.new(total) if options[:progressbar]
 
           dumpfile.get_objects_output_stream do |out|
             client.each_scroll_hit(scroll_id) do |hit|
               metadata = { index: { _type: hit["_type"], _id: hit["_id"] } }
               out.write("#{MultiJson.dump(metadata)}\n#{MultiJson.dump(hit["_source"])}\n")
-              bar.increment! unless options[:noprogressbar]
+              bar.increment! if options[:progressbar]
             end
           end
         end
@@ -47,13 +50,13 @@ module EsDumpRestore
 
         client.start_scan do |scroll_id, total|
           dumpfile.num_objects = total
-          bar = ProgressBar.new(total) unless options[:noprogressbar]
+          bar = ProgressBar.new(total) if options[:progressbar]
 
           dumpfile.get_objects_output_stream do |out|
             client.each_scroll_hit(scroll_id) do |hit|
               metadata = { index: { _type: hit["_type"], _id: hit["_id"] } }
               out.write("#{MultiJson.dump(metadata)}\n#{MultiJson.dump(hit["_source"])}\n")
-              bar.increment! unless options[:noprogressbar]
+              bar.increment! if options[:progressbar]
             end
           end
         end
@@ -67,10 +70,10 @@ module EsDumpRestore
       Dumpfile.read(filename) do |dumpfile|
         client.create_index(dumpfile.index, overrides)
 
-        bar = ProgressBar.new(dumpfile.num_objects) unless options[:noprogressbar]
+        bar = ProgressBar.new(dumpfile.num_objects) if options[:progressbar]
         dumpfile.scan_objects(batch_size.to_i) do |batch, size|
           client.bulk_index batch
-          bar.increment!(size) unless options[:noprogressbar]
+          bar.increment!(size) if options[:progressbar]
         end
       end
     end
@@ -84,10 +87,10 @@ module EsDumpRestore
       Dumpfile.read(filename) do |dumpfile|
         client.create_index(dumpfile.index, overrides)
 
-        bar = ProgressBar.new(dumpfile.num_objects) unless options[:noprogressbar]
+        bar = ProgressBar.new(dumpfile.num_objects) if options[:progressbar]
         dumpfile.scan_objects(batch_size.to_i) do |batch, size|
           client.bulk_index batch
-          bar.increment!(size) unless options[:noprogressbar]
+          bar.increment!(size) if options[:progressbar]
         end
       end
 

data/lib/es_dump_restore/version.rb

@@ -1,3 +1,3 @@
 module EsDumpRestore
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es_dump_restore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json