awful 0.0.110 → 0.0.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66a636931acf101421264806dd2d2507a17f6b0b
-  data.tar.gz: 971d772db2f68e04147b9b138dfe2564baef6fd8
+  metadata.gz: 05de4d2644881dd896a8f620b8e714406475196f
+  data.tar.gz: 73bf3944a1a82890464ce59a5d314d6d55384e5c
 SHA512:
-  metadata.gz: d82ae0c797e622d721c3ef7dafdac5ec1cdff8feaae4d8d695a83931b1725e53f5825a2f3e7eddc9ef6ede72341a1901df9d137cd99b0c8b60f137995778a65d
-  data.tar.gz: 57bf1ec07acd7b0d16bbf118ab9648a85ba603150fd8b7f2045975c14108edff04031c38ecaef82796df0a643bbcb341dba3355b3f6685b2e795a228486d9139
+  metadata.gz: abdbece43be134fc09c80656abe98939c6399fbee3d3e5420ace4268d9051b8cf69d150e5486cb1702801015c3a20f171444a20fda1eaadb1f5dad560d838c4c
+  data.tar.gz: 109636c3a86b4644fc5a9bb40ab8c29c97b132ac065e44d2dc598cdaaa29bd9311f58b49f96bbf14535166aad995a23af1cb1eb233169b3c1dc0c74c91ba1ef7

data/lib/awful/dynamodb.rb

@@ -184,11 +184,13 @@ module Awful
       ## lame progress indicator, pass true for put, false for skip
       dots = options[:dots] ? ->(x){print x ? '.' : 'x'} : ->(_){}
 
-      ## recursive closure to scan some items from src and put to dest;
-      ## would be more studly as an anonymous y-combinator, but we should write readable code instead
-      scan_and_put = ->(myself, key) {
-        r = src_client.scan(table_name: src_table, exclusive_start_key: key, return_consumed_capacity: 'INDEXES')
-        print "[#{Time.now}] [#{src_table}] scanned:#{r.count} key:#{r.last_evaluated_key || 'nil'}"
+      ## loop on each batch of scanned items
+      exclusive_start_key = nil
+      loop do
+        r = src_client.scan(table_name: src_table, exclusive_start_key: exclusive_start_key, return_consumed_capacity: 'INDEXES')
+        puts "[#{Time.now}] [#{src_table}] scanned:#{r.count} key:#{r.last_evaluated_key || 'nil'}"
+
+        ## loop items and put to destination
         put = skipped = 0
         r.items.each do |item|
           begin
@@ -200,17 +202,14 @@ module Awful
             dots.call(false)
           end
         end
-        print "\n"
-        puts "[#{Time.now}] [#{dst_table}] put:#{put} skipped:#{skipped}"
 
-        ## recurse if there are more keys to scan
-        if r.last_evaluated_key
-          myself.call(myself, r.last_evaluated_key)
-        end
-      }
+        print "\n" if options[:dots]
+        puts "[#{Time.now}] [#{dst_table}] put:#{put} skipped:#{skipped}"
 
-      ## start scanning data
-      scan_and_put.call(scan_and_put, nil)
+        ## loop if there are more keys to scan
+        exclusive_start_key = r.last_evaluated_key
+        break unless exclusive_start_key
+      end
     end
 
     desc 'scan NAME', 'scan table with NAME'

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.110'
+  VERSION = '0.0.111'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.110
+  version: 0.0.111
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler