fastlane 1.20.0 → 1.21.0

data/lib/fastlane/actions/chatwork.rb

@@ -22,12 +22,12 @@ module Fastlane
 
         response = https.request(req)
         case response.code.to_i
-          when 200..299
-            Helper.log.info 'Successfully sent notification to ChatWork right now 📢'.green
-          else
-            require 'json'
-            json = JSON.parse(response.body)
-            raise "HTTP Error: #{response.code} #{json['errors']}".red
+        when 200..299
+          Helper.log.info 'Successfully sent notification to ChatWork right now 📢'.green
+        else
+          require 'json'
+          json = JSON.parse(response.body)
+          raise "HTTP Error: #{response.code} #{json['errors']}".red
         end
       end
 
@@ -40,11 +40,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "CHATWORK_API_TOKEN",
                                        description: "ChatWork API Token",
-                                       verify_block: Proc.new do |value|
-                                        unless value.to_s.length > 0
-                                          Helper.log.fatal "Please add 'ENV[\"CHATWORK_API_TOKEN\"] = \"your token\"' to your Fastfile's `before_all` section.".red
-                                          raise 'No CHATWORK_API_TOKEN given.'.red
-                                        end
+                                       verify_block: proc do |value|
+                                         unless value.to_s.length > 0
+                                           Helper.log.fatal "Please add 'ENV[\"CHATWORK_API_TOKEN\"] = \"your token\"' to your Fastfile's `before_all` section.".red
+                                           raise 'No CHATWORK_API_TOKEN given.'.red
+                                         end
                                        end),
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "FL_CHATWORK_MESSAGE",
@@ -59,7 +59,7 @@ module Fastlane
                                        optional: true,
                                        default_value: true,
                                        is_string: false)
-          ]
+        ]
       end
 
       def self.author

data/lib/fastlane/actions/clean_build_artifacts.rb

@@ -5,16 +5,14 @@ module Fastlane
         [
           Actions.lane_context[Actions::SharedValues::IPA_OUTPUT_PATH],
           Actions.lane_context[Actions::SharedValues::SIGH_PROFILE_PATH],
-          Actions.lane_context[Actions::SharedValues::DSYM_OUTPUT_PATH],
-        ].reject { |file| file.nil? || !File.exist?(file) }.each do |file| 
-
+          Actions.lane_context[Actions::SharedValues::DSYM_OUTPUT_PATH]
+        ].reject { |file| file.nil? || !File.exist?(file) }.each do |file|
           if options[:exclude_pattern]
             next if file.match(options[:exclude_pattern])
           end
 
           Helper.log.debug "Cleaning up '#{file}'".yellow
-          File.delete(file) 
-          
+          File.delete(file)
         end
 
         Helper.log.info 'Cleaned up build artifacts 🐙'.green
@@ -39,7 +37,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end

data/lib/fastlane/actions/clipboard.rb

@@ -32,4 +32,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/commit_version_bump.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/AbcSize
 module Fastlane
   module Actions
     # Commits the current changes in the repo as a version bump, checking to make sure only files which contain version information have been changed.
@@ -19,7 +20,7 @@ module Fastlane
           raise "Could not find the specified xcodeproj: #{xcodeproj_path}" unless File.directory?(xcodeproj_path)
         else
           # find an xcodeproj (ignoring the Cocoapods one)
-          xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| /Pods\/.*.xcodeproj/ =~ path }
+          xcodeproj_paths = Dir[File.expand_path(File.join(repo_path, '**/*.xcodeproj'))].reject { |path| %r{Pods\/.*.xcodeproj} =~ path }
 
           # no projects found: error
           raise 'Could not find a .xcodeproj in the current repository\'s working directory.'.red if xcodeproj_paths.count == 0
@@ -39,8 +40,20 @@ module Fastlane
         pbxproj_path = pbxproj_pathname.relative_path_from(repo_pathname).to_s
 
         # find the info_plist files
+        # rubocop:disable Style/MultilineBlockChain
         project = Xcodeproj::Project.open(xcodeproj_path)
-        info_plist_files = project.objects.select { |object| object.isa == 'XCBuildConfiguration' }.map(&:to_hash).map { |object_hash| object_hash['buildSettings'] }.select { |build_settings| build_settings.key?('INFOPLIST_FILE') }.map { |build_settings| build_settings['INFOPLIST_FILE'] }.uniq.map { |info_plist_path| Pathname.new(File.expand_path(File.join(xcodeproj_path, '..', info_plist_path))).relative_path_from(repo_pathname).to_s }
+        info_plist_files = project.objects.select do |object|
+          object.isa == 'XCBuildConfiguration'
+        end.map(&:to_hash).map do |object_hash|
+          object_hash['buildSettings']
+        end.select do |build_settings|
+          build_settings.key?('INFOPLIST_FILE')
+        end.map do |build_settings|
+          build_settings['INFOPLIST_FILE']
+        end.uniq.map do |info_plist_path|
+          Pathname.new(File.expand_path(File.join(xcodeproj_path, '..', info_plist_path))).relative_path_from(repo_pathname).to_s
+        end
+        # rubocop:enable Style/MultilineBlockChain
 
         # create our list of files that we expect to have changed, they should all be relative to the project root, which should be equal to the git workdir root
         expected_changed_files = []
@@ -58,25 +71,36 @@ module Fastlane
         changed_files_as_expected = (Set.new(git_dirty_files.map(&:downcase)).subset? Set.new(expected_changed_files.map(&:downcase)))
         unless changed_files_as_expected
           unless params[:force]
-            raise "Found unexpected uncommited changes in the working directory. Expected these files to have changed: \n#{expected_changed_files.join("\n")}.\nBut found these actual changes: \n#{git_dirty_files.join("\n")}.\nMake sure you have cleaned up the build artifacts and are only left with the changed version files at this stage in your lane, and don't touch the working directory while your lane is running. You can also use the :force option to bypass this check, and always commit a version bump regardless of the state of the working directory.".red
+            error = [
+              "Found unexpected uncommited changes in the working directory. Expected these files to have ",
+              "changed: \n#{expected_changed_files.join("\n")}.\nBut found these actual changes: ",
+              "#{git_dirty_files.join("\n")}.\nMake sure you have cleaned up the build artifacts and ",
+              "are only left with the changed version files at this stage in your lane, and don't touch the ",
+              "working directory while your lane is running. You can also use the :force option to bypass this ",
+              "check, and always commit a version bump regardless of the state of the working directory."
+            ].join("\n")
+            raise error.red
           end
         end
 
         # get the absolute paths to the files
-        git_add_paths = expected_changed_files.map { |path| File.expand_path(File.join(repo_pathname, path)) }
+        git_add_paths = expected_changed_files.map do |path|
+          File.expand_path(File.join(repo_pathname, path))
+        end
 
         # then create a commit with a message
         Actions.sh("git add #{git_add_paths.map(&:shellescape).join(' ')}")
 
         begin
           build_number = Actions.lane_context[Actions::SharedValues::BUILD_NUMBER]
-          
+
           params[:message] ||= (build_number ? "Version Bump to #{build_number}" : "Version Bump")
-          
+
           Actions.sh("git commit -m '#{params[:message]}'")
 
           Helper.log.info "Committed \"#{params[:message]}\" 💾.".green
         rescue => ex
+          Helper.log.error ex
           Helper.log.info "Didn't commit any changes.".yellow
         end
       end
@@ -95,9 +119,9 @@ module Fastlane
                                        env_name: "FL_BUILD_NUMBER_PROJECT",
                                        description: "The path to your project file (Not the workspace). If you have only one, this is optional",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        raise "Please pass the path to the project, not the workspace".red if value.include?"workspace"
-                                        raise "Could not find Xcode project".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Please pass the path to the project, not the workspace".red if value.include? "workspace"
+                                         raise "Could not find Xcode project".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :force,
                                        env_name: "FL_FORCE_COMMIT",
@@ -113,8 +137,9 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end
 end
+# rubocop:enable Metrics/AbcSize

data/lib/fastlane/actions/crashlytics.rb

@@ -5,9 +5,9 @@ end
 module Fastlane
   module Actions
     class CrashlyticsAction < Action
-      
+
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.run(params)
@@ -27,19 +27,19 @@ module Fastlane
         # Normalized notification to Crashlytics notification parameter requirement
         # 'YES' or 'NO' - String
         case params[:notifications]
-          when String
-            if params[:notifications] == 'YES' || params[:notifications] == 'NO'
-              notifications = params[:notifications]
-            else
-              notifications = 'YES' if params[:notifications] == 'true'
-              notifications = 'NO' if params[:notifications] == 'false'
-            end
-          when TrueClass
-            notifications = 'YES'
-          when FalseClass
-            notifications = 'NO'
+        when String
+          if params[:notifications] == 'YES' || params[:notifications] == 'NO'
+            notifications = params[:notifications]
           else
-            notifications = nil
+            notifications = 'YES' if params[:notifications] == 'true'
+            notifications = 'NO' if params[:notifications] == 'false'
+          end
+        when TrueClass
+          notifications = 'YES'
+        when FalseClass
+          notifications = 'NO'
+        else
+          notifications = nil
         end
 
         Helper.log.info 'Uploading the IPA to Crashlytics. Go for a coffee ☕️.'.green
@@ -70,34 +70,34 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :crashlytics_path,
                                        env_name: "CRASHLYTICS_FRAMEWORK_PATH",
                                        description: "Path to the submit binary in the Crashlytics bundle",
-                                       verify_block: Proc.new do |value|
-                                        raise "No Crashlytics path given or found, pass using `crashlytics_path: 'path'`".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "No Crashlytics path given or found, pass using `crashlytics_path: 'path'`".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "CRASHLYTICS_API_TOKEN",
                                        description: "Crashlytics Beta API Token",
-                                       verify_block: Proc.new do |value|
-                                          raise "No API token for Crashlytics given, pass using `api_token: 'token'`".red unless (value and not value.empty?)
+                                       verify_block: proc do |value|
+                                         raise "No API token for Crashlytics given, pass using `api_token: 'token'`".red unless value and !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :build_secret,
                                        env_name: "CRASHLYTICS_BUILD_SECRET",
                                        description: "Crashlytics Build Secret",
-                                       verify_block: Proc.new do |value|
-                                        raise "No build secret for Crashlytics given, pass using `build_secret: 'secret'`".red unless (value and not value.empty?)
+                                       verify_block: proc do |value|
+                                         raise "No build secret for Crashlytics given, pass using `build_secret: 'secret'`".red unless value and !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :ipa_path,
                                        env_name: "CRASHLYTICS_IPA_PATH",
                                        description: "Path to your IPA file. Optional if you use the `ipa` or `xcodebuild` action",
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
-                                       verify_block: Proc.new do |value|
-                                        raise "Couldn't find ipa file at path '#{value}'".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Couldn't find ipa file at path '#{value}'".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :notes_path,
                                        env_name: "CRASHLYTICS_NOTES_PATH",
                                        description: "Path to the release notes",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        raise "Path '#{value}' not found".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Path '#{value}' not found".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :groups,
                                        env_name: "CRASHLYTICS_GROUPS",
@@ -112,8 +112,8 @@ module Fastlane
                                        description: "Crashlytics notification option (true/false)",
                                        optional: true,
                                        is_string: false,
-                                       verify_block: Proc.new do |value|
-                                         raise "Crashlytics supported notifications options: TrueClass, FalseClass, 'true', 'false', 'YES', 'NO'".red unless (value.is_a?(TrueClass) || value.is_a?(FalseClass) || value.is_a?(String))
+                                       verify_block: proc do |value|
+                                         raise "Crashlytics supported notifications options: TrueClass, FalseClass, 'true', 'false', 'YES', 'NO'".red unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass) || value.kind_of?(String)
                                        end)
         ]
       end

data/lib/fastlane/actions/create_keychain.rb

@@ -12,14 +12,14 @@ module Fastlane
         escaped_password = params[:password].shellescape
 
         commands = []
-        commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{escaped_name}", log:false)
+        commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{escaped_name}", log: false)
 
         if params[:default_keychain]
-          Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN] = Fastlane::Actions.sh("security default-keychain", log:false).strip
-          commands << Fastlane::Actions.sh("security default-keychain -s #{escaped_name}", log:false)
+          Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN] = Fastlane::Actions.sh("security default-keychain", log: false).strip
+          commands << Fastlane::Actions.sh("security default-keychain -s #{escaped_name}", log: false)
         end
 
-        commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{escaped_name}", log:false) if params[:unlock]
+        commands << Fastlane::Actions.sh("security unlock-keychain -p #{escaped_password} #{escaped_name}", log: false) if params[:unlock]
 
         command = "security set-keychain-settings"
         command << " -t #{params[:timeout]}" if params[:timeout]
@@ -27,7 +27,7 @@ module Fastlane
         command << " -u" if params[:lock_after_timeout]
         command << " ~/Library/Keychains/#{escaped_name}"
 
-        commands << Fastlane::Actions.sh(command, log:false)
+        commands << Fastlane::Actions.sh(command, log: false)
         commands
       end
 
@@ -64,7 +64,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :lock_after_timeout,
                                        description: 'Lock keychain after timeout interval',
                                        is_string: false,
-                                       default_value: false),
+                                       default_value: false)
         ]
       end
 

data/lib/fastlane/actions/default_platform.rb

@@ -10,7 +10,7 @@ module Fastlane
 
         platform = params.first.to_sym
 
-        SupportedPlatforms.verify!platform
+        SupportedPlatforms.verify! platform
 
         Actions.lane_context[SharedValues::DEFAULT_PLATFORM] = platform
       end

data/lib/fastlane/actions/delete_keychain.rb

@@ -5,8 +5,8 @@ module Fastlane
     class DeleteKeychainAction < Action
       def self.run(params)
         original = Actions.lane_context[Actions::SharedValues::ORIGINAL_DEFAULT_KEYCHAIN]
-        Fastlane::Actions.sh("security default-keychain -s #{original}", log:false) unless original.nil?
-        Fastlane::Actions.sh "security delete-keychain #{params[:name].shellescape}", log:false
+        Fastlane::Actions.sh("security default-keychain -s #{original}", log: false) unless original.nil?
+        Fastlane::Actions.sh "security delete-keychain #{params[:name].shellescape}", log: false
       end
 
       def self.description
@@ -18,7 +18,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :name,
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain name",
-                                       optional: false),
+                                       optional: false)
         ]
       end
 

data/lib/fastlane/actions/deliver.rb

@@ -69,8 +69,8 @@ module Fastlane
                                        env_name: "FL_DELIVER_CONFIG_PATH",
                                        description: "Specify a path to the directory containing the Deliverfile",
                                        default_value: FastlaneFolder.path || Dir.pwd, # defaults to fastlane folder
-                                       verify_block: Proc.new do |value|
-                                        raise "Couldn't find folder '#{value}'. Make sure to pass the path to the directory not the file!".red unless File.directory?(value)
+                                       verify_block: proc do |value|
+                                         raise "Couldn't find folder '#{value}'. Make sure to pass the path to the directory not the file!".red unless File.directory?(value)
                                        end)
         ]
       end
@@ -80,7 +80,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end

data/lib/fastlane/actions/deploygate.rb

@@ -42,17 +42,18 @@ module Fastlane
 
       def self.parse_response(response)
         if response.body && response.body.key?('error')
-          unless response.body['error']
+
+          if response.body['error']
+            Helper.log.error "Error uploading to DeployGate: #{response.body['message']}".red
+            help_message(response)
+            return
+          else
             res = response.body['results']
             url = DEPLOYGATE_URL_BASE + res['path']
 
             Actions.lane_context[SharedValues::DEPLOYGATE_URL] = url
             Actions.lane_context[SharedValues::DEPLOYGATE_REVISION] = res['revision']
             Actions.lane_context[SharedValues::DEPLOYGATE_APP_INFO] = res
-          else
-            Helper.log.error "Error uploading to DeployGate: #{response.body['message']}".red
-            help_message(response)
-            return
           end
         else
           Helper.log.fatal "Error uploading to DeployGate: #{response.body}".red
@@ -65,12 +66,12 @@ module Fastlane
       def self.help_message(response)
         message =
           case response.body['message']
-            when 'you are not authenticated'
-              'Invalid API Token specified.'
-            when 'application create error: permit'
-              'Access denied: May be trying to upload to wrong user or updating app you join as a tester?'
-            when 'application create error: limit'
-              'Plan limit: You have reached to the limit of current plan or your plan was expired.'
+          when 'you are not authenticated'
+            'Invalid API Token specified.'
+          when 'application create error: permit'
+            'Access denied: May be trying to upload to wrong user or updating app you join as a tester?'
+          when 'application create error: limit'
+            'Plan limit: You have reached to the limit of current plan or your plan was expired.'
           end
         Helper.log.error message.red if message
       end
@@ -85,21 +86,21 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "DEPLOYGATE_API_TOKEN",
                                        description: "Deploygate API Token",
-                                       verify_block: Proc.new do |value|
-                                          raise "No API Token for DeployGate given, pass using `api_token: 'token'`".red unless value.to_s.length > 0
+                                       verify_block: proc do |value|
+                                         raise "No API Token for DeployGate given, pass using `api_token: 'token'`".red unless value.to_s.length > 0
                                        end),
           FastlaneCore::ConfigItem.new(key: :user,
                                        env_name: "DEPLOYGATE_USER",
-                                       description: "Target username or organization name", 
-                                       verify_block: Proc.new do |value|
-                                        raise "No User for app given, pass using `user: 'user'`".red unless value.to_s.length > 0
+                                       description: "Target username or organization name",
+                                       verify_block: proc do |value|
+                                         raise "No User for app given, pass using `user: 'user'`".red unless value.to_s.length > 0
                                        end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "DEPLOYGATE_IPA_PATH",
                                        description: "Path to your IPA file. Optional if you use the `ipa` or `xcodebuild` action",
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
-                                       verify_block: Proc.new do |value|
-                                        raise "Couldn't find ipa file at path '#{value}'".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Couldn't find ipa file at path '#{value}'".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :message,
                                        env_name: "DEPLOYGATE_MESSAGE",

data/lib/fastlane/actions/dsym_zip.rb

@@ -10,30 +10,28 @@ module Fastlane
       def self.run(params)
         archive = params[:archive_path]
         params[:dsym_path] ||= File.join("#{File.basename(archive, '.*')}.app.dSYM.zip")
-        
+
         dsym_folder_path = File.expand_path(File.join(archive, 'dSYMs'))
         zipped_dsym_path = File.expand_path(params[:dsym_path])
 
         Actions.lane_context[SharedValues::DSYM_ZIP_PATH] = zipped_dsym_path
 
         if params[:all]
-          Actions.sh(%Q[cd "#{dsym_folder_path}" && zip -r "#{zipped_dsym_path}" "#{dsym_folder_path}"/*.dSYM])
+          Actions.sh(%(cd "#{dsym_folder_path}" && zip -r "#{zipped_dsym_path}" "#{dsym_folder_path}"/*.dSYM))
         else
-          plist = Plist::parse_xml(File.join(archive, 'Info.plist'))
+          plist = Plist.parse_xml(File.join(archive, 'Info.plist'))
           app_name = Helper.test? ? 'MyApp.app' : File.basename(plist['ApplicationProperties']['ApplicationPath'])
           dsym_name = "#{app_name}.dSYM"
-          Actions.sh(%Q[cd "#{dsym_folder_path}" && zip -r "#{zipped_dsym_path}" "#{dsym_name}"])
+          Actions.sh(%(cd "#{dsym_folder_path}" && zip -r "#{zipped_dsym_path}" "#{dsym_name}"))
         end
-
       end
 
-
       #####################################################
       # @!group Documentation
       #####################################################
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.description
@@ -47,8 +45,8 @@ module Fastlane
                                        default_value: Actions.lane_context[SharedValues::XCODEBUILD_ARCHIVE],
                                        optional: true,
                                        env_name: 'DSYM_ZIP_XCARCHIVE_PATH',
-                                       verify_block: Proc.new do |value|
-                                        raise "Couldn't find xcarchive file at path '#{value}'".red if !Helper.test? && !File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Couldn't find xcarchive file at path '#{value}'".red if !Helper.test? && !File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :dsym_path,
                                        description: 'Path for generated dsym. Optional, default is your apps root directory',