fastlane 2.97.0 → 2.98.0

data/fastlane/lib/fastlane/actions/docs/get_push_certificate.md

@@ -35,7 +35,9 @@ Check out this gif:
 
 # Usage
 
-    fastlane pem
+```no-highlight
+fastlane pem
+```
 
 Yes, that's the whole command!
 
@@ -50,27 +52,39 @@ Note that ``_pem_`` will never revoke your existing certificates. _pem_ can't do
 
 If you already have a push certificate enabled, which is active for at least 30 more days, _pem_ will not create a new certificate. If you still want to create one, use the `force`:
 
-    fastlane pem --force
+```no-highlight
+fastlane pem --force
+```
 
 You can pass parameters like this:
 
-    fastlane pem -a com.krausefx.app -u username
+```no-highlight
+fastlane pem -a com.krausefx.app -u username
+```
 
 If you want to generate a development certificate instead:
 
-    fastlane pem --development
+```no-highlight
+fastlane pem --development
+```
 
 Set a password for your `p12` file:
 
-    fastlane pem -p "MyPass"
+```no-highlight
+fastlane pem -p "MyPass"
+```
 
 You can specify a name for the output file:
 
-    fastlane pem -o my.pem
+```no-highlight
+fastlane pem -o my.pem
+```
 
 To get a list of available options run:
 
-    fastlane action pem
+```no-highlight
+fastlane action pem
+```
 
 
 ### Note about empty `p12` passwords and Keychain Access.app
@@ -80,23 +94,27 @@ While the file is valid, the Mac's Keychain Access will not allow you to open th
 
 Instead, you may verify the file is valid using OpenSSL:
 
-    openssl pkcs12 -info -in my.p12
+```no-highlight
+openssl pkcs12 -info -in my.p12
+```
 
 If you need the `p12` in your keychain, perhaps to test push with an app like [Knuff](https://github.com/KnuffApp/Knuff) or [Pusher](https://github.com/noodlewerk/NWPusher), you can use `openssl` to export the `p12` to _pem_ and back to `p12`:
 
-    % openssl pkcs12 -in my.p12 -out my.pem
-    Enter Import Password:
-      <hit enter: the p12 has no password>
-    MAC verified OK
-    Enter PEM pass phrase:
-      <enter a temporary password to encrypt the pem file>
-      
-    % openssl pkcs12 -export -in my.pem -out my-with-passphrase.p12
-    Enter pass phrase for temp.pem:
-      <enter the temporary password to decrypt the pem file>
-
-    Enter Export Password:
-      <enter a password for encrypting the new p12 file>
+```no-highlight
+% openssl pkcs12 -in my.p12 -out my.pem
+Enter Import Password:
+  <hit enter: the p12 has no password>
+MAC verified OK
+Enter PEM pass phrase:
+  <enter a temporary password to encrypt the pem file>
+
+% openssl pkcs12 -export -in my.pem -out my-with-passphrase.p12
+Enter pass phrase for temp.pem:
+  <enter the temporary password to decrypt the pem file>
+
+Enter Export Password:
+  <enter a password for encrypting the new p12 file>
+```
 
 ## Environment Variables
 

data/fastlane/lib/fastlane/actions/docs/run_tests.md

@@ -71,15 +71,15 @@ _scan_ uses the latest APIs and tools to make running tests plain simple and off
 🚠 | Sensible defaults: Automatically detect the project, schemes and more
 📊 | Support for HTML, JSON and JUnit reports
 🔎 | Xcode duplicated your simulators again? _scan_ will handle this for you
-🔗  | Works perfectly with [_fastlane_](https://fastlane.tools) and other tools
+🔗 | Works perfectly with [_fastlane_](https://fastlane.tools) and other tools
 🚅 | Don't remember any complicated build commands, just _scan_
-🔧  | Easy and dynamic configuration using parameters and environment variables
+🔧 | Easy and dynamic configuration using parameters and environment variables
 📢 | Beautiful slack notifications of the test results
-💾   | Store common build settings in a `Scanfile`
+💾 | Store common build settings in a `Scanfile`
 📤 | The raw `xcodebuild` outputs are stored in `~/Library/Logs/scan`
 💻 | Supports both iOS and Mac applications
-👱      | Automatically switches to the [travis formatter](https://github.com/kattrali/xcpretty-travis-formatter) when running on Travis
-📖     | Helps you resolve common test errors like simulator not responding
+👱 | Automatically switches to the [travis formatter](https://github.com/kattrali/xcpretty-travis-formatter) when running on Travis
+📖 | Helps you resolve common test errors like simulator not responding
 
 _scan_ uses a plain `xcodebuild` command, therefore keeping 100% compatible with `xcodebuild`. To generate the nice output, _scan_ uses [xcpretty](https://github.com/supermarin/xcpretty). You can alway access the raw output in `~/Library/Logs/scan`.
 
@@ -90,15 +90,21 @@ _scan_ uses a plain `xcodebuild` command, therefore keeping 100% compatible with
 
 # Usage
 
-    fastlane scan
+```no-highlight
+fastlane scan
+```
 
 That's all you need to run your tests. If you want more control, here are some available parameters:
 
-    fastlane scan --workspace "Example.xcworkspace" --scheme "AppName" --device "iPhone 6" --clean
+```no-highlight
+fastlane scan --workspace "Example.xcworkspace" --scheme "AppName" --device "iPhone 6" --clean
+```
 
 If you need to use a different xcode install, use `xcode-select` or define `DEVELOPER_DIR`:
 
-    DEVELOPER_DIR="/Applications/Xcode6.2.app" scan
+```no-highlight
+DEVELOPER_DIR="/Applications/Xcode6.2.app" scan
+```
 
 To run _scan_ on multiple devices via [_fastlane_](https://fastlane.tools), add this to your `Fastfile`:
 

data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb

@@ -32,8 +32,8 @@ To upload builds to TestFlight check out [_pilot_](/actions/pilot).
 
 The guide will create all the necessary files for you, using the existing app metadata from iTunes Connect.
 
-- ```cd [your_project_folder]```
-- ```fastlane deliver init```
+- `cd [your_project_folder]`
+- `fastlane deliver init`
 - Enter your iTunes Connect credentials
 - Enter your app identifier
 - Enjoy a good drink, while the computer does all the work for you
@@ -684,14 +684,14 @@ Detailed instructions about how to set up _deliver_ and _fastlane_ in `Jenkins`
 
 _deliver_ uses the iTunes Transporter to upload metadata and binaries. In case you are behind a firewall, you can specify a different transporter protocol using
 
-```bash
+```no-highlight
 DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS="-t DAV" fastlane deliver
 ```
 
 ## HTTP Proxy
 iTunes Transporter is a Java application bundled with Xcode. In addition to utilizing the `DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS="-t DAV"`, you need to configure the transporter application to use the proxy independently from the system proxy or any environment proxy settings. You can find the configuration file within Xcode:
 
-```bash
+```no-highlight
 TOOLS_PATH=$( xcode-select -p )
 REL_PATH='../Applications/Application Loader.app/Contents/itms/java/lib/net.properties'
 echo "$TOOLS_PATH/$REL_PATH"
@@ -701,7 +701,7 @@ Add necessary proxy configuration values to the net.properties according to [Jav
 
 As an alternative to editing the properties files, proxy configuration can be specified on the command line directly:
 
-```bash
+```no-highlight
 DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS="-t DAV -Dhttp.proxyHost=myproxy.com -Dhttp.proxyPort=8080"
 ```
 

data/fastlane/lib/fastlane/actions/docs/upload_to_testflight.md

@@ -192,7 +192,9 @@ fastlane pilot import -c ~/Desktop/testers.csv
 
 If you run into any issues you can use the `verbose` mode to get a more detailed output:
 
-    fastlane pilot upload --verbose
+```no-highlight
+fastlane pilot upload --verbose
+```
 
 ## Firewall Issues
 

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

@@ -91,8 +91,14 @@ module Fastlane
                                       env_name: "MAILGUN_ATTACHMENT",
                                       description: "Mail Attachment filenames, either an array or just one string",
                                       optional: true,
-                                      is_string: false)
-
+                                      is_string: false),
+          FastlaneCore::ConfigItem.new(key: :custom_placeholders,
+                                       short_option: "-p",
+                                       env_name: "MAILGUN_CUSTOM_PLACEHOLDERS",
+                                       description: "Placeholders for template given as a hash",
+                                       default_value: {},
+                                       is_string: false,
+                                       type: Hash)
         ]
       end
 
@@ -140,6 +146,9 @@ module Fastlane
         hash[:success] = options[:success]
         hash[:ci_build_link] = options[:ci_build_link]
 
+        # concatenate with custom placeholders passed by user
+        hash = hash.merge(options[:custom_placeholders])
+
         # grabs module
         eth = Fastlane::ErbTemplateHelper
 
@@ -171,6 +180,10 @@ module Fastlane
             app_link: "http://www.myapplink.com",
             ci_build_link: "http://www.mycibuildlink.com",
             template_path: "HTML_TEMPLATE_PATH",
+            custom_placeholders: {
+              :var1 => 123,
+              :var2 => "string"
+            },
             attachment: "dirname/filename.ext"
           )'
         ]

data/fastlane/lib/fastlane/actions/modify_services.rb

@@ -153,7 +153,7 @@ module Fastlane
             username: "test.account@gmail.com",
             app_identifier: "com.someorg.app",
             services: {
-              push_notifications: "on",
+              push_notification: "on",
               associated_domains: "off"
             }
           )'

data/fastlane/lib/fastlane/actions/nexus_upload.rb

@@ -14,7 +14,23 @@ module Fastlane
       end
 
       def self.upload_url(params)
-        "#{params[:endpoint]}#{params[:mount_path]}/service/local/artifact/maven/content".shellescape
+        url = "#{params[:endpoint]}#{params[:mount_path]}"
+
+        if params[:nexus_version] == 2
+          url << "/service/local/artifact/maven/content"
+        else
+          file_extension = File.extname(params[:file]).shellescape
+
+          url << "/repository/#{params[:repo_id]}"
+          url << "/#{params[:repo_group_id].gsub('.', '/')}"
+          url << "/#{params[:repo_project_name]}"
+          url << "/#{params[:repo_project_version]}"
+          url << "/#{params[:repo_project_name]}-#{params[:repo_project_version]}"
+          url << "-#{params[:repo_classifier]}" if params[:repo_classifier]
+          url << file_extension.to_s
+        end
+
+        url.shellescape
       end
 
       def self.verbose(params)
@@ -26,19 +42,24 @@ module Fastlane
         file_extension = file_path.split('.').last.shellescape
 
         options = []
-        options << "-F p=zip"
-        options << "-F hasPom=false"
-        options << "-F r=#{params[:repo_id].shellescape}"
-        options << "-F g=#{params[:repo_group_id].shellescape}"
-        options << "-F a=#{params[:repo_project_name].shellescape}"
-        options << "-F v=#{params[:repo_project_version].shellescape}"
-
-        if params[:repo_classifier]
-          options << "-F c=#{params[:repo_classifier].shellescape}"
+        if params[:nexus_version] == 2
+          options << "-F p=zip"
+          options << "-F hasPom=false"
+          options << "-F r=#{params[:repo_id].shellescape}"
+          options << "-F g=#{params[:repo_group_id].shellescape}"
+          options << "-F a=#{params[:repo_project_name].shellescape}"
+          options << "-F v=#{params[:repo_project_version].shellescape}"
+
+          if params[:repo_classifier]
+            options << "-F c=#{params[:repo_classifier].shellescape}"
+          end
+
+          options << "-F e=#{file_extension}"
+          options << "-F file=@#{file_path}"
+        else
+          options << "--upload-file #{file_path}"
         end
 
-        options << "-F e=#{file_extension}"
-        options << "-F file=@#{file_path}"
         options << "-u #{params[:username].shellescape}:#{params[:password].shellescape}"
 
         options
@@ -107,7 +128,7 @@ module Fastlane
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :mount_path,
                                        env_name: "FL_NEXUS_MOUNT_PATH",
-                                       description: "Nexus mount path",
+                                       description: "Nexus mount path (Nexus 3 instances have this configured as empty by default)",
                                        default_value: "/nexus",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
@@ -124,6 +145,18 @@ module Fastlane
                                        is_string: false,
                                        default_value: true,
                                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :nexus_version,
+                                       env_name: "FL_NEXUS_MAJOR_VERSION",
+                                       description: "Nexus major version",
+                                       type: Integer,
+                                       default_value: 2,
+                                       optional: true,
+                                       verify_block: proc do |value|
+                                         min_version = 2
+                                         max_version = 3
+                                         UI.user_error!("Unsupported version (#{value}) min. supported version: #{min_version}") unless value >= min_version
+                                         UI.user_error!("Unsupported version (#{value}) max. supported version: #{max_version}") unless value <= max_version
+                                       end),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        env_name: "FL_NEXUS_VERBOSE",
                                        description: "Make detailed output",
@@ -151,7 +184,7 @@ module Fastlane
       end
 
       def self.authors
-        ["xfreebird"]
+        ["xfreebird", "mdio"]
       end
 
       def self.is_supported?(platform)
@@ -160,7 +193,22 @@ module Fastlane
 
       def self.example_code
         [
-          'nexus_upload(
+          '# for Nexus 2
+          nexus_upload(
+            file: "/path/to/file.ipa",
+            repo_id: "artefacts",
+            repo_group_id: "com.fastlane",
+            repo_project_name: "ipa",
+            repo_project_version: "1.13",
+            repo_classifier: "dSYM", # Optional
+            endpoint: "http://localhost:8081",
+            username: "admin",
+            password: "admin123"
+          )',
+          '# for Nexus 3
+          nexus_upload(
+            nexus_version: 3,
+            mount_path: "",
             file: "/path/to/file.ipa",
             repo_id: "artefacts",
             repo_group_id: "com.fastlane",

data/fastlane/lib/fastlane/actions/unlock_keychain.rb

@@ -72,6 +72,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_UNLOCK_KEYCHAIN_PATH",
                                        description: "Path to the keychain file",
+                                       default_value: "login",
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :password,
                                        env_name: "FL_UNLOCK_KEYCHAIN_PASSWORD",

data/fastlane/lib/fastlane/documentation/markdown_docs_generator.rb

@@ -104,6 +104,32 @@ module Fastlane
       return nil
     end
 
+    def actions_md_contents
+      action_mds = {}
+
+      ActionsList.all_actions do |action|
+        @action = action
+        @action_filename = filename_for_action(action)
+
+        unless @action_filename
+          next
+        end
+
+        @custom_content = load_custom_action_md(action)
+
+        if action.superclass != Fastlane::Action
+          @custom_content ||= load_custom_action_md(action.superclass)
+        end
+
+        template = File.join(Fastlane::ROOT, "lib/assets/ActionDetails.md.erb")
+        result = ERB.new(File.read(template), 0, '-').result(binding)
+
+        action_mds[action.action_name] = result
+      end
+
+      return action_mds
+    end
+
     def generate!(target_path: nil)
       require 'yaml'
       FileUtils.mkdir_p(target_path)

data/fastlane/lib/fastlane/plugins/plugin_search.rb

@@ -1,5 +1,6 @@
 module Fastlane
   class PluginSearch
+    require 'terminal-table'
     require 'word_wrap'
 
     def self.print_plugins(search_query: nil)

data/fastlane/lib/fastlane/plugins/plugin_update_manager.rb

@@ -41,6 +41,7 @@ module Fastlane
         return
       end
 
+      require 'terminal-table'
       puts(Terminal::Table.new({
         rows: FastlaneCore::PrintTable.transform_output(rows),
         title: "Plugin updates available".yellow,

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.97.0'.freeze
+  VERSION = '2.98.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.97.0
+// Generated with fastlane 2.98.0

data/fastlane/swift/Fastlane.swift

@@ -2033,7 +2033,8 @@ func mailgun(mailgunSandboxDomain: String? = nil,
              ciBuildLink: String? = nil,
              templatePath: String? = nil,
              replyTo: String? = nil,
-             attachment: String? = nil) {
+             attachment: String? = nil,
+             customPlaceholders: [String : Any] = [:]) {
   let command = RubyCommand(commandID: "", methodName: "mailgun", className: nil, args: [RubyCommand.Argument(name: "mailgun_sandbox_domain", value: mailgunSandboxDomain),
                                                                                          RubyCommand.Argument(name: "mailgun_sandbox_postmaster", value: mailgunSandboxPostmaster),
                                                                                          RubyCommand.Argument(name: "mailgun_apikey", value: mailgunApikey),
@@ -2048,7 +2049,8 @@ func mailgun(mailgunSandboxDomain: String? = nil,
                                                                                          RubyCommand.Argument(name: "ci_build_link", value: ciBuildLink),
                                                                                          RubyCommand.Argument(name: "template_path", value: templatePath),
                                                                                          RubyCommand.Argument(name: "reply_to", value: replyTo),
-                                                                                         RubyCommand.Argument(name: "attachment", value: attachment)])
+                                                                                         RubyCommand.Argument(name: "attachment", value: attachment),
+                                                                                         RubyCommand.Argument(name: "custom_placeholders", value: customPlaceholders)])
   _ = runner.executeCommand(command)
 }
 func makeChangelogFromJenkins(fallbackChangelog: String = "",
@@ -2130,6 +2132,7 @@ func nexusUpload(file: String,
                  username: String,
                  password: String,
                  sslVerify: Bool = true,
+                 nexusVersion: Int = 2,
                  verbose: Bool = false,
                  proxyUsername: String? = nil,
                  proxyPassword: String? = nil,
@@ -2146,6 +2149,7 @@ func nexusUpload(file: String,
                                                                                               RubyCommand.Argument(name: "username", value: username),
                                                                                               RubyCommand.Argument(name: "password", value: password),
                                                                                               RubyCommand.Argument(name: "ssl_verify", value: sslVerify),
+                                                                                              RubyCommand.Argument(name: "nexus_version", value: nexusVersion),
                                                                                               RubyCommand.Argument(name: "verbose", value: verbose),
                                                                                               RubyCommand.Argument(name: "proxy_username", value: proxyUsername),
                                                                                               RubyCommand.Argument(name: "proxy_password", value: proxyPassword),
@@ -2295,7 +2299,8 @@ func pilot(username: String,
            devPortalTeamId: String? = nil,
            itcProvider: String? = nil,
            groups: [String]? = nil,
-           waitForUploadedBuild: Bool = false) {
+           waitForUploadedBuild: Bool = false,
+           rejectBuildWaitingForReview: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "pilot", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
                                                                                        RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                        RubyCommand.Argument(name: "app_platform", value: appPlatform),
@@ -2320,7 +2325,8 @@ func pilot(username: String,
                                                                                        RubyCommand.Argument(name: "dev_portal_team_id", value: devPortalTeamId),
                                                                                        RubyCommand.Argument(name: "itc_provider", value: itcProvider),
                                                                                        RubyCommand.Argument(name: "groups", value: groups),
-                                                                                       RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild)])
+                                                                                       RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild),
+                                                                                       RubyCommand.Argument(name: "reject_build_waiting_for_review", value: rejectBuildWaitingForReview)])
   _ = runner.executeCommand(command)
 }
 func pluginScores(outputPath: String,
@@ -3403,7 +3409,8 @@ func testflight(username: String,
                 devPortalTeamId: String? = nil,
                 itcProvider: String? = nil,
                 groups: [String]? = nil,
-                waitForUploadedBuild: Bool = false) {
+                waitForUploadedBuild: Bool = false,
+                rejectBuildWaitingForReview: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "testflight", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
                                                                                             RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                             RubyCommand.Argument(name: "app_platform", value: appPlatform),
@@ -3428,7 +3435,8 @@ func testflight(username: String,
                                                                                             RubyCommand.Argument(name: "dev_portal_team_id", value: devPortalTeamId),
                                                                                             RubyCommand.Argument(name: "itc_provider", value: itcProvider),
                                                                                             RubyCommand.Argument(name: "groups", value: groups),
-                                                                                            RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild)])
+                                                                                            RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild),
+                                                                                            RubyCommand.Argument(name: "reject_build_waiting_for_review", value: rejectBuildWaitingForReview)])
   _ = runner.executeCommand(command)
 }
 func tryouts(appId: String,
@@ -3463,7 +3471,7 @@ func typetalk() {
   let command = RubyCommand(commandID: "", methodName: "typetalk", className: nil, args: [])
   _ = runner.executeCommand(command)
 }
-func unlockKeychain(path: String,
+func unlockKeychain(path: String = "login",
                     password: String,
                     addToSearchList: Bool = true,
                     setDefault: Bool = false) {
@@ -3787,7 +3795,8 @@ func uploadToTestflight(username: String,
                         devPortalTeamId: String? = nil,
                         itcProvider: String? = nil,
                         groups: [String]? = nil,
-                        waitForUploadedBuild: Bool = false) {
+                        waitForUploadedBuild: Bool = false,
+                        rejectBuildWaitingForReview: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "upload_to_testflight", className: nil, args: [RubyCommand.Argument(name: "username", value: username),
                                                                                                       RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                                       RubyCommand.Argument(name: "app_platform", value: appPlatform),
@@ -3812,7 +3821,8 @@ func uploadToTestflight(username: String,
                                                                                                       RubyCommand.Argument(name: "dev_portal_team_id", value: devPortalTeamId),
                                                                                                       RubyCommand.Argument(name: "itc_provider", value: itcProvider),
                                                                                                       RubyCommand.Argument(name: "groups", value: groups),
-                                                                                                      RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild)])
+                                                                                                      RubyCommand.Argument(name: "wait_for_uploaded_build", value: waitForUploadedBuild),
+                                                                                                      RubyCommand.Argument(name: "reject_build_waiting_for_review", value: rejectBuildWaitingForReview)])
   _ = runner.executeCommand(command)
 }
 func verifyBuild(provisioningType: String? = nil,
@@ -4041,4 +4051,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.20]
+// FastlaneRunnerAPIVersion [0.9.21]