phraseapp_updater 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d137755330d9711327e6731a7b4ae1fc701ec705ce719055bca7479dcd3579a
-  data.tar.gz: ab2839920b873ed264759eadf926d6b9df837b511b163f1f18e4ef777bcfc820
+  metadata.gz: b44812204928f9576633c2d59bd8c4deb220cdd70e7cfb2f52cdc059368b7b8a
+  data.tar.gz: 13e282dcfc436150b6edecf384ae6b54c4133c8cb19a73bd5f723fe90bbb923b
 SHA512:
-  metadata.gz: afe9e8266f248e39c52095a762a64a9e1823bf94f825a4cbe7d166946892cd1c171252d2218b3dce0c47c6dd6e4cfe224c826a5ffea812d8f3011f07991c5034
-  data.tar.gz: ba81fe027f6016fc759e72b5cf27c88e1c31ca7e08e1580dd4c5b110ecaa83dcd6f603ec686978b21071fbb5bc9e02e5967e32a1a102612a5a16448094c3158a
+  metadata.gz: 5bd3fe2ab57e511236b31902d21d31d3e80d2e07029c1c7f2d52c4983bf263d5839ab85a6eef904967f6560f387af4312170d3032307b73a2456a816ef97f59b
+  data.tar.gz: c0d4677afd153d1b8f0aa95d0f58bb2b1c1568abd6ee68b646610316c8cd7f28a82e0670e5302d6e39c4f4543a025fa867f4850e05922892d22276b5ba771f11

data/lib/phraseapp_updater/phraseapp_api.rb

@@ -151,7 +151,7 @@ class PhraseAppUpdater
     # Return a map of locale name to upload id.
     def verify_uploads(uploads)
       successful_upload_ids = Concurrent::Hash.new
-
+      attempts = 1
       STDERR.puts('Verifying uploads...')
       until uploads.empty?
         threaded_request(uploads.to_a) do |upload_id, locale_file|
@@ -174,7 +174,12 @@ class PhraseAppUpdater
           end
         end
 
-        sleep(2) unless uploads.empty?
+        unless uploads.empty?
+          delay = attempts ** 1.6 + 1
+          STDERR.puts("#{uploads.size} remaining, waiting #{delay.round} seconds...")
+          sleep(delay)
+          attempts += 1
+        end
       end
 
       successful_upload_ids
@@ -233,17 +238,30 @@ class PhraseAppUpdater
       phraseapp_request(Phrase::TagsApi,:tag_create, @project_id, params)
     end
 
-    def wrap_phrase_errors
-      yield
-    rescue Phrase::ApiError => e
-      if e.code == 401
-        raise BadAPIKeyError.new(e)
-      elsif e.message.match?(/not found/)
-        raise BadProjectIDError.new(e, @project_id)
-      elsif e.message.match?(/has already been taken/)
-        raise ProjectNameTakenError.new(e)
-      else
-        raise
+    def wrap_phrase_errors(retries: 10)
+      begin
+        yield
+      rescue Phrase::ApiError => e
+        if e.code == 401
+          raise BadAPIKeyError.new(e)
+        elsif e.code == 429
+          # If we bail mid-sync, it can be expensive to recover from a partial
+          # merge. Instead, aggressively try to retry.
+          if retries >= 0
+            retries -= 1
+            STDERR.puts('Rate limited, retrying in 5...')
+            sleep(5)
+            retry
+          end
+
+          raise RateLimitError.new(e)
+        elsif e.message.match?(/not found/)
+          raise BadProjectIDError.new(e, @project_id)
+        elsif e.message.match?(/has already been taken/)
+          raise ProjectNameTakenError.new(e)
+        else
+          raise
+        end
       end
     end
 
@@ -348,5 +366,11 @@ class PhraseAppUpdater
         super(original_error.message)
       end
     end
+
+    class RateLimitError < RuntimeError
+      def initialize(original_error)
+        super(original_error.message)
+      end
+    end
   end
 end

data/lib/phraseapp_updater/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - iKnow Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -192,7 +192,7 @@ homepage: https://github.com/iknow/phraseapp_updater
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A three-way differ for PhraseApp projects.
 test_files: []