fastlane 1.20.0 → 1.21.0

data/lib/fastlane/actions/sigh.rb

@@ -16,7 +16,7 @@ module Fastlane
           FastlaneCore::UpdateChecker.start_looking_for_update('sigh') unless Helper.is_test?
 
           Sigh.config = values # we already have the finished config
-          
+
           path = Sigh::Manager.start
 
           Actions.lane_context[SharedValues::SIGH_PROFILE_PATH] = path # absolute path

data/lib/fastlane/actions/slack.rb

@@ -1,3 +1,6 @@
+# rubocop:disable Style/CaseEquality
+# rubocop:disable Style/MultilineTernaryOperator
+# rubocop:disable Style/NestedTernaryOperator
 module Fastlane
   module Actions
     class SlackAction < Action
@@ -44,11 +47,11 @@ module Fastlane
                                icon_url: 'https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png',
                                attachments: [slack_attachment]
 
-        unless result.code.to_i == 200
+        if result.code.to_i == 200
+          Helper.log.info 'Successfully sent Slack notification'.green
+        else
           Helper.log.debug result
           raise 'Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile.'.red
-        else
-          Helper.log.info 'Successfully sent Slack notification'.green
         end
       end
 
@@ -69,8 +72,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :slack_url,
                                        env_name: "SLACK_URL",
                                        description: "Create an Incoming WebHook for your Slack group",
-                                       verify_block: Proc.new do |value|
-                                        raise "Invalid URL, must start with https://" unless value.start_with?"https://"
+                                       verify_block: proc do |value|
+                                         raise "Invalid URL, must start with https://" unless value.start_with? "https://"
                                        end),
           FastlaneCore::ConfigItem.new(key: :payload,
                                        env_name: "FL_SLACK_PAYLOAD",
@@ -92,7 +95,7 @@ module Fastlane
                                        description: "Was this build successful? (true/false)",
                                        optional: true,
                                        default_value: true,
-                                       is_string: false),
+                                       is_string: false)
         ]
       end
 
@@ -100,87 +103,95 @@ module Fastlane
         "KrauseFx"
       end
 
-      private
-        def self.generate_slack_attachments(options)
-          color = (options[:success] ? 'good' : 'danger')
-          should_add_payload = ->(payload_name) { options[:default_payloads].nil? || options[:default_payloads].include?(payload_name) }
-
-          slack_attachment = {
-            fallback: options[:message],
-            text: options[:message],
-            color: color,
-            fields: []
+      #####################################################
+      # @!group Helper
+      #####################################################
+
+      def self.generate_slack_attachments(options)
+        color = (options[:success] ? 'good' : 'danger')
+        should_add_payload = ->(payload_name) { options[:default_payloads].nil? || options[:default_payloads].include?(payload_name) }
+
+        slack_attachment = {
+          fallback: options[:message],
+          text: options[:message],
+          color: color,
+          fields: []
+        }
+
+        # custom user payloads
+        slack_attachment[:fields] += options[:payload].map do |k, v|
+          {
+            title: k.to_s,
+            value: Slack::Notifier::LinkFormatter.format(v.to_s),
+            short: false
           }
+        end
 
-          # custom user payloads
-          slack_attachment[:fields] += options[:payload].map do |k, v|
-            {
-              title: k.to_s,
-              value: Slack::Notifier::LinkFormatter.format(v.to_s),
-              short: false
-            }
-          end
+        # lane
+        if should_add_payload[:lane]
+          slack_attachment[:fields] << {
+            title: 'Lane',
+            value: Actions.lane_context[Actions::SharedValues::LANE_NAME],
+            short: true
+          }
+        end
 
-          # lane
-          if should_add_payload[:lane]
-            slack_attachment[:fields] << {
-              title: 'Lane',
-              value: Actions.lane_context[Actions::SharedValues::LANE_NAME],
-              short: true
-            }
-          end
+        # test_result
+        if should_add_payload[:test_result]
+          slack_attachment[:fields] << {
+            title: 'Result',
+            value: (options[:success] ? 'Success' : 'Error'),
+            short: true
+          }
+        end
 
-          # test_result
-          if should_add_payload[:test_result]
-            slack_attachment[:fields] << {
-              title: 'Result',
-              value: (options[:success] ? 'Success' : 'Error'),
-              short: true
-            }
-          end
+        # git branch
+        if Actions.git_branch && should_add_payload[:git_branch]
+          slack_attachment[:fields] << {
+            title: 'Git Branch',
+            value: Actions.git_branch,
+            short: true
+          }
+        end
 
-          # git branch
-          if Actions.git_branch && should_add_payload[:git_branch]
+        # git_author
+        if Actions.git_author && should_add_payload[:git_author]
+          if ENV['FASTLANE_SLACK_HIDE_AUTHOR_ON_SUCCESS'] && options[:success]
+            # We only show the git author if the build failed
+          else
             slack_attachment[:fields] << {
-              title: 'Git Branch',
-              value: Actions.git_branch,
+              title: 'Git Author',
+              value: Actions.git_author,
               short: true
             }
           end
+        end
 
-          # git_author
-          if Actions.git_author && should_add_payload[:git_author]
-            if ENV['FASTLANE_SLACK_HIDE_AUTHOR_ON_SUCCESS'] && options[:success]
-              # We only show the git author if the build failed
-            else
-              slack_attachment[:fields] << {
-                title: 'Git Author',
-                value: Actions.git_author,
-                short: true
-              }
-            end
-          end
-
-          # last_git_commit
-          if Actions.last_git_commit && should_add_payload[:last_git_commit]
-            slack_attachment[:fields] << {
-              title: 'Git Commit',
-              value: Actions.last_git_commit,
-              short: false
-            }
-          end
-
-          # merge additional properties
-          deep_merge(slack_attachment, options[:attachment_properties])
+        # last_git_commit
+        if Actions.last_git_commit && should_add_payload[:last_git_commit]
+          slack_attachment[:fields] << {
+            title: 'Git Commit',
+            value: Actions.last_git_commit,
+            short: false
+          }
         end
 
-        # Adapted from http://stackoverflow.com/a/30225093/158525
-        def self.deep_merge(a, b)
-          merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? 
-                            v1.merge(v2, &merger) : Array === v1 && Array === v2 ? 
-                              v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2 }
-          a.merge(b, &merger)
+        # merge additional properties
+        deep_merge(slack_attachment, options[:attachment_properties])
+      end
+
+      # Adapted from http://stackoverflow.com/a/30225093/158525
+      def self.deep_merge(a, b)
+        merger = proc do |key, v1, v2|
+          Hash === v1 && Hash === v2 ?
+                 v1.merge(v2, &merger) : Array === v1 && Array === v2 ?
+                   v1 | v2 : [:undefined, nil, :nil].include?(v2) ? v1 : v2
         end
+        a.merge(b, &merger)
+      end
     end
   end
 end
+# rubocop:enable Style/CaseEquality
+# rubocop:enable Style/MultilineTernaryOperator
+# rubocop:enable Style/NestedTernaryOperator

data/lib/fastlane/actions/snapshot.rb

@@ -55,8 +55,8 @@ module Fastlane
                                        env_name: "FL_SNAPSHOT_CONFIG_PATH",
                                        description: "Specify a path to the directory containing the Snapfile",
                                        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),
           FastlaneCore::ConfigItem.new(key: :nobuild,
                                        env_name: "FL_SNAPSHOT_NO_BUILD",

data/lib/fastlane/actions/team_id.rb

@@ -5,7 +5,8 @@ module Fastlane
 
     class TeamIdAction < Action
       def self.run(params)
-        team = (params.first rescue nil)
+        params = nil unless params.kind_of? Array
+        team = (params || []).first
         raise "Please pass your Team ID (e.g. team_id 'Q2CBPK58CA')".red unless team.to_s.length > 0
 
         Helper.log.info "Setting Team ID to '#{team}' for all build steps"

data/lib/fastlane/actions/team_name.rb

@@ -5,7 +5,8 @@ module Fastlane
 
     class TeamNameAction < Action
       def self.run(params)
-        team = (params.first rescue nil)
+        params = nil unless params.kind_of? Array
+        team = (params || []).first
         raise "Please pass your Team Name (e.g. team_name 'Felix Krause')".red unless team.to_s.length > 0
 
         Helper.log.info "Setting Team Name to '#{team}' for all build steps"

data/lib/fastlane/actions/testflight.rb

@@ -40,8 +40,8 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        Actions::DeliverAction.is_supported?platform
+        Actions::DeliverAction.is_supported? platform
       end
     end
   end
-end
+end

data/lib/fastlane/actions/testmunk.rb

@@ -14,16 +14,16 @@ module Fastlane
     class TestmunkAction < Action
       def self.run(config)
         Helper.log.info 'Testmunk: Uploading the .ipa and starting your tests'.green
-        
+
         Helper.log.info 'Zipping features/ to features.zip'.green
         zipped_features_path = File.expand_path('features.zip')
-        Actions.sh(%Q[zip -r "features" "features/"])
+        Actions.sh(%(zip -r "features" "features/"))
 
-        response = system("#{"curl -H 'Accept: application/vnd.testmunk.v1+json'" +
-            " -F 'file=@#{config[:ipa]}' -F 'autoStart=true'" +
-            " -F 'testcases=@#{zipped_features_path}'" +
-            " -F 'email=#{config[:email]}'" +
-            " https://#{config[:api]}@api.testmunk.com/apps/#{config[:app]}/testruns"}")
+        response = system("curl -H 'Accept: application/vnd.testmunk.v1+json'" \
+            " -F 'file=@#{config[:ipa]}' -F 'autoStart=true'" \
+            " -F 'testcases=@#{zipped_features_path}'" \
+            " -F 'email=#{config[:email]}'" \
+            " https://#{config[:api]}@api.testmunk.com/apps/#{config[:app]}/testruns")
 
         if response
           Helper.log.info 'Your tests are being executed right now. Please wait for the mail with results and decide if you want to continue.'.green
@@ -42,26 +42,26 @@ module Fastlane
                                        env_name: "TESTMUNK_IPA",
                                        description: "Path to IPA",
                                        default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
-                                       verify_block: Proc.new do |value|
-                                        raise "Please pass to existing ipa" unless File.exists?value
+                                       verify_block: proc do |value|
+                                         raise "Please pass to existing ipa" unless File.exist? value
                                        end),
           FastlaneCore::ConfigItem.new(key: :email,
                                        env_name: "TESTMUNK_EMAIL",
                                        description: "Your email address",
-                                       verify_block: Proc.new do |value|
-                                        raise "Please pass your Testmunk email address using `ENV['TESTMUNK_EMAIL'] = 'value'`" unless value
+                                       verify_block: proc do |value|
+                                         raise "Please pass your Testmunk email address using `ENV['TESTMUNK_EMAIL'] = 'value'`" unless value
                                        end),
           FastlaneCore::ConfigItem.new(key: :api,
                                        env_name: "TESTMUNK_API",
                                        description: "Testmunk API Key",
-                                       verify_block: Proc.new do |value|
-                                          raise "Please pass your Testmunk API Key using `ENV['TESTMUNK_API'] = 'value'`" unless value
+                                       verify_block: proc do |value|
+                                         raise "Please pass your Testmunk API Key using `ENV['TESTMUNK_API'] = 'value'`" unless value
                                        end),
           FastlaneCore::ConfigItem.new(key: :app,
                                        env_name: "TESTMUNK_APP",
                                        description: "Testmunk App Name",
-                                       verify_block: Proc.new do |value|
-                                        raise "Please pass your Testmunk app name using `ENV['TESTMUNK_APP'] = 'value'`" unless value
+                                       verify_block: proc do |value|
+                                         raise "Please pass your Testmunk app name using `ENV['TESTMUNK_APP'] = 'value'`" unless value
                                        end)
         ]
       end
@@ -75,4 +75,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/typetalk.rb

@@ -6,16 +6,16 @@ module Fastlane
             message: nil,
             note_path: nil,
             success: true,
-            topicId: nil,
-            typetalk_token: nil,
+            topic_id: nil,
+            typetalk_token: nil
         }.merge(params || {})
 
-        [:message, :topicId, :typetalk_token].each { |key|
+        [:message, :topic_id, :typetalk_token].each do |key|
           raise "No #{key} given.".red unless options[key]
-        }
+        end
 
         emoticon = (options[:success] ? ':smile:' : ':rage:')
-        message = "#{emoticon} #{options[:message].to_s}"
+        message = "#{emoticon} #{options[:message]}"
 
         note_path = File.expand_path(options[:note_path]) if options[:note_path]
         if note_path and File.exist?(note_path)
@@ -23,19 +23,19 @@ module Fastlane
           message += "\n\n```\n#{contents}\n```"
         end
 
-        topicId = options[:topicId]
+        topic_id = options[:topic_id]
         typetalk_token = options[:typetalk_token]
 
-        self.post_to_typetalk(message, topicId, typetalk_token)
+        self.post_to_typetalk(message, topic_id, typetalk_token)
 
         Helper.log.info 'Successfully sent Typetalk notification'.green
       end
 
-      def self.post_to_typetalk(message, topicId, typetalk_token)
+      def self.post_to_typetalk(message, topic_id, typetalk_token)
         require 'net/http'
         require 'uri'
 
-        uri = URI.parse("https://typetalk.in/api/v1/topics/#{topicId}")
+        uri = URI.parse("https://typetalk.in/api/v1/topics/#{topic_id}")
         response = Net::HTTP.post_form(uri, {'message' => message,
                                              'typetalkToken' => typetalk_token})
 
@@ -44,10 +44,10 @@ module Fastlane
 
       def self.check_response(response)
         case response.code.to_i
-          when 200, 204
-            true
-          else
-            raise "Could not sent Typetalk notification".red
+        when 200, 204
+          true
+        else
+          raise "Could not sent Typetalk notification".red
         end
       end
 
@@ -59,7 +59,7 @@ module Fastlane
         [
           ['message', 'The message to post'],
           ['note_path', 'Path to an additional note'],
-          ['topicId', 'Typetalk topic id'],
+          ['topic_id', 'Typetalk topic id'],
           ['success', 'Successful build?'],
           ['typetalk_token', 'typetalk token']
         ]

data/lib/fastlane/actions/update_app_group_identifiers.rb

@@ -12,10 +12,10 @@ module Fastlane
         Helper.log.info "New App Group Identifiers: #{params[:app_group_identifiers]}"
 
         entitlements_file = params[:entitlements_file]
-        raise "Could not find entitlements file at path '#{entitlements_file}'".red unless File.exists?(entitlements_file)
+        raise "Could not find entitlements file at path '#{entitlements_file}'".red unless File.exist?(entitlements_file)
 
         # parse entitlements
-        result = Plist::parse_xml(entitlements_file)
+        result = Plist.parse_xml(entitlements_file)
         raise "Entitlements file at '#{entitlements_file}' cannot be parsed.".red unless result
 
         # get app group field
@@ -39,20 +39,20 @@ module Fastlane
 
       def self.available_options
         [
-            FastlaneCore::ConfigItem.new(key: :entitlements_file,
-                                         env_name: "FL_UPDATE_APP_GROUP_IDENTIFIER_ENTITLEMENTS_FILE_PATH", # The name of the environment variable
-                                         description: "The path to the entitlement file which contains the app group identifiers", # a short description of this parameter
-                                         verify_block: Proc.new do |value|
-                                           raise "Please pass a path to an entitlements file. ".red unless value.include? ".entitlements"
-                                           raise "Could not find entitlements file".red if (not File.exists?(value) and not Helper.is_test?)
-                                         end),
-            FastlaneCore::ConfigItem.new(key: :app_group_identifiers,
-                                         env_name: "FL_UPDATE_APP_GROUP_IDENTIFIER_APP_GROUP_IDENTIFIERS",
-                                         description: "An Array of unique identifiers for the app groups. Eg. ['group.com.test.testapp']",
-                                         is_string: false,
-                                         verify_block: Proc.new do |value|
-                                           raise "The parameter app_group_identifiers need to be an Array.".red unless value.is_a? Array
-                                         end)
+          FastlaneCore::ConfigItem.new(key: :entitlements_file,
+                                       env_name: "FL_UPDATE_APP_GROUP_IDENTIFIER_ENTITLEMENTS_FILE_PATH", # The name of the environment variable
+                                       description: "The path to the entitlement file which contains the app group identifiers", # a short description of this parameter
+                                       verify_block: proc do |value|
+                                         raise "Please pass a path to an entitlements file. ".red unless value.include? ".entitlements"
+                                         raise "Could not find entitlements file".red if !File.exist?(value) and !Helper.is_test?
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :app_group_identifiers,
+                                       env_name: "FL_UPDATE_APP_GROUP_IDENTIFIER_APP_GROUP_IDENTIFIERS",
+                                       description: "An Array of unique identifiers for the app groups. Eg. ['group.com.test.testapp']",
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         raise "The parameter app_group_identifiers need to be an Array.".red unless value.kind_of? Array
+                                       end)
         ]
       end
 
@@ -69,4 +69,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/update_fastlane.rb

@@ -1,9 +1,10 @@
+# rubocop:disable Metrics/AbcSize
 require 'rubygems/spec_fetcher'
 require 'rubygems/command_manager'
 
 module Fastlane
   module Actions
-    # Makes sure fastlane tools are up-to-date when running fastlane 
+    # Makes sure fastlane tools are up-to-date when running fastlane
     class UpdateFastlaneAction < Action
 
       ALL_TOOLS = [
@@ -56,7 +57,7 @@ module Fastlane
         # suppress updater output - very noisy
         Gem::DefaultUserInteraction.ui = Gem::SilentUI.new
 
-        update_needed.each do |tool_info| 
+        update_needed.each do |tool_info|
           tool = tool_info[0]
           local_version = Gem::Version.new(highest_versions[tool].version)
           latest_version = FastlaneCore::UpdateChecker.fetch_latest(tool)
@@ -64,7 +65,7 @@ module Fastlane
 
           # Approximate_recommendation will create a string like "~> 0.10" from a version 0.10.0, e.g. one that is valid for versions >= 0.10 and <1.0
           updater.update_gem tool, Gem::Requirement.new(local_version.approximate_recommendation)
-          
+
           Helper.log.info "Finished updating #{tool}"
         end
 
@@ -72,21 +73,21 @@ module Fastlane
           updated_tool.version > highest_versions[updated_tool.name].version
         end
 
-        unless all_updated_tools.empty?
+        if all_updated_tools.empty?
+          Helper.log.info "All fastlane tools are up-to-date!"
+        else
           Helper.log.info "Cleaning up old versions..."
-          cleaner.options[:args] = all_updated_tools.map {|t| t.name }
+          cleaner.options[:args] = all_updated_tools.map(&:name)
           cleaner.execute
           Helper.log.info "fastlane.tools succesfully updated! I will now restart myself... 😴"
-          
+
           # Set no_update to true so we don't try to update again
           exec "FL_NO_UPDATE=true #{$PROGRAM_NAME} #{ARGV.join ' '}"
-        else 
-          Helper.log.info "All fastlane tools are up-to-date!"
         end
       end
 
       def self.all_installed_tools
-        Gem::Specification.select { |s| ALL_TOOLS.include? s.name }.map {|s| s.name}.uniq
+        Gem::Specification.select { |s| ALL_TOOLS.include? s.name }.map(&:name).uniq
       end
 
       def self.description
@@ -99,11 +100,11 @@ module Fastlane
                                        env_name: "FL_TOOLS_TO_UPDATE",
                                        description: "Comma separated list of fastlane tools to update (e.g. fastlane,deliver,sigh). If not specified, all currently installed fastlane-tools will be updated",
                                        optional: true),
-         FastlaneCore::ConfigItem.new(key: :no_update,
-                                      env_name: "FL_NO_UPDATE",
-                                      description: "Don't update during this run. Defaults to false",
-                                      is_string: false,
-                                      default_value: false),
+          FastlaneCore::ConfigItem.new(key: :no_update,
+                                       env_name: "FL_NO_UPDATE",
+                                       description: "Don't update during this run. Defaults to false",
+                                       is_string: false,
+                                       default_value: false)
         ]
       end
 
@@ -117,3 +118,4 @@ module Fastlane
     end
   end
 end
+# rubocop:enable Metrics/AbcSize