es-reindex 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb1862c74c923e6e30a22bc694f2b4cc97a11ac
-  data.tar.gz: bc5529358af365d1803a6d5c5a5158c6e265fd36
+  metadata.gz: 75e91c0a58aec17def06e3d69858f98cd759f46e
+  data.tar.gz: d223121aa74c36553917cbd6b9cede4068383024
 SHA512:
-  metadata.gz: 5eec5cb2304c337e4fd242f2035d99354f1542939948830292f5a94f4a1d4d684e066f1a6cd576e23f27fac84678d203d9fad544ce81235c337beeff0ec8b99d
-  data.tar.gz: 341436662c907031f3ed38ead2e96dca6a2228203b47b6c70d5d7a1f6a9f84cd648c01d5b61d0332dc30f2811057f603660ecb061d647b7269772ee8fd69ccd7
+  metadata.gz: 4ff8dd6b08a4cea265aa49d212a8ddb7a3c34472d0751932f9cec3e4b0152cb06bdb71c18e4d9ea4f71e404cab8003ef33cc2123153feb6119eb02f3bc5ae4b2
+  data.tar.gz: 67a9a28d9106e8c2d885eab9f4006a935a889a290aaa384701bf561ae66efc03b7d75ec744863029c8b24c04e8760659776d58fbe20b9ebee12c55c921027d35

data/CHANGELOG.markdown

@@ -1,5 +1,6 @@
 ## Changelog
 
++ __0.3.3__: Added `-nm` option [@wader](https://github.com/wader)
 + __0.3.2__: Remove activesupport dependency entirely, handle aliased indices [@waterlink](https://github.com/waterlink)
 + __0.3.1__: Add activesupport dependency since es-reindex uses methods from it.
 + __0.3.0__: Add `:if` and `:unless` callbacks

data/README.markdown

@@ -17,7 +17,7 @@ Progress and time estimation is displayed during the scrolling process.
 
 Refer to script's help:
 
-```bash
+```
 $ ./es-reindex.rb -h
 
 Script to copy particular ES index including its (re)creation w/options set
@@ -25,11 +25,12 @@ and mapping copied.
 
 Usage:
 
-  ./es-reindex.rb [-r] [-f <frame>] [source_url/]<index> [destination_url/]<index>
+  ./es-reindex [options] [source_url/]<index> [destination_url/]<index>
 
-    - -r - remove the index in the new location first
-    - -f - specify frame size to be obtained with one fetch during scrolling
-    - -u - update existing documents (default: only create non-existing)
+    - -r  - remove the index in the new location first
+    - -f  - specify frame size to be obtained with one fetch during scrolling
+    - -u  - update existing documents (default: only create non-existing)
+    - -nm - don't copy mappings and settings
     - optional source/destination urls default to http://127.0.0.1:9200
 ```
 

data/bin/es-reindex

@@ -12,11 +12,12 @@ if ARGV.size == 0 or ARGV[0] =~ /^-(?:h|-?help)$/
 
   Usage:
 
-    #{__FILE__} [-r] [-f <frame>] [source_url/]<index> [destination_url/]<index>
+    #{__FILE__} [options] [source_url/]<index> [destination_url/]<index>
 
-      - -r - remove the index in the new location first
-      - -f - specify frame size to be obtained with one fetch during scrolling
-      - -u - update existing documents (default: only create non-existing)
+      - -r  - remove the index in the new location first
+      - -f  - specify frame size to be obtained with one fetch during scrolling
+      - -u  - update existing documents (default: only create non-existing)
+      - -nm - dont't copy mappings and settings
       - optional source/destination urls default to http://127.0.0.1:9200
   \n"
 

data/lib/es-reindex.rb

@@ -108,8 +108,8 @@ class ESReindex
         return false unless get_mappings
         create_msg = " with settings & mappings from '#{surl}/#{sidx}'"
       else
-        @mappings = options[:mappings].call
-        @settings = options[:settings].call
+        @mappings = options[:mappings].nil? ? {} : options[:mappings].call
+        @settings = options[:settings].nil? ? {} : options[:settings].call
         create_msg = ""
       end
 

data/lib/es-reindex/args_parser.rb

@@ -2,13 +2,19 @@ class ESReindex
   class ArgsParser
 
     def self.parse(args)
-      remove, update, frame, src, dst = false, false, 1000, nil, nil
+      remove = false
+      update = false
+      frame = 1000
+      src = nil
+      dst = nil
+      copy_mappings = true
 
       while args[0]
         case arg = args.shift
         when '-r' then remove = true
         when '-f' then frame  = args.shift.to_i
         when '-u' then update = true
+        when '-nm' then copy_mappings = false
         else
           u = arg.chomp '/'
           !src ? (src = u) : !dst ? (dst = u) :
@@ -19,7 +25,8 @@ class ESReindex
       return src, dst, {
         remove: remove,
         frame:  frame,
-        update: update
+        update: update,
+        copy_mappings: copy_mappings,
       }
     end
   end

data/lib/es-reindex/version.rb

@@ -1,3 +1,3 @@
 class ESReindex
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/spec/es-reindex/args_parser_spec.rb

@@ -74,4 +74,20 @@ describe ESReindex::ArgsParser do
       expect(parsed_opts[:update]).to be true
     end
   end
+
+  context "without -nm" do
+    let(:args) { ["-u"] }
+
+    it "sets copy_mappings to true" do
+      expect(parsed_opts[:copy_mappings]).to be true
+    end
+  end
+
+  context "with -nm" do
+    let(:args) { ["-u", "-nm"] }
+
+    it "sets copy_mappings to false" do
+      expect(parsed_opts[:copy_mappings]).to be false
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-reindex
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Justin Aiken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
@@ -170,3 +170,4 @@ test_files:
 - spec/integration/reindex_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_model.rb
+has_rdoc: