fastlane_hotfix 2.165.1 → 2.187.0

data/fastlane/lib/fastlane/fastlane_require.rb

@@ -59,8 +59,14 @@ module Fastlane
 
       def find_gem_name(user_supplied_name)
         fetcher = Gem::SpecFetcher.fetcher
-        gems = fetcher.suggest_gems_from_name(user_supplied_name)
 
+        # RubyGems 3.2.0 changed behavior of suggest_gems_from_name to no longer return user supplied name (only similar suggestions)
+        # First search for exact gem with detect then use suggest_gems_from_name
+        if (detected_gem = fetcher.detect(:latest) { |nt| nt.name == user_supplied_name }.first)
+          return detected_gem[0].name
+        end
+
+        gems = fetcher.suggest_gems_from_name(user_supplied_name)
         return gems.first
       end
 

data/fastlane/lib/fastlane/features.rb

@@ -1,4 +1,4 @@
-# Use this file as the place to register Feature switches for the fastlan_core project
+# Use this file as the place to register Feature switches for the fastlane_core project
 
 # FastlaneCore::Feature.register(env_var: 'YOUR_FEATURE_SWITCH_ENV_VAR',
 #                            description: 'Describe what this feature switch controls')

data/fastlane/lib/fastlane/helper/adb_helper.rb

@@ -24,7 +24,7 @@ module Fastlane
           adb_path = File.join(android_home, "platform-tools", "adb")
         end
 
-        self.adb_path = File.expand_path(adb_path)
+        self.adb_path = Helper.get_executable_path(File.expand_path(adb_path))
         self.adb_host = adb_host
       end
 

data/fastlane/lib/fastlane/helper/crashlytics_helper.rb

@@ -47,9 +47,9 @@ module Fastlane
           command << params[:api_token]
           command << params[:build_secret]
           command << "-ipaPath '#{params[:ipa_path]}'"
-          command << "-emails '#{params[:emails]}'" if params[:emails]
+          command << "-emails '#{params[:emails].join(',')}'" if params[:emails]
           command << "-notesPath '#{params[:notes_path]}'" if params[:notes_path]
-          command << "-groupAliases '#{params[:groups]}'" if params[:groups]
+          command << "-groupAliases '#{params[:groups].join(',')}'" if params[:groups]
           command << "-notifications #{(params[:notifications] ? 'YES' : 'NO')}"
           command << "-debug #{(params[:debug] ? 'YES' : 'NO')}"
 
@@ -74,9 +74,9 @@ module Fastlane
           command << "-androidManifest #{File.expand_path(android_manifest_path).shellescape}"
 
           # Optional
-          command << "-betaDistributionEmails #{params[:emails].shellescape}" if params[:emails]
+          command << "-betaDistributionEmails #{params[:emails].join(',').shellescape}" if params[:emails]
           command << "-betaDistributionReleaseNotesFilePath #{File.expand_path(params[:notes_path]).shellescape}" if params[:notes_path]
-          command << "-betaDistributionGroupAliases #{params[:groups].shellescape}" if params[:groups]
+          command << "-betaDistributionGroupAliases #{params[:groups].join(',').shellescape}" if params[:groups]
           command << "-betaDistributionNotifications #{(params[:notifications] ? 'true' : 'false')}"
 
           return command

data/fastlane/lib/fastlane/helper/gem_helper.rb

@@ -10,8 +10,8 @@ module Fastlane
       rescue Gem::LoadError
         UI.error("Could not find gem '#{gem_name}'")
         UI.error("")
-        UI.error("If you installed fastlane using `sudo gem install fastlane` run")
-        UI.command("sudo gem install #{gem_name}")
+        UI.error("If you installed fastlane using `gem install fastlane` run")
+        UI.command("gem install #{gem_name}")
         UI.error("to install the missing gem")
         UI.error("")
         UI.error("If you use a Gemfile add this to your Gemfile:")

data/fastlane/lib/fastlane/helper/git_helper.rb

@@ -2,6 +2,13 @@ module Fastlane
   module Actions
     GIT_MERGE_COMMIT_FILTERING_OPTIONS = [:include_merges, :exclude_merges, :only_include_merges].freeze
 
+    module SharedValues
+      GIT_BRANCH_ENV_VARS = %w(GIT_BRANCH BRANCH_NAME TRAVIS_BRANCH BITRISE_GIT_BRANCH CI_BUILD_REF_NAME CI_COMMIT_REF_NAME WERCKER_GIT_BRANCH BUILDKITE_BRANCH APPCENTER_BRANCH CIRCLE_BRANCH).reject do |branch|
+        # Removing because tests break on CircleCI
+        Helper.test? && branch == "CIRCLE_BRANCH"
+      end.freeze
+    end
+
     def self.git_log_between(pretty_format, from, to, merge_commit_filtering, date_format = nil, ancestry_path)
       command = %w(git log)
       command << "--pretty=#{pretty_format}"
@@ -112,13 +119,35 @@ module Fastlane
       return nil
     end
 
-    # Returns the current git branch - can be replaced using the environment variable `GIT_BRANCH`
+    # Returns the current git branch, or "HEAD" if it's not checked out to any branch
+    # Can be replaced using the environment variable `GIT_BRANCH`
     def self.git_branch
-      return ENV['GIT_BRANCH'] if ENV['GIT_BRANCH'].to_s.length > 0 # set by Jenkins
-      s = Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
-      return s.to_s.strip if s.to_s.length > 0
+      env_name = SharedValues::GIT_BRANCH_ENV_VARS.find { |env_var| FastlaneCore::Env.truthy?(env_var) }
+      ENV.fetch(env_name.to_s) do
+        self.git_branch_name_using_HEAD
+      end
+    end
+
+    # Returns the checked out git branch name or "HEAD" if you're in detached HEAD state
+    def self.git_branch_name_using_HEAD
+      # Rescues if not a git repo or no commits in a git repo
+      Actions.sh("git rev-parse --abbrev-ref HEAD", log: false).chomp
+    rescue => err
+      UI.verbose("Error getting git branch: #{err.message}")
       nil
-    rescue
+    end
+
+    # Returns the default git remote branch name
+    def self.git_remote_branch_name(remote_name)
+      # Rescues if not a git repo or no remote repo
+      if remote_name
+        Actions.sh("git remote show #{remote_name} | grep 'HEAD branch' | sed 's/.*: //'", log: false).chomp
+      else
+        # Query git for the current remote head
+        Actions.sh("variable=$(git remote) && git remote show $variable | grep 'HEAD branch' | sed 's/.*: //'", log: false).chomp
+      end
+    rescue => err
+      UI.verbose("Error getting git default remote branch: #{err.message}")
       nil
     end
 

data/fastlane/lib/fastlane/lane_manager.rb

@@ -107,12 +107,13 @@ module Fastlane
 
       puts(table)
 
+      fastlane_command = Helper.bundler? ? "bundle exec fastlane" : "fastlane"
       i = UI.input("Which number would you like run?")
 
       i = i.to_i - 1
       if i >= 0 && available[i]
         selection = available[i].last.pretty_name
-        UI.important("Running lane `#{selection}`. Next time you can do this by directly typing `fastlane #{selection}` 🚀.")
+        UI.important("Running lane `#{selection}`. Next time you can do this by directly typing `#{fastlane_command} #{selection}` 🚀.")
         platform = selection.split(' ')[0]
         lane_name = selection.split(' ')[1]
 
@@ -123,7 +124,7 @@ module Fastlane
 
         return platform, lane_name # yeah
       else
-        UI.user_error!("Run `fastlane` the next time you need to build, test or release your app 🚀")
+        UI.user_error!("Run `#{fastlane_command}` the next time you need to build, test or release your app 🚀")
       end
     end
   end

data/fastlane/lib/fastlane/notification/slack.rb

@@ -0,0 +1,56 @@
+module Fastlane
+  module Notification
+    class Slack
+      def initialize(webhook_url)
+        @webhook_url = webhook_url
+        @client = Faraday.new do |conn|
+          conn.use(Faraday::Response::RaiseError)
+        end
+      end
+
+      # Overriding channel, icon_url and username is only supported in legacy incoming webhook.
+      # Also note that the use of attachments has been discouraged by Slack, in favor of Block Kit.
+      # https://api.slack.com/legacy/custom-integrations/messaging/webhooks
+      def post_to_legacy_incoming_webhook(channel:, username:, attachments:, link_names:, icon_url:)
+        @client.post(@webhook_url) do |request|
+          request.headers['Content-Type'] = 'application/json'
+          request.body = {
+            channel: channel,
+            username: username,
+            icon_url: icon_url,
+            attachments: attachments,
+            link_names: link_names
+          }.to_json
+        end
+      end
+
+      # This class was inspired by `LinkFormatter` in `slack-notifier` gem
+      # https://github.com/stevenosloan/slack-notifier/blob/4bf6582663dc9e5070afe3fdc42d67c14a513354/lib/slack-notifier/util/link_formatter.rb
+      class LinkConverter
+        HTML_PATTERN = %r{<a.*?href=['"](?<link>#{URI.regexp})['"].*?>(?<label>.+?)<\/a>}
+        MARKDOWN_PATTERN = /\[(?<label>[^\[\]]*?)\]\((?<link>#{URI.regexp}|mailto:#{URI::MailTo::EMAIL_REGEXP})\)/
+
+        def self.convert(string)
+          convert_markdown_to_slack_link(convert_html_to_slack_link(string.scrub))
+        end
+
+        def self.convert_html_to_slack_link(string)
+          string.gsub(HTML_PATTERN) do |match|
+            slack_link(Regexp.last_match[:link], Regexp.last_match[:label])
+          end
+        end
+
+        def self.convert_markdown_to_slack_link(string)
+          string.gsub(MARKDOWN_PATTERN) do |match|
+            slack_link(Regexp.last_match[:link], Regexp.last_match[:label])
+          end
+        end
+
+        def self.slack_link(href, text)
+          return "<#{href}>" if text.nil? || text.empty?
+          "<#{href}|#{text}>"
+        end
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/plugins/plugin_fetcher.rb

@@ -7,14 +7,13 @@ module Fastlane
     # Returns an array of FastlanePlugin objects
     def self.fetch_gems(search_query: nil)
       require 'json'
-      require 'open-uri'
 
       page = 1
       plugins = []
       loop do
         url = "https://rubygems.org/api/v1/search.json?query=#{PluginManager.plugin_prefix}&page=#{page}"
         FastlaneCore::UI.verbose("RubyGems API Request: #{url}")
-        results = JSON.parse(open(url).read)
+        results = JSON.parse(FastlaneCore::Helper.open_uri(url).read)
         break if results.count == 0
 
         plugins += results.collect do |current|

data/fastlane/lib/fastlane/plugins/plugin_info.rb

@@ -33,11 +33,11 @@ module Fastlane
 
     # Used to expose a local binding for use in ERB templating
     #
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def get_binding
       binding
     end
-    # rubocop:enable Style/AccessorMethodName
+    # rubocop:enable Naming/AccessorMethodName
 
     def ==(other)
       @plugin_name == other.plugin_name &&

data/fastlane/lib/fastlane/plugins/plugin_info_collector.rb

@@ -65,10 +65,9 @@ module Fastlane
 
     # Checks if the gem name is still free on RubyGems
     def gem_name_taken?(name)
-      require 'open-uri'
       require 'json'
       url = "https://rubygems.org/api/v1/gems/#{name}.json"
-      response = JSON.parse(open(url).read)
+      response = JSON.parse(FastlaneCore::Helper.open_uri(url).read)
       return !!response['version']
     rescue
       false

data/fastlane/lib/fastlane/plugins/plugin_manager.rb

@@ -155,11 +155,10 @@ module Fastlane
     #####################################################
 
     def self.fetch_gem_info_from_rubygems(gem_name)
-      require 'open-uri'
       require 'json'
       url = "https://rubygems.org/api/v1/gems/#{gem_name}.json"
       begin
-        JSON.parse(URI.open(url).read)
+        JSON.parse(FastlaneCore::Helper.open_uri(url).read)
       rescue
         nil
       end
@@ -327,7 +326,7 @@ module Fastlane
           no_action_found = true
           [current[0].red, current[1][:version_number], "No actions found".red]
         else
-          [current[0], current[1][:version_number], current[1][:actions].join("\n")]
+          [current[0], current[1][:version_number], current[1][:actions].join(", ")]
         end
       end
 

data/fastlane/lib/fastlane/plugins/template/%gem_name%.gemspec.erb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require '<%= require_path %>/version'
 
@@ -18,18 +16,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.5'
+
   # Don't add a dependency to fastlane or fastlane_re
   # since this would cause a circular dependency
 
   # spec.add_dependency 'your-dependency', '~> 1.0.0'
 
-  spec.add_development_dependency('pry')
   spec.add_development_dependency('bundler')
+  spec.add_development_dependency('fastlane', '>= <%= Fastlane::VERSION %>')
+  spec.add_development_dependency('pry')
+  spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec')
   spec.add_development_dependency('rspec_junit_formatter')
-  spec.add_development_dependency('rake')
   spec.add_development_dependency('rubocop', '<%= Fastlane::RUBOCOP_REQUIREMENT %>')
+  spec.add_development_dependency('rubocop-performance')
   spec.add_development_dependency('rubocop-require_tools')
   spec.add_development_dependency('simplecov')
-  spec.add_development_dependency('fastlane', '>= <%= Fastlane::VERSION %>')
 end

data/fastlane/lib/fastlane/plugins/template/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.4.2
+       - image: circleci/ruby:2.5
 
     working_directory: ~/repo
 

data/fastlane/lib/fastlane/plugins/template/.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.4
+        ruby-version: 2.5
     - name: Install dependencies
       run: bundle check || bundle install --jobs=4 --retry=3 --path vendor/bundle
     - name: Run tests

data/fastlane/lib/fastlane/plugins/template/.rubocop.yml

@@ -1,4 +1,23 @@
 ---
+require:
+- rubocop/require_tools
+- rubocop-performance
+AllCops:
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  Include:
+  - "**/*.rb"
+  - "**/*file"
+  - "**/*.gemspec"
+  - "*/lib/assets/*Template"
+  - "*/lib/assets/*TemplateAndroid"
+  Exclude:
+  - "**/lib/assets/custom_action_template.rb"
+  - "./vendor/**/*"
+  - "**/lib/assets/DefaultFastfileTemplate"
+  - "**/lib/assets/MatchfileTemplate"
+  - "**/spec/fixtures/broken_files/broken_file.rb"
+  - "**/*.provisionprofile"
 Style/MultipleComparison:
   Enabled: false
 Style/PercentLiteralDelimiters:
@@ -19,11 +38,11 @@ Metrics/BlockLength:
   Enabled: false
 Metrics/ModuleLength:
   Enabled: false
-Style/VariableNumber:
+Naming/VariableNumber:
   Enabled: false
-Style/MethodMissing:
+Style/MissingRespondToMissing:
   Enabled: false
-MultilineBlockChain:
+Style/MultilineBlockChain:
   Enabled: false
 Style/NumericLiteralPrefix:
   Enabled: false
@@ -31,8 +50,6 @@ Style/TernaryParentheses:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false
-Style/BracesAroundHashParameters:
-  Enabled: false
 Lint/UselessAssignment:
   Exclude:
   - "**/spec/**/*"
@@ -41,6 +58,7 @@ Require/MissingRequireStatement:
   - "**/spec/**/*.rb"
   - "**/spec_helper.rb"
   - spaceship/lib/spaceship/babosa_fix.rb
+  - fastlane_core/lib/fastlane_core/ui/disable_colors.rb
   - "**/Fastfile"
   - "**/*.gemspec"
   - rakelib/**/*
@@ -48,9 +66,9 @@ Require/MissingRequireStatement:
   - "**/Rakefile"
   - fastlane/**/*
   - supply/**/*
-Layout/IndentHash:
+Layout/FirstHashElementIndentation:
   Enabled: false
-Layout/AlignHash:
+Layout/HashAlignment:
   Enabled: false
 Layout/DotPosition:
   Enabled: false
@@ -58,12 +76,12 @@ Style/DoubleNegation:
   Enabled: false
 Style/SymbolArray:
   Enabled: false
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 Style/MixinGrouping:
   Exclude:
   - "**/spec/**/*"
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Enabled: false
 Lint/UnusedBlockArgument:
   Enabled: false
@@ -94,12 +112,10 @@ Style/AndOr:
   EnforcedStyle: conditionals
 Metrics/ClassLength:
   Max: 320
-Metrics/LineLength:
+Layout/LineLength:
   Max: 370
 Metrics/ParameterLists:
   Max: 17
-Metrics/PerceivedComplexity:
-  Max: 18
 Style/GuardClause:
   Enabled: false
 Style/StringLiterals:
@@ -113,25 +129,14 @@ Lint/UnusedMethodArgument:
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
   - "**/spec/**/*"
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 Style/PerlBackrefs:
   Enabled: false
 Layout/SpaceAroundOperators:
   Exclude:
   - "**/spec/actions_specs/xcodebuild_spec.rb"
-AllCops:
-  TargetRubyVersion: 2.0
-  Include:
-  - "*/lib/assets/*Template"
-  - "*/lib/assets/*TemplateAndroid"
-  Exclude:
-  - "**/lib/assets/custom_action_template.rb"
-  - "./vendor/**/*"
-  - "**/lib/assets/DefaultFastfileTemplate"
-  - "**/lib/assets/MatchfileTemplate"
-  - "**/spec/fixtures/broken_files/broken_file.rb"
-Style/FileName:
+Naming/FileName:
   Exclude:
   - "**/Dangerfile"
   - "**/Brewfile"
@@ -141,6 +146,7 @@ Style/FileName:
   - "**/Fastfile"
   - "**/Deliverfile"
   - "**/Snapfile"
+  - "**/Pluginfile"
   - "**/*.gemspec"
 Style/Documentation:
   Enabled: false
@@ -152,16 +158,6 @@ Style/IfInsideElse:
   Enabled: false
 Style/CollectionMethods:
   Enabled: false
-CrossPlatform/ForkUsage:
-  Exclude:
-  - "**/plugins/template/**/*"
-Lint/IsStringUsage:
-  Include:
-  - cert/**/*
-  - gym/**/*
-  - match/**/*
-  - screengrab/**/*
-  - supply/**/*
 Style/MethodCallWithArgsParentheses:
   Enabled: true
   IgnoredMethods: