fastlane-plugin-wpmreleasetoolkit 1.0.1 → 1.1.0

data/lib/fastlane/plugin/wpmreleasetoolkit/actions/ios/ios_validate_ci_build.rb

@@ -2,8 +2,8 @@ module Fastlane
   module Actions
     class IosValidateCiBuildAction < Action
       def self.run(params)
-        require_relative '../../helper/ios/ios_git_helper.rb'
-        require_relative '../../helper/ios/ios_version_helper.rb'
+        require_relative '../../helper/ios/ios_git_helper'
+        require_relative '../../helper/ios/ios_version_helper'
 
         version = Fastlane::Helper::Ios::VersionHelper.get_public_version()
         head_tags = Fastlane::Helper::GitHelper.list_tags_on_current_commit()

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

@@ -91,7 +91,7 @@ module Fastlane
 
       def is_handler_for(key)
         values = key.split('_')
-        key.start_with?(@rel_note_key) && values.length == 3 && is_int?(values[2].sub(/^[0]*/, ''))
+        key.start_with?(@rel_note_key) && values.length == 3 && is_int?(values[2].sub(/^0*/, ''))
       end
 
       def handle_line(fw, line)
@@ -123,7 +123,7 @@ module Fastlane
       end
 
       def extract_key(line)
-        line.split(' ')[1].tr('\"', '')
+        line.split[1].tr('\"', '')
       end
 
       def is_int?(value)
@@ -141,7 +141,7 @@ module Fastlane
 
       def is_handler_for(key)
         values = key.split('_')
-        key.start_with?(@rel_note_key) && values.length == 4 && is_int?(values[3].sub(/^[0]*/, ''))
+        key.start_with?(@rel_note_key) && values.length == 4 && is_int?(values[3].sub(/^0*/, ''))
       end
 
       def generate_block(fw)

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

@@ -154,7 +154,7 @@ module Fastlane
         def self.verify_local_diff(main, library, main_strings, lib_strings)
           `git diff #{main}`.each_line do |line|
             if line.start_with?('+ ') || line.start_with?('- ')
-              diffs = line.gsub(/\s+/m, ' ').strip.split(' ')
+              diffs = line.gsub(/\s+/m, ' ').strip.split
               diffs.each do |diff|
                 verify_diff(diff, main_strings, lib_strings, library)
               end
@@ -165,7 +165,7 @@ module Fastlane
         def self.verify_pr_diff(main, library, main_strings, lib_strings, source_diff)
           source_diff.each_line do |line|
             if line.start_with?('+ ') || line.start_with?('- ')
-              diffs = line.gsub(/\s+/m, ' ').strip.split(' ')
+              diffs = line.gsub(/\s+/m, ' ').strip.split
               diffs.each do |diff|
                 verify_diff(diff, main_strings, lib_strings, library)
               end
@@ -299,6 +299,15 @@ module Fastlane
         #
         def self.apply_substitutions(tag)
           tag.content = tag.content.gsub('...', '…')
+
+          # Typography en-dash
+          if tag.content.include?('-')
+            tag.content = tag.content.gsub(/(\d+\s*)-(\s*\d+)/) do |str|
+              match = Regexp.last_match # of type `MatchData`. match[0] == str == whole match, match[1] = 1st capture group (left part of the range), match[2] = second capture group (right part of the range)
+              is_negative_number = match[2][0] != ' ' && match[1][-1] == ' ' # if right part of range does not start with a space (e.g. `-3`), but left part of range does end with space, it's not a range after all but more likely a list containing negative numbers in it (e.g. `2 -3`)
+              is_negative_number ? str : "#{match[1]}\u{2013}#{match[2]}"
+            end
+          end
         end
         private_class_method :apply_substitutions
 

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

@@ -377,10 +377,10 @@ module Fastlane
           found_section = false
           File.open(file_path, 'r') do |file|
             file.each_line do |line|
-              if !found_section
-                found_section = true if line.include?(section)
+              if found_section
+                return line.split[1] if line.include?(keyword) && !line.include?("\"#{keyword}\"") && !line.include?("P#{keyword}")
               else
-                return line.split(' ')[1] if line.include?(keyword) && !line.include?("\"#{keyword}\"") && !line.include?("P#{keyword}")
+                found_section = true if line.include?(section)
               end
             end
           end
@@ -442,24 +442,24 @@ module Fastlane
           version_updated = 0
           File.open(gradle_path, 'r') do |file|
             file.each_line do |line|
-              if !found_section
-                temp_file.puts line
-                found_section = true if line.include? section
-              else
+              if found_section
                 if version_updated < 2
                   if line.include?('versionName') && !line.include?('"versionName"') && !line.include?('PversionName')
-                    version_name = line.split(' ')[1].tr('\"', '')
+                    version_name = line.split[1].tr('\"', '')
                     line.sub!(version_name, version[VERSION_NAME].to_s)
                     version_updated = version_updated + 1
                   end
 
                   if line.include? 'versionCode'
-                    version_code = line.split(' ')[1]
+                    version_code = line.split[1]
                     line.sub!(version_code, version[VERSION_CODE].to_s)
                     version_updated = version_updated + 1
                   end
                 end
                 temp_file.puts line
+              else
+                temp_file.puts line
+                found_section = true if line.include? section
               end
             end
             file.close

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

@@ -80,7 +80,7 @@ module Fastlane
 
         Net::HTTP.start(command_uri.host, command_uri.port, use_ssl: true) do |http|
           request = Net::HTTP::Post.new(command_uri.request_uri, headers)
-          body = { "branch": branch, "parameters": parameters }
+          body = { branch: branch, parameters: parameters }
           request.body = body.to_json
           response = http.request(request)
           return response

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

@@ -187,7 +187,7 @@ module Fastlane
 
           if File.directory?(abs_path)
             Dir.glob("#{abs_path}**/*").map do |sub_path|
-              sub_path.gsub(repository_path + '/', '')
+              sub_path.gsub("#{repository_path}/", '')
             end
           else
             return path
@@ -230,7 +230,7 @@ module Fastlane
         end
 
         new_config = self.configuration
-        new_config.add_file_to_copy(params[:source], params[:destination], params[:encrypt])
+        new_config.add_file_to_copy(params[:source], params[:destination], encrypt: params[:encrypt])
         update_configuration(new_config)
       end
 

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

@@ -9,7 +9,7 @@ module Fastlane
       end
 
       def self.cipher(op_type)
-        cipher = OpenSSL::Cipher::AES256.new :CBC
+        cipher = OpenSSL::Cipher.new('aes-256-cbc')
 
         cipher.encrypt if op_type == OperationType::ENCRYPT
         cipher.decrypt if op_type == OperationType::DECRYPT

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

@@ -50,15 +50,13 @@ module Fastlane
 
         last_stone = nil
         milestones.each do |mile|
+          mile_vcomps = mile[:title].split[0].split('.')
           if last_stone.nil?
-            last_stone = mile unless mile[:title].split(' ')[0].split('.').length < 2
+            last_stone = mile unless mile_vcomps.length < 2
           else
             begin
-              if mile[:title].split(' ')[0].split('.')[0] > last_stone[:title].split(' ')[0].split('.')[0]
-                last_stone = mile
-              elsif mile[:title].split(' ')[0].split('.')[1] > last_stone[:title].split(' ')[0].split('.')[1]
-                last_stone = mile
-              end
+              last_vcomps = last_stone[:title].split[0].split('.')
+              last_stone = mile if mile_vcomps[0] > last_vcomps[0] || mile_vcomps[1] > last_vcomps[1]
             rescue StandardError
               puts 'Found invalid milestone'
             end

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

@@ -30,7 +30,7 @@ module Fastlane
             print "Fetching info for: #{v.version_string.rjust(8)} (#{v.build.version.rjust(11)}) [#{idx.to_s.rjust(3)}/#{versions.count}]\r"
             Spaceship::Tunes.client.build_details(app_id: app.id, train: v.version_string, build_number: v.build.version, platform: 'ios') rescue nil
           end.compact.reverse
-          print(' ' * 55 + "\n")
+          print("#{' ' * 55}\n")
 
           builds_details
         end
@@ -40,12 +40,12 @@ module Fastlane
         end
 
         def self.sz_mb(bytes)
-          sz(bytes).to_s.rjust(5) + ' MB'
+          "#{sz(bytes).to_s.rjust(5)} MB"
         end
 
         def self.format_csv(app_sizes, devices: nil)
           devices = DEFAULT_DEVICES if devices.nil? || devices.empty?
-          csv = "Version\t" + devices.join("\t") + "\n"
+          csv = "Version\t#{devices.join("\t")}\n"
           app_sizes.each do |details|
             build_number = details['cfBundleVersion']
             sizes = details['sizesInBytes'].select { |name, _| devices.include?(name) }

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

@@ -9,8 +9,7 @@ module Fastlane
         DEFAULT_BASE_LANG = 'en'
         CONFIG_FILE_NAME = 'swiftgen-stringtypes.yml'
 
-        attr_reader :install_path
-        attr_reader :version
+        attr_reader :install_path, :version
 
         # @param [String] install_path The path to install SwiftGen to. Usually something like "$PROJECT_DIR/vendor/swiftgen/#{SWIFTGEN_VERSION}".
         #        It's recommended to provide an absolute path here rather than a relative one, to ensure it's not dependant on where the action is run from.
@@ -175,7 +174,7 @@ module Fastlane
             # Run diffs
             base_file = sort_file_lines!(tmpdir, base_lang)
             langs.delete(base_lang)
-            return Hash[langs.map do |lang|
+            return langs.map do |lang|
               file = sort_file_lines!(tmpdir, lang)
               # If the lang ends up not having any translation at all (e.g. a `.lproj` without any `.strings` file in it but maybe just a storyboard or assets catalog), ignore it
               next nil if file.nil? || only_empty_lines?(file)
@@ -189,7 +188,7 @@ module Fastlane
               #       file instead, but they can still give an indication at the index in the list of keys at which this difference is located.
               diff.gsub!(/^(---|\+\+\+).*\n/, '')
               diff.empty? ? nil : [lang, diff]
-            end.compact]
+            end.compact.to_h
           end
         end
 

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

@@ -127,7 +127,7 @@ module Fastlane
       end
 
       def extract_key(line)
-        line.split(' ')[1].tr('\"', '')
+        line.split[1].tr('\"', '')
       end
     end
 

data/lib/fastlane/plugin/wpmreleasetoolkit/models/configuration.rb

@@ -1,5 +1,5 @@
 require 'json'
-require_relative 'file_reference.rb'
+require_relative 'file_reference'
 
 module Fastlane
   class Configuration
@@ -22,7 +22,7 @@ module Fastlane
       File.write(path, JSON.pretty_generate(to_hash))
     end
 
-    def add_file_to_copy(source, destination, encrypt = false)
+    def add_file_to_copy(source, destination, encrypt: false)
       file = FileReference.new(file: source, destination: destination, encrypt: encrypt)
       self.files_to_copy << file
     end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-wpmreleasetoolkit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Lorenzo Mattei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -384,6 +384,7 @@ files:
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_tag_build.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_update_metadata.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_update_release_notes.rb
+- lib/fastlane/plugin/wpmreleasetoolkit/actions/common/check_for_toolkit_updates_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/circleci_trigger_job_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/close_milestone_action.rb
 - lib/fastlane/plugin/wpmreleasetoolkit/actions/common/create_new_milestone_action.rb
@@ -462,7 +463,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="