fastlane 2.105.2 → 2.106.0

data/match/lib/match/storage.rb

@@ -0,0 +1,16 @@
+require_relative 'storage/interface'
+require_relative 'storage/git_storage'
+
+module Match
+  module Storage
+    def self.for_mode(storage_mode, params)
+      if storage_mode == "git"
+        return Storage::GitStorage.configure(params)
+      elsif storage_mode == "google_cloud"
+        # return Storage::GoogleCloudStorage
+      else
+        UI.user_error!("Invalid storage mode '#{storage_mode}'")
+      end
+    end
+  end
+end

data/match/lib/match/storage/git_storage.rb

@@ -0,0 +1,228 @@
+require 'fastlane_core/command_executor'
+
+require_relative '../module'
+require_relative './interface'
+
+module Match
+  module Storage
+    # Store the code signing identities in a git repo
+    class GitStorage < Interface
+      MATCH_VERSION_FILE_NAME = "match_version.txt"
+
+      # User provided values
+      attr_accessor :git_url
+      attr_accessor :shallow_clone
+      attr_accessor :skip_docs
+      attr_accessor :branch
+      attr_accessor :git_full_name
+      attr_accessor :git_user_email
+      attr_accessor :clone_branch_directly
+      attr_accessor :type
+      attr_accessor :platform
+
+      def self.configure(params)
+        return self.new(
+          type: params[:type].to_s,
+          platform: params[:platform].to_s,
+          git_url: params[:git_url],
+          shallow_clone: params[:shallow_clone],
+          skip_docs: params[:skip_docs],
+          branch: params[:git_branch],
+          git_full_name: params[:git_full_name],
+          git_user_email: params[:git_user_email],
+          clone_branch_directly: params[:clone_branch_directly]
+        )
+      end
+
+      def initialize(type: nil,
+                     platform: nil,
+                     git_url: nil,
+                     shallow_clone: nil,
+                     skip_docs: false,
+                     branch: "master",
+                     git_full_name: nil,
+                     git_user_email: nil,
+                     clone_branch_directly: false)
+        self.git_url = git_url
+        self.shallow_clone = shallow_clone
+        self.skip_docs = skip_docs
+        self.branch = branch
+        self.git_full_name = git_full_name
+        self.git_user_email = git_user_email
+        self.clone_branch_directly = clone_branch_directly
+
+        self.type = type if type
+        self.platform = platform if platform
+      end
+
+      def download
+        # Check if we already have a functional working_directory
+        return self.working_directory if @working_directory
+
+        # No existing working directory, creating a new one now
+        self.working_directory = Dir.mktmpdir
+
+        command = "git clone '#{self.git_url}' '#{self.working_directory}'"
+        if self.shallow_clone
+          command << " --depth 1 --no-single-branch"
+        elsif self.clone_branch_directly
+          command += " -b #{self.branch.shellescape} --single-branch"
+        end
+
+        UI.message("Cloning remote git repo...")
+        if self.branch && !self.clone_branch_directly
+          UI.message("If cloning the repo takes too long, you can use the `clone_branch_directly` option in match.")
+        end
+
+        begin
+          # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
+          FastlaneCore::CommandExecutor.execute(command: "GIT_TERMINAL_PROMPT=0 #{command}",
+                                              print_all: FastlaneCore::Globals.verbose?,
+                                          print_command: FastlaneCore::Globals.verbose?)
+        rescue
+          UI.error("Error cloning certificates repo, please make sure you have read access to the repository you want to use")
+          if self.branch && self.clone_branch_directly
+            UI.error("You passed '#{self.branch}' as branch in combination with the `clone_branch_directly` flag. Please remove `clone_branch_directly` flag on the first run for _match_ to create the branch.")
+          end
+          UI.error("Run the following command manually to make sure you're properly authenticated:")
+          UI.command(command)
+          UI.user_error!("Error cloning certificates git repo, please make sure you have access to the repository - see instructions above")
+        end
+
+        add_user_config(self.git_full_name, self.git_user_email)
+
+        unless File.directory?(self.working_directory)
+          UI.user_error!("Error cloning repo, make sure you have access to it '#{self.git_url}'")
+        end
+
+        checkout_branch unless self.branch == "master"
+      end
+
+      def save_changes!(files_to_commit: [], custom_message: nil)
+        Dir.chdir(File.expand_path(self.working_directory)) do
+          commands = []
+
+          if files_to_commit.count > 0 # e.g. for nuke this is treated differently
+            if !File.exist?(MATCH_VERSION_FILE_NAME) || File.read(MATCH_VERSION_FILE_NAME) != Fastlane::VERSION.to_s
+              files_to_commit << MATCH_VERSION_FILE_NAME
+              File.write(MATCH_VERSION_FILE_NAME, Fastlane::VERSION) # stored unencrypted
+            end
+
+            template = File.read("#{Match::ROOT}/lib/assets/READMETemplate.md")
+            readme_path = "README.md"
+            if (!File.exist?(readme_path) || File.read(readme_path) != template) && !self.skip_docs
+              files_to_commit << readme_path
+              File.write(readme_path, template)
+            end
+
+            # `git add` each file we want to commit
+            #   - Fixes https://github.com/fastlane/fastlane/issues/8917
+            #   - Fixes https://github.com/fastlane/fastlane/issues/8793
+            #   - Replaces, closes and fixes https://github.com/fastlane/fastlane/pull/8919
+            commands += files_to_commit.map do |current_file|
+              "git add #{current_file.shellescape}"
+            end
+          else
+            # No specific list given, e.g. this happens on `fastlane match nuke`
+            # We just want to run `git add -A` to commit everything
+            commands << "git add -A"
+          end
+          commit_message = custom_message || generate_commit_message
+          commands << "git commit -m #{commit_message.shellescape}"
+          commands << "GIT_TERMINAL_PROMPT=0 git push origin #{self.branch.shellescape}"
+
+          UI.message("Pushing changes to remote git repo...")
+
+          begin
+            commands.each do |command|
+              FastlaneCore::CommandExecutor.execute(command: command,
+                                                  print_all: FastlaneCore::Globals.verbose?,
+                                              print_command: FastlaneCore::Globals.verbose?)
+            end
+
+            self.clear_changes
+          rescue => ex
+            UI.error("Couldn't commit or push changes back to git...")
+            UI.error(ex)
+          end
+        end
+      end
+
+      def clear_changes
+        return unless @working_directory
+
+        FileUtils.rm_rf(self.working_directory)
+        self.working_directory = nil
+      end
+
+      # Generate the commit message based on the user's parameters
+      def generate_commit_message
+        [
+          "[fastlane]",
+          "Updated",
+          self.type,
+          "and platform",
+          self.platform
+        ].join(" ")
+      end
+
+      private
+
+      # Create and checkout an specific branch in the git repo
+      def checkout_branch
+        return unless self.working_directory
+
+        commands = []
+        if branch_exists?(self.branch)
+          # Checkout the branch if it already exists
+          commands << "git checkout #{self.branch.shellescape}"
+        else
+          # If a new branch is being created, we create it as an 'orphan' to not inherit changes from the master branch.
+          commands << "git checkout --orphan #{self.branch.shellescape}"
+          # We also need to reset the working directory to not transfer any uncommitted changes to the new branch.
+          commands << "git reset --hard"
+        end
+
+        UI.message("Checking out branch #{self.branch}...")
+
+        Dir.chdir(self.working_directory) do
+          commands.each do |command|
+            FastlaneCore::CommandExecutor.execute(command: command,
+                                                  print_all: FastlaneCore::Globals.verbose?,
+                                                  print_command: FastlaneCore::Globals.verbose?)
+          end
+        end
+      end
+
+      # Checks if a specific branch exists in the git repo
+      def branch_exists?(branch)
+        return unless self.working_directory
+
+        result = Dir.chdir(self.working_directory) do
+          FastlaneCore::CommandExecutor.execute(command: "git --no-pager branch --list origin/#{branch.shellescape} --no-color -r",
+                                                print_all: FastlaneCore::Globals.verbose?,
+                                                print_command: FastlaneCore::Globals.verbose?)
+        end
+        return !result.empty?
+      end
+
+      def add_user_config(user_name, user_email)
+        # Add git config if needed
+        commands = []
+        commands << "git config user.name \"#{user_name}\"" unless user_name.nil?
+        commands << "git config user.email \"#{user_email}\"" unless user_email.nil?
+
+        return if commands.empty?
+
+        UI.message("Add git user config to local git repo...")
+        Dir.chdir(self.working_directory) do
+          commands.each do |command|
+            FastlaneCore::CommandExecutor.execute(command: command,
+                                                  print_all: FastlaneCore::Globals.verbose?,
+                                                  print_command: FastlaneCore::Globals.verbose?)
+          end
+        end
+      end
+    end
+  end
+end

data/match/lib/match/storage/interface.rb

@@ -0,0 +1,50 @@
+module Match
+  module Storage
+    class Interface
+      # The working directory in which we download all the profiles
+      # and decrypt/encrypt them
+      attr_accessor :working_directory
+
+      # To make debugging easier, we have a custom exception here
+      def working_directory
+        if @working_directory.nil?
+          raise "`working_directory` for the current storage provider is `nil` as the `#download` method was never called"
+        end
+        return @working_directory
+      end
+
+      # Call this method after creating a new object to configure
+      # the given Storage object. This method will take
+      # different paramters depending on specific class being used
+      def configure
+        not_implemented(__method__)
+      end
+
+      # Call this method for the initial clone/download of the
+      # user's certificates & profiles
+      # As part of this method, the `self.working_directory` attribute
+      # will be set
+      def download
+        not_implemented(__method__)
+      end
+
+      # Call this method after locally modifying the files
+      # This will commit the changes and push it back to the
+      # given remote server
+      # This method is blocking, meaning it might take multiple
+      # seconds or longer to run
+      # @parameter files_to_commit [Array] Array to paths to files
+      #   that should be committed to the storage provider
+      # @parameter custom_message: [String] Custom change message
+      #           that's optional, is used for commit title
+      def save_changes!(files_to_commit: [], custom_message: nil)
+        not_implemented(__method__)
+      end
+
+      # Call this method to reset any changes made locally to the files
+      def clear_changes
+        not_implemented(__method__)
+      end
+    end
+  end
+end

data/snapshot/lib/snapshot/screenshot_rotate.rb

@@ -25,16 +25,11 @@ module Snapshot
           command = "sips -r 180 '#{file}'"
         end
 
+        # Only rotate if we need to
         next unless command
 
-        # Only rotate if we need to
-        FastlaneCore::FastlanePty.spawn(command) do |command_stdout, command_stdin, pid|
-          command_stdout.sync
-          command_stdout.each do |line|
-            # We need to read this otherwise things hang
-          end
-          ::Process.wait(pid)
-        end
+        # Rotate
+        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: false)
       end
     end
   end

data/spaceship/README.md

@@ -113,7 +113,7 @@ This requires you to install `pry` using `sudo gem install pry`. `pry` is not in
 
 ## 2 Step Verification
 
-When your Apple account has 2 factor verification enabled, you'll automatically be asked to verify your identity using your phone. The resulting session will be stored in `~/.fastlane/spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
+When your Apple account has 2 factor verification enabled, you'll automatically be asked to verify your identity. If you have a trusted device configured for your account, then a code will appear on the device. If you don't have any devices configured, but have trusted a phone number, then a code will be sent to your phone. The resulting session will be stored in `~/.fastlane/spaceship/[email]/cookie`. The session should be valid for about one month, however there is no way to test this without actually waiting for over a month.
 
 ### Support for CI machines
 
@@ -133,6 +133,15 @@ export FASTLANE_SESSION='---\n- !ruby/object:HTTP::Cookie\n  name: DES5c148586df
 
 Copy everything from `---\n` to your CI server and provide it as environment variable named `FASTLANE_SESSION`.
 
+#### Bypass trusted device and use SMS for verification
+
+If you have a trusted device configured, Apple will not send a SMS code to your phone for your Apple account when you try to generate a web session with _fastlane_. Instead, a code will be displayed on one of your account's trusted devices. This can be problematic if you are trying to authenticate but don't have access to a trusted device. Take the following steps to circumvent the device and use SMS instead:
+
+- Attempt to generate a web session with `fastlane spaceauth -u [email]` and wait for security code prompt to appear
+- Open a browser to [appleid.apple.com](https://appleid.apple.com) or an address that requires you to login with your Apple ID, and logout of any previous session
+- Login with your Apple ID and request a code be sent to the desired phone when prompted for a security code
+- Use the code sent to phone with _fastlane_ instead of with the browser
+
 #### Transporter
 
 If you want to upload builds to TestFlight/App Store Connect from your CI, you have to generate an application specific password:

data/spaceship/lib/spaceship/du/du_client.rb

@@ -102,6 +102,7 @@ module Spaceship
       # rubocop:enable Layout/ExtraSpacing
       {
         watch:        "MZPFT.SortedN27ScreenShot",
+        watchSeries4: "MZPFT.SortedN131ScreenShot",
         ipad:         "MZPFT.SortedTabletScreenShot",
         ipadPro:      "MZPFT.SortedJ99ScreenShot",
         ipad105:      "MZPFT.SortedJ207ScreenShot",
@@ -134,6 +135,7 @@ module Spaceship
       # rubocop:enable Layout/ExtraSpacing
       {
         watch:        [[312, 390]],
+        watchSeries4: [[368, 448]],
         ipad:         [[1024, 748], [1024, 768], [2048, 1496], [2048, 1536], [768, 1004], [768, 1024], [1536, 2008], [1536, 2048]],
         ipadPro:      [[2048, 2732], [2732, 2048]],
         ipad105:      [[1668, 2224], [2224, 1668]],

data/spaceship/lib/spaceship/portal/device.rb

@@ -155,7 +155,6 @@ module Spaceship
           return existing if existing
 
           # It is valid to have the same name for multiple devices
-
           device = client.create_device!(name, udid, mac: mac)
 
           # Update self with the new device

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -532,7 +532,13 @@ module Spaceship
         register: 'single'
       })
 
-      parse_response(req, 'devices').first
+      devices = parse_response(req, 'devices')
+      return devices.first unless devices.empty?
+
+      validation_messages = parse_response(req, 'validationMessages').map { |message| message["validationUserMessage"] }.compact.uniq
+
+      raise UnexpectedResponse.new, validation_messages.join('\n') unless validation_messages.empty?
+      raise UnexpectedResponse.new, "Couldn't register new device, got this: #{parse_response(req)}"
     end
 
     def disable_device!(device_id, device_udid, mac: false)

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -44,7 +44,7 @@ module Spaceship
 
       # We remove all the un-needed cookies
       cookies.select! do |cookie|
-        cookie.name.start_with?("DES5") || cookie.name == 'dqsid'
+        cookie.name.start_with?("myacinfo") || cookie.name == 'dqsid'
       end
 
       yaml = cookies.to_yaml.gsub("\n", "\\n")

data/spaceship/lib/spaceship/tunes/app_details.rb

@@ -23,7 +23,7 @@ module Spaceship
       # @return (Hash) A hash representing the privacy URL in all languages
       attr_reader :privacy_url
 
-      # @return (Hash) Some bla bla about privacy
+      # @return (Hash) A hash prepresenting the privacy URL in all languages for Apple TV
       attr_reader :apple_tv_privacy_policy
 
       # Categories (e.g. MZGenre.Business)

data/spaceship/lib/spaceship/tunes/device_type.rb

@@ -1,7 +1,7 @@
 module Spaceship
   module Tunes
     class DeviceType
-      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'iphone65', 'ipad', 'ipadPro', 'ipad105', 'watch', 'appleTV', 'desktop']
+      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'iphone58', 'iphone65', 'ipad', 'ipadPro', 'ipad105', 'watch', 'watchSeries4', 'appleTV', 'desktop']
       class << self
         attr_accessor :types
 

