fastlane 2.191.0 → 2.192.0

data/fastlane/lib/fastlane/actions/notarize.rb

@@ -10,6 +10,8 @@ module Fastlane
         verbose = params[:verbose]
         api_key_path = params[:api_key_path]
 
+        use_notarytool = params[:use_notarytool]
+
         # Compress and read bundle identifier only for .app bundle.
         compressed_package_path = nil
         if File.extname(package_path) == '.app'
@@ -30,6 +32,74 @@ module Fastlane
 
         UI.user_error!('Could not read bundle identifier, provide as a parameter') unless bundle_id
 
+        if use_notarytool
+          notarytool(params, package_path, bundle_id, try_early_stapling, print_log, verbose, api_key_path, compressed_package_path)
+        else
+          altool(params, package_path, bundle_id, try_early_stapling, print_log, verbose, api_key_path, compressed_package_path)
+        end
+      end
+
+      def self.notarytool(params, package_path, bundle_id, try_early_stapling, print_log, verbose, api_key_path, compressed_package_path)
+        temp_file = nil
+
+        # Create authorization part of command with either API Key or Apple ID
+        auth_parts = []
+        if api_key_path
+          api_key = Spaceship::ConnectAPI::Token.from_json_file(api_key_path)
+
+          # Writes key contents to temporary file for command
+          require 'tempfile'
+          temp_file = Tempfile.new
+          api_key.write_key_to_file(temp_file.path)
+
+          auth_parts << "--key #{temp_file.path}"
+          auth_parts << "--key-id #{api_key.key_id}"
+          auth_parts << "--issuer #{api_key.issuer_id}"
+        else
+          auth_parts << "--apple-id #{params[:username]}"
+          auth_parts << "--password #{ENV['FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD']}"
+          auth_parts << "--team-id #{params[:asc_provider]}"
+        end
+
+        # Submits package and waits for processing using `xcrun notarytool submit --wait`
+        submit_parts = [
+          "xcrun notarytool submit",
+          (compressed_package_path || package_path).shellescape,
+          "--output-format json",
+          "--wait"
+        ] + auth_parts
+
+        submit_command = submit_parts.join(' ')
+        submit_response = Actions.sh(
+          submit_command,
+          log: verbose,
+          error_callback: lambda { |msg|
+            UI.error("Error polling for notarization info: #{msg}")
+          }
+        )
+
+        notarization_info = JSON.parse(submit_response)
+
+        # Staple
+        case notarization_info['status']
+        when 'Accepted'
+          submission_id = notarization_info["id"]
+          UI.success("Successfully uploaded package to notarization service with request identifier #{submission_id}")
+
+          UI.message('Stapling package')
+          self.staple(package_path, verbose)
+
+          UI.success("Successfully notarized and stapled package")
+        when 'Invalid'
+          UI.user_error!("Could not notarize package with message '#{notarization_info['statusSummary']}'")
+        else
+          UI.crash!("Could not notarize package with status '#{notarization_info['status']}'")
+        end
+      ensure
+        temp_file.delete if temp_file
+      end
+
+      def self.altool(params, package_path, bundle_id, try_early_stapling, print_log, verbose, api_key_path, compressed_package_path)
         UI.message('Uploading package to notarization service, might take a while')
 
         notarization_upload_command = "xcrun altool --notarize-app -t osx -f \"#{compressed_package_path || package_path}\" --primary-bundle-id #{bundle_id} --output-format xml"
@@ -125,7 +195,7 @@ module Fastlane
 
       def self.staple(package_path, verbose)
         Actions.sh(
-          "xcrun stapler staple \"#{package_path}\"",
+          "xcrun stapler staple #{package_path.shellescape}",
           log: verbose
         )
       end
@@ -180,6 +250,12 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find package at '#{value}'") unless File.exist?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :use_notarytool,
+                                       env_name: 'FL_NOTARIZE_USE_NOTARYTOOL',
+                                       description: 'Whether to `xcrun notarytool` or `xcrun altool`',
+                                       default_value: Helper.mac? && Helper.xcode_at_least?("13.0"), # Notary tool added in Xcode 13
+                                       default_value_dynamic: true,
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :try_early_stapling,
                                        env_name: 'FL_NOTARIZE_TRY_EARLY_STAPLING',
                                        description: 'Whether to try early stapling while the notarization request is in progress',

data/fastlane/lib/fastlane/actions/push_git_tags.rb

@@ -9,7 +9,7 @@ module Fastlane
         ]
 
         if params[:tag]
-          command << "refs/tags/#{params[:tag]}"
+          command << "refs/tags/#{params[:tag].shellescape}"
         else
           command << '--tags'
         end

data/fastlane/lib/fastlane/actions/zip.rb

@@ -34,7 +34,7 @@ module Fastlane
         def run_zip_command
           # The 'zip' command archives relative to the working directory, chdir to produce expected results relative to `path`
           Dir.chdir(File.expand_path("..", path)) do
-            Actions.sh(zip_command)
+            Actions.sh(*zip_command)
           end
         end
 
@@ -52,8 +52,8 @@ module Fastlane
           # The zip command is executed from the paths **parent** directory, as a result we use just the basename, which is the file or folder within
           basename = File.basename(path)
 
-          command << output_path.shellescape
-          command << basename.shellescape
+          command << output_path
+          command << basename
 
           unless include.empty?
             command << "-i"

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.191.0'.freeze
+  VERSION = '2.192.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 = '1.12.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -17,4 +17,4 @@ public class Deliverfile: DeliverfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/DeliverfileProtocol.swift

@@ -260,4 +260,4 @@ public extension DeliverfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.79]
+// FastlaneRunnerAPIVersion [0.9.80]

data/fastlane/swift/Fastlane.swift

@@ -3504,37 +3504,63 @@ public func createPullRequest(apiToken: OptionalConfigValue<String?> = .fastlane
  Package multiple build configs of a library/framework into a single xcframework
 
  - parameters:
-   - frameworks: Frameworks to add to the target xcframework
-   - libraries: Libraries to add to the target xcframework, with their corresponding headers
+   - frameworks: Frameworks (without dSYMs) to add to the target xcframework
+   - frameworksWithDsyms: Frameworks (with dSYMs) to add to the target xcframework
+   - libraries: Libraries (without headers or dSYMs) to add to the target xcframework
+   - librariesWithHeadersOrDsyms: Libraries (with headers or dSYMs) to add to the target xcframework
    - output: The path to write the xcframework to
    - allowInternalDistribution: Specifies that the created xcframework contains information not suitable for public distribution
 
  Utility for packaging multiple build configurations of a given library
  or framework into a single xcframework.
 
- If you want to package several frameworks just provide an array containing
- the list of frameworks to be packaged using the :frameworks parameter.
+ If you want to package several frameworks just provide one of:
 
- If you want to package several libraries with their corresponding headers
- provide a hash containing the library as the key and the directory containing
- its headers as the value (or an empty string if there are no headers associated
- with the provided library).
+   * An array containing the list of frameworks using the :frameworks parameter
+     (if they have no associated dSYMs):
+       ['FrameworkA.framework', 'FrameworkB.framework']
+
+   * A hash containing the list of frameworks with their dSYMs using the
+     :frameworks_with_dsyms parameter:
+       {
+         'FrameworkA.framework' => {},
+         'FrameworkB.framework' => { dsyms: 'FrameworkB.framework.dSYM' }
+       }
+
+ If you want to package several libraries just provide one of:
+
+   * An array containing the list of libraries using the :libraries parameter
+     (if they have no associated headers or dSYMs):
+       ['LibraryA.so', 'LibraryB.so']
+
+   * A hash containing the list of libraries with their headers and dSYMs
+     using the :libraries_with_headers_or_dsyms parameter:
+       {
+         'LibraryA.so' => { dsyms: 'libraryA.so.dSYM' },
+         'LibraryB.so' => { headers: 'headers' }
+       }
 
  Finally specify the location of the xcframework to be generated using the :output
  parameter.
 
  */
 public func createXcframework(frameworks: OptionalConfigValue<[String]?> = .fastlaneDefault(nil),
-                              libraries: OptionalConfigValue<[String: Any]?> = .fastlaneDefault(nil),
+                              frameworksWithDsyms: OptionalConfigValue<[String: Any]?> = .fastlaneDefault(nil),
+                              libraries: OptionalConfigValue<[String]?> = .fastlaneDefault(nil),
+                              librariesWithHeadersOrDsyms: OptionalConfigValue<[String: Any]?> = .fastlaneDefault(nil),
                               output: String,
                               allowInternalDistribution: OptionalConfigValue<Bool> = .fastlaneDefault(false))
 {
     let frameworksArg = frameworks.asRubyArgument(name: "frameworks", type: nil)
+    let frameworksWithDsymsArg = frameworksWithDsyms.asRubyArgument(name: "frameworks_with_dsyms", type: nil)
     let librariesArg = libraries.asRubyArgument(name: "libraries", type: nil)
+    let librariesWithHeadersOrDsymsArg = librariesWithHeadersOrDsyms.asRubyArgument(name: "libraries_with_headers_or_dsyms", type: nil)
     let outputArg = RubyCommand.Argument(name: "output", value: output, type: nil)
     let allowInternalDistributionArg = allowInternalDistribution.asRubyArgument(name: "allow_internal_distribution", type: nil)
     let array: [RubyCommand.Argument?] = [frameworksArg,
+                                          frameworksWithDsymsArg,
                                           librariesArg,
+                                          librariesWithHeadersOrDsymsArg,
                                           outputArg,
                                           allowInternalDistributionArg]
     let args: [RubyCommand.Argument] = array
@@ -7103,6 +7129,7 @@ public func nexusUpload(file: String,
 
  - parameters:
    - package: Path to package to notarize, e.g. .app bundle or disk image
+   - useNotarytool: Whether to `xcrun notarytool` or `xcrun altool`
    - tryEarlyStapling: Whether to try early stapling while the notarization request is in progress
    - bundleId: Bundle identifier to uniquely identify the package
    - username: Apple ID username
@@ -7112,6 +7139,7 @@ public func nexusUpload(file: String,
    - apiKeyPath: Path to AppStore Connect API key
  */
 public func notarize(package: String,
+                     useNotarytool: OptionalConfigValue<Bool> = .fastlaneDefault(true),
                      tryEarlyStapling: OptionalConfigValue<Bool> = .fastlaneDefault(false),
                      bundleId: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                      username: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -7121,6 +7149,7 @@ public func notarize(package: String,
                      apiKeyPath: OptionalConfigValue<String?> = .fastlaneDefault(nil))
 {
     let packageArg = RubyCommand.Argument(name: "package", value: package, type: nil)
+    let useNotarytoolArg = useNotarytool.asRubyArgument(name: "use_notarytool", type: nil)
     let tryEarlyStaplingArg = tryEarlyStapling.asRubyArgument(name: "try_early_stapling", type: nil)
     let bundleIdArg = bundleId.asRubyArgument(name: "bundle_id", type: nil)
     let usernameArg = username.asRubyArgument(name: "username", type: nil)
@@ -7129,6 +7158,7 @@ public func notarize(package: String,
     let verboseArg = verbose.asRubyArgument(name: "verbose", type: nil)
     let apiKeyPathArg = apiKeyPath.asRubyArgument(name: "api_key_path", type: nil)
     let array: [RubyCommand.Argument?] = [packageArg,
+                                          useNotarytoolArg,
                                           tryEarlyStaplingArg,
                                           bundleIdArg,
                                           usernameArg,
@@ -10672,6 +10702,7 @@ public func ssh(username: String,
    - deactivateOnPromote: **DEPRECATED!** Google Play does this automatically now - When promoting to a new track, deactivate the binary in the origin track
    - versionCodesToRetain: An array of version codes to retain when publishing a new APK
    - changesNotSentForReview: Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Google Play Console UI
+   - rescueChangesNotSentForReview: Catches changes_not_sent_for_review errors when an edit is committed and retries with the configuration that the error message recommended
    - inAppUpdatePriority: In-app update priority for all the newly added apks in the release. Can take values between [0,5]
    - obbMainReferencesVersion: References version of 'main' expansion file
    - obbMainFileSize: Size of 'main' expansion file in bytes
@@ -10712,6 +10743,7 @@ public func supply(packageName: String,
                    deactivateOnPromote: OptionalConfigValue<Bool> = .fastlaneDefault(true),
                    versionCodesToRetain: OptionalConfigValue<[String]?> = .fastlaneDefault(nil),
                    changesNotSentForReview: OptionalConfigValue<Bool> = .fastlaneDefault(false),
+                   rescueChangesNotSentForReview: OptionalConfigValue<Bool> = .fastlaneDefault(true),
                    inAppUpdatePriority: OptionalConfigValue<Int?> = .fastlaneDefault(nil),
                    obbMainReferencesVersion: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                    obbMainFileSize: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -10750,6 +10782,7 @@ public func supply(packageName: String,
     let deactivateOnPromoteArg = deactivateOnPromote.asRubyArgument(name: "deactivate_on_promote", type: nil)
     let versionCodesToRetainArg = versionCodesToRetain.asRubyArgument(name: "version_codes_to_retain", type: nil)
     let changesNotSentForReviewArg = changesNotSentForReview.asRubyArgument(name: "changes_not_sent_for_review", type: nil)
+    let rescueChangesNotSentForReviewArg = rescueChangesNotSentForReview.asRubyArgument(name: "rescue_changes_not_sent_for_review", type: nil)
     let inAppUpdatePriorityArg = inAppUpdatePriority.asRubyArgument(name: "in_app_update_priority", type: nil)
     let obbMainReferencesVersionArg = obbMainReferencesVersion.asRubyArgument(name: "obb_main_references_version", type: nil)
     let obbMainFileSizeArg = obbMainFileSize.asRubyArgument(name: "obb_main_file_size", type: nil)
@@ -10787,6 +10820,7 @@ public func supply(packageName: String,
                                           deactivateOnPromoteArg,
                                           versionCodesToRetainArg,
                                           changesNotSentForReviewArg,
+                                          rescueChangesNotSentForReviewArg,
                                           inAppUpdatePriorityArg,
                                           obbMainReferencesVersionArg,
                                           obbMainFileSizeArg,
@@ -12296,6 +12330,7 @@ public func uploadToAppStore(apiKeyPath: OptionalConfigValue<String?> = .fastlan
    - deactivateOnPromote: **DEPRECATED!** Google Play does this automatically now - When promoting to a new track, deactivate the binary in the origin track
    - versionCodesToRetain: An array of version codes to retain when publishing a new APK
    - changesNotSentForReview: Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Google Play Console UI
+   - rescueChangesNotSentForReview: Catches changes_not_sent_for_review errors when an edit is committed and retries with the configuration that the error message recommended
    - inAppUpdatePriority: In-app update priority for all the newly added apks in the release. Can take values between [0,5]
    - obbMainReferencesVersion: References version of 'main' expansion file
    - obbMainFileSize: Size of 'main' expansion file in bytes
@@ -12336,6 +12371,7 @@ public func uploadToPlayStore(packageName: String,
                               deactivateOnPromote: OptionalConfigValue<Bool> = .fastlaneDefault(true),
                               versionCodesToRetain: OptionalConfigValue<[String]?> = .fastlaneDefault(nil),
                               changesNotSentForReview: OptionalConfigValue<Bool> = .fastlaneDefault(false),
+                              rescueChangesNotSentForReview: OptionalConfigValue<Bool> = .fastlaneDefault(true),
                               inAppUpdatePriority: OptionalConfigValue<Int?> = .fastlaneDefault(nil),
                               obbMainReferencesVersion: OptionalConfigValue<String?> = .fastlaneDefault(nil),
                               obbMainFileSize: OptionalConfigValue<String?> = .fastlaneDefault(nil),
@@ -12374,6 +12410,7 @@ public func uploadToPlayStore(packageName: String,
     let deactivateOnPromoteArg = deactivateOnPromote.asRubyArgument(name: "deactivate_on_promote", type: nil)
     let versionCodesToRetainArg = versionCodesToRetain.asRubyArgument(name: "version_codes_to_retain", type: nil)
     let changesNotSentForReviewArg = changesNotSentForReview.asRubyArgument(name: "changes_not_sent_for_review", type: nil)
+    let rescueChangesNotSentForReviewArg = rescueChangesNotSentForReview.asRubyArgument(name: "rescue_changes_not_sent_for_review", type: nil)
     let inAppUpdatePriorityArg = inAppUpdatePriority.asRubyArgument(name: "in_app_update_priority", type: nil)
     let obbMainReferencesVersionArg = obbMainReferencesVersion.asRubyArgument(name: "obb_main_references_version", type: nil)
     let obbMainFileSizeArg = obbMainFileSize.asRubyArgument(name: "obb_main_file_size", type: nil)
@@ -12411,6 +12448,7 @@ public func uploadToPlayStore(packageName: String,
                                           deactivateOnPromoteArg,
                                           versionCodesToRetainArg,
                                           changesNotSentForReviewArg,
+                                          rescueChangesNotSentForReviewArg,
                                           inAppUpdatePriorityArg,
                                           obbMainReferencesVersionArg,
                                           obbMainFileSizeArg,
@@ -13213,4 +13251,4 @@ public let snapshotfile = Snapshotfile()
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.132]
+// FastlaneRunnerAPIVersion [0.9.133]

data/fastlane/swift/Gymfile.swift

@@ -17,4 +17,4 @@ public class Gymfile: GymfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/GymfileProtocol.swift

@@ -196,4 +196,4 @@ public extension GymfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.82]
+// FastlaneRunnerAPIVersion [0.9.83]

data/fastlane/swift/Matchfile.swift

@@ -17,4 +17,4 @@ public class Matchfile: MatchfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -184,4 +184,4 @@ public extension MatchfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.76]
+// FastlaneRunnerAPIVersion [0.9.77]

data/fastlane/swift/Precheckfile.swift

@@ -17,4 +17,4 @@ public class Precheckfile: PrecheckfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/PrecheckfileProtocol.swift

@@ -52,4 +52,4 @@ public extension PrecheckfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.75]
+// FastlaneRunnerAPIVersion [0.9.76]

data/fastlane/swift/Scanfile.swift

@@ -17,4 +17,4 @@ public class Scanfile: ScanfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/ScanfileProtocol.swift

@@ -296,4 +296,4 @@ public extension ScanfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.87]
+// FastlaneRunnerAPIVersion [0.9.88]

data/fastlane/swift/Screengrabfile.swift

@@ -17,4 +17,4 @@ public class Screengrabfile: ScreengrabfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/ScreengrabfileProtocol.swift

@@ -96,4 +96,4 @@ public extension ScreengrabfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.77]
+// FastlaneRunnerAPIVersion [0.9.78]

data/fastlane/swift/Snapshotfile.swift

@@ -17,4 +17,4 @@ public class Snapshotfile: SnapshotfileProtocol {
     // during the `init` process, and you won't see this message
 }
 
-// Generated with fastlane 2.191.0
+// Generated with fastlane 2.192.0

data/fastlane/swift/SnapshotfileProtocol.swift

@@ -200,4 +200,4 @@ public extension SnapshotfileProtocol {
 
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.71]
+// FastlaneRunnerAPIVersion [0.9.72]

data/fastlane/swift/formatting/Brewfile.lock.json

@@ -43,12 +43,12 @@
         "macOS": "10.15.7"
       },
       "big_sur": {
-        "HOMEBREW_VERSION": "2.4.13-249-g6454504",
-        "HOMEBREW_PREFIX": "/usr/local",
-        "Homebrew/homebrew-core": "020491c34515c229d904e6e69e14157cb728d2fa",
-        "CLT": "11.0.28.3",
-        "Xcode": "12.0",
-        "macOS": "11.0"
+        "HOMEBREW_VERSION": "3.2.9",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "d2c0a344f23a132f6fdf06a8b1d6d0eaaec54a21",
+        "CLT": "12.5.1.0.1.1623191612",
+        "Xcode": "13.0",
+        "macOS": "11.5.2"
       },
       "monterey": {
         "HOMEBREW_VERSION": "3.2.6-34-g6bb3699",

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -34,6 +34,46 @@ module Commander
 
     attr_accessor :collector
 
+    # Temporary work around for issues mentioned in https://github.com/fastlane/fastlane/pull/18760
+    # Code taken from https://github.com/commander-rb/commander/blob/40d06bfbc54906d0de7c72ac73f4e9188c9ca294/lib/commander/runner.rb#L372-L385
+    #
+    # Problem:
+    #  `optparse` is guessing that command option `-e` is referring to global option `--env` (because it starts with an e).
+    #  This is raising OptionParser::MissingArgument error because `--env` takes a string argument.
+    #  A command of `-e --verbose` works because `--verbose` is seen as the argument.
+    #  A command of `--verbose -e` doesn't work because no argument after `-e` so MissingArgument is raised again.
+    #  This broke somewhere between Ruby 2.5 and Ruby 2.6
+    #
+    # Solution:
+    #  Proper solution is to set `parser.require_exact = true` but this only available on `optparse` version 0.1.1
+    #  which is not used by Commander.
+    #  `require_exact` will prevent OptionParser from assuming `-e` is the same as `--env STRING`
+    #  Even if it was on RubyGems, it would require Commander to allow this option to be set on OptionParser
+    #
+    # This work around was made on 2021-08-13
+    #
+    # When fixed:
+    #  This method implementation overrides one provided by Commander::Runner already. Just delete this method
+    #  so the existing one can be used
+    def parse_global_options
+      parser = options.inject(OptionParser.new) do |options, option|
+        options.on(*option[:args], &global_option_proc(option[:switches], &option[:proc]))
+      end
+
+      # This is the actual solution but is only in version 0.1.1 of optparse and its not in Commander
+      # This is the only change from Commanders implementation of parse_global_options
+      parser.require_exact = true
+
+      options = @args.dup
+      begin
+        parser.parse!(options)
+      rescue OptionParser::InvalidOption => e
+        # Remove the offending args and retry.
+        options = options.reject { |o| e.args.include?(o) }
+        retry
+      end
+    end
+
     def run!
       require_program(:version, :description)
       trap('INT') { abort(program(:int_message)) } if program(:int_message)
@@ -47,6 +87,7 @@ module Commander
         say(version)
         return
       end
+
       parse_global_options
       remove_global_options(options, @args)