fastlane 2.135.0 → 2.138.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/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/tunes_client.rb

@@ -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

@@ -345,6 +345,7 @@ module Supply
       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

@@ -24,6 +24,7 @@ module Supply
                                      env_name: "SUPPLY_VERSION_CODE",
                                      short_option: "-C",
                                      optional: true,
+                                     type: Integer,
                                      description: "Version code (used when updating rollout or promoting specific versions)",
                                      default_value: CredentialsManager::AppfileConfig.try_fetch_value(:version_code),
                                      default_value_dynamic: true),
@@ -42,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",
@@ -207,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,

data/supply/lib/supply/uploader.rb

@@ -1,4 +1,5 @@
 module Supply
+  # rubocop:disable Metrics/ClassLength
   class Uploader
     def perform_upload
       FastlaneCore::PrintTable.print_values(config: Supply.config, hide_keys: [:issuer], mask_keys: [:json_key_data], title: "Summary for supply #{Fastlane::VERSION}")
@@ -14,40 +15,47 @@ module Supply
 
       apk_version_codes.concat(Supply.config[:version_codes_to_retain]) if Supply.config[:version_codes_to_retain]
 
-      # Only update tracks if we have version codes
-      # Updating a track with empty version codes can completely clear out a track
-      update_track(apk_version_codes) unless apk_version_codes.empty?
-
-      if !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
-        update_rollout
+      if !apk_version_codes.empty?
+        # Only update tracks if we have version codes
+        # update_track handle setting rollout if needed
+        # Updating a track with empty version codes can completely clear out a track
+        update_track(apk_version_codes)
+      else
+        # Only promote or rollout if we don't have version codes
+        if Supply.config[:track_promote_to]
+          promote_track
+        elsif !Supply.config[:rollout].nil? && Supply.config[:track].to_s != ""
+          update_rollout
+        end
       end
 
-      promote_track if Supply.config[:track_promote_to]
+      perform_upload_meta(apk_version_codes)
 
       if Supply.config[:validate_only]
-        UI.message("Validating all track and release changes with Google Play...")
+        UI.message("Validating all changes with Google Play...")
         client.validate_current_edit!
         UI.success("Successfully validated the upload to Google Play")
       else
-        UI.message("Uploading all track and release changes to Google Play...")
+        UI.message("Uploading all changes to Google Play...")
         client.commit_current_edit!
         UI.success("Successfully finished the upload to Google Play")
       end
-
-      perform_upload_meta(apk_version_codes)
     end
 
     def perform_upload_meta(version_codes)
-      client.begin_edit(package_name: Supply.config[:package_name])
-
       if (!Supply.config[:skip_upload_metadata] || !Supply.config[:skip_upload_images] || !Supply.config[:skip_upload_changelogs] || !Supply.config[:skip_upload_screenshots]) && metadata_path
+        # Use version code from config if version codes is empty and no nil or empty string
         version_codes = [Supply.config[:version_code]] if version_codes.empty?
+        version_codes = version_codes.reject do |version_code|
+          version_codes.to_s == ""
+        end
+
         version_codes.each do |version_code|
           UI.user_error!("Could not find folder #{metadata_path}") unless File.directory?(metadata_path)
 
           track, release = fetch_track_and_release!(Supply.config[:track], version_code)
           UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
-          UI.user_error!("Coult not find release for version code '#{version_code}' to update changelog") unless release
+          UI.user_error!("Could not find release for version code '#{version_code}' to update changelog") unless release
 
           release_notes = []
           all_languages.each do |language|
@@ -59,22 +67,12 @@ module Supply
             upload_metadata(language, listing) unless Supply.config[:skip_upload_metadata]
             upload_images(language) unless Supply.config[:skip_upload_images]
             upload_screenshots(language) unless Supply.config[:skip_upload_screenshots]
-            release_notes << upload_changelog(language, release.name) unless Supply.config[:skip_upload_changelogs]
+            release_notes << upload_changelog(language, version_code) unless Supply.config[:skip_upload_changelogs]
           end
 
           upload_changelogs(release_notes, release, track) unless release_notes.empty?
         end
       end
-
-      if Supply.config[:validate_only]
-        UI.message("Validating all meta changes with Google Play...")
-        client.validate_current_edit!
-        UI.success("Successfully validated the upload to Google Play")
-      else
-        UI.message("Uploading all meta changes to Google Play...")
-        client.commit_current_edit!
-        UI.success("Successfully finished the upload to Google Play")
-      end
     end
 
     def fetch_track_and_release!(track, version_code, status = nil)
@@ -83,23 +81,25 @@ module Supply
 
       track = tracks.first
       releases = track.releases
+
       releases = releases.select { |r| r.status == status } if status
+      releases = releases.select { |r| r.version_codes.map(&:to_s).include?(version_code.to_s) } if version_code
 
       if releases.size > 1
         UI.user_error!("More than one release found in this track. Please specify with the :version_code option to select a release.")
       end
 
-      release = releases.first { |r| r.version_codes.include?(version_code) }
-
-      return track, release
+      return track, releases.first
     end
 
     def update_rollout
       track, release = fetch_track_and_release!(Supply.config[:track], Supply.config[:version_code], Supply::ReleaseStatus::IN_PROGRESS)
+      UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
+      UI.user_error!("Unable to find the requested release on track - '#{Supply.config[:track]}'") unless release
+
       version_code = release.version_codes.first
 
       UI.message("Updating #{version_code}'s rollout to '#{Supply.config[:rollout]}' on track '#{Supply.config[:track]}'...")
-      UI.user_error!("Unable to find the requested track - '#{Supply.config[:track]}'") unless track
 
       if track && release
         completed = Supply.config[:rollout].to_f == 1
@@ -107,7 +107,7 @@ module Supply
         release.status = Supply::ReleaseStatus::COMPLETED if completed
 
         # Deleted other version codes if completed because only allowed on completed version in a release
-        track.releases.delete_if { |r| !(r.version_codes || []).include?(version_code) } if completed
+        track.releases.delete_if { |r| !(r.version_codes || []).map(&:to_s).include?(version_code) } if completed
       else
         UI.user_error!("Unable to find version to rollout in track '#{Supply.config[:track]}'")
       end
@@ -129,7 +129,7 @@ module Supply
         UI.user_error!("Cannot provide both apk(s) and aab - use `skip_upload_apk`, `skip_upload_aab`, or  make sure to remove any existing .apk or .aab files that are no longer needed")
       end
 
-      if Supply.config[:release_status] == 'draft' && Supply.config[:rollout]
+      if Supply.config[:release_status] == Supply::ReleaseStatus::DRAFT && Supply.config[:rollout]
         UI.user_error!(%(Cannot specify rollout percentage when the release status is set to 'draft'))
       end
 
@@ -147,7 +147,11 @@ module Supply
       releases = track_from.releases
       if Supply.config[:version_code].to_s != ""
         releases = releases.select do |release|
-          release.version_codes.include?(Supply.config[:version_code])
+          release.version_codes.include?(Supply.config[:version_code].to_s)
+        end
+      else
+        releases = releases.select do |release|
+          release.status == Supply::ReleaseStatus::COMPLETED
         end
       end
 
@@ -157,9 +161,17 @@ module Supply
         UI.user_error!("Track '#{Supply.config[:track]}' has more than one release - use :version_code to filter the release to promote")
       end
 
-      release = track_from.releases.first
+      release = releases.first
       track_to = client.tracks(Supply.config[:track_promote_to]).first
 
+      if Supply.config[:rollout]
+        release.status = Supply::ReleaseStatus::IN_PROGRESS
+        release.user_fraction = Supply.config[:rollout]
+      else
+        release.status = Supply::ReleaseStatus::COMPLETED
+        release.user_fraction = nil
+      end
+
       if track_to
         # Its okay to set releases to an array containing the newest release
         # Google Play will keep previous releases there this release is a partial rollout
@@ -174,14 +186,22 @@ module Supply
       client.update_track(Supply.config[:track_promote_to], track_to)
     end
 
-    def upload_changelog(language, version_name)
-      UI.user_error!("Cannot find changelog because no version name given - please specify :version_name") unless version_name
+    def upload_changelog(language, version_code)
+      UI.user_error!("Cannot find changelog because no version code given - please specify :version_code") unless version_code
 
-      path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "#{version_name}.txt")
+      path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "#{version_code}.txt")
       changelog_text = ''
       if File.exist?(path)
-        UI.message("Updating changelog for '#{version_name}' and language '#{language}'...")
+        UI.message("Updating changelog for '#{version_code}' and language '#{language}'...")
         changelog_text = File.read(path, encoding: 'UTF-8')
+      else
+        default_changelog_path = File.join(Supply.config[:metadata_path], language, Supply::CHANGELOGS_FOLDER_NAME, "default.txt")
+        if File.exist?(default_changelog_path)
+          UI.message("Updating changelog for '#{version_code}' and language '#{language}' to default changelog...")
+          changelog_text = File.read(default_changelog_path, encoding: 'UTF-8')
+        else
+          UI.message("Could not find changelog for '#{version_code}' and language '#{language}' at path #{path}...")
+        end
       end
 
       AndroidPublisher::LocalizedText.new({
@@ -336,8 +356,11 @@ module Supply
       )
 
       if Supply.config[:rollout]
-        track_release.status = Supply::ReleaseStatus::IN_PROGRESS
-        track_release.user_fraction = Supply.config[:rollout].to_f
+        rollout = Supply.config[:rollout].to_f
+        if rollout > 0 && rollout < 1
+          track_release.status = Supply::ReleaseStatus::IN_PROGRESS
+          track_release.user_fraction = rollout
+        end
       end
 
       tracks = client.tracks(Supply.config[:track])
@@ -421,4 +444,5 @@ module Supply
       end
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.135.0
+  version: 2.138.0
 platform: ruby
 authors:
-- Aaron Brager
-- Matthew Ellis
-- Josh Holtz
-- Stefan Natchev
 - Jorge Revuelta H
-- Helmut Januschka
-- Fumiya Nakamura
-- Manu Wallner
-- Iulian Onofrei
-- Felix Krause
 - Joshua Liebowitz
-- Olivier Halligon
+- Josh Holtz
 - Danielle Tomlinson
-- Maksym Grebenets
-- Jérôme Lacoste
-- Jimmy Dee
-- Andrew McBurney
 - Kohki Miki
 - Luka Mirosevic
+- Iulian Onofrei
+- Stefan Natchev
+- Maksym Grebenets
+- Manu Wallner
+- Aaron Brager
+- Matthew Ellis
+- Felix Krause
 - Jan Piotrowski
+- Jérôme Lacoste
+- Helmut Januschka
+- Fumiya Nakamura
+- Andrew McBurney
+- Olivier Halligon
+- Jimmy Dee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -55,7 +55,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -65,7 +65,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.13.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -325,7 +325,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.71.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -335,7 +335,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.45.0
+        version: 0.71.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -1420,7 +1420,6 @@ files:
 - gym/lib/assets/GymfileTemplate.swift
 - gym/lib/assets/wrap_xcodebuild/xcbuild-safe.sh
 - gym/lib/gym.rb
-- gym/lib/gym/.module.rb.swp
 - gym/lib/gym/code_signing_mapping.rb
 - gym/lib/gym/commands_generator.rb
 - gym/lib/gym/detect_values.rb
@@ -1608,7 +1607,9 @@ files:
 - spaceship/lib/spaceship/connect_api/models/beta_app_review_submission.rb
 - spaceship/lib/spaceship/connect_api/models/beta_build_localization.rb
 - spaceship/lib/spaceship/connect_api/models/beta_build_metric.rb
+- spaceship/lib/spaceship/connect_api/models/beta_feedback.rb
 - spaceship/lib/spaceship/connect_api/models/beta_group.rb
+- spaceship/lib/spaceship/connect_api/models/beta_screenshot.rb
 - spaceship/lib/spaceship/connect_api/models/beta_tester.rb
 - spaceship/lib/spaceship/connect_api/models/beta_tester_metric.rb
 - spaceship/lib/spaceship/connect_api/models/build.rb
@@ -1732,9 +1733,6 @@ files:
 - spaceship/lib/spaceship/ui.rb
 - supply/README.md
 - supply/lib/supply.rb
-- supply/lib/supply/.client.rb.swp
-- supply/lib/supply/.options.rb.swp
-- supply/lib/supply/.uploader.rb.swp
 - supply/lib/supply/apk_listing.rb
 - supply/lib/supply/client.rb
 - supply/lib/supply/commands_generator.rb