metadata

@@ -1,33 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.105.2
+  version: 2.106.0
 platform: ruby
 authors:
-- Aaron Brager
-- Joshua Liebowitz
-- Maksym Grebenets
-- Jorge Revuelta H
+- Manu Wallner
 - Olivier Halligon
-- Kohki Miki
-- Jimmy Dee
+- Felix Krause
+- Danielle Tomlinson
+- Fumiya Nakamura
+- Maksym Grebenets
+- Luka Mirosevic
+- Iulian Onofrei
 - Jérôme Lacoste
+- Kohki Miki
+- Jorge Revuelta H
+- Stefan Natchev
+- Helmut Januschka
+- Aaron Brager
 - Andrew McBurney
-- Matthew Ellis
-- Fumiya Nakamura
+- Jimmy Dee
 - Josh Holtz
-- Helmut Januschka
+- Joshua Liebowitz
 - Jan Piotrowski
-- Felix Krause
-- Stefan Natchev
-- Luka Mirosevic
-- Danielle Tomlinson
-- Iulian Onofrei
-- Manu Wallner
+- Matthew Ellis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -633,6 +633,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: bootsnap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -1009,6 +1029,7 @@ files:
 - fastlane/lib/fastlane/actions/dotgpg_environment.rb
 - fastlane/lib/fastlane/actions/download.rb
 - fastlane/lib/fastlane/actions/download_dsyms.rb
+- fastlane/lib/fastlane/actions/download_from_play_store.rb
 - fastlane/lib/fastlane/actions/dsym_zip.rb
 - fastlane/lib/fastlane/actions/echo.rb
 - fastlane/lib/fastlane/actions/ensure_git_branch.rb
@@ -1312,7 +1333,6 @@ files:
 - fastlane_core/lib/fastlane_core/ios_app_identifier_guesser.rb
 - fastlane_core/lib/fastlane_core/ipa_file_analyser.rb
 - fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb
-- fastlane_core/lib/fastlane_core/itunes_search_api.rb
 - fastlane_core/lib/fastlane_core/itunes_transporter.rb
 - fastlane_core/lib/fastlane_core/keychain_importer.rb
 - fastlane_core/lib/fastlane_core/languages.rb
@@ -1386,15 +1406,19 @@ files:
 - match/lib/match.rb
 - match/lib/match/change_password.rb
 - match/lib/match/commands_generator.rb
-- match/lib/match/encrypt.rb
+- match/lib/match/encryption.rb
+- match/lib/match/encryption/interface.rb
+- match/lib/match/encryption/openssl.rb
 - match/lib/match/generator.rb
-- match/lib/match/git_helper.rb
 - match/lib/match/module.rb
 - match/lib/match/nuke.rb
 - match/lib/match/options.rb
 - match/lib/match/runner.rb
 - match/lib/match/setup.rb
 - match/lib/match/spaceship_ensure.rb
+- match/lib/match/storage.rb
+- match/lib/match/storage/git_storage.rb
+- match/lib/match/storage/interface.rb
 - match/lib/match/table_printer.rb
 - match/lib/match/utils.rb
 - pem/README.md
@@ -1530,6 +1554,8 @@ files:
 - spaceship/lib/assets/languageMapping.json
 - spaceship/lib/assets/languageMappingReadable.json
 - spaceship/lib/spaceship.rb
+- spaceship/lib/spaceship/api/.DS_Store
+- spaceship/lib/spaceship/api/.base.rb.swp
 - spaceship/lib/spaceship/babosa_fix.rb
 - spaceship/lib/spaceship/base.rb
 - spaceship/lib/spaceship/client.rb