fastlane 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30bf18c8b5fd980a862648ec6cba94f11f0b1aed
-  data.tar.gz: 3558eaec5dcce06536ed04f2fa20a7315c2b3b4b
+  metadata.gz: acbb31b6b342da9f2a15a22936808c0c93d68762
+  data.tar.gz: 21bd81ba701a4b11a2bf71d8cc8b41a20f4be78c
 SHA512:
-  metadata.gz: 725d84319bf1219fef0658c4f29f5004baa1fb7eb8625642855f48a3b0d607c4839e2519575a31fcc4963cca43189379e5f4ff405287e250a1d27094639dd926
-  data.tar.gz: 1dcb5131e5708cd5c2c0841192e66b65f97768bee7e371b45aa09468d2fd38042a9d498bb8d760e39d79b642394fd953de22888e09345686be074788b8fa2784
+  metadata.gz: 43b2ba4ba3613e9324522c76a6a081639d4ddb46d1a00d95c01c2a809e2d84c43525d09533102e7197fd4a4dedb288f40c1a90dcc5393def55ab3a15619d1317
+  data.tar.gz: e372a9675ae45e33aa649f620116ee257313679d692673ecc073f88fa134fdb382a787a4e430065a3a2d05847851532e2602b22d3db587c34795703ffb62e901

data/bin/fastlane

@@ -2,4 +2,14 @@
 $LOAD_PATH.push File.expand_path("../../lib", __FILE__)
 
 require "fastlane/cli_tools_distributor"
+
+if Fastlane::CLIToolsDistributor.running_version_command?
+  # This will print out the fastlane binary path right above the
+  # version number. Very often, users are not aware they have
+  # e.g. bundled fastlane installed
+  puts "fastlane installation at path:"
+  puts File.expand_path(__FILE__)
+  puts "-----------------------------"
+end
+
 Fastlane::CLIToolsDistributor.take_off

data/credentials_manager/lib/credentials_manager/account_manager.rb

@@ -3,19 +3,31 @@ require 'highline/import' # to hide the entered password
 
 module CredentialsManager
   class AccountManager
+    DEFAULT_PREFIX = "deliver"
     # @param prefix [String] Very optional, is used for the
     #   iTunes Transporter which uses application specofic passwords
-    def initialize(user: nil, password: nil, prefix: nil)
-      @prefix = prefix || "deliver"
+    # @param note [String] An optional note that will be shown next
+    #   to the password and username prompt
+    def initialize(user: nil, password: nil, prefix: nil, note: nil)
+      @prefix = prefix || DEFAULT_PREFIX
 
       @user = user
       @password = password
+      @note = note
+    end
+
+    # Is the that default prefix "deliver"
+    def default_prefix?
+      @prefix == DEFAULT_PREFIX
     end
 
     def user
-      @user ||= ENV["FASTLANE_USER"]
-      @user ||= ENV["DELIVER_USER"]
-      @user ||= AppfileConfig.try_fetch_value(:apple_id)
+      if default_prefix?
+        @user ||= ENV["FASTLANE_USER"]
+        @user ||= ENV["DELIVER_USER"]
+        @user ||= AppfileConfig.try_fetch_value(:apple_id)
+      end
+
       ask_for_login if @user.to_s.length == 0
       return @user
     end
@@ -25,7 +37,10 @@ module CredentialsManager
     end
 
     def password(ask_if_missing: true)
-      @password ||= fetch_password_from_env
+      if default_prefix?
+        @password ||= fetch_password_from_env
+      end
+
       unless @password
         item = Security::InternetPassword.find(server: server_name)
         @password ||= item.password if item
@@ -87,20 +102,28 @@ module CredentialsManager
     def ask_for_login
       puts "-------------------------------------------------------------------------------------".green
       puts "The login information you enter will be stored in your Mac OS Keychain".green
-      puts "You can also pass the password using the `FASTLANE_PASSWORD` environment variable".green
-      puts "More information about it on GitHub: https://github.com/fastlane/fastlane/tree/master/credentials_manager".green
+      if default_prefix?
+        # We don't want to show this message, if we ask for the application specific password
+        # which has a different prefix
+        puts "You can also pass the password using the `FASTLANE_PASSWORD` environment variable".green
+        puts "More information about it on GitHub: https://github.com/fastlane/fastlane/tree/master/credentials_manager".green
+      end
       puts "-------------------------------------------------------------------------------------".green
 
       if @user.to_s.length == 0
         raise "Missing username, and running in non-interactive shell" if $stdout.isatty == false
-        @user = ask("Username: ") while @user.to_s.length == 0
+        prompt_text = "Username"
+        prompt_text += " (#{@note})" if @note
+        prompt_text += ": "
+        @user = ask(prompt_text) while @user.to_s.length == 0
         # we return here, as only the username was asked for now, we'll get called for the pw again anyway
         return
       end
 
       while @password.to_s.length == 0
         raise "Missing password for user #{@user}, and running in non-interactive shell" if $stdout.isatty == false
-        @password = ask("Password (for #{@user}): ") { |q| q.echo = "*" }
+        note = @note + " " if @note
+        @password = ask("Password (#{note}for #{@user}): ") { |q| q.echo = "*" }
       end
 
       return true if ENV["FASTLANE_DONT_STORE_PASSWORD"]

data/deliver/lib/deliver/options.rb

@@ -27,6 +27,7 @@ module Deliver
         FastlaneCore::ConfigItem.new(key: :edit_live,
                                      short_option: "-o",
                                      optional: true,
+                                     default_value: false,
                                      env_name: "DELIVER_EDIT_LIVE",
                                      description: "Modify live metadata, this option disables ipa upload and screenshot upload",
                                      is_string: false),

data/deliver/lib/deliver/upload_metadata.rb

@@ -37,6 +37,15 @@ module Deliver
         v = app.live_version(platform: options[:platform])
         localised_options = LOCALISED_LIVE_VALUES
         non_localised_options = NON_LOCALISED_LIVE_VALUES
+
+        if v.nil?
+          UI.message("Couldn't find live version, editing the current version on iTunes Connect instead")
+          v = app.edit_version(platform: options[:platform])
+          # we don't want to update the localised_options and non_localised_options
+          # as we also check for `options[:edit_live]` at other areas in the code
+          # by not touching those 2 variables, deliver is more consistent with what the option says
+          # in the documentation
+        end
       else
         v = app.edit_version(platform: options[:platform])
         localised_options = (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES)

data/fastlane/lib/fastlane/commands_generator.rb

@@ -28,7 +28,7 @@ module Fastlane
       FastlaneCore::UpdateChecker.start_looking_for_update('fastlane')
       Fastlane.load_actions
       # do not use "include" as it may be some where in the commandline where "env" is required, therefore explicit index->0
-      unless ARGV[0] == "env"
+      unless ARGV[0] == "env" || CLIToolsDistributor.running_version_command?
         # *after* loading the plugins
         Fastlane.plugin_manager.load_plugins
         Fastlane::PluginUpdateManager.start_looking_for_updates

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.4.0'.freeze
+  VERSION = '2.5.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -71,14 +71,8 @@ module FastlaneCore
 
         device_uuids = []
         result = Plist.parse_xml(usb_devices_output)
-        result[0]['_items'].each do |host_controller| # loop just incase the host system has more then 1 controller
-          host_controller['_items'].each do |usb_device|
-            is_supported_device = device_types.any? { |device_type| usb_device['_name'] == device_type }
-            if is_supported_device && usb_device['serial_num'].length == 40
-              device_uuids.push(usb_device['serial_num'])
-            end
-          end
-        end
+
+        discover_devices(result[0], device_types, device_uuids) if result[0]
 
         if device_uuids.count > 0 # instruments takes a little while to return so skip it if we have no devices
           instruments_devices_output = ''
@@ -100,6 +94,21 @@ module FastlaneCore
         return devices
       end
 
+      # Recursively handle all USB items, discovering devices that match the
+      # desired types.
+      def discover_devices(usb_item, device_types, discovered_device_udids)
+        (usb_item['_items'] || []).each do |child_item|
+          discover_devices(child_item, device_types, discovered_device_udids)
+        end
+
+        is_supported_device = device_types.any? { |device_type| usb_item['_name'] == device_type }
+        has_serial_number = (usb_item['serial_num'] || '').length == 40
+
+        if is_supported_device && has_serial_number
+          discovered_device_udids << usb_item['serial_num']
+        end
+      end
+
       # The code below works from Xcode 7 on
       # def all
       #   UI.verbose("Fetching available devices")

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -294,20 +294,9 @@ module FastlaneCore
       use_shell_script ||= Helper.is_mac? && Helper.xcode_version.start_with?('6.')
       use_shell_script ||= Feature.enabled?('FASTLANE_ITUNES_TRANSPORTER_USE_SHELL_SCRIPT')
 
-      # First, see if we have an application specific password
-      data = CredentialsManager::AccountManager.new(user: user,
-                                                  prefix: TWO_STEP_HOST_PREFIX)
-      @user = data.user
-      @password ||= data.password(ask_if_missing: false)
-
-      if @password.to_s.length == 0
-        # No specific password found, just using the iTC/Dev Portal one
-        # default to the given password here
-        data = CredentialsManager::AccountManager.new(user: user,
-                                                  password: password)
-        @user = data.user
-        @password ||= data.password
-      end
+      @user = user
+      @password = password || load_password_for_transporter
+
       @transporter_executor = use_shell_script ? ShellScriptTransporterExecutor.new : JavaTransporterExecutor.new
       @provider_short_name = provider_short_name
     end
@@ -383,10 +372,36 @@ module FastlaneCore
 
     private
 
+    TWO_FACTOR_ENV_VARIABLE = "FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD"
+
+    # Returns the password to be used with the transporter
+    def load_password_for_transporter
+      # 3 different sources for the password
+      #   1) ENV variable for application specific password
+      return ENV[TWO_FACTOR_ENV_VARIABLE] if ENV[TWO_FACTOR_ENV_VARIABLE].to_s.length > 0
+      #   2) TWO_STEP_HOST_PREFIX from keychain
+      account_manager = CredentialsManager::AccountManager.new(user: @user,
+                                                             prefix: TWO_STEP_HOST_PREFIX,
+                                                               note: "application-specific")
+      password = account_manager.password(ask_if_missing: false)
+      return password if password.to_s.length > 0
+      #   3) standard iTC password
+      account_manager = CredentialsManager::AccountManager.new(user: @user)
+      return account_manager.password(ask_if_missing: true)
+    end
+
     # Tells the user how to get an application specific password
     def handle_two_step_failure(ex)
+      if ENV[TWO_FACTOR_ENV_VARIABLE].to_s.length > 0
+        # Password provided, however we already used it
+        UI.error("Application specific password you provided using #{TWO_FACTOR_ENV_VARIABLE}")
+        UI.error("is invalid, please make sure it's correct")
+        UI.user_error!("Invalid application specific password provided")
+      end
+
       a = CredentialsManager::AccountManager.new(user: @user,
-                                               prefix: TWO_STEP_HOST_PREFIX)
+                                               prefix: TWO_STEP_HOST_PREFIX,
+                                                 note: "application-specific")
       if a.password(ask_if_missing: false).to_s.length > 0
         # user already entered one.. delete the old one
         UI.error("Application specific password seems wrong")
@@ -397,7 +412,10 @@ module FastlaneCore
       UI.error("Please go to https://appleid.apple.com/account/manage")
       UI.error("and generate an application specific password for")
       UI.error("the iTunes Transporter, which is used to upload builds")
-      @password = a.password # to ask the user for the missing value
+      UI.error("To set the application specific password on a CI machine using")
+      UI.error("an environment variable, you can set the")
+      UI.error("#{TWO_FACTOR_ENV_VARIABLE} variable")
+      @password = a.password(ask_if_missing: true) # to ask the user for the missing value
 
       return true
     end

data/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb

@@ -71,6 +71,8 @@ module FastlaneCore
       end
       puts '#######################################################################'.green
       Changelog.show_changes(gem_name, current_version) unless FastlaneCore::Env.truthy?("FASTLANE_HIDE_CHANGELOG")
+
+      ensure_rubygems_source
     end
 
     # The command that the user should use to update their mac
@@ -84,6 +86,20 @@ module FastlaneCore
       end
     end
 
+    # Check if RubyGems is set as a gem source
+    # on some machines that might not be the case
+    # and then users can't find the update when
+    # running the specified command
+    def self.ensure_rubygems_source
+      return if Helper.contained_fastlane?
+      return if `gem sources`.include?("https://rubygems.org")
+      puts ""
+      UI.error("RubyGems is not listed as your Gem source")
+      UI.error("You can run `gem sources` to see all your sources")
+      UI.error("Please run the following command to fix this:")
+      UI.command("gem sources --add https://rubygems.org")
+    end
+
     # Generate the URL on the main thread (since we're switching directory)
     def self.generate_fetch_url(gem_name)
       url = UPDATE_URL + gem_name

data/spaceship/README.md

@@ -112,7 +112,11 @@ This requires you to install `pry` using `sudo gem install pry`. `pry` is not in
 
 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 `~/.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.
 
-Since your CI system probably doesn't allow you to input values (like the verification code), you can use `fastlane spaceauth`:
+### Support for CI machines
+
+#### Web sessions
+
+To generate a web session for your CI machine, use
 
 ```sh
 fastlane spaceauth -u apple@krausefx.com
@@ -126,6 +130,16 @@ 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`.
 
+#### Transporter
+
+If you want to upload builds to TestFlight/iTunes Connect from your CI, you have to generate an application specific password:
+
+1. Visit [appleid.apple.com/account/manage](https://appleid.apple.com/account/manage)
+1. Generate a new application specific password
+1. Provide the application specific password using an environment variable `FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD`.
+
+Alternatively you can enter the password when you're asked the first time _fastlane_ uploads a build.
+
 ### _spaceship_ in use
 
 All [fastlane tools](https://fastlane.tools) that communicate with Apple's web services in some way, use _spaceship_ to do so.

data/supply/lib/supply/client.rb

@@ -211,6 +211,21 @@ module Supply
       return result_upload.version_code
     end
 
+    def upload_mapping(path_to_mapping, apk_version_code)
+      ensure_active_edit!
+
+      call_google_api do
+        android_publisher.upload_edit_deobfuscationfile(
+          current_package_name,
+          current_edit.id,
+          apk_version_code,
+          "proguard",
+          upload_source: path_to_mapping,
+          content_type: "application/octet-stream"
+        )
+      end
+    end
+
     # Updates the track for the provided version code(s)
     def update_track(track, rollout, apk_version_code)
       ensure_active_edit!

data/supply/lib/supply/options.rb

@@ -127,7 +127,29 @@ module Supply
                                      optional: true,
                                      description: "Indicate that changes will only be validated with Google Play rather than actually published",
                                      is_string: false,
-                                     default_value: false)
+                                     default_value: false),
+        FastlaneCore::ConfigItem.new(key: :mapping,
+                                     env_name: "SUPPLY_MAPPING",
+                                     description: "Path to the mapping file to upload",
+                                     short_option: "-d",
+                                     conflicting_options: [:mapping_paths],
+                                     optional: true,
+                                     verify_block: proc do |value|
+                                       UI.user_error! "Could not find mapping file at path '#{value}'" unless File.exist?(value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :mapping_paths,
+                                     env_name: "SUPPLY_MAPPING_PATHS",
+                                     conflicting_options: [:mapping],
+                                     optional: true,
+                                     type: Array,
+                                     description: "An array of paths to mapping files to upload",
+                                     short_option: "-s",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("Could not evaluate array from '#{value}'") unless value.kind_of?(Array)
+                                       value.each do |path|
+                                         UI.user_error! "Could not find mapping file at path '#{path}'" unless File.exist?(path)
+                                       end
+                                     end)
 
       ]
     end

data/supply/lib/supply/uploader.rb

@@ -115,6 +115,13 @@ module Supply
         apk_version_codes.push(upload_binary_data(apk_path))
       end
 
+      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
+          client.upload_mapping(mapping_path, version_code)
+        end
+      end
+
       update_track(apk_version_codes)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Felix Krause
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier