fastlane 2.180.1 → 2.181.0

data/spaceship/README.md

@@ -111,21 +111,11 @@ When your Apple account has 2 factor verification enabled, you'll automatically
 
 #### Web sessions
 
-To generate a web session for your CI machine, use
-
-```sh
-fastlane spaceauth -u user@example.org
-```
-
-This will authenticate you and provide a string that can be transferred to your CI system. Copy everything from `---\n` to your CI server and provide it as environment variable named `FASTLANE_SESSION`. For example:
-
-```
-export FASTLANE_SESSION='---\n- !ruby/object:HTTP::Cookie\n  name: DES5c148586dfd451e55afbaaa5f62418f91\n  value: HSARMTKNSRVTWFla1+yO4gVPowH17VaaaxPFnUdMUegQZxqy1Ie1c2v6bM1vSOzIbuOmrl/FNenlScsd/NbF7/Lw4cpnL15jsyg0TOJwP32tC/NguPiyOaaaU+jrj4tf4uKdIywVaaaFSRVT\n  domain: idmsa.apple.com\n  for_domain: true\n  path: "/"\n  secure: true\n  httponly: true\n  expires: 2016-04-27 23:55:56.000000000 Z\n  max_age: \n  created_at: 2016-03-28 16:55:57.032086000 -07:00\n  accessed_at: 2016-03-28 19:11:17.828141000 -07:00\n'
-```
+See [Continuous Integration > Authenticating with Apple services > Method 2: Two-step or two-factor authentication > Storing a manually verified session using spaceauth](https://docs.fastlane.tools/best-practices/continuous-integration/#storing-a-manually-verified-session-using-spaceauth)
 
 #### Transporter
 
-See [Continuous Integration > Authentication with Apple services > Application specific passwords](https://docs.fastlane.tools/best-practices/continuous-integration/#application-specific-passwords)
+See [Getting Started > iOS > Authentication > Method 3: Application-specific passwords](https://docs.fastlane.tools/getting-started/ios/authentication/#method-3-application-specific-passwords)
 
 ## _spaceship_ in use
 

data/spaceship/lib/spaceship/commands_generator.rb

@@ -39,9 +39,10 @@ module Spaceship
       command :spaceauth do |c|
         c.syntax = 'fastlane spaceship spaceauth'
         c.description = 'Authentication helper for spaceship/fastlane to work with Apple 2-Step/2FA'
+        c.option('--copy_to_clipboard', 'Whether the session string should be copied to clipboard. For more info see https://docs.fastlane.tools/best-practices/continuous-integration/#storing-a-manually-verified-session-using-spaceauth`')
 
         c.action do |args, options|
-          Spaceship::SpaceauthRunner.new(username: options.user).run
+          Spaceship::SpaceauthRunner.new(username: options.user, copy_to_clipboard: options.copy_to_clipboard).run
         end
       end
 

data/spaceship/lib/spaceship/spaceauth_runner.rb

@@ -1,15 +1,17 @@
 require 'colored'
 require 'credentials_manager/appfile_config'
 require 'yaml'
+require 'fastlane_core'
 
 require_relative 'tunes/tunes_client'
 
 module Spaceship
   class SpaceauthRunner
-    def initialize(username: nil)
+    def initialize(username: nil, copy_to_clipboard: nil)
       @username = username
       @username ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
       @username ||= ask("Username: ")
+      @copy_to_clipboard = copy_to_clipboard
     end
 
     def run
@@ -22,7 +24,7 @@ module Spaceship
         puts("Could not login to App Store Connect".red)
         puts("Please check your credentials and try again.".yellow)
         puts("This could be an issue with App Store Connect,".yellow)
-        puts("Please try unsetting the FASTLANE_SESSION environment variable".yellow)
+        puts("Please try unsetting the FASTLANE_SESSION environment variable by calling 'unset FASTLANE_SESSION'".yellow)
         puts("(if it is set) and re-run `fastlane spaceauth`".yellow)
         puts("")
         puts("Exception type: #{ex.class}")
@@ -49,22 +51,30 @@ module Spaceship
         cookie.name.start_with?("myacinfo") || cookie.name == "dqsid" || cookie.name.start_with?("DES")
       end
 
-      yaml = cookies.to_yaml.gsub("\n", "\\n")
+      @yaml = cookies.to_yaml.gsub("\n", "\\n")
 
       puts("---")
       puts("")
       puts("Pass the following via the FASTLANE_SESSION environment variable:")
-      puts(yaml.cyan.underline)
+      puts(@yaml.cyan.underline)
       puts("")
       puts("")
       puts("Example:")
-      puts("export FASTLANE_SESSION='#{yaml}'".cyan.underline)
+      puts("export FASTLANE_SESSION='#{@yaml}'".cyan.underline)
 
-      if mac? && Spaceship::Client::UserInterface.interactive? && agree("🙄 Should fastlane copy the cookie into your clipboard, so you can easily paste it? (y/n)", true)
-        require 'open3'
-        Open3.popen3('pbcopy') { |input, _, _| input << yaml }
-        puts("Successfully copied text into your clipboard 🎨".green)
+      if @copy_to_clipboard == false
+        puts("Skipped asking to copy the session string into your clipboard ⏭️".green)
+      elsif @copy_to_clipboard || (mac? && Spaceship::Client::UserInterface.interactive? && agree("🙄 Should fastlane copy the cookie into your clipboard, so you can easily paste it? (y/n)", true))
+        FastlaneCore::Clipboard.copy(content: @yaml)
+        puts("Successfully copied the session string into your clipboard 🎨".green)
       end
+
+      return self
+    end
+
+    def session_string
+      FastlaneCore::UI.user_error!("`#{__method__}` method called before calling `run` in `SpaceauthRunner`") unless @yaml
+      @yaml
     end
 
     def mac?

data/spaceship/lib/spaceship/tunes/members.rb

@@ -15,7 +15,7 @@ module Spaceship
 
         def find(email)
           all.each do |member|
-            if member.email_address == email
+            if member.email_address.casecmp?(email)
               return member
             end
           end

data/supply/lib/supply/client.rb

@@ -327,12 +327,14 @@ module Supply
     def upload_mapping(path_to_mapping, apk_version_code)
       ensure_active_edit!
 
+      extension = File.extname(path_to_mapping).downcase
+
       call_google_api do
         client.upload_edit_deobfuscationfile(
           current_package_name,
           current_edit.id,
           apk_version_code,
-          "proguard",
+          extension == ".zip" ? "nativeCode" : "proguard",
           upload_source: path_to_mapping,
           content_type: "application/octet-stream"
         )

data/supply/lib/supply/options.rb

@@ -223,7 +223,7 @@ module Supply
                                      default_value: false),
         FastlaneCore::ConfigItem.new(key: :mapping,
                                      env_name: "SUPPLY_MAPPING",
-                                     description: "Path to the mapping file to upload",
+                                     description: "Path to the mapping file to upload (mapping.txt or native-debug-symbols.zip alike)",
                                      short_option: "-d",
                                      conflicting_options: [:mapping_paths],
                                      optional: true,
@@ -235,7 +235,7 @@ module Supply
                                      conflicting_options: [:mapping],
                                      optional: true,
                                      type: Array,
-                                     description: "An array of paths to mapping files to upload",
+                                     description: "An array of paths to mapping files to upload (mapping.txt or native-debug-symbols.zip alike)",
                                      short_option: "-s",
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)

data/supply/lib/supply/uploader.rb

@@ -304,6 +304,7 @@ module Supply
       mapping_paths = [Supply.config[:mapping]] unless (mapping_paths = Supply.config[:mapping_paths])
       mapping_paths.zip(apk_version_codes).each do |mapping_path, version_code|
         if mapping_path
+          UI.message("Preparing mapping at path '#{mapping_path}', version code #{version_code} for upload...")
           client.upload_mapping(mapping_path, version_code)
         end
       end

metadata

@@ -1,37 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.180.1
+  version: 2.181.0
 platform: ruby
 authors:
-- Roger Oba
-- Jimmy Dee
-- Stefan Natchev
-- Jorge Revuelta H
+- Matthew Ellis
+- Maksym Grebenets
+- Iulian Onofrei
+- Jérôme Lacoste
 - Josh Holtz
-- Fumiya Nakamura
-- Helmut Januschka
+- Luka Mirosevic
+- Joshua Liebowitz
 - Manu Wallner
-- Jan Piotrowski
-- Daniel Jankowski
-- Iulian Onofrei
-- Olivier Halligon
 - Max Ott
-- Kohki Miki
+- Jorge Revuelta H
+- Andrew McBurney
+- Fumiya Nakamura
 - Felix Krause
 - Satoshi Namai
-- Maksym Grebenets
-- Joshua Liebowitz
-- Danielle Tomlinson
-- Jérôme Lacoste
-- Luka Mirosevic
+- Helmut Januschka
 - Aaron Brager
-- Andrew McBurney
-- Matthew Ellis
+- Roger Oba
+- Jan Piotrowski
+- Danielle Tomlinson
+- Olivier Halligon
+- Daniel Jankowski
+- Jimmy Dee
+- Stefan Natchev
+- Kohki Miki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1011,10 +1011,8 @@ files:
 - fastlane/lib/assets/s3_version_template.erb
 - fastlane/lib/fastlane.rb
 - fastlane/lib/fastlane/.erb_template_helper.rb.swp
-- fastlane/lib/fastlane/.fastlane_require.rb.swp
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
-- fastlane/lib/fastlane/actions/.cocoapods.rb.swp
 - fastlane/lib/fastlane/actions/.git_commit.rb.swp
 - fastlane/lib/fastlane/actions/README.md
 - fastlane/lib/fastlane/actions/actions_helper.rb
@@ -1400,6 +1398,7 @@ files:
 - fastlane_core/lib/fastlane_core/android_package_name_guesser.rb
 - fastlane_core/lib/fastlane_core/build_watcher.rb
 - fastlane_core/lib/fastlane_core/cert_checker.rb
+- fastlane_core/lib/fastlane_core/clipboard.rb
 - fastlane_core/lib/fastlane_core/command_executor.rb
 - fastlane_core/lib/fastlane_core/configuration/commander_generator.rb
 - fastlane_core/lib/fastlane_core/configuration/config_item.rb