fastlane 2.135.2 → 2.140.0

data/spaceship/lib/spaceship/client.rb

@@ -563,10 +563,15 @@ module Spaceship
     #####################################################
 
     def load_session_from_file
-      if File.exist?(persistent_cookie_path)
-        puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
-        @cookie.load(persistent_cookie_path)
-        return true
+      begin
+        if File.exist?(persistent_cookie_path)
+          puts("Loading session from '#{persistent_cookie_path}'") if Spaceship::Globals.verbose?
+          @cookie.load(persistent_cookie_path)
+          return true
+        end
+      rescue => ex
+        puts(ex.to_s)
+        puts("Continuing with normal login.")
       end
       return false
     end

data/spaceship/lib/spaceship/connect_api.rb

@@ -20,7 +20,9 @@ require 'spaceship/connect_api/models/beta_build_localization'
 require 'spaceship/connect_api/models/beta_build_metric'
 require 'spaceship/connect_api/models/beta_app_review_detail'
 require 'spaceship/connect_api/models/beta_app_review_submission'
+require 'spaceship/connect_api/models/beta_feedback'
 require 'spaceship/connect_api/models/beta_group'
+require 'spaceship/connect_api/models/beta_screenshot'
 require 'spaceship/connect_api/models/beta_tester'
 require 'spaceship/connect_api/models/beta_tester_metric'
 require 'spaceship/connect_api/models/build'

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

@@ -45,6 +45,17 @@ module Spaceship
         return Spaceship::ConnectAPI.get_app(app_id: app_id, includes: includes).first
       end
 
+      #
+      # Beta Feedback
+
+      def get_beta_feedback(filter: {}, includes: "tester,build,screenshots", limit: nil, sort: nil)
+        filter ||= {}
+        filter["build.app"] = id
+
+        resps = Spaceship::ConnectAPI.get_beta_feedback(filter: filter, includes: includes, limit: limit, sort: sort).all_pages
+        return resps.flat_map(&:to_models)
+      end
+
       #
       # Beta Testers
       #

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

@@ -0,0 +1,71 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class BetaFeedback
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :timestamp
+      attr_accessor :comment
+      attr_accessor :email_address
+      attr_accessor :device_model
+      attr_accessor :os_version
+      attr_accessor :bookmarked
+      attr_accessor :locale
+      attr_accessor :carrier
+      attr_accessor :timezone
+      attr_accessor :architecture
+      attr_accessor :connection_status
+      attr_accessor :paired_apple_watch
+      attr_accessor :app_up_time_millis
+      attr_accessor :available_disk_bytes
+      attr_accessor :total_disk_bytes
+      attr_accessor :network_type
+      attr_accessor :battery_percentage
+      attr_accessor :screen_width
+      attr_accessor :screen_height
+
+      attr_accessor :build
+      attr_accessor :tester
+      attr_accessor :screenshots
+
+      attr_mapping({
+        "timestamp" => "timestamp",
+        "comment" => "comment",
+        "emailAddress" => "email_address",
+        "contactEmail" => "contact_email",
+        "deviceModel" => "device_model",
+        "osVersion" => "os_version",
+        "bookmarked" => "bookmarked",
+        "locale" => "locale",
+        "carrier" => "carrier",
+        "timezone" => "timezone",
+        "architecture" => "architecture",
+        "connectionStatus" => "connection_status",
+        "pairedAppleWatch" => "paired_apple_watch",
+        "appUpTimeMillis" => "app_up_time_millis",
+        "availableDiskBytes" => "available_disk_bytes",
+        "totalDiskBytes" => "total_disk_bytes",
+        "networkType" => "network_type",
+        "batteryPercentage" => "battery_percentage",
+        "screenWidth" => "screen_width",
+        "screenHeight" => "screen_height",
+
+        "build" => "build",
+        "tester" => "tester",
+        "screenshots" => "screenshots"
+      })
+
+      def self.type
+        return "betaFeedbacks"
+      end
+
+      #
+      # API
+      #
+
+      def self.all(filter: {}, includes: "tester,build,screenshots", limit: nil, sort: nil)
+        return Spaceship::ConnectAPI.get_beta_feedback(filter: filter, includes: includes, limit: limit, sort: sort)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative '../model'
+module Spaceship
+  class ConnectAPI
+    class BetaScreenshot
+      include Spaceship::ConnectAPI::Model
+
+      attr_accessor :image_assets
+
+      attr_mapping({
+        "imageAssets" => "image_assets"
+      })
+
+      def self.type
+        return "betaScreenshots"
+      end
+    end
+  end
+end

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

@@ -78,6 +78,11 @@ module Spaceship
         return processing_state != ProcessingState::PROCESSING
       end
 
+      def ready_for_internal_testing?
+        raise "No build_beta_detail included" unless build_beta_detail
+        return build_beta_detail.ready_for_internal_testing?
+      end
+
       def ready_for_beta_submission?
         raise "No build_beta_detail included" unless build_beta_detail
         return build_beta_detail.ready_for_beta_submission?

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

@@ -10,6 +10,7 @@ module Spaceship
       attr_accessor :external_build_state
 
       module InternalState
+        PROCESSING = "PROCESSING"
         PROCESSING_EXCEPTION = "PROCESSING_EXCEPTION"
         MISSING_EXPORT_COMPLIANCE = "MISSING_EXPORT_COMPLIANCE"
         READY_FOR_BETA_TESTING = "READY_FOR_BETA_TESTING"
@@ -47,6 +48,10 @@ module Spaceship
       #
       # Helpers
       #
+      #
+      def ready_for_internal_testing?
+        return internal_build_state == InternalState::READY_FOR_BETA_TESTING
+      end
 
       def ready_for_beta_submission?
         return external_build_state == ExternalState::READY_FOR_BETA_SUBMISSION

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -317,6 +317,15 @@ module Spaceship
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
         Client.instance.get("preReleaseVersions", params)
       end
+
+      #
+      # betaFeedbacks (private API as of end 2019)
+      #
+
+      def get_beta_feedback(filter: {}, includes: nil, limit: nil, sort: nil)
+        params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
+        Client.instance.get("betaFeedbacks", params)
+      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -105,17 +105,6 @@ module Spaceship
         end
       end
 
-      # find a specific product
-      # @param product_id (String) Product Id
-      def find(product_id)
-        all.each do |product|
-          if product.product_id == product_id
-            return product
-          end
-        end
-        return nil
-      end
-
       # return all available In-App-Purchase's of current app
       # this is not paged inside iTC-API so if you have a lot if IAP's (2k+)
       # it might take some time to load, same as it takes when you load the list via App Store Connect
@@ -132,6 +121,17 @@ module Spaceship
         return_iaps
       end
 
+      # find a specific product
+      # @param product_id (String) Product Id
+      def find(product_id)
+        all.each do |product|
+          if product.product_id == product_id
+            return product
+          end
+        end
+        return nil
+      end
+
       private
 
       def find_product_with_retries(product_id, max_tries)

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -80,7 +80,9 @@ module Spaceship
           language = localized_version["value"]["localeCode"]
           parsed_versions[language.to_sym] = {
             name: localized_version["value"]["name"]["value"],
-            description: localized_version["value"]["description"]["value"]
+            description: localized_version["value"]["description"]["value"],
+            id: localized_version["value"]["id"],
+            status: localized_version["value"]["status"]
           }
         end
         return parsed_versions
@@ -98,7 +100,8 @@ module Spaceship
             "value" =>   {
               "name" =>  { "value" => current_version[:name] },
               "description" =>  { "value" => current_version[:description] },
-              "localeCode" =>  language.to_s
+              "localeCode" => language.to_s,
+              "id" => current_version[:id]
             }
           }
         end
@@ -167,7 +170,8 @@ module Spaceship
                     "value" =>  {
                       "description" => { "value" => value[:description] },
                       "name" => { "value" => value[:name] },
-                      "localeCode" => language.to_s
+                      "localeCode" => language.to_s,
+                      "id" => value[:id]
                     }
           }
         end

data/spaceship/lib/spaceship/tunes/iap_families.rb

@@ -40,7 +40,7 @@ module Spaceship
         client.create_iap_family(app_id: self.application.apple_id, name: name, product_id: product_id, reference_name: reference_name, versions: versions_array)
       end
 
-      # returns a list of all families
+      # returns a list of all available subscription groups/families of the current In-App-Purchase
       def all
         r = client.iap_families(app_id: self.application.apple_id)
         return_families = []
@@ -52,6 +52,17 @@ module Spaceship
         end
         return_families
       end
+
+      # find a specific family
+      # @param family_id (String) Family Id
+      def find(family_id)
+        all.each do |family|
+          if family.family_id == family_id
+            return family
+          end
+        end
+        return nil
+      end
     end
   end
 end

data/spaceship/lib/spaceship/tunes/iap_family_details.rb

@@ -18,13 +18,34 @@ module Spaceship
       # @return (Intger) amount of linked in-app purchases of this family (read-only)
       attr_accessor :iap_count
 
+      # @return (Array) of all in-app purchase family details
+      attr_accessor :family_details
+
       attr_mapping({
         'id' => :family_id,
         'name.value' => :name,
         'activeAddOns' => :linked_iaps,
-        'totalActiveAddOns' => :iap_count
+        'totalActiveAddOns' => :iap_count,
+        'details.value' => :family_details
       })
 
+      # @return (Hash) localized names
+      def versions
+        parsed_versions = {}
+        raw_versions = raw_data["details"]["value"]
+        raw_versions.each do |version|
+          language = version["value"]["localeCode"]["value"]
+          parsed_versions[language.to_sym] = {
+            subscription_name: version["value"]["subscriptionName"]["value"],
+            name: version["value"]["name"]["value"],
+            id: version["value"]["id"],
+            status: version["value"]["status"]
+          }
+        end
+        return parsed_versions
+      end
+
+      # transforms user-set versions to iTC ones
       def versions=(value = {})
         if value.kind_of?(Array)
           # input that comes from iTC api
@@ -36,7 +57,8 @@ module Spaceship
             "value" =>   {
               "subscriptionName" =>  { "value" => current_version[:subscription_name] },
               "name" =>  { "value" => current_version[:name] },
-              "localeCode" => { "value" => language }
+              "localeCode" => { "value" => language },
+              "id" => current_version[:id]
             }
           }
         end
@@ -44,20 +66,6 @@ module Spaceship
         raw_data.set(["details"], { "value" => new_versions })
       end
 
-      # @return (Hash) localized names
-      def versions
-        parsed_versions = {}
-        raw_versions = raw_data["details"]["value"]
-        raw_versions.each do |version|
-          language = version["value"]["localeCode"]["value"]
-          parsed_versions[language.to_sym] = {
-            subscription_name: version["value"]["subscriptionName"]["value"],
-            name: version["value"]["name"]["value"]
-          }
-        end
-        return parsed_versions
-      end
-
       # modify existing family
       def save!
         # Transform localization versions back to original format.
@@ -67,7 +75,8 @@ module Spaceship
                                "value" => {
                                  "subscriptionName" => { "value" => value[:subscription_name] },
                                  "name" => { "value" => value[:name] },
-                                 "localeCode" => { "value" => language_code.to_s }
+                                 "localeCode" => { "value" => language_code.to_s },
+                                 "id" => value[:id]
                                }
                             }
         end

data/spaceship/lib/spaceship/tunes/tunes_client.rb

@@ -400,7 +400,7 @@ module Spaceship
         rating_url << "sort=REVIEW_SORT_ORDER_MOST_RECENT"
         rating_url << "&index=#{index}"
         rating_url << "&storefront=#{storefront}" unless storefront.empty?
-        rating_url << "&version_id=#{version_id}" unless version_id.empty?
+        rating_url << "&versionId=#{version_id}" unless version_id.empty?
 
         r = request(:get, rating_url)
         all_reviews.concat(parse_response(r, 'data')['reviews'])
@@ -627,7 +627,7 @@ module Spaceship
       handle_itc_response(r.body)
     end
 
-    def transform_to_raw_pricing_intervals(app_id = nil, purchase_id = nil, pricing_intervals = nil, subscription_price_target = nil)
+    def transform_to_raw_pricing_intervals(app_id = nil, purchase_id = nil, pricing_intervals = 5, subscription_price_target = nil)
       intervals_array = []
       if pricing_intervals
         intervals_array = pricing_intervals.map do |interval|
@@ -784,11 +784,8 @@ module Spaceship
     end
 
     def available_languages
-      r = request(:get, "ra/apps/storePreview/regionCountryLanguage")
-      response = parse_response(r, 'data')
-      response.flat_map { |region| region["storeFronts"] }
-              .flat_map { |storefront| storefront["supportedLocaleCodes"] }
-              .uniq
+      r = request(:get, "ra/ref")
+      parse_response(r, 'data')['detailLocales']
     end
 
     #####################################################

data/supply/lib/supply/client.rb

@@ -310,6 +310,19 @@ module Supply
       return result_upload.version_code
     end
 
+    def upload_apk_to_internal_app_sharing(package_name, path_to_apk)
+      # NOTE: This Google API is a little different. It doesn't require an active edit.
+      result_upload = call_google_api do
+        client.uploadapk_internalappsharingartifact(
+          package_name,
+          upload_source: path_to_apk,
+          content_type: "application/octet-stream"
+        )
+      end
+
+      return result_upload.download_url
+    end
+
     def upload_mapping(path_to_mapping, apk_version_code)
       ensure_active_edit!
 
@@ -340,11 +353,25 @@ module Supply
       return result_upload.version_code
     end
 
+    def upload_bundle_to_internal_app_sharing(package_name, path_to_aab)
+      # NOTE: This Google API is a little different. It doesn't require an active edit.
+      result_upload = call_google_api do
+        client.uploadbundle_internalappsharingartifact(
+          package_name,
+          upload_source: path_to_aab,
+          content_type: "application/octet-stream"
+        )
+      end
+
+      return result_upload.download_url
+    end
+
     # Get a list of all tracks - returns the list
     def tracks(*tracknames)
       ensure_active_edit!
 
       all_tracks = call_google_api { client.list_edit_tracks(current_package_name, current_edit.id) }.tracks
+      all_tracks = [] unless all_tracks
 
       if tracknames.length > 0
         all_tracks = all_tracks.select { |track| tracknames.include?(track.track) }

data/supply/lib/supply/options.rb

@@ -43,7 +43,10 @@ module Supply
                                      env_name: "SUPPLY_TRACK",
                                      description: "The track of the application to use. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}",
                                      default_value: Supply::Tracks::DEFAULT,
-                                     type: String),
+                                     type: String,
+                                     verify_block: proc do |value|
+                                       UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
+                                     end),
         FastlaneCore::ConfigItem.new(key: :rollout,
                                      short_option: "-r",
                                      description: "The percentage of the user fraction when uploading to the rollout track",
@@ -208,7 +211,10 @@ module Supply
         FastlaneCore::ConfigItem.new(key: :track_promote_to,
                                      env_name: "SUPPLY_TRACK_PROMOTE_TO",
                                      optional: true,
-                                     description: "The track to promote to. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}"),
+                                     description: "The track to promote to. The default available tracks are: #{Supply::Tracks::DEFAULTS.join(', ')}",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("'rollout' is no longer a valid track name - please use 'production' instead") if value.casecmp('rollout').zero?
+                                     end),
         FastlaneCore::ConfigItem.new(key: :validate_only,
                                      env_name: "SUPPLY_VALIDATE_ONLY",
                                      optional: true,