fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/actions/notification.rb

@@ -13,7 +13,7 @@ module Fastlane
           app_icon: :appIcon,
           content_image: :contentImage
         }
-        options = Hash[options.map { |k, v| [option_map.fetch(k, k), v] }]
+        options = options.transform_keys { |k| option_map.fetch(k, k) }
         TerminalNotifier.notify(message, options)
       end
 

data/fastlane/lib/fastlane/actions/number_of_commits.rb

@@ -42,7 +42,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :all,
                                        env_name: "FL_NUMBER_OF_COMMITS_ALL",
                                        optional: true,
-                                       is_string: false,
+                                       type: Boolean,
                                        description: "Returns number of all commits instead of current branch")
         ]
       end

data/fastlane/lib/fastlane/actions/oclint.rb

@@ -129,20 +129,21 @@ module Fastlane
                                        description: 'The json compilation database, use xctool reporter \'json-compilation-database\'',
                                        default_value: 'compile_commands.json',
                                        optional: true),
-          FastlaneCore::ConfigItem.new(key: :select_reqex, # select_reqex is deprecated, remove as soon as possible
+          FastlaneCore::ConfigItem.new(key: :select_reqex,
                                        env_name: 'FL_OCLINT_SELECT_REQEX',
                                        description: 'Select all files matching this reqex',
-                                       is_string: false,
+                                       skip_type_validation: true, # allows Regex
+                                       deprecated: "Use `:select_regex` instead",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :select_regex,
                                        env_name: 'FL_OCLINT_SELECT_REGEX',
                                        description: 'Select all files matching this regex',
-                                       is_string: false,
+                                       skip_type_validation: true, # allows Regex
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :exclude_regex,
                                        env_name: 'FL_OCLINT_EXCLUDE_REGEX',
                                        description: 'Exclude all files matching this regex',
-                                       is_string: false,
+                                       skip_type_validation: true, # allows Regex
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :report_type,
                                        env_name: 'FL_OCLINT_REPORT_TYPE',
@@ -156,7 +157,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :list_enabled_rules,
                                        env_name: "FL_OCLINT_LIST_ENABLED_RULES",
                                        description: "List enabled rules",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :rc,
                                        env_name: 'FL_OCLINT_RC',
@@ -165,47 +166,47 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :thresholds,
                                        env_name: 'FL_OCLINT_THRESHOLDS',
                                        description: 'List of rule thresholds to override the default behavior of rules',
-                                       is_string: false,
+                                       type: Array,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :enable_rules,
                                        env_name: 'FL_OCLINT_ENABLE_RULES',
                                        description: 'List of rules to pick explicitly',
-                                       is_string: false,
+                                       type: Array,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :disable_rules,
                                        env_name: 'FL_OCLINT_DISABLE_RULES',
                                        description: 'List of rules to disable',
-                                       is_string: false,
+                                       type: Array,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :max_priority_1,
                                        env_name: 'FL_OCLINT_MAX_PRIOTITY_1',
                                        description: 'The max allowed number of priority 1 violations',
-                                       is_string: false,
+                                       type: Integer,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :max_priority_2,
                                        env_name: 'FL_OCLINT_MAX_PRIOTITY_2',
                                        description: 'The max allowed number of priority 2 violations',
-                                       is_string: false,
+                                       type: Integer,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :max_priority_3,
                                        env_name: 'FL_OCLINT_MAX_PRIOTITY_3',
                                        description: 'The max allowed number of priority 3 violations',
-                                       is_string: false,
+                                       type: Integer,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :enable_clang_static_analyzer,
                                        env_name: "FL_OCLINT_ENABLE_CLANG_STATIC_ANALYZER",
                                        description: "Enable Clang Static Analyzer, and integrate results into OCLint report",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :enable_global_analysis,
                                        env_name: "FL_OCLINT_ENABLE_GLOBAL_ANALYSIS",
                                        description: "Compile every source, and analyze across global contexts (depends on number of source files, could results in high memory load)",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :allow_duplicated_violations,
                                        env_name: "FL_OCLINT_ALLOW_DUPLICATED_VIOLATIONS",
                                        description: "Allow duplicated violations in the OCLint report",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :extra_arg,
                                        env_name: 'FL_OCLINT_EXTRA_ARG',

data/fastlane/lib/fastlane/actions/onesignal.rb

@@ -17,6 +17,7 @@ module Fastlane
         apns_p12_password = params[:apns_p12_password]
         android_token = params[:android_token]
         android_gcm_sender_id = params[:android_gcm_sender_id]
+        organization_id = params[:organization_id]
 
         has_app_id = !app_id.empty?
         has_app_name = !app_name.empty?
@@ -43,6 +44,7 @@ module Fastlane
 
         payload["gcm_key"] = android_token unless android_token.nil?
         payload["android_gcm_sender_id"] = android_gcm_sender_id unless android_gcm_sender_id.nil?
+        payload["organization_id"] = organization_id unless organization_id.nil?
 
         # here's the actual lifting - POST or PUT to OneSignal
 
@@ -135,7 +137,13 @@ module Fastlane
                                        env_name: "APNS_ENV",
                                        description: "APNS environment",
                                        optional: true,
-                                       default_value: 'production')
+                                       default_value: 'production'),
+
+          FastlaneCore::ConfigItem.new(key: :organization_id,
+                                       env_name: "ONE_SIGNAL_ORGANIZATION_ID",
+                                       sensitive: true,
+                                       description: "OneSignal Organization ID",
+                                       optional: true)
         ]
       end
 
@@ -163,7 +171,8 @@ module Fastlane
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
-            apns_env: "production/sandbox (defaults to production)"
+            apns_env: "production/sandbox (defaults to production)",
+            organization_id: "Onesignal organization id (optional)"
           )',
           'onesignal(
             app_id: "Your OneSignal App ID",
@@ -173,7 +182,8 @@ module Fastlane
             android_gcm_sender_id: "Your Android GCM Sender ID (optional)",
             apns_p12: "Path to Apple .p12 file (optional)",
             apns_p12_password: "Password for .p12 file (optional)",
-            apns_env: "production/sandbox (defaults to production)"
+            apns_env: "production/sandbox (defaults to production)",
+            organization_id: "Onesignal organization id (optional)"
           )'
         ]
       end

data/fastlane/lib/fastlane/actions/pod_push.rb

@@ -43,6 +43,10 @@ module Fastlane
           command << "--skip-tests"
         end
 
+        if params[:use_json]
+          command << "--use-json"
+        end
+
         if params[:verbose]
           command << "--verbose"
         end
@@ -100,7 +104,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :sources,
                                        description: "The sources of repos you want the pod spec to lint with, separated by commas",
                                        optional: true,
-                                       is_string: false,
                                        type: Array,
                                        verify_block: proc do |value|
                                          UI.user_error!("Sources must be an array.") unless value.kind_of?(Array)
@@ -109,7 +112,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :swift_version,
                                        description: "The SWIFT_VERSION that should be used to lint the spec. This takes precedence over a .swift-version file",
                                        optional: true,
-                                       is_string: true,
                                        env_name: "FL_POD_PUSH_SWIFT_VERSION"),
           FastlaneCore::ConfigItem.new(key: :skip_import_validation,
                                        description: "Lint skips validating that the pod can be imported",
@@ -121,6 +123,11 @@ module Fastlane
                                        optional: true,
                                        type: Boolean,
                                        env_name: "FL_POD_PUSH_SKIP_TESTS"),
+          FastlaneCore::ConfigItem.new(key: :use_json,
+                                       description: "Convert the podspec to JSON before pushing it to the repo",
+                                       optional: true,
+                                       type: Boolean,
+                                       env_name: "FL_POD_PUSH_USE_JSON"),
           FastlaneCore::ConfigItem.new(key: :verbose,
                                        description: "Show more debugging information",
                                        optional: true,

data/fastlane/lib/fastlane/actions/podio_item.rb

@@ -37,7 +37,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :client_id,
                                        env_name: 'PODIO_ITEM_CLIENT_ID',
                                        description: 'Client ID for Podio API (see https://developers.podio.com/api-key)',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No Client ID for Podio given, pass using `client_id: 'id'`") unless value && !value.empty?
                                        end),
@@ -45,14 +44,12 @@ module Fastlane
                                        env_name: 'PODIO_ITEM_CLIENT_SECRET',
                                        sensitive: true,
                                        description: 'Client secret for Podio API (see https://developers.podio.com/api-key)',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No Client Secret for Podio given, pass using `client_secret: 'secret'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :app_id,
                                        env_name: 'PODIO_ITEM_APP_ID',
                                        description: 'App ID of the app you intend to authenticate with (see https://developers.podio.com/authentication/app_auth)',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No App ID for Podio given, pass using `app_id: 'id'`") unless value && !value.empty?
                                        end),
@@ -60,26 +57,22 @@ module Fastlane
                                        env_name: 'PODIO_ITEM_APP_TOKEN',
                                        sensitive: true,
                                        description: 'App token of the app you intend to authenticate with (see https://developers.podio.com/authentication/app_auth)',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No App token for Podio given, pass using `app_token: 'token'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :identifying_field,
                                        env_name: 'PODIO_ITEM_IDENTIFYING_FIELD',
                                        description: 'String specifying the field key used for identification of an item',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No Identifying field given, pass using `identifying_field: 'field name'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :identifying_value,
                                        description: 'String uniquely specifying an item within the app',
-                                       is_string: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("No Identifying value given, pass using `identifying_value: 'unique value'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :other_fields,
                                        description: 'Dictionary of your app fields. Podio supports several field types, see https://developers.podio.com/doc/items',
-                                       is_string: false,
                                        type: Hash,
                                        optional: true)
         ]

data/fastlane/lib/fastlane/actions/prompt.rb

@@ -67,15 +67,14 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :boolean,
                                        description: "Is that a boolean question (yes/no)? This will add (y/n) at the end",
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :secure_text,
                                        description: "Is that a secure text (yes/no)?",
                                        default_value: false,
-                                       is_string: false),
+                                       type: Boolean),
           FastlaneCore::ConfigItem.new(key: :multi_line_end_keyword,
                                        description: "Enable multi-line inputs by providing an end text (e.g. 'END') which will stop the user input",
-                                       optional: true,
-                                       is_string: true)
+                                       optional: true)
         ]
       end
 

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

@@ -35,7 +35,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_PUSH_GIT_FORCE",
                                        description: "Force push to remote",
-                                       is_string: false,
+                                       type: Boolean,
                                        default_value: false,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :remote,

data/fastlane/lib/fastlane/actions/push_to_git_remote.rb

@@ -3,8 +3,12 @@ module Fastlane
     # Push local changes to the remote branch
     class PushToGitRemoteAction < Action
       def self.run(params)
+        # Find the local git branch using HEAD or fallback to CI's ENV git branch if you're in detached HEAD state
+        local_git_branch = Actions.git_branch_name_using_HEAD
+        local_git_branch = Actions.git_branch unless local_git_branch && local_git_branch != "HEAD"
+
         local_branch = params[:local_branch]
-        local_branch ||= Actions.git_branch.gsub(%r{#{params[:remote]}\/}, '') if Actions.git_branch
+        local_branch ||= local_git_branch.gsub(%r{#{params[:remote]}\/}, '') if local_git_branch
         UI.user_error!('Failed to get the current branch.') unless local_branch
 
         remote_branch = params[:remote_branch] || local_branch
@@ -32,8 +36,10 @@ module Fastlane
         # optionally add the set-upstream component
         command << '--set-upstream' if params[:set_upstream]
 
+        # optionally add the --push_options components
+        params[:push_options].each { |push_option| command << "--push-option=#{push_option}" } if params[:push_options]
+
         # execute our command
-        Actions.sh('pwd')
         return command.join(' ') if Helper.test?
 
         Actions.sh(command.join(' '))
@@ -84,7 +90,12 @@ module Fastlane
                                        env_name: "FL_GIT_PUSH_USE_SET_UPSTREAM",
                                        description: "Whether or not to use --set-upstream",
                                        type: Boolean,
-                                       default_value: false)
+                                       default_value: false),
+          FastlaneCore::ConfigItem.new(key: :push_options,
+                                       env_name: "FL_GIT_PUSH_PUSH_OPTION",
+                                       description: "Array of strings to be passed using the '--push-option' option",
+                                       type: Array,
+                                       default_value: [])
         ]
       end
 

data/fastlane/lib/fastlane/actions/puts.rb

@@ -26,8 +26,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_PUTS_MESSAGE",
                                        description: "Message to be printed out",
-                                       optional: true,
-                                       is_string: true)
+                                       optional: true)
         ]
       end
 

data/fastlane/lib/fastlane/actions/register_device.rb

@@ -16,9 +16,11 @@ module Fastlane
 
         platform = Spaceship::ConnectAPI::BundleIdPlatform.map(platform)
 
