fastlane 2.151.0 → 2.153.1

data/spaceship/lib/spaceship/connect_api.rb

@@ -42,6 +42,7 @@ require 'spaceship/connect_api/models/app_price'
 require 'spaceship/connect_api/models/app_price_tier'
 require 'spaceship/connect_api/models/app_store_review_attachment'
 require 'spaceship/connect_api/models/app_store_review_detail'
+require 'spaceship/connect_api/models/app_store_version_release_request'
 require 'spaceship/connect_api/models/app_store_version_submission'
 require 'spaceship/connect_api/models/app_screenshot_set'
 require 'spaceship/connect_api/models/app_screenshot'

data/spaceship/lib/spaceship/connect_api/client.rb

@@ -88,8 +88,8 @@ module Spaceship
         handle_response(response)
       end
 
-      def post(url_or_path, body)
-        response = with_asc_retry do
+      def post(url_or_path, body, tries: 5)
+        response = with_asc_retry(tries) do
           request(:post) do |req|
             req.url(url_or_path)
             req.body = body.to_json

data/spaceship/lib/spaceship/connect_api/file_uploader.rb

@@ -74,7 +74,6 @@ module Spaceship
 
         @client ||= Faraday.new(options) do |c|
           c.response(:json, content_type: /\bjson$/)
-          c.response(:xml, content_type: /\bxml$/)
           c.response(:plist, content_type: /\bplist$/)
           c.adapter(Faraday.default_adapter)
 

data/spaceship/lib/spaceship/connect_api/model.rb

@@ -8,6 +8,7 @@ module Spaceship
       end
 
       attr_accessor :id
+      attr_accessor :reverse_attr_map
 
       def initialize(id, attributes)
         self.id = id
@@ -29,6 +30,7 @@ module Spaceship
       # Creates alias for :minOsVersion to :min_os_version
       #
       def attr_mapping(attr_map)
+        self.reverse_attr_map ||= attr_map.invert.each_with_object({}) { |(k, v), memo| memo[k.to_sym] = v; }
         attr_map.each do |key, value|
           # Actual
           reader = value.to_sym
@@ -50,6 +52,18 @@ module Spaceship
         end
       end
 
+      def reverse_attr_mapping(attributes)
+        return nil if attributes.nil?
+
+        # allows for getting map from either an instance or class execution
+        map = self.reverse_attr_map || self.class.reverse_attr_map
+
+        attributes.each_with_object({}) do |(k, v), memo|
+          key = map[k.to_sym] || k.to_sym
+          memo[key] = v
+        end
+      end
+
       def to_json(*options)
         instance_variables.map do |var|
           [var.to_s[1..-1], instance_variable_get(var)]

data/spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb

@@ -106,6 +106,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_age_rating_declaration(age_rating_declaration_id: id, attributes: attributes)
       end
     end

data/spaceship/lib/spaceship/connect_api/models/app.rb

@@ -12,9 +12,8 @@ module Spaceship
       attr_accessor :primary_locale
       attr_accessor :removed
       attr_accessor :is_aag
-
+      attr_accessor :available_in_new_territories
       attr_accessor :content_rights_declaration
-
       attr_accessor :app_store_versions
 
       module ContentRightsDeclaration
@@ -29,6 +28,7 @@ module Spaceship
         "primaryLocale" => "primary_locale",
         "removed" => "removed",
         "isAAG" => "is_aag",
+        "availableInNewTerritories" => "available_in_new_territories",
 
         "contentRightsDeclaration" => "content_rights_declaration",
 
@@ -71,6 +71,7 @@ module Spaceship
       end
 
       def update(attributes: nil, app_price_tier_id: nil, territory_ids: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app(app_id: id, attributes: attributes, app_price_tier_id: app_price_tier_id, territory_ids: territory_ids)
       end
 
@@ -78,6 +79,21 @@ module Spaceship
       # App Info
       #
 
+      def fetch_live_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
+        states = [
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::READY_FOR_SALE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PENDING_DEVELOPER_RELEASE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::PROCESSING_FOR_APP_STORE,
+          Spaceship::ConnectAPI::AppInfo::AppStoreState::IN_REVIEW
+        ]
+
+        filter = { app: id }
+        resp = Spaceship::ConnectAPI.get_app_infos(filter: filter, includes: includes)
+        return resp.to_models.select do |model|
+          states.include?(model.app_store_state)
+        end.first
+      end
+
       def fetch_edit_app_info(includes: Spaceship::ConnectAPI::AppInfo::ESSENTIAL_INCLUDES)
         states = [
           Spaceship::ConnectAPI::AppInfo::AppStoreState::PREPARE_FOR_SUBMISSION,
@@ -95,6 +111,16 @@ module Spaceship
         end.first
       end
 
+      #
+      # Available Territories
+      #
+
+      def fetch_available_territories(filter: {}, includes: nil, limit: nil, sort: nil)
+        filter ||= {}
+        resps = Spaceship::ConnectAPI.get_available_territories(app_id: id, filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
       #
       # App Pricing
       #
@@ -152,6 +178,18 @@ module Spaceship
         end
       end
 
+      def get_latest_app_store_version(platform: nil, includes: nil)
+        platform ||= Spaceship::ConnectAPI::Platform::IOS
+        filter = {
+          platform: platform
+        }
+
+        # Get the latest version
+        return get_app_store_versions(filter: filter, includes: includes)
+               .sort_by { |v| Gem::Version.new(v.version_string) }
+               .last
+      end
+
       def get_live_app_store_version(platform: nil, includes: nil)
         platform ||= Spaceship::ConnectAPI::Platform::IOS
         filter = {

data/spaceship/lib/spaceship/connect_api/models/app_info_localization.rb

@@ -27,6 +27,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_info_localization(app_info_localization_id: id, attributes: attributes)
       end
 

data/spaceship/lib/spaceship/connect_api/models/app_preview.rb

@@ -17,7 +17,7 @@ module Spaceship
       attr_accessor :video_url
       attr_accessor :preview_image
       attr_accessor :upload_operations
-      attr_accessor :asset_deliver_state
+      attr_accessor :asset_delivery_state
       attr_accessor :upload
 
       attr_mapping({
@@ -70,7 +70,7 @@ module Spaceship
         preview = Spaceship::ConnectAPI.post_app_preview(
           app_preview_set_id: app_preview_set_id,
           attributes: post_attributes
-        ).to_models.first
+        ).first
 
         # Upload the file
         upload_operations = preview.upload_operations
@@ -86,7 +86,7 @@ module Spaceship
           preview = Spaceship::ConnectAPI.patch_app_preview(
             app_preview_id: preview.id,
             attributes: patch_attributes
-          ).to_models.first
+          ).first
         rescue => error
           puts("Failed to patch app preview. Update may have gone through so verifying") if Spaceship::Globals.verbose?
 
@@ -119,7 +119,8 @@ module Spaceship
       end
 
       def update(attributes: nil)
-        Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes)
+        attributes = reverse_attr_mapping(attributes)
+        Spaceship::ConnectAPI.patch_app_preview(app_preview_id: id, attributes: attributes).first
       end
 
       def delete!(filter: {}, includes: nil, limit: nil, sort: nil)

data/spaceship/lib/spaceship/connect_api/models/app_screenshot.rb

@@ -1,5 +1,6 @@
 require_relative '../model'
 require_relative '../file_uploader'
+require_relative './app_screenshot_set'
 require 'spaceship/globals'
 
 require 'digest/md5'
@@ -9,6 +10,7 @@ module Spaceship
     class AppScreenshot
       include Spaceship::ConnectAPI::Model
 
+      attr_accessor :file_size
       attr_accessor :file_name
       attr_accessor :source_file_checksum
       attr_accessor :image_asset
@@ -19,6 +21,7 @@ module Spaceship
       attr_accessor :uploaded
 
       attr_mapping({
+        "fileSize" => "file_size",
         "fileName" => "file_name",
         "sourceFileChecksum" => "source_file_checksum",
         "imageAsset" => "image_asset",
@@ -33,6 +36,10 @@ module Spaceship
         return "appScreenshots"
       end
 
+      def awaiting_upload?
+        (asset_delivery_state || {})["state"] == "AWAITING_UPLOAD"
+      end
+
       def complete?
         (asset_delivery_state || {})["state"] == "COMPLETE"
       end
@@ -84,11 +91,43 @@ module Spaceship
           fileName: filename
         }
 
-        # Create placeholder
-        screenshot = Spaceship::ConnectAPI.post_app_screenshot(
-          app_screenshot_set_id: app_screenshot_set_id,
-          attributes: post_attributes
-        ).first
+        # Create placeholder to upload screenshot
+        begin
+          screenshot = Spaceship::ConnectAPI.post_app_screenshot(
+            app_screenshot_set_id: app_screenshot_set_id,
+            attributes: post_attributes
+          ).first
+        rescue => error
+          # Sometimes creating a screenshot with the web session App Store Connect API
+          # will result in a false failure. The response will return a 503 but the database
+          # insert will eventually go through.
+          #
+          # When this is observed, we will poll until we find the matchin screenshot that
+          # is awaiting for upload and file size
+          #
+          # https://github.com/fastlane/fastlane/pull/16842
+          time = Time.now.to_i
+
+          timeout_minutes = (ENV["SPACESHIP_SCREENSHOT_UPLOAD_TIMEOUT"] || 20).to_i
+
+          loop do
+            puts("Waiting for screenshot to appear before uploading...")
+            sleep(30)
+
+            screenshots = Spaceship::ConnectAPI::AppScreenshotSet
+                          .get(app_screenshot_set_id: app_screenshot_set_id)
+                          .app_screenshots
+
+            screenshot = screenshots.find do |s|
+              s.awaiting_upload? && s.file_size == filesize
+            end
+
+            break if screenshot
+
+            time_diff = Time.now.to_i - time
+            raise error if time_diff >= (60 * timeout_minutes)
+          end
+        end
 
         # Upload the file
         upload_operations = screenshot.upload_operations

data/spaceship/lib/spaceship/connect_api/models/app_store_review_detail.rb

@@ -39,6 +39,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_review_detail(app_store_review_detail_id: id, attributes: attributes)
       end
 

data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb

@@ -1,4 +1,5 @@
 require_relative '../model'
+require_relative './app_store_review_detail'
 require_relative './app_store_version_localization'
 
 module Spaceship
@@ -85,6 +86,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_app_store_version(app_store_version_id: id, attributes: attributes).first
       end
 
@@ -118,6 +120,7 @@ module Spaceship
       #
 
       def create_app_store_review_detail(attributes: nil)
+        attributes = Spaceship::ConnectAPI::AppStoreReviewDetail.reverse_attr_mapping(attributes)
         resp = Spaceship::ConnectAPI.post_app_store_review_detail(app_store_version_id: id, attributes: attributes)
         return resp.to_models.first
       end
@@ -155,6 +158,15 @@ module Spaceship
         return resp.to_models.first
       end
 
+      #
+      # App Store Version Release Requests
+      #
+
+      def create_app_store_version_release_request
+        resp = Spaceship::ConnectAPI.post_app_store_version_release_request(app_store_version_id: id)
+        return resp.to_models.first
+      end
+
       #
       # Build
       #

data/spaceship/lib/spaceship/connect_api/models/app_store_version_localization.rb

@@ -45,6 +45,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_app_store_version_localization(app_store_version_localization_id: id, attributes: attributes)
       end
 

data/spaceship/lib/spaceship/connect_api/models/app_store_version_release_request.rb

@@ -0,0 +1,12 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class AppStoreVersionReleaseRequest
+      include Spaceship::ConnectAPI::Model
+
+      def self.type
+        return "appStoreVersionReleaseRequests"
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/connect_api/models/build.rb

@@ -130,6 +130,7 @@ module Spaceship
       end
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         return Spaceship::ConnectAPI.patch_builds(build_id: id, attributes: attributes).first
       end
 

data/spaceship/lib/spaceship/connect_api/models/idfa_declaration.rb

@@ -29,6 +29,7 @@ module Spaceship
       #
 
       def update(attributes: nil)
+        attributes = reverse_attr_mapping(attributes)
         Spaceship::ConnectAPI.patch_idfa_declaration(idfa_declaration_id: id, attributes: attributes)
       end
 

data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb

@@ -280,6 +280,15 @@ module Spaceship
         Client.instance.patch("appPreviewSets/#{app_preview_set_id}/relationships/appPreviews", body)
       end
 
+      #
+      # availableTerritories
+      #
+
+      def get_available_territories(app_id: nil, filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("apps/#{app_id}/availableTerritories", params)
+      end
+
       #
       # appPrices
       #
@@ -402,7 +411,7 @@ module Spaceship
           }
         }
 
-        Client.instance.post("appScreenshots", body)
+        Client.instance.post("appScreenshots", body, tries: 1)
       end
 
       def patch_app_screenshot(app_screenshot_id: nil, attributes: {})
@@ -821,6 +830,28 @@ module Spaceship
         Client.instance.delete("appStoreVersionSubmissions/#{app_store_version_submission_id}", params)
       end
 
+      #
+      # appStoreVersionReleaseRequests
+      #
+
+      def post_app_store_version_release_request(app_store_version_id: nil)
+        body = {
+            data: {
+                type: "appStoreVersionReleaseRequests",
+                relationships: {
+                    appStoreVersion: {
+                        data: {
+                            type: "appStoreVersions",
+                            id: app_store_version_id
+                        }
+                    }
+                }
+            }
+        }
+
+        Client.instance.post("appStoreVersionReleaseRequests", body)
+      end
+
       #
       # idfaDeclarations
       #

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.151.0
+  version: 2.153.1
 platform: ruby
 authors:
-- Matthew Ellis
-- Iulian Onofrei
-- Andrew McBurney
-- Stefan Natchev
+- Danielle Tomlinson
 - Fumiya Nakamura
+- Maksym Grebenets
+- Kohki Miki
 - Luka Mirosevic
-- Jimmy Dee
 - Manu Wallner
-- Daniel Jankowski
-- Aaron Brager
-- Danielle Tomlinson
-- Maksym Grebenets
-- Jan Piotrowski
-- Josh Holtz
-- Jérôme Lacoste
 - Joshua Liebowitz
-- Helmut Januschka
 - Olivier Halligon
-- Kohki Miki
+- Matthew Ellis
 - Max Ott
+- Josh Holtz
+- Helmut Januschka
+- Daniel Jankowski
 - Jorge Revuelta H
+- Jimmy Dee
 - Felix Krause
+- Aaron Brager
+- Iulian Onofrei
+- Jan Piotrowski
+- Stefan Natchev
+- Jérôme Lacoste
+- Andrew McBurney
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -345,42 +345,30 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
@@ -691,28 +679,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -789,28 +777,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: hashdiff
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -887,14 +861,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -969,10 +943,7 @@ files:
 - deliver/lib/assets/ScreenshotsHelp
 - deliver/lib/assets/summary.html.erb
 - deliver/lib/deliver.rb
-- deliver/lib/deliver/.commands_generator.rb.swp
-- deliver/lib/deliver/.download_screenshots.rb.swp
-- deliver/lib/deliver/.submit_for_review.rb.swp
-- deliver/lib/deliver/.upload_screenshots.rb.swp
+- deliver/lib/deliver/.upload_metadata.rb.swp
 - deliver/lib/deliver/app_screenshot.rb
 - deliver/lib/deliver/commands_generator.rb
 - deliver/lib/deliver/detect_values.rb
@@ -1007,8 +978,10 @@ files:
 - fastlane/lib/assets/s3_plist_template.erb
 - fastlane/lib/assets/s3_version_template.erb
 - fastlane/lib/fastlane.rb
+- fastlane/lib/fastlane/.erb_template_helper.rb.swp
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
+- fastlane/lib/fastlane/actions/.git_commit.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
 - fastlane/lib/fastlane/actions/adb.rb
@@ -1637,11 +1610,12 @@ files:
 - spaceship/lib/spaceship/client.rb
 - spaceship/lib/spaceship/commands_generator.rb
 - spaceship/lib/spaceship/connect_api.rb
-- spaceship/lib/spaceship/connect_api/.file_uploader.rb.swp
+- spaceship/lib/spaceship/connect_api/.model.rb.swp
 - spaceship/lib/spaceship/connect_api/client.rb
 - spaceship/lib/spaceship/connect_api/file_uploader.rb
 - spaceship/lib/spaceship/connect_api/model.rb
-- spaceship/lib/spaceship/connect_api/models/.app_screenshot.rb.swp
+- spaceship/lib/spaceship/connect_api/models/.app_store_review_detail.rb.swp
+- spaceship/lib/spaceship/connect_api/models/.app_store_version.rb.swp
 - spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb
 - spaceship/lib/spaceship/connect_api/models/app.rb
 - spaceship/lib/spaceship/connect_api/models/app_category.rb
@@ -1658,6 +1632,7 @@ files:
 - spaceship/lib/spaceship/connect_api/models/app_store_version.rb
 - spaceship/lib/spaceship/connect_api/models/app_store_version_localization.rb
 - spaceship/lib/spaceship/connect_api/models/app_store_version_phased_release.rb
+- spaceship/lib/spaceship/connect_api/models/app_store_version_release_request.rb
 - spaceship/lib/spaceship/connect_api/models/app_store_version_submission.rb
 - spaceship/lib/spaceship/connect_api/models/beta_app_localization.rb
 - spaceship/lib/spaceship/connect_api/models/beta_app_review_detail.rb