phraseapp_updater 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd13cd155e4d1489c4eadba7a8fc5def83bfc86a28f43646a9ef1924706f85a5
-  data.tar.gz: 341169c0beb43396cbf1b404a888ebc8ecae66a5acb57c2eb164e89d6cef856d
+  metadata.gz: 45e3b0d7a9b4211b1dbf7e568d3a4a5f5684c881b6f745d6d8576c7a75ef61a7
+  data.tar.gz: 88f20fb2fa95f07b9eaf35d4760873a259f85a884fde6d74b1323ef61698138c
 SHA512:
-  metadata.gz: 830206a333355912b6ade08d4c73e1526d22c65fbde8c6674429071e3a12e9db5f9706c8fb5d7ddf29437af78b965db268635e1efa2fc3f9546ea4ed90f72aa9
-  data.tar.gz: 8b80b6341dd8ae25edb861ddf67a8a86788179893204c46255c02686f7e0bc09428b3f9d5fe991892a05a4c9f97850b76d235b0a1e06d7d8555d65072972f668
+  metadata.gz: 452a378d2ca304eda9dc0093634f6efeda587597f4a3a42357a3f6d0f956ba31c8900d4a3549ed3f6bcdc4c98d41d56994b68f917f3085f081a6573d25c11912
+  data.tar.gz: 6acd39998a5c485555e70a1f8aa52787ee16721fbc8f5d95ee0418b4af8e8b78a924b925d70d15fadd7942df9638ec79b6f413ae9aee4e216d9df852044d3c0b

data/lib/phraseapp_updater.rb

@@ -74,7 +74,7 @@ class PhraseAppUpdater
       end
     end
 
-    HashDiff.diff(our_content, their_content)
+    Hashdiff.diff(our_content, their_content)
   end
 
   def merge_locale_files(our_locales, their_locales, ancestor_locales)

data/lib/phraseapp_updater/differ.rb

@@ -63,7 +63,7 @@ class PhraseAppUpdater
     end
 
     def apply_diffs(hash, diffs)
-      deep_compact!(HashDiff.patch!(hash, diffs))
+      deep_compact!(Hashdiff.patch!(hash, diffs))
     end
 
     def resolve!(original:, primary:, secondary:)
@@ -73,8 +73,8 @@ class PhraseAppUpdater
       f_primary   = flatten(primary)
       f_secondary = flatten(secondary)
 
-      primary_diffs   = HashDiff.diff(f_original, f_primary)
-      secondary_diffs = HashDiff.diff(f_original, f_secondary)
+      primary_diffs   = Hashdiff.diff(f_original, f_primary)
+      secondary_diffs = Hashdiff.diff(f_original, f_secondary)
 
       # However, flattening discards one critical piece of information: when we
       # have deleted or clobbered an entire prefix (subtree) from the original,
@@ -88,7 +88,7 @@ class PhraseAppUpdater
       #
       # Additionally calculate subtree prefixes that were deleted in `secondary`:
       secondary_deleted_prefixes =
-        HashDiff.diff(original, secondary, delimiter: SEPARATOR).lazy
+        Hashdiff.diff(original, secondary, delimiter: SEPARATOR).lazy
           .select { |op, path, from, to| (op == "-" || op == "~") && from.is_a?(Hash) && !to.is_a?(Hash) }
           .map    { |op, path, from, to| path }
           .to_a
@@ -109,7 +109,7 @@ class PhraseAppUpdater
         resolved_diffs.each { |d| STDERR.puts(d.inspect) }
       end
 
-      HashDiff.patch!(f_original, resolved_diffs)
+      Hashdiff.patch!(f_original, resolved_diffs)
 
       expand(f_original)
     end

data/lib/phraseapp_updater/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PhraseAppUpdater
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor