fastlane 2.164.0 → 2.169.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cdb3738f1c646ea1cbff438e63895c5001d876fb9aeb585c1750ee61cbd86a4
-  data.tar.gz: e19bd6d624de20687b690df55a2f906a69eecc9ea2ee45bf6ad6b58eb64c468c
+  metadata.gz: 89942043b1528ca3c3eff8b253e5c13a8fe910178b1670a553197f27260bb7d5
+  data.tar.gz: 476dffe7ef2b50121441191673e20041e4c91cdb8eecc5e1928a9f02930538b0
 SHA512:
-  metadata.gz: da9f5620643df9f24fbded5fe29445ad72c9601d7c370a8092d1874ab22f629389fc9c43cbed71a8fa27667d91c425aa1666a581bbd2f1b34578dc0067ba4684
-  data.tar.gz: a62090282896c1d8c65b2c789067a82f09f60089bc4fc963c104d4bfae0ef2d89e859484e744fd3e92e49f804c0d8cd5f315c6d5f392cd7bb1ee18f34efae631
+  metadata.gz: 26f4595813c6d3bdea582beabb32f4824b170dc660cf576d01aa1e6c696781e7538c6740bf09246f492ed06ac05a15db5eb0de88e21ccc07ed00e24b373c9380
+  data.tar.gz: e711d070232cecbcb7749c47c0fa6ac72e19b137753856c39de6739a55fd6159d4943575f784eb06070e12ba2d02ba5aea478481b48be8b9561a360e0756fa27

data/README.md

@@ -34,61 +34,49 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 <!-- This table is regenerated and resorted on each release -->
 <table id='team'>
 <tr>
-<td id='stefan-natchev'>
-<a href='https://github.com/snatchev'>
-<img src='https://github.com/snatchev.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
-</td>
-<td id='olivier-halligon'>
-<a href='https://github.com/AliSoftware'>
-<img src='https://github.com/AliSoftware.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
-</td>
-<td id='luka-mirosevic'>
-<a href='https://github.com/lmirosevic'>
-<img src='https://github.com/lmirosevic.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
-</td>
-<td id='joshua-liebowitz'>
-<a href='https://github.com/taquitos'>
-<img src='https://github.com/taquitos.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
-</td>
-<td id='manu-wallner'>
-<a href='https://github.com/milch'>
-<img src='https://github.com/milch.png?size=140'>
+<td id='josh-holtz'>
+<a href='https://github.com/joshdholtz'>
+<img src='https://github.com/joshdholtz.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
+<h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
 </td>
-</tr>
-<tr>
 <td id='maksym-grebenets'>
 <a href='https://github.com/mgrebenets'>
 <img src='https://github.com/mgrebenets.png?size=140'>
 </a>
 <h4 align='center'><a href='https://twitter.com/mgrebenets'>Maksym Grebenets</a></h4>
 </td>
+<td id='matthew-ellis'>
+<a href='https://github.com/matthewellis'>
+<img src='https://github.com/matthewellis.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
+</td>
+<td id='aaron-brager'>
+<a href='https://github.com/getaaron'>
+<img src='https://github.com/getaaron.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
+</td>
 <td id='jorge-revuelta-h'>
 <a href='https://github.com/minuscorp'>
 <img src='https://github.com/minuscorp.png?size=140'>
 </a>
 <h4 align='center'><a href='https://twitter.com/minuscorp'>Jorge Revuelta H</a></h4>
 </td>
+</tr>
+<tr>
 <td id='jan-piotrowski'>
 <a href='https://github.com/janpio'>
 <img src='https://github.com/janpio.png?size=140'>
 </a>
 <h4 align='center'><a href='https://twitter.com/Sujan'>Jan Piotrowski</a></h4>
 </td>
-<td id='helmut-januschka'>
-<a href='https://github.com/hjanuschka'>
-<img src='https://github.com/hjanuschka.png?size=140'>
+<td id='kohki-miki'>
+<a href='https://github.com/giginet'>
+<img src='https://github.com/giginet.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
+<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
 </td>
 <td id='max-ott'>
 <a href='https://github.com/max-ott'>
@@ -96,83 +84,95 @@ If the above doesn't help, please [submit an issue](https://github.com/fastlane/
 </a>
 <h4 align='center'><a href='https://twitter.com/ott_max'>Max Ott</a></h4>
 </td>
+<td id='iulian-onofrei'>
+<a href='https://github.com/revolter'>
+<img src='https://github.com/revolter.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
+</td>
+<td id='fumiya-nakamura'>
+<a href='https://github.com/nafu'>
+<img src='https://github.com/nafu.png?size=140'>
+</a>
+<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
+</td>
 </tr>
 <tr>
-<td id='matthew-ellis'>
-<a href='https://github.com/matthewellis'>
-<img src='https://github.com/matthewellis.png?size=140'>
+<td id='felix-krause'>
+<a href='https://github.com/KrauseFx'>
+<img src='https://github.com/KrauseFx.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/mellis1995'>Matthew Ellis</a></h4>
+<h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
 </td>
-<td id='aaron-brager'>
-<a href='https://github.com/getaaron'>
-<img src='https://github.com/getaaron.png?size=140'>
+<td id='daniel-jankowski'>
+<a href='https://github.com/mollyIV'>
+<img src='https://github.com/mollyIV.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/getaaron'>Aaron Brager</a></h4>
+<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
 </td>
-<td id='josh-holtz'>
-<a href='https://github.com/joshdholtz'>
-<img src='https://github.com/joshdholtz.png?size=140'>
+<td id='manu-wallner'>
+<a href='https://github.com/milch'>
+<img src='https://github.com/milch.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/joshdholtz'>Josh Holtz</a></h4>
+<h4 align='center'><a href='https://twitter.com/acrooow'>Manu Wallner</a></h4>
 </td>
-<td id='jimmy-dee'>
-<a href='https://github.com/jdee'>
-<img src='https://github.com/jdee.png?size=140'>
+<td id='helmut-januschka'>
+<a href='https://github.com/hjanuschka'>
+<img src='https://github.com/hjanuschka.png?size=140'>
 </a>
-<h4 align='center'>Jimmy Dee</h4>
+<h4 align='center'><a href='https://twitter.com/hjanuschka'>Helmut Januschka</a></h4>
 </td>
-<td id='jérôme-lacoste'>
-<a href='https://github.com/lacostej'>
-<img src='https://github.com/lacostej.png?size=140'>
+<td id='danielle-tomlinson'>
+<a href='https://github.com/endocrimes'>
+<img src='https://github.com/endocrimes.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
+<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
 </td>
 </tr>
 <tr>
-<td id='daniel-jankowski'>
-<a href='https://github.com/mollyIV'>
-<img src='https://github.com/mollyIV.png?size=140'>
-</a>
-<h4 align='center'><a href='https://twitter.com/mollyIV'>Daniel Jankowski</a></h4>
-</td>
 <td id='andrew-mcburney'>
 <a href='https://github.com/armcburney'>
 <img src='https://github.com/armcburney.png?size=140'>
 </a>
 <h4 align='center'><a href='https://twitter.com/armcburney'>Andrew McBurney</a></h4>
 </td>
-<td id='kohki-miki'>
-<a href='https://github.com/giginet'>
-<img src='https://github.com/giginet.png?size=140'>
+<td id='jérôme-lacoste'>
+<a href='https://github.com/lacostej'>
+<img src='https://github.com/lacostej.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/giginet'>Kohki Miki</a></h4>
+<h4 align='center'><a href='https://twitter.com/lacostej'>Jérôme Lacoste</a></h4>
 </td>
-<td id='danielle-tomlinson'>
-<a href='https://github.com/endocrimes'>
-<img src='https://github.com/endocrimes.png?size=140'>
+<td id='stefan-natchev'>
+<a href='https://github.com/snatchev'>
+<img src='https://github.com/snatchev.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/endocrimes'>Danielle Tomlinson</a></h4>
+<h4 align='center'><a href='https://twitter.com/snatchev'>Stefan Natchev</a></h4>
 </td>
-<td id='iulian-onofrei'>
-<a href='https://github.com/revolter'>
-<img src='https://github.com/revolter.png?size=140'>
+<td id='joshua-liebowitz'>
+<a href='https://github.com/taquitos'>
+<img src='https://github.com/taquitos.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/Revolt666'>Iulian Onofrei</a></h4>
+<h4 align='center'><a href='https://twitter.com/taquitos'>Joshua Liebowitz</a></h4>
+</td>
+<td id='jimmy-dee'>
+<a href='https://github.com/jdee'>
+<img src='https://github.com/jdee.png?size=140'>
+</a>
+<h4 align='center'>Jimmy Dee</h4>
 </td>
 </tr>
 <tr>
-<td id='fumiya-nakamura'>
-<a href='https://github.com/nafu'>
-<img src='https://github.com/nafu.png?size=140'>
+<td id='olivier-halligon'>
+<a href='https://github.com/AliSoftware'>
+<img src='https://github.com/AliSoftware.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/nafu003'>Fumiya Nakamura</a></h4>
+<h4 align='center'><a href='https://twitter.com/aligatr'>Olivier Halligon</a></h4>
 </td>
-<td id='felix-krause'>
-<a href='https://github.com/KrauseFx'>
-<img src='https://github.com/KrauseFx.png?size=140'>
+<td id='luka-mirosevic'>
+<a href='https://github.com/lmirosevic'>
+<img src='https://github.com/lmirosevic.png?size=140'>
 </a>
-<h4 align='center'><a href='https://twitter.com/KrauseFx'>Felix Krause</a></h4>
+<h4 align='center'><a href='https://twitter.com/lmirosevic'>Luka Mirosevic</a></h4>
 </td>
 </table>
 

data/cert/lib/cert/options.rb

@@ -109,7 +109,7 @@ module Cert
                                      short_option: "-p",
                                      env_name: "CERT_KEYCHAIN_PASSWORD",
                                      sensitive: true,
-                                     description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your account password",
+                                     description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your macOS account password",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :skip_set_partition_list,
                                      short_option: "-P",
@@ -119,11 +119,11 @@ module Cert
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :platform,
                                      env_name: "CERT_PLATFORM",
-                                     description: "Set the provisioning profile's platform (ios, macos)",
+                                     description: "Set the provisioning profile's platform (ios, macos, tvos)",
                                      default_value: "ios",
                                      verify_block: proc do |value|
                                        value = value.to_s
-                                       pt = %w(macos ios)
+                                       pt = %w(macos ios tvos)
                                        UI.user_error!("Unsupported platform, must be: #{pt}") unless pt.include?(value)
                                      end)
       ]

data/cert/lib/cert/runner.rb

@@ -190,7 +190,7 @@ module Cert
       begin
         certificate = Spaceship::ConnectAPI::Certificate.create(
           certificate_type: certificate_type,
-          csr_content: csr
+          csr_content: csr.to_pem
         )
       rescue => ex
         type_name = (Cert.config[:development] ? "Development" : "Distribution")
@@ -232,7 +232,7 @@ module Cert
       cert_name = "#{cert_name}.cer" unless File.extname(cert_name) == ".cer"
       path = File.expand_path(File.join(Cert.config[:output_path], cert_name))
       raw_data = Base64.decode64(certificate.certificate_content)
-      File.write(path, raw_data)
+      File.write(path, raw_data.force_encoding("UTF-8"))
       return path
     end
   end

data/deliver/lib/deliver/app_screenshot.rb

@@ -187,7 +187,9 @@ module Deliver
       return {
         ScreenSize::IOS_65_MESSAGES => [
           [1242, 2688],
-          [2688, 1242]
+          [2688, 1242],
+          [1284, 2778],
+          [2778, 1284]
         ],
         ScreenSize::IOS_61_MESSAGES => [
           [828, 1792],
@@ -243,7 +245,9 @@ module Deliver
       return {
         ScreenSize::IOS_65 => [
           [1242, 2688],
-          [2688, 1242]
+          [2688, 1242],
+          [1284, 2778],
+          [2778, 1284]
         ],
         ScreenSize::IOS_61 => [
           [828, 1792],

data/deliver/lib/deliver/loader.rb

@@ -2,6 +2,7 @@ require 'fastlane_core/languages'
 require 'spaceship/tunes/tunes'
 
 require_relative 'module'
+require_relative 'app_screenshot'
 require_relative 'upload_metadata'
 require_relative 'languages'
 
@@ -13,6 +14,7 @@ module Deliver
     IMESSAGE_DIR_NAME = "iMessage".freeze
     DEFAULT_DIR_NAME = "default".freeze
 
+    EXPANDABLE_DIR_NAMES = [APPLE_TV_DIR_NAME, IMESSAGE_DIR_NAME].freeze
     SPECIAL_DIR_NAMES = [APPLE_TV_DIR_NAME, IMESSAGE_DIR_NAME, DEFAULT_DIR_NAME].freeze
 
     # Some exception directories may exist from other actions that should not be iterated through
@@ -20,35 +22,151 @@ module Deliver
     FRAMEIT_FONTS_DIR_NAME = "fonts".freeze
     META_DIR_NAMES = UploadMetadata::ALL_META_SUB_DIRS.map(&:downcase)
 
-    EXCEPTION_DIRECTORIES =  (META_DIR_NAMES << SUPPLY_DIR_NAME << FRAMEIT_FONTS_DIR_NAME).freeze
+    EXCEPTION_DIRECTORIES = (META_DIR_NAMES << SUPPLY_DIR_NAME << FRAMEIT_FONTS_DIR_NAME).freeze
 
-    def self.language_folders(root, ignore_validation)
-      folders = Dir.glob(File.join(root, '*'))
+    # A class that represents language folder under screenshots or metadata folder
+    class LanguageFolder
+      attr_reader :path
+
+      # @return [String] A normalized language name that corresponds to the directory's name
+      attr_reader :language
+
+      def self.available_languages
+        # 2020-08-24 - Available locales are not available as an endpoint in App Store Connect
+        # Update with Spaceship::Tunes.client.available_languages.sort (as long as endpoint is avilable)
+        Deliver::Languages::ALL_LANGUAGES
+      end
+
+      def self.allowed_directory_names_with_case
+        available_languages + SPECIAL_DIR_NAMES
+      end
+
+      # @param path [String] A directory path otherwise this initializer fails
+      # @param nested [Boolan] Whether given path is nested of another special directory.
+      #  This affects `expandable?` to return `false` when this set to `true`.
+      def initialize(path, nested: false)
+        raise(ArgumentError, "Given path must be a directory path - #{path}") unless File.directory?(path)
+        @path = path
+        @language = self.class.available_languages.find { |lang| basename.casecmp?(lang) }
+        @nested = nested
+      end
+
+      def nested?
+        @nested
+      end
+
+      def valid?
+        self.class.allowed_directory_names_with_case.any? { |name| name.casecmp?(basename) }
+      end
+
+      def expandable?
+        !nested? && EXPANDABLE_DIR_NAMES.any? { |name| name.casecmp?(basename) }
+      end
+
+      def skip?
+        EXCEPTION_DIRECTORIES.map(&:downcase).include?(basename.downcase)
+      end
+
+      def file_paths(extensions = '{png,jpg,jpeg}')
+        Dir.glob(File.join(path, "*.#{extensions}"), File::FNM_CASEFOLD).sort
+      end
 
-      # 2020-08-24 - Available locales are not available as an endpoint in App Store Connect
-      # Update with Spaceship::Tunes.client.available_languages.sort (as long as endpoint is avilable)
-      available_languages = Deliver::Languages::ALL_LANGUAGES
+      def framed_file_paths(extensions = '{png,jpg,jpeg}')
+        Dir.glob(File.join(path, "*_framed.#{extensions}"), File::FNM_CASEFOLD).sort
+      end
+
+      def basename
+        File.basename(@path)
+      end
+    end
+
+    # Returns the list of valid app screenshot
+    #
+    # @param root [String] A directory path
+    # @param ignore_validation [String] Set false not to raise the error when finding invalid folder name
+    # @return [Array<AppScreenshot>] The list of AppScreenshot that exist under given `root` directory
+    def self.load_app_screenshots(root, ignore_validation)
+      screenshots = language_folders(root, ignore_validation, true).flat_map do |language_folder|
+        paths = if language_folder.framed_file_paths.count > 0
+                  UI.important("Framed screenshots are detected! 🖼 Non-framed screenshot files may be skipped. 🏃")
+                  # watchOS screenshots can be picked up even when framed ones were found since frameit doesn't support watchOS screenshots
+                  framed_or_watch, skipped = language_folder.file_paths.partition { |path| path.downcase.include?('framed') || path.downcase.include?('watch') }
+                  skipped.each { |path| UI.important("🏃 Skipping screenshot file: #{path}") }
+                  framed_or_watch
+                else
+                  language_folder.file_paths
+                end
+        paths.map { |path| AppScreenshot.new(path, language_folder.language) }
+      end
+
+      errors = []
+      valid_screenshots = screenshots.select { |screenshot| validate_screenshot(screenshot, errors) }
+
+      unless errors.empty?
+        UI.important("Unaccepted device screenshots are detected! 🚫 Screenshot file will be skipped. 🏃")
+        errors.each { |error| UI.important(error) }
+      end
 
-      allowed_directory_names_with_case = (available_languages + SPECIAL_DIR_NAMES)
-      allowed_directory_names = allowed_directory_names_with_case.map(&:downcase).freeze
+      valid_screenshots
+    end
 
-      selected_folders = folders.select do |path|
-        File.directory?(path) && allowed_directory_names.include?(File.basename(path).downcase)
-      end.sort
+    # Validate a screenshot and inform an error message via `errors` parameters. `errors` is mutated
+    # to append the messages and each message should contain the corresponding path to let users know which file gets the error.
+    #
+    # @param screenshot [AppScreenshot]
+    # @param errors [Array<String>] Pass an array object to add error messages when finding an error
+    # @return [Boolean] true if given screenshot is valid
+    def self.validate_screenshot(screenshot, errors)
+      # Given screenshot will be diagnosed and errors found are accumulated
+      errors_found = []
 
-      # Gets list of folders that are not supported languages
-      rejected_folders = folders.select do |path|
-        normalized_path = File.basename(path).downcase
-        File.directory?(path) && !allowed_directory_names.include?(normalized_path) && !EXCEPTION_DIRECTORIES.include?(normalized_path)
-      end.sort
+      # Checking if the device type exists in spaceship
+      # Ex: iPhone 6.1 inch isn't supported in App Store Connect but need
+      # to have it in there for frameit support
+      if screenshot.device_type.nil?
+        errors_found << "🏃 Skipping screenshot file: #{screenshot.path} - Not an accepted App Store Connect device..."
+      end
+
+      # Merge errors found into given errors array
+      errors_found.each { |error| errors.push(error) }
+      errors_found.empty?
+    end
+
+    # Returns the list of language folders
+    #
+    # @param roort [String] A directory path to get the list of language folders
+    # @param ignore_validation [Boolean] Set false not to raise the error when finding invalid folder name
+    # @param expand_sub_folders [Boolean] Set true to expand special folders; such as "iMessage" to nested language folders
+    # @return [Array<LanguageFolder>] The list of LanguageFolder whose each of them
+    def self.language_folders(root, ignore_validation, expand_sub_folders = false)
+      folders = Dir.glob(File.join(root, '*'))
+                   .select { |path| File.directory?(path) }
+                   .map { |path| LanguageFolder.new(path, nested: false) }
+                   .reject(&:skip?)
+
+      selected_folders, rejected_folders = folders.partition(&:valid?)
 
       if !ignore_validation && !rejected_folders.empty?
-        rejected_folders = rejected_folders.map { |path| File.basename(path) }
+        rejected_folders = rejected_folders.map(&:basename)
         UI.user_error!("Unsupported directory name(s) for screenshots/metadata in '#{root}': #{rejected_folders.join(', ')}" \
-                       "\nValid directory names are: #{allowed_directory_names_with_case}" \
+                       "\nValid directory names are: #{LanguageFolder.allowed_directory_names_with_case}" \
                        "\n\nEnable 'ignore_language_directory_validation' to prevent this validation from happening")
       end
 
+      # Expand selected_folders for the special directories
+      if expand_sub_folders
+        selected_folders = selected_folders.flat_map do |folder|
+          if folder.expandable?
+            Dir.glob(File.join(folder.path, '*'))
+               .select { |p| File.directory?(p) }
+               .map { |p| LanguageFolder.new(p, nested: true) }
+               .select(&:valid?)
+          else
+            folder
+          end
+        end
+      end
+
       selected_folders
     end
   end