phraseapp_updater 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c463406d92e91f0b311686a594ca4999fe4c5ff70bae5bb1273aee24f67bb7
-  data.tar.gz: 63b4f385a02dfb4ff71c286dc009e7d5414660b40bd75c3cc983cc931084ee9e
+  metadata.gz: 5e8639a81e55d83a36d03854f2c970737ee9754266e629ef2bad1d9e65c53826
+  data.tar.gz: '078928d80c10deb59f9a293fbd7135a2d9b4b52479809985b5c4cf9835332131'
 SHA512:
-  metadata.gz: 9d1565057faaf557dcf42a17051898a3d13fac378bbb539255bfa967dcc79fe524087b861b7f9ce849f8feee9ed3b8b093f6e052dbf089eb7f648a243be868eb
-  data.tar.gz: 11095d3c165dd9aac8146de4fffb57a61422904970547ba334597deeef269522ab1479e1422a0d2e0ae60ee97a8df608c1cfbb3268d3f8b1f44d806bcb77a8d6
+  metadata.gz: 1e2927b0dc2e87ba9ec5c64c8d0393a58624ce7e754183d556e1e165bb51fed61e0cac138a8e9bb9b46e2f97b74628ff75e2d24190fad30a68a1124d1425dee9
+  data.tar.gz: 23f2339b569cbe5f6237d1f23c89259153ac80c79830a02861ec740c5c077384a8794aadad4d462fca4d95e46c04e4b145aff09f1bf5d1bc89c1b8f44e38f805

data/bin/phraseapp_updater

@@ -14,6 +14,7 @@ class PhraseAppUpdaterCLI < Thor
   method_option :phraseapp_api_key,      type: :string, required: true, desc: 'PhraseApp API key.'
   method_option :phraseapp_project_name, type: :string, required: true, desc: 'Name for new PhraseApp project.'
   method_option :parent_commit,          type: :string, required: true, desc: 'git commit hash of initial locales'
+  method_option :remove_orphans,         type: :boolean, default: true, desc: 'Remove keys not in the uploaded default locale'
 
   def setup(locales_path)
     validate_readable_path!('locales', locales_path)
@@ -26,7 +27,7 @@ class PhraseAppUpdaterCLI < Thor
                  options[:parent_commit],
                  verbose: options[:verbose])
 
-      updater.upload_directory(locales_path)
+      updater.upload_directory(locales_path, remove_orphans: options[:remove_orphans])
 
       puts project_id
     end
@@ -104,6 +105,7 @@ class PhraseAppUpdaterCLI < Thor
   method_option :phraseapp_api_key,    type: :string, required: true, desc: 'PhraseApp API key.'
   method_option :phraseapp_project_id, type: :string, required: true, desc: 'PhraseApp project ID.'
   method_option :parent_commit,        type: :string, required: true, desc: 'git commit hash of locales being uploaded'
+  method_option :remove_orphans,       type: :boolean, default: true, desc: 'Remove keys not in the uploaded default locale'
 
   def upload(source_path)
     validate_readable_path!('source path', source_path)
@@ -115,7 +117,7 @@ class PhraseAppUpdaterCLI < Thor
         options[:file_format],
         verbose: options[:verbose])
 
-      updater.upload_directory(source_path)
+      updater.upload_directory(source_path, remove_orphans: options[:remove_orphans])
       updater.update_parent_commit(options[:parent_commit])
     end
   end
@@ -162,6 +164,23 @@ class PhraseAppUpdaterCLI < Thor
     end
   end
 
+  desc 'normalize <source_path> <destination_path>',
+       'Normalize the locale directory at <source_path> into <destination_path>.'
+
+  long_desc <<-LONGDESC
+    Read, normalize, then write out the locales in <source_path> into <destination_path>.
+  LONGDESC
+
+  def normalize(source_path, destination_path)
+    validate_readable_path!('source_path', source_path)
+    validate_writable_path!('destination_path', destination_path)
+
+    handle_errors do
+      updater = PhraseAppUpdater.new(nil, nil, options[:file_format], verbose: options[:verbose])
+      updater.normalize_directory(source_path, destination_path)
+    end
+  end
+
   desc 'merge <ancestor_path> <our_path> <their_path>',
        '3-way merge locale file directories <ancestor_path>, <our_path>, <their_path> into TO.'
 

data/lib/phraseapp_updater/locale_file/json_file.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'multi_json'
 require 'oj'
 
 # We're working with pure JSON, not

data/lib/phraseapp_updater/version.rb

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

data/lib/phraseapp_updater.rb

@@ -52,9 +52,9 @@ class PhraseAppUpdater
     write_locale_file(result, result_file)
   end
 
-  def upload_directory(path)
+  def upload_directory(path, remove_orphans: true)
     locales = load_locale_directory(path)
-    upload_locale_files(locales)
+    upload_locale_files(locales, remove_orphans: remove_orphans)
   end
 
   def download_to_directory(path)
@@ -62,6 +62,11 @@ class PhraseAppUpdater
     write_locale_directory(path, locale_files)
   end
 
+  def normalize_directory(source, destination)
+    locales = load_locale_directory(source)
+    write_locale_directory(destination, locales)
+  end
+
   def update_parent_commit(parent_commit)
     @phraseapp_api.update_parent_commit(parent_commit)
   end
@@ -98,7 +103,7 @@ class PhraseAppUpdater
     end
   end
 
-  def upload_locale_files(locale_files)
+  def upload_locale_files(locale_files, remove_orphans: true)
     # We assert that the default locale contains all legitimate strings, and so
     # we clean up orphaned content on PhraseApp post-upload by removing keys not
     # in the default locale.
@@ -109,8 +114,10 @@ class PhraseAppUpdater
     upload_ids = @phraseapp_api.upload_files(locale_files, default_locale: @default_locale)
     default_upload_id = upload_ids.fetch(@default_locale)
 
-    STDERR.puts "Removing keys not in default locale '#{@default_locale}' upload '#{default_upload_id}'"
-    @phraseapp_api.remove_keys_not_in_upload(default_upload_id)
+    if remove_orphans
+      STDERR.puts "Removing keys not in default locale '#{@default_locale}' upload '#{default_upload_id}'"
+      @phraseapp_api.remove_keys_not_in_upload(default_upload_id)
+    end
   end
 
   def download_locale_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: phrase
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.20.0
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -52,62 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '3.16'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,42 +114,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.14'
 description: A tool for merging data on PhraseApp with local changes (usually two
   git revisions)
 email:
@@ -207,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: A three-way differ for PhraseApp projects.