fastlane 2.13.0 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 564e6544aeab7f92fc130134ce78fee3a037cb16
-  data.tar.gz: 68f2180b569422134323d02514a6c1c6b08d73e4
+  metadata.gz: 070a2e3ea852f83722a3a732f385c6d998b4a91f
+  data.tar.gz: 6b4a9022927123cece1c49d6a1b691c61ed37f3a
 SHA512:
-  metadata.gz: 1c65b9bc5a1494d9d9a06fff5dc282293a62082826010a73f6b4edc9a7043fc3d1603591cf265744bdaa86936207561adbf3abfc23ccb98106688d710b9be790
-  data.tar.gz: 36d5d7e41b5575e3ad1c18875f571322d4fef79172ca881042cc7f516d231b7e35ae158ee1ef06deeaa7538da242c3d60efb8a1d321215b0897a222fc75a271c
+  metadata.gz: adf527daf42b09341b84cba7ccd8029de0ffe3303946cce19c89ed6822400dc94223d527fcadad63a75a892351c145d73c1191683f1b12b9ce282841edc8c0a9
+  data.tar.gz: 268b99f8538e136d11764042be7d43ecda6f2caffee580413cc25e813ab0ef4fc3abed4f00bc61abb54605a17e6b1b1da77d033e4d1e9ef18215f217e21e97e1

data/credentials_manager/lib/credentials_manager.rb

@@ -4,7 +4,7 @@ require 'credentials_manager/cli'
 require 'credentials_manager/appfile_config'
 
 # Third Party code
-require 'colored'
+require 'colored2'
 require 'security'
 require 'highline/import' # to hide the entered password
 

data/fastlane/lib/fastlane/actions/ipa.rb

@@ -187,7 +187,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :xcargs,
                                        env_name: "IPA_XCARGS",
                                        description: "Pass additional arguments to xcodebuild when building the app. Be sure to quote multiple args",
-                                       optional: true)
+                                       optional: true,
+                                       type: :shell_string)
         ]
       end
 

data/fastlane/lib/fastlane/actions/mailgun.rb

@@ -86,7 +86,12 @@ module Fastlane
                                       env_name: "MAILGUN_REPLY_TO",
                                       description: "Mail Reply to",
                                       optional: true,
-                                      is_string: true)
+                                      is_string: true),
+          FastlaneCore::ConfigItem.new(key: :attachment,
+                                      env_name: "MAILGUN_ATTACHMENT",
+                                      description: "Mail Attachment filenames, either an array or just one string",
+                                      optional: true,
+                                      is_string: false)
 
         ]
       end
@@ -114,6 +119,13 @@ module Fastlane
         unless options[:reply_to].nil?
           params.store(:"h:Reply-To", options[:reply_to])
         end
+
+        unless options[:attachment].nil?
+          attachment_filenames = [*options[:attachment]]
+          attachments = attachment_filenames.map { |filename| File.new(filename, 'rb') }
+          params.store(:attachment, attachments)
+        end
+
         RestClient.post "https://api:#{options[:apikey]}@api.mailgun.net/v3/#{sandbox_domain}/messages", params
         mail_template(options)
       end
@@ -158,7 +170,8 @@ module Fastlane
             message: "Mail Body",
             app_link: "http://www.myapplink.com",
             ci_build_link: "http://www.mycibuildlink.com",
-            template_path: "HTML_TEMPLATE_PATH"
+            template_path: "HTML_TEMPLATE_PATH",
+            attachment: "dirname/filename.ext"
           )'
         ]
       end

data/fastlane/lib/fastlane/actions/scan.rb

@@ -77,6 +77,20 @@ module Fastlane
             workspace: "App.xcworkspace",
             scheme: "MyTests",
             clean: false
+          )',
+          '#Build For Testing
+           scan(
+             derived_data_path: "my_folder",
+             build_for_testing: true
+          )',
+          '# run tests using derived data from prev. build
+           scan(
+             derived_data_path: "my_folder",
+             test_without_building: true
+          )',
+          '# or run it from an existing xctestrun package
+          scan(
+             xctestrun: "/path/to/mytests.xctestrun"
           )'
         ]
       end

data/fastlane/lib/fastlane/documentation/docs_generator.rb

@@ -7,9 +7,32 @@ module Fastlane
       output << "================"
 
       output << "# Installation"
+      output << ""
+      output << "Make sure you have the latest version of the Xcode command line tools installed:"
+      output << ""
       output << "```"
-      output << "sudo gem install fastlane"
+      output << "xcode-select --install"
       output << "```"
+      output << ""
+      output << "## Choose your installation method:"
+      output << ""
+      output << "<table width=\"100%\" >"
+      output << "<tr>"
+      output << "<th width=\"33%\"><a href=\"http://brew.sh\">Homebrew</a></td>"
+      output << "<th width=\"33%\">Installer Script</td>"
+      output << "<th width=\"33%\">Rubygems</td>"
+      output << "</tr>"
+      output << "<tr>"
+      output << "<td width=\"33%\" align=\"center\">macOS</td>"
+      output << "<td width=\"33%\" align=\"center\">macOS</td>"
+      output << "<td width=\"33%\" align=\"center\">macOS or Linux with Ruby 2.0.0 or above</td>"
+      output << "</tr>"
+      output << "<tr>"
+      output << "<td width=\"33%\"><code>brew cask install fastlane</code></td>"
+      output << "<td width=\"33%\"><a href=\"https://download.fastlane.tools/fastlane.zip\">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>"
+      output << "<td width=\"33%\"><code>sudo gem install fastlane -NV</code></td>"
+      output << "</tr>"
+      output << "</table>"
 
       output << "# Available Actions"
 

data/fastlane/lib/fastlane/environment_printer.rb

@@ -217,7 +217,8 @@ module Fastlane
         "Host" => "#{product} #{version} (#{build})",
         "Ruby Lib Dir" => anonymized_path(RbConfig::CONFIG['libdir']),
         "OpenSSL Version" => OpenSSL::OPENSSL_VERSION,
-        "Is contained" => Helper.contained_fastlane?.to_s
+        "Is contained" => Helper.contained_fastlane?.to_s,
+        "Is homebrew" => Helper.homebrew?.to_s
       }
 
       if Helper.mac?

data/fastlane/lib/fastlane/fast_file.rb

@@ -206,12 +206,12 @@ module Fastlane
 
       UI.user_error!("Could not find Fastfile at path '#{path}'") unless File.exist?(path)
 
-      collector.did_launch_action(:import)
-      parse(File.read(path), path)
-
-      # Check if we can also import local actions which are in the same directory as the Fastfile
+      # First check if there are local actions to import in the same directory as the Fastfile
       actions_path = File.join(File.expand_path("..", path), 'actions')
       Fastlane::Actions.load_external_actions(actions_path) if File.directory?(actions_path)
+
+      collector.did_launch_action(:import)
+      parse(File.read(path), path)
     end
 
     # @param url [String] The git URL to clone the repository from

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.13.0'.freeze
+  VERSION = '2.14.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.rb

@@ -31,7 +31,7 @@ require 'fastlane_core/keychain_importer'
 require 'fastlane_core/swag'
 
 # Third Party code
-require 'colored'
+require 'colored2'
 require 'commander'
 
 # after commander import

data/fastlane_core/lib/fastlane_core/configuration/config_item.rb

@@ -1,6 +1,43 @@
 module FastlaneCore
   class ConfigItem
-    attr_accessor :key, :env_name, :description, :short_option, :default_value, :verify_block, :optional, :conflicting_options, :conflict_block, :deprecated, :sensitive
+    # [Symbol] the key which is used as command paramters or key in the fastlane tools
+    attr_accessor :key
+
+    # [String] the name of the environment variable, which is only used if no other values were found
+    attr_accessor :env_name
+
+    # [String] A description shown to the user
+    attr_accessor :description
+
+    # [String] A string of length 1 which is used for the command parameters (e.g. -f)
+    attr_accessor :short_option
+
+    # the value which is used if there was no given values and no environment values
+    attr_accessor :default_value
+
+    # An optional block which is called when a new value is set.
+    #   Check value is valid. This could be type checks or if a folder/file exists
+    #   You have to raise a specific exception if something goes wrong. Append .red after the string
+    attr_accessor :verify_block
+
+    # [Boolean] is false by default. If set to true, also string values will not be asked to the user
+    attr_accessor :optional
+
+    # [Array] array of conflicting option keys(@param key). This allows to resolve conflicts intelligently
+    attr_accessor :conflicting_options
+
+    # An optional block which is called when options conflict happens
+    attr_accessor :conflict_block
+
+    # [String] Set if the option is deprecated. A deprecated option should be optional and is made optional if the parameter isn't set, and fails otherwise
+    attr_accessor :deprecated
+
+    # [Boolean] Set if the variable is sensitive, such as a password or API token, to prevent echoing when prompted for the parameter
+    attr_accessor :sensitive
+
+    # [Boolean] Set if the variable is to be converted to a shell-escaped String when provided as a Hash or Array
+    # Allows items expected to be strings used in shell arguments to be alternatively provided as a Hash or Array for better readability and auto-escaped for us.
+    attr_accessor :allow_shell_conversion
 
     # Creates a new option
     # @param key (Symbol) the key which is used as command paramters or key in the fastlane tools
@@ -12,7 +49,7 @@ module FastlaneCore
     #   Check value is valid. This could be type checks or if a folder/file exists
     #   You have to raise a specific exception if something goes wrong. Append .red after the string
     # @param is_string *DEPRECATED: Use `type` instead* (Boolean) is that parameter a string? Defaults to true. If it's true, the type string will be verified.
-    # @param type (Class) the data type of this config item. Takes precedence over `is_string`
+    # @param type (Class) the data type of this config item. Takes precedence over `is_string`. Use `:shell_string` to allow types `String`, `Hash` and `Array` that will be converted to shell-escaped strings
     # @param optional (Boolean) is false by default. If set to true, also string values will not be asked to the user
     # @param conflicting_options ([]) array of conflicting option keys(@param key). This allows to resolve conflicts intelligently
     # @param conflict_block an optional block which is called when options conflict happens
@@ -53,11 +90,13 @@ module FastlaneCore
       @verify_block = verify_block
       @is_string = is_string
       @data_type = type
+      @data_type = String if type == :shell_string
       @optional = optional
       @conflicting_options = conflicting_options
       @conflict_block = conflict_block
       @deprecated = deprecated
       @sensitive = sensitive
+      @allow_shell_conversion = (type == :shell_string)
     end
 
     # This will raise an exception if the value is not valid
@@ -99,6 +138,9 @@ module FastlaneCore
         return value.to_i if value.to_i.to_s == value.to_s
       elsif data_type == Float
         return value.to_f if value.to_f.to_s == value.to_s
+      elsif data_type == String && allow_shell_conversion
+        return value.map(&:to_s).map(&:shellescape).join(' ') if value.kind_of?(Array)
+        return value.map { |k, v| "#{k.to_s.shellescape}=#{v.shellescape}" }.join(' ') if value.kind_of?(Hash)
       else
         # Special treatment if the user specified true, false or YES, NO
         # There is no boolean type, so we just do it here

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -194,6 +194,21 @@ module FastlaneCore
         all.each(&:reset)
       end
 
+      def copy_logarchive(device, dest)
+        sim_resource_dir = FastlaneCore::CommandExecutor.execute(command: "xcrun simctl getenv #{device.udid} SIMULATOR_SHARED_RESOURCES_DIRECTORY 2>/dev/null", print_all: false, print_command: true)
+        logarchive_src = File.join(sim_resource_dir, "system_logs.logarchive")
+
+        # if logarchive already exists it fails as the .logarchive is a directory, so delete it. to be sure its gone
+        FileUtils.rm_rf(logarchive_src)
+        FileUtils.rm_rf(dest)
+
+        command = "xcrun simctl spawn #{device.udid} log collect 2>/dev/null"
+        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
+
+        FileUtils.cp_r(logarchive_src, dest)
+        UI.success "Copying file '#{logarchive_src}' to '#{dest}'..."
+      end
+
       def reset_all_by_version(os_version: nil)
         return false unless os_version
         all.select { |device| device.os_version == os_version }.each(&:reset)

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -1,5 +1,5 @@
 require 'logger'
-require 'colored'
+require 'colored2'
 
 module FastlaneCore
   module Helper

data/fastlane_core/lib/fastlane_core/ui/disable_colors.rb

@@ -1,15 +1,15 @@
 # This code overwrites the methods from the colored gem
-# via https://github.com/defunkt/colored/blob/master/lib/colored.rb
+# via https://github.com/kigster/colored2/blob/aa274018906641ffb07aaa3015081a174d169dfe/lib/colored2.rb
 
-require 'colored'
+require 'colored2'
 
 class String
-  Colored::COLORS.keys.each do |color|
+  Colored2::COLORS.keys.each do |color|
     define_method(color) do
       self # do nothing with the string, but return it
     end
   end
-  Colored::EXTRAS.keys.each do |extra|
+  Colored2::EXTRAS.keys.each do |extra|
     define_method(extra) do
       self # do nothing with the string, but return it
     end

data/frameit/lib/frameit/config_parser.rb

@@ -64,11 +64,10 @@ module Frameit
         if value.kind_of?(Hash)
           validate_values(value) # recursive call
         else
-          if key == 'font'
+          case key
+          when 'font'
             UI.user_error!("Could not find font at path '#{File.expand_path(value)}'") unless File.exist?(value)
-          end
-
-          if key == 'fonts'
+          when 'fonts'
             UI.user_error!("`fonts` must be an array") unless value.kind_of?(Array)
 
             value.each do |current|
@@ -76,20 +75,16 @@ module Frameit
               UI.user_error!("Could not find font at path '#{File.expand_path(current.fetch('font'))}'") unless File.exist?(current.fetch('font'))
               UI.user_error!("`supported` must be an array") unless current.fetch('supported', []).kind_of? Array
             end
-          end
-
-          if key == 'background'
+          when 'background'
             UI.user_error!("Could not find background image at path '#{File.expand_path(value)}'") unless File.exist? value
-          end
-
-          if key == 'color'
+          when 'color'
             UI.user_error!("Invalid color '#{value}'. Must be valid Hex #123123") unless value.include?("#")
-          end
-
-          if key == 'padding'
+          when 'padding'
             unless value.kind_of?(Integer) || value.split('x').length == 2
               UI.user_error!("padding must be type integer or pair of integers of format 'AxB'")
             end
+          when 'font_scale_factor'
+            UI.user_error! "font_scale_factor must be numeric" unless value.kind_of?(Numeric)
           end
         end
       end

data/frameit/lib/frameit/editor.rb

@@ -236,12 +236,13 @@ module Frameit
     end
 
     def actual_font_size
-      [@image.width / 10.0].max.round
+      font_scale_factor = fetch_config['font_scale_factor'] || 0.1
+      [@image.width * font_scale_factor].max.round
     end
 
     # The space between the keyword and the title
     def keyword_padding
-      (actual_font_size / 2.0).round
+      (actual_font_size / 3.0).round
     end
 
     # This will build 2 individual images with the title, which will then be added to the real image

data/gym/lib/gym/options.rb

@@ -131,7 +131,8 @@ module Gym
                                      conflicting_options: [:use_legacy_build_api],
                                      conflict_block: proc do |value|
                                        UI.user_error!("'#{value.key}' must be false to use 'export_xcargs'")
-                                     end),
+                                     end,
+                                     type: :shell_string),
         FastlaneCore::ConfigItem.new(key: :skip_build_archive,
                                      env_name: "GYM_SKIP_BUILD_ARCHIVE",
                                      description: "Export ipa from previously build xarchive. Uses archive_path as source",
@@ -196,7 +197,8 @@ module Gym
                                      short_option: "-x",
                                      env_name: "GYM_XCARGS",
                                      description: "Pass additional arguments to xcodebuild for the build phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS=\"-ObjC -lstdc++\"",
-                                     optional: true),
+                                     optional: true,
+                                     type: :shell_string),
         FastlaneCore::ConfigItem.new(key: :xcconfig,
                                      short_option: "-y",
                                      env_name: "GYM_XCCONFIG",

data/match/README.md

@@ -377,13 +377,13 @@ In general those profiles are harmless as they can only be used to install a sig
 
 Attackers could use an In-House profile to distribute signed application to a potentially unlimited number of devices. All this would run under your company name and it could eventually lead to Apple revoking your In-House account. However it is very easy to revoke a certificate to remotely break the app on all devices.
 
-Because of the potentially dangerous nature of In-House profiles we decided to not allow the use of `match` with enterprise accounts.
+Because of the potentially dangerous nature of In-House profiles please use _match_ with enterprise profiles with caution, ensure your git repository is private and use a secure password.
 
 ##### To sum up
 
 - You have full control over the access list of your Git repo, no third party service involved
 - Even if your certificates are leaked, they can't be used to cause any harm without your iTunes Connect login credentials
-- `match` does not currently support In-House Enterprise profiles as they are harder to control
+- Use In-House enterprise profile with _match_ with caution
 - If you use GitHub or Bitbucket we encourage enabling 2 factor authentication for all accounts that have access to the certificates repo
 - The complete source code of `match` is fully open source on [GitHub](https://github.com/fastlane/fastlane/tree/master/match)
 

data/match/lib/match.rb

@@ -21,31 +21,17 @@ module Match
   DESCRIPTION = "Easily sync your certificates and profiles across your team using git"
 
   def self.environments
-    envs = %w(appstore adhoc development)
-    envs << "enterprise" if self.enterprise?
-    return envs
-  end
-
-  # @return [Boolean] returns true if the unsupported enterprise mode should be enabled
-  def self.enterprise?
-    return FastlaneCore::Env.truthy?("MATCH_FORCE_ENTERPRISE")
-  end
-
-  # @return [Boolean] returns true if match should interpret the given [certificate|profile] type as an enterprise one
-  def self.type_is_enterprise?(type)
-    Match.enterprise? && type != "development"
+    return %w(appstore adhoc development enterprise)
   end
 
   def self.profile_type_sym(type)
-    return :enterprise if self.type_is_enterprise? type
-    return :adhoc if type == "adhoc"
-    return :appstore if type == "appstore"
-    return :development
+    return type.to_sym
   end
 
   def self.cert_type_sym(type)
-    return :enterprise if self.type_is_enterprise? type
+    return :enterprise if type == "enterprise"
     return :development if type == "development"
-    return :distribution
+    return :distribution if type == "adhoc" || type == "appstore"
+    raise "Unknown cert type: '#{type}'"
   end
 end

data/match/lib/match/generator.rb

@@ -39,7 +39,13 @@ module Match
 
       prov_type = Match.profile_type_sym(params[:type])
 
-      profile_name = ["match", profile_type_name(prov_type), app_identifier].join(" ")
+      names = ["match", profile_type_name(prov_type), app_identifier]
+
+      if params[:platform].to_s != :ios.to_s # For ios we do not include the platform for backwards compatibility
+        names << params[:platform]
+      end
+
+      profile_name = names.join(" ")
 
       values = {
         app_identifier: app_identifier,
@@ -52,6 +58,7 @@ module Match
         team_id: params[:team_id]
       }
 
+      values[:platform] = params[:platform]
       values[:adhoc] = true if prov_type == :adhoc
       values[:development] = true if prov_type == :development