fastlane 1.20.0 → 1.21.0

data/lib/fastlane/actions/ensure_git_branch.rb

@@ -14,7 +14,6 @@ module Fastlane
         end
       end
 
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -29,7 +28,7 @@ module Fastlane
                                        env_name: "FL_ENSURE_GIT_BRANCH_NAME",
                                        description: "The branch that should be checked for",
                                        is_string: true,
-                                       default_value: 'master'),
+                                       default_value: 'master')
         ]
       end
 
@@ -46,4 +45,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/ensure_no_debug_code.rb

@@ -7,7 +7,7 @@ module Fastlane
 
         Helper.log.info command.yellow
         results = `#{command}` # we don't use `sh` as the return code of grep is wrong for some reason
-        
+
         # Example Output
         #   ./fastlane.gemspec:  spec.add_development_dependency 'my_word'
         #   ./Gemfile.lock:    my_word (0.10.1)
@@ -16,7 +16,7 @@ module Fastlane
         results.split("\n").each do |current_raw|
           current = current_raw.strip
           if params[:extension]
-            if current.include?".#{params[:extension]}:"
+            if current.include? ".#{params[:extension]}:"
               found << current
             end
           else
@@ -53,16 +53,16 @@ module Fastlane
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_PATH",
                                        description: "The directory containing all the source files",
                                        default_value: ".",
-                                       verify_block: Proc.new do |value|
-                                        raise "Couldn't find the folder at '#{File.absolute_path(value)}'".red unless File.directory?(value)
+                                       verify_block: proc do |value|
+                                         raise "Couldn't find the folder at '#{File.absolute_path(value)}'".red unless File.directory?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :extension,
                                        env_name: "FL_ENSURE_NO_DEBUG_CODE_EXTENSION",
                                        description: "The extension that should be searched for",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        value.gsub!(".", "") if value.include?"."
-                                       end),
+                                       verify_block: proc do |value|
+                                         value.delete!('.') if value.include? "."
+                                       end)
         ]
       end
 
@@ -79,4 +79,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/fastlane_version.rb

@@ -1,12 +1,14 @@
 module Fastlane
   module Actions
     module SharedValues
-      
     end
 
     class FastlaneVersionAction < Action
       def self.run(params)
-        defined_version = ((Gem::Version.new(params.first) if params.first) rescue nil)
+        params = nil unless params.kind_of? Array
+        value = (params || []).first
+        defined_version = Gem::Version.new(value) if value
+
         raise "Please pass minimum fastlane version as parameter to fastlane_version".red unless defined_version
 
         if Gem::Version.new(Fastlane::VERSION) < defined_version

data/lib/fastlane/actions/frameit.rb

@@ -9,7 +9,7 @@ module Fastlane
         begin
           FastlaneCore::UpdateChecker.start_looking_for_update('frameit') unless Helper.is_test?
           color = Frameit::Color::BLACK
-          color = Frameit::Color::SILVER if (config[:white] or config[:silver])
+          color = Frameit::Color::SILVER if config[:white] || config[:silver]
 
           Helper.log.info "Framing screenshots at path #{config[:path]}"
 
@@ -46,11 +46,11 @@ module Fastlane
                                        env_name: "FRAMEIT_FORCE_DEVICE_TYPE",
                                        description: "Forces a given device type, useful for Mac screenshots, as their sizes vary",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        available = ['iPhone_6_Plus', 'iPhone_5s', 'iPhone_4', 'iPad_mini', 'Mac']
-                                        unless available.include?value
-                                          raise "Invalid device type '#{value}'. Available values: #{available}".red
-                                        end
+                                       verify_block: proc do |value|
+                                         available = ['iPhone_6_Plus', 'iPhone_5s', 'iPhone_4', 'iPad_mini', 'Mac']
+                                         unless available.include? value
+                                           raise "Invalid device type '#{value}'. Available values: #{available}".red
+                                         end
                                        end)
         ]
       end
@@ -60,7 +60,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end

data/lib/fastlane/actions/gcovr.rb

@@ -60,11 +60,11 @@ module Fastlane
         gcovr_args = nil
 
         # Allows for a whole variety of configurations
-        if params.is_a? Hash
+        if params.kind_of? Hash
           params_hash = params
 
           # Check if an output path was given
-          if params_hash.has_key? :output
+          if params_hash.key? :output
             create_output_dir_if_not_exists(params_hash[:output])
           end
 
@@ -87,7 +87,7 @@ module Fastlane
         output_dir = File.dirname(output_path)
 
         # If the output directory doesn't exist, create it
-        unless Dir.exists? output_dir
+        unless Dir.exist? output_dir
           FileUtils.mkpath output_dir
         end
       end
@@ -99,7 +99,8 @@ module Fastlane
         # Maps nice developer param names to CLI arguments
         params.map do |k, v|
           v ||= ""
-          if args = ARGS_MAP[k]
+          args = ARGS_MAP[k]
+          if args
             value = (v != true && v.to_s.length > 0 ? "\"#{v}\"" : "")
             "#{args} #{value}".strip
           end

data/lib/fastlane/actions/get_build_number.rb

@@ -7,35 +7,32 @@ module Fastlane
         # More information about how to set up your project and how it works:
         # https://developer.apple.com/library/ios/qa/qa1827/_index.html
 
-        begin
-          folder = params[:xcodeproj] ? File.join('.', params[:xcodeproj], '..') : '.'
+        folder = params[:xcodeproj] ? File.join('.', params[:xcodeproj], '..') : '.'
 
-          command_prefix = [
-            'cd',
-            File.expand_path(folder).shellescape,
-            '&&'
-          ].join(' ')
+        command_prefix = [
+          'cd',
+          File.expand_path(folder).shellescape,
+          '&&'
+        ].join(' ')
 
-          command = [
-            command_prefix,
-            'agvtool',
-            'what-version',
-            '-terse'
-          ].join(' ')
+        command = [
+          command_prefix,
+          'agvtool',
+          'what-version',
+          '-terse'
+        ].join(' ')
 
-          if Helper.test?
-            Actions.lane_context[SharedValues::BUILD_NUMBER] = command
-          else
+        if Helper.test?
+          Actions.lane_context[SharedValues::BUILD_NUMBER] = command
+        else
+          build_number = (Actions.sh command).split("\n").last.strip
 
-            build_number = (Actions.sh command).split("\n").last.to_i
-
-            # Store the number in the shared hash
-            Actions.lane_context[SharedValues::BUILD_NUMBER] = build_number
-          end          
-        rescue => ex
-          Helper.log.error 'Make sure to to follow the steps to setup your Xcode project: https://developer.apple.com/library/ios/qa/qa1827/_index.html'.yellow
-          raise ex
+          # Store the number in the shared hash
+          Actions.lane_context[SharedValues::BUILD_NUMBER] = build_number
         end
+      rescue => ex
+        Helper.log.error 'Make sure to to follow the steps to setup your Xcode project: https://developer.apple.com/library/ios/qa/qa1827/_index.html'.yellow
+        raise ex
       end
 
       #####################################################
@@ -51,7 +48,7 @@ module Fastlane
           "This action will return the current build number set on your project.",
           "You first have to set up your Xcode project, if you haven't done it already:",
           "https://developer.apple.com/library/ios/qa/qa1827/_index.html"
-          ].join(' ')
+        ].join(' ')
       end
 
       def self.available_options
@@ -60,9 +57,9 @@ module Fastlane
                              env_name: "FL_BUILD_NUMBER_PROJECT",
                              description: "optional, you must specify the path to your main Xcode project if it is not in the project root directory",
                              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 if (not File.exists?(value) and not Helper.is_test?)
+                             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 if !File.exist?(value) and !Helper.is_test?
                              end)
         ]
       end
@@ -78,8 +75,8 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end
-end
+end

data/lib/fastlane/actions/get_github_release.rb

@@ -11,7 +11,7 @@ module Fastlane
         require 'base64'
         headers = { 'User-Agent' => 'fastlane-get_github_release' }
         headers['Authorization'] = "Basic #{Base64.strict_encode64(params[:api_token])}" if params[:api_token]
-        response = Excon.get("https://api.github.com/repos/#{params[:url]}/releases", :headers => headers)
+        response = Excon.get("https://api.github.com/repos/#{params[:url]}/releases", headers: headers)
 
         case response[:status]
         when 404
@@ -26,15 +26,15 @@ module Fastlane
             return nil
           end
         end
-        
+
         result = JSON.parse(response.body)
         result.each do |current|
-          if current['tag_name'] == params[:version]
-            # Found it
-            Actions.lane_context[SharedValues::GET_GITHUB_RELEASE_INFO] = current
-            Helper.log.info "Version is already live on GitHub.com 🚁"
-            return current
-          end 
+          next unless current['tag_name'] == params[:version]
+
+          # Found it
+          Actions.lane_context[SharedValues::GET_GITHUB_RELEASE_INFO] = current
+          Helper.log.info "Version is already live on GitHub.com 🚁"
+          return current
         end
 
         Helper.log.info "Couldn't find GitHub release #{params[:version]}".yellow
@@ -105,9 +105,9 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :url,
                                        env_name: "FL_GET_GITHUB_RELEASE_URL",
                                        description: "The path to your repo, e.g. 'KrauseFx/fastlane'",
-                                       verify_block: Proc.new do |value|
-                                          raise "Please only pass the path, e.g. 'KrauseFx/fastlane'".red if value.include?"github.com"
-                                          raise "Please only pass the path, e.g. 'KrauseFx/fastlane'".red if value.split('/').count != 2
+                                       verify_block: proc do |value|
+                                         raise "Please only pass the path, e.g. 'KrauseFx/fastlane'".red if value.include? "github.com"
+                                         raise "Please only pass the path, e.g. 'KrauseFx/fastlane'".red if value.split('/').count != 2
                                        end),
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "FL_GET_GITHUB_RELEASE_VERSION",

data/lib/fastlane/actions/get_version_number.rb

@@ -7,35 +7,33 @@ module Fastlane
         # More information about how to set up your project and how it works:
         # https://developer.apple.com/library/ios/qa/qa1827/_index.html
 
-        begin
-          folder = params[:xcodeproj] ? File.join('.', params[:xcodeproj], '..') : '.'
-            
-          command_prefix = [
-            'cd',
-            File.expand_path(folder).shellescape,
-            '&&'
-          ].join(' ')
+        folder = params[:xcodeproj] ? File.join('.', params[:xcodeproj], '..') : '.'
 
-          command = [
-            command_prefix,
-            'agvtool',
-            'what-marketing-version',
-            '-terse1'
-          ].join(' ')
+        command_prefix = [
+          'cd',
+          File.expand_path(folder).shellescape,
+          '&&'
+        ].join(' ')
 
-          if Helper.test?
-            Actions.lane_context[SharedValues::VERSION_NUMBER] = command
-          else
+        command = [
+          command_prefix,
+          'agvtool',
+          'what-marketing-version',
+          '-terse1'
+        ].join(' ')
 
-            version_number = (Actions.sh command).split("\n").last
+        if Helper.test?
+          Actions.lane_context[SharedValues::VERSION_NUMBER] = command
+        else
 
-            # Store the number in the shared hash
-            Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
-          end
-        rescue => ex
-          Helper.log.error 'Make sure to to follow the steps to setup your Xcode project: https://developer.apple.com/library/ios/qa/qa1827/_index.html'.yellow
-          raise ex
+          version_number = (Actions.sh command).split("\n").last
+
+          # Store the number in the shared hash
+          Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
         end
+      rescue => ex
+        Helper.log.error 'Make sure to to follow the steps to setup your Xcode project: https://developer.apple.com/library/ios/qa/qa1827/_index.html'.yellow
+        raise ex
       end
 
       #####################################################
@@ -51,7 +49,7 @@ module Fastlane
           "This action will return the current version number set on your project.",
           "You first have to set up your Xcode project, if you haven't done it already:",
           "https://developer.apple.com/library/ios/qa/qa1827/_index.html"
-          ].join(' ')
+        ].join(' ')
       end
 
       def self.available_options
@@ -60,9 +58,9 @@ module Fastlane
                              env_name: "FL_VERSION_NUMBER_PROJECT",
                              description: "optional, you must specify the path to your main Xcode project if it is not in the project root directory",
                              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 if (not File.exists?(value) and not Helper.is_test?)
+                             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 if !File.exist?(value) and !Helper.is_test?
                              end)
         ]
       end
@@ -78,8 +76,8 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end
-end
+end

data/lib/fastlane/actions/git_branch.rb

@@ -1,7 +1,6 @@
 module Fastlane
   module Actions
     module SharedValues
-
     end
 
     class GitBranchAction < Action
@@ -38,4 +37,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/gym.rb

@@ -16,7 +16,7 @@ module Fastlane
             sigh_path = Actions.lane_context[Actions::SharedValues::SIGH_PROFILE_PATH] || ENV["SIGH_PROFILE_PATH"]
             values[:provisioning_profile_path] = File.expand_path(sigh_path) if sigh_path
           end
-          
+
           absolute_ipa_path = File.expand_path(Gym::Manager.new.work(values))
           absolute_dsym_path = absolute_ipa_path.gsub(".ipa", ".app.dSYM.zip")
 
@@ -24,7 +24,7 @@ module Fastlane
           Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH] = absolute_dsym_path if File.exist?(absolute_dsym_path)
           ENV[SharedValues::IPA_OUTPUT_PATH.to_s] = absolute_ipa_path # for deliver
           ENV[SharedValues::DSYM_OUTPUT_PATH.to_s] = absolute_dsym_path if File.exist?(absolute_dsym_path)
-          
+
           return absolute_ipa_path
         ensure
           FastlaneCore::UpdateChecker.show_update_status('gym', Gym::VERSION)

data/lib/fastlane/actions/hg_commit_version_bump.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/AbcSize
 module Fastlane
   module Actions
     # Commits version bump.
@@ -25,7 +26,7 @@ module Fastlane
           end
         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
@@ -49,8 +50,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 hg workdir root
           expected_changed_files = []
@@ -71,7 +84,14 @@ module Fastlane
         changed_files_as_expected = dirty_set.subset? expected_set
         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#{hg_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
+            str = ["Found unexpected uncommited changes in the working directory. Expected these files to have changed:",
+                   "#{expected_changed_files.join("\n")}.",
+                   "But found these actual changes: \n#{hg_dirty_files.join("\n")}.",
+                   "Make 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 str.red
           end
         end
 
@@ -83,6 +103,7 @@ module Fastlane
 
           Helper.log.info "Committed \"#{params[:message]}\" 💾.".green
         rescue => ex
+          Helper.log.error ex
           Helper.log.info "Didn't commit any changes. 😐".yellow
         end
       end
@@ -101,9 +122,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",
@@ -135,3 +156,4 @@ module Fastlane
     end
   end
 end
+# rubocop:enable Metrics/AbcSize