tapsoob 0.4.2 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661f0fd554e2cd6781c9a174c4051331024879fb1abecb9f48f19b9e365c1e46
-  data.tar.gz: 10535d8376543d13e16a35b8d7e098cdb4c4757b518e75068d6a83884196cd98
+  metadata.gz: cc84752fc2a91822aa3bc16f26c08caeeb65908cef115a65a926ef8b20234af2
+  data.tar.gz: d8a7436afa147cb420c18552e3dcbbed8e1255a74176463ddaa6a51bf23fc8be
 SHA512:
-  metadata.gz: 171152e81bcb75da25c9865b8b8211256e7fce176bca88f576b4eb9cf159d67a66badacc51344b3c3a4efa137f16dd57384f606780f0b35984ecfb1d6bfbe96c
-  data.tar.gz: a9a59c2a045419d2b580b9d3932055f012f9b192daf6feef8e35602546b0b8dcbd77fc87e56ffa728c1818c6de5004b8027cc0051c9e44d313acc1c5673bc862
+  metadata.gz: 639660bd7c1d819d8cace1b1270356628c2e4c7784c65ec828ad71e59316e651d94c10068c45d9185ad5a89115e31d237d33300452b8cf30d1a11198d437361b
+  data.tar.gz: 0c5f443dc175183a43ae68573f3c32775e9ca339e29a467d9b9303d684b4d3a4b533fd2509065f18266cf17f7e71fb39a69f6d44c13acbc46215f916fc55e769

data/lib/tapsoob/data_stream.rb

@@ -152,7 +152,7 @@ module Tapsoob
 
       rows = parse_encoded_data(encoded_data, json[:checksum])
 
-      @complete = rows == { }
+      @complete = rows[:data] == [ ]
 
       # update local state
       state.merge!(json[:state].merge(:chunksize => state[:chunksize]))

data/lib/tapsoob/operation.rb

@@ -227,8 +227,6 @@ module Tapsoob
               Tapsoob::Utils.export_rows(dump_path, stream.table_name, rows)
             end
           end
-          break if stream.complete?
-          progress.inc(size) if progress && !exiting?
           stream.error = false
           self.stream_state = stream.to_hash
         rescue Tapsoob::CorruptedData => e
@@ -236,6 +234,9 @@ module Tapsoob
           stream.error = true
           next
         end
+
+        progress.inc(size) if progress && !exiting?
+        break if stream.complete?
       end
 
       progress.finish if progress

data/lib/tapsoob/utils.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'zlib'
+require 'active_support/core_ext/file/atomic.rb'
 
 require 'tapsoob/errors'
 require 'tapsoob/chunksize'
@@ -143,11 +144,15 @@ Data : #{data}
       data = row_data
       if File.exists?(File.join(dump_path, "data", "#{table}.json"))
         previous_data = JSON.parse(File.read(File.join(dump_path, "data", "#{table}.json")))
-        data[:data] = previous_data["data"] + row_data[:data]
-      end
+        data[:data] = (previous_data["data"].nil?  ? row_data[:data] : previous_data["data"] + row_data[:data])
 
-      File.open(File.join(dump_path, "data", "#{table}.json"), 'w') do |file|
-        file.write(JSON.generate(data))
+        File.atomic_write(File.join(dump_path, "data", "#{table}.json")) do |file|
+          file.write(JSON.generate(data))
+        end
+      else
+        File.open(File.join(dump_path, "data", "#{table}.json"), 'w') do |file|
+          file.write(JSON.generate(data))
+        end
       end
     end
 

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.7
 platform: ruby
 authors:
 - Félix Bellanger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ripl