-        if (token = api_token(params))
-          UI.message("Using App Store Connect API token...")
-          Spaceship::ConnectAPI.token = token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
           UI.message("Login to App Store Connect (#{params[:username]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -27,7 +29,7 @@ module Fastlane
         end
 
         begin
-          Spaceship::ConnectAPI::Device.create(name: name, platform: platform, udid: udid)
+          Spaceship::ConnectAPI::Device.find_or_create(udid, name: name, platform: platform)
         rescue => ex
           UI.error(ex.to_s)
           UI.crash!("Failed to register new device (name: #{name}, platform: #{platform}, UDID: #{udid})")
@@ -37,13 +39,6 @@ module Fastlane
         return udid
       end
 
-      def self.api_token(params)
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-        api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-        return api_token
-      end
-
       def self.description
         "Registers a new device to the Apple Dev Portal"
       end
@@ -69,7 +64,7 @@ module Fastlane
                                        env_name: "FL_REGISTER_DEVICE_UDID",
                                        description: "Provide the UDID of the device to register as"),
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                       env_name: "FL_REGISTER_DEVICE_API_KEY_PATH",
+                                       env_names: ["FL_REGISTER_DEVICE_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
                                        description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                        optional: true,
                                        conflicting_options: [:api_key],
@@ -77,9 +72,11 @@ module Fastlane
                                          UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "FL_REGISTER_DEVICE_API_KEY",
+                                       env_names: ["FL_REGISTER_DEVICE_API_KEY", "APP_STORE_CONNECT_API_KEY"],
                                        description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
                                        type: Hash,
+                                       default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                       default_value_dynamic: true,
                                        optional: true,
                                        sensitive: true,
                                        conflicting_options: [:api_key_path]),

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -39,9 +39,11 @@ module Fastlane
         end
 
         require 'spaceship'
-        if (token = api_token(params))
-          UI.message("Using App Store Connect API token...")
-          Spaceship::ConnectAPI.token = token
+        if (api_token = Spaceship::ConnectAPI::Token.from(hash: params[:api_key], filepath: params[:api_key_path]))
+          UI.message("Creating authorization token for App Store Connect API")
+          Spaceship::ConnectAPI.token = api_token
+        elsif !Spaceship::ConnectAPI.token.nil?
+          UI.message("Using existing authorization token for App Store Connect API")
         else
           UI.message("Login to App Store Connect (#{params[:username]})")
           credentials = CredentialsManager::AccountManager.new(user: params[:username])
@@ -77,19 +79,12 @@ module Fastlane
       end
 
       def self.try_create_device(name: nil, platform: nil, udid: nil)
-        Spaceship::ConnectAPI::Device.create(name: name, platform: platform, udid: udid)
+        Spaceship::ConnectAPI::Device.find_or_create(udid, name: name, platform: platform)
       rescue => ex
         UI.error(ex.to_s)
         UI.crash!("Failed to register new device (name: #{name}, UDID: #{udid})")
       end
 
-      def self.api_token(params)
-        params[:api_key] ||= Actions.lane_context[SharedValues::APP_STORE_CONNECT_API_KEY]
-        api_token ||= Spaceship::ConnectAPI::Token.create(params[:api_key]) if params[:api_key]
-        api_token ||= Spaceship::ConnectAPI::Token.from_json_file(params[:api_key_path]) if params[:api_key_path]
-        return api_token
-      end
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -107,7 +102,6 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :devices,
                                        env_name: "FL_REGISTER_DEVICES_DEVICES",
                                        description: "A hash of devices, with the name as key and the UDID as value",
-                                       is_string: false,
                                        type: Hash,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :devices_file,
@@ -118,7 +112,7 @@ module Fastlane
                                          UI.user_error!("Could not find file '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key_path,
-                                       env_name: "FL_REGISTER_DEVICES_API_KEY_PATH",
+                                       env_names: ["FL_REGISTER_DEVICES_API_KEY_PATH", "APP_STORE_CONNECT_API_KEY_PATH"],
                                        description: "Path to your App Store Connect API Key JSON file (https://docs.fastlane.tools/app-store-connect-api/#using-fastlane-api-key-json-file)",
                                        optional: true,
                                        conflicting_options: [:api_key],
@@ -126,9 +120,11 @@ module Fastlane
                                          UI.user_error!("Couldn't find API key JSON file at path '#{value}'") unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_key,
-                                       env_name: "FL_REGISTER_DEVICES_API_KEY",
+                                       env_names: ["FL_REGISTER_DEVICES_API_KEY", "APP_STORE_CONNECT_API_KEY"],
                                        description: "Your App Store Connect API Key information (https://docs.fastlane.tools/app-store-connect-api/#use-return-value-and-pass-in-as-an-option)",
                                        type: Hash,
+                                       default_value: Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::APP_STORE_CONNECT_API_KEY],
+                                       default_value_dynamic: true,
                                        optional: true,
                                        sensitive: true,
                                        conflicting_options: [:api_key_path]),
@@ -155,6 +151,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: "DELIVER_USER",
                                        description: "Optional: Your Apple ID",
+                                       optional: true,
                                        default_value: user,
                                        default_value_dynamic: true),
           FastlaneCore::ConfigItem.new(key: :platform,