fastlane-plugin-wpmreleasetoolkit 13.5.2 → 13.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b2482314dd0f766ed17163b49308b9054982c3e85bcf017310611e53d43155c
-  data.tar.gz: b942e2a2c4d0778420d2f15ec35d6a8b9f2718d237bb687aeb5ee6b6cdae86e1
+  metadata.gz: 46149eab0c077a2b31f02f27b4ef5ea3bc5f485835ef1e8b0e63546e40523e7a
+  data.tar.gz: 1870bc699234b49685901b4f324feb284c34a5ff8ac652212d3e4cb9c141a8d3
 SHA512:
-  metadata.gz: c033a332896e9151be106d316960beecb8f275bfa14865ff716e663508318ef29240ee668507436337e8a16bb80ef296ae31abb7ca774597f1f3ea014c123489
-  data.tar.gz: 4120e9a3d1c7974959b6c2a6b950ec827ea23c524535fb754c2c9130f95395f65f0ca202adb9fc93e5c94f36b34212512dc389022ea487d2e31b726991484a7d
+  metadata.gz: 5117ff6981b4893f78986ddf61674fc690b82bfe6d1ab3bef3d540656cc09c074b53edaeaaac5aa65b98a9a4e7dadf3c5f8d47efb0df840ceb86d05609f3fae5
+  data.tar.gz: 422c053f58a84609d4597367eff41c00408dd246aa11a5150fc8266ef34bb3192f711700f82c96213f2b0cac46b56dacc8a90ec6b8b5f17515f81395f19ef7da

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_localize_helper.rb

@@ -4,6 +4,7 @@ require 'fastlane_core/ui/ui'
 require 'fileutils'
 require 'nokogiri'
 require 'open-uri'
+require_relative '../glotpress_downloader'
 
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?('UI')
@@ -285,17 +286,15 @@ module Fastlane
         #
         def self.download_glotpress_export_file(project_url:, locale:, filters:)
           query_params = filters.transform_keys { |k| "filters[#{k}]" }.merge(format: 'android')
-          uri = URI.parse("#{project_url.chomp('/')}/#{locale}/default/export-translations/?#{URI.encode_www_form(query_params)}")
-
-          # Set an unambiguous User Agent so GlotPress won't rate-limit us
-          options = { 'User-Agent' => Wpmreleasetoolkit::USER_AGENT }
-
-          begin
-            uri.open(options) { |f| Nokogiri::XML(f.read.gsub("\t", '    '), nil, Encoding::UTF_8.to_s) }
-          rescue StandardError => e
-            UI.error "Error downloading #{locale} - #{e.message}"
-            retry if e.is_a?(OpenURI::HTTPError) && UI.confirm("Retry downloading `#{locale}`?")
-            nil
+          url = "#{project_url.chomp('/')}/#{locale}/default/export-translations/?#{URI.encode_www_form(query_params)}"
+
+          Fastlane::Helper::GlotPressDownloader.download(
+            url: url,
+            locale: locale,
+            auto_retry: true
+          ) do |response_body|
+            # Replace tabs with spaces (GlotPress uses tabs, but we prefer spaces)
+            Nokogiri::XML(response_body.gsub("\t", '    '), nil, Encoding::UTF_8.to_s)
           end
         end
         private_class_method :download_glotpress_export_file

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_downloader.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'uri'
+
+module Fastlane
+  module Helper
+    # A helper class to download files from GlotPress with proper error handling and retry mechanism
+    class GlotPressDownloader
+      AUTO_RETRY_SLEEP_TIME = 20
+      MAX_AUTO_RETRY_ATTEMPTS = 30
+
+      attr_reader :auto_retry, :auto_retry_attempt_counter, :url, :locale
+
+      # Initialize a new GlotPressDownloader
+      #
+      # @param [String] url The URL to download from
+      # @param [String] locale The locale being downloaded (for logging purposes)
+      # @param [Boolean] auto_retry Whether to automatically retry on rate limiting (429 errors)
+      #
+      def initialize(url:, locale:, auto_retry: false)
+        @url = url
+        @locale = locale
+        @auto_retry = auto_retry
+        @auto_retry_attempt_counter = 0
+      end
+
+      # Convenience class method to download in a single call
+      #
+      # @param [String] url The URL to download from
+      # @param [String] locale The locale being downloaded (for logging purposes)
+      # @param [Boolean] auto_retry Whether to automatically retry on rate limiting (429 errors)
+      # @yield [String] The response body if the download was successful
+      # @return The result of the block if provided, or true/false indicating success if no block provided
+      #
+      #
+      def self.download(url:, locale:, auto_retry: false, &)
+        new(url: url, locale: locale, auto_retry: auto_retry).download(&)
+      end
+
+      # Downloads data from GlotPress
+      #
+      # @yield [String] The response body if the download was successful
+      # @return The result of the block if provided, or true/false indicating success if no block provided
+      #
+      def download(&)
+        @auto_retry_attempt_counter = 0 # Reset counter only at start of download
+        download_from_url(@url, &)
+      end
+
+      private
+
+      def download_from_url(url, &)
+        uri = URI(url)
+        response = make_request(uri)
+        result = nil
+        success = handle_response(response: response, url: url, original_uri: uri) do |body|
+          result = yield body if block_given?
+        end
+        block_given? ? result : success
+      end
+
+      def make_request(uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = (uri.scheme == 'https')
+        request = Net::HTTP::Get.new(uri.request_uri)
+        request['User-Agent'] = Wpmreleasetoolkit::USER_AGENT
+        http.request(request)
+      rescue StandardError => e
+        # Network errors, connection errors, etc.
+        UI.error("Error downloading locale `#{@locale}` — #{e.message} (#{uri})")
+        retry if UI.interactive? && UI.confirm("Retry downloading `#{@locale}`?")
+        nil
+      end
+
+      def handle_response(response:, url:, original_uri:)
+        return false if response.nil?
+
+        case response.code
+        when '200'
+          UI.success("Successfully downloaded `#{@locale}`.")
+          yield response.body if block_given?
+          true
+        when '301', '302', '307', '308'
+          # Follow the redirect
+          UI.message("Received #{response.code} for `#{@locale}`. Following redirect...")
+          redirect_url = response['location']
+          if redirect_url.nil?
+            UI.error("Received #{response.code} but no location header found.")
+            false
+          else
+            # Follow redirect with the new URL
+            download_from_url(redirect_url) { |body| yield body if block_given? }
+          end
+        when '429'
+          # Rate limited
+          handle_rate_limiting(url: url) do |body|
+            yield body if block_given?
+          end
+        else
+          # Unexpected status code (including 404, 500, etc.)
+          status_line = "#{response.code} #{response.message}"
+          UI.error("Error downloading locale `#{@locale}` — #{status_line} (#{original_uri})")
+          if UI.interactive? && UI.confirm("Retry downloading `#{@locale}`?")
+            download_from_url(url) { |body| yield body if block_given? }
+          else
+            false
+          end
+        end
+      end
+
+      def handle_rate_limiting(url:)
+        if @auto_retry && @auto_retry_attempt_counter < MAX_AUTO_RETRY_ATTEMPTS
+          UI.message("Received 429 for `#{@locale}`. Auto retrying in #{AUTO_RETRY_SLEEP_TIME} seconds... (attempt #{@auto_retry_attempt_counter + 1}/#{MAX_AUTO_RETRY_ATTEMPTS})")
+          sleep(AUTO_RETRY_SLEEP_TIME)
+          @auto_retry_attempt_counter += 1
+          download_from_url(url) { |body| yield body if block_given? }
+        elsif UI.interactive? && UI.confirm("Retry downloading `#{@locale}` after receiving 429 from the API?")
+          download_from_url(url) { |body| yield body if block_given? }
+        else
+          UI.error("Abandoning `#{@locale}` download.")
+          false
+        end
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_l10n_helper.rb

@@ -6,6 +6,7 @@ require 'nokogiri'
 require 'open3'
 require 'open-uri'
 require 'tempfile'
+require_relative '../glotpress_downloader'
 
 module Fastlane
   module Helper
@@ -165,16 +166,22 @@ module Fastlane
         #
         def self.download_glotpress_export_file(project_url:, locale:, filters:, destination:)
           query_params = (filters || {}).transform_keys { |k| "filters[#{k}]" }.merge(format: 'strings')
-          uri = URI.parse("#{project_url.chomp('/')}/#{locale}/default/export-translations/?#{URI.encode_www_form(query_params)}")
-
-          # Set an unambiguous User Agent so GlotPress won't rate-limit us
-          options = { 'User-Agent' => Wpmreleasetoolkit::USER_AGENT }
+          url = "#{project_url.chomp('/')}/#{locale}/default/export-translations/?#{URI.encode_www_form(query_params)}"
 
           begin
-            IO.copy_stream(uri.open(options), destination)
+            Fastlane::Helper::GlotPressDownloader.download(
+              url: url,
+              locale: locale,
+              auto_retry: true
+            ) do |response_body|
+              if destination.is_a?(String)
+                File.write(destination, response_body)
+              else
+                destination.write(response_body)
+              end
+            end
           rescue StandardError => e
-            UI.error "Error downloading locale `#{locale}` — #{e.message} (#{uri})"
-            retry if e.is_a?(OpenURI::HTTPError) && UI.confirm("Retry downloading `#{locale}`?")
+            UI.error "Error downloading locale `#{locale}` — #{e.message} (#{url})"
             nil
           end
         end

data/lib/fastlane/plugin/wpmreleasetoolkit/helper/metadata_download_helper.rb

@@ -2,13 +2,11 @@
 
 require 'net/http'
 require 'json'
+require_relative 'glotpress_downloader'
 
 module Fastlane
   module Helper
     class MetadataDownloader
-      AUTO_RETRY_SLEEP_TIME = 20
-      MAX_AUTO_RETRY_ATTEMPTS = 30
-
       attr_reader :target_folder, :target_files
 
       def initialize(target_folder, target_files, auto_retry)
@@ -16,14 +14,17 @@ module Fastlane
         @target_files = target_files
         @auto_retry = auto_retry
         @alternates = {}
-        @auto_retry_attempt_counter = 0
       end
 
       # Downloads data from GlotPress, in JSON format
       def download(target_locale, glotpress_url, is_source)
-        uri = URI(glotpress_url)
-        response = Net::HTTP.get_response(uri)
-        handle_glotpress_download(response: response, locale: target_locale, is_source: is_source)
+        GlotPressDownloader.download(
+          url: glotpress_url,
+          locale: target_locale,
+          auto_retry: @auto_retry
+        ) do |response_body|
+          handle_glotpress_response(response_body: response_body, locale: target_locale, is_source: is_source)
+        end
       end
 
       # Parse JSON data and update the local files
@@ -105,39 +106,16 @@ module Fastlane
 
       private
 
-      def handle_glotpress_download(response:, locale:, is_source:)
-        case response.code
-        when '200'
-          # All good, parse the result
-          UI.success("Successfully downloaded `#{locale}`.")
-          @alternates.clear
-          loc_data = begin
-            JSON.parse(response.body)
-          rescue StandardError
-            loc_data = nil
-          end
-          parse_data(locale, loc_data, is_source)
-          reparse_alternates(target_locale, loc_data, is_source) unless @alternates.empty?
-        when '301'
-          # Follow the redirect
-          UI.message("Received 301 for `#{locale}`. Following redirect...")
-          download(locale, response.header['location'], is_source)
-        when '429'
-          # We got rate-limited, auto_retry or offer to try again with a prompt
-          if @auto_retry && @auto_retry_attempt_counter <= MAX_AUTO_RETRY_ATTEMPTS
-            UI.message("Received 429 for `#{locale}`. Auto retrying in #{AUTO_RETRY_SLEEP_TIME} seconds...")
-            sleep(AUTO_RETRY_SLEEP_TIME)
-            @auto_retry_attempt_counter += 1
-            download(locale, response.uri, is_source)
-          elsif UI.confirm("Retry downloading `#{locale}` after receiving 429 from the API?")
-            download(locale, response.uri, is_source)
-          else
-            UI.error("Abandoning `#{locale}` download as requested.")
-          end
-        else
-          message = "Received unexpected #{response.code} from request to URI #{response.uri}."
-          UI.abort_with_message!(message) unless UI.confirm("#{message} Continue anyway?")
+      def handle_glotpress_response(response_body:, locale:, is_source:)
+        # Parse the JSON response
+        @alternates.clear
+        loc_data = begin
+          JSON.parse(response_body)
+        rescue StandardError
+          nil
         end
+        parse_data(locale, loc_data, is_source)
+        reparse_alternates(locale, loc_data, is_source) unless @alternates.empty?
       end
     end
   end

data/lib/fastlane/plugin/wpmreleasetoolkit/version.rb

@@ -2,6 +2,6 @@
 
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '13.5.2'
+    VERSION = '13.5.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 13.5.2
+  version: 13.5.3
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-14 00:00:00.000000000 Z
+date: 2025-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -465,6 +465,7 @@ files:
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/filesystem_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/github_helper.rb
+- lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_downloader.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/glotpress_helper.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/interactive_prompt_reminder.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/helper/ios/ios_adc_app_sizes_helper.rb