fastlane 1.20.0 → 1.21.0

data/lib/fastlane/actions/hg_push.rb

@@ -3,7 +3,6 @@ module Fastlane
     # Pushes commits to the remote hg repo
     class HgPushAction < Action
       def self.run(params)
-
         command = ['hg', 'push']
 
         command << '--force' if params[:force]

data/lib/fastlane/actions/hipchat.rb

@@ -16,7 +16,7 @@ module Fastlane
 
         channel = options[:channel]
         color = (options[:success] ? 'green' : 'red')
-        
+
         the_message = options[:message]
         message = "<table><tr><td><img src='https://s3-eu-west-1.amazonaws.com/fastlane.tools/fastlane.png' width='50' height='50'></td><td>#{the_message[0..9999]}</td></tr></table>"
 
@@ -70,14 +70,14 @@ module Fastlane
 
       def self.check_response_code(response, channel)
         case response.code.to_i
-          when 200, 204
-            true
-          when 404
-            raise "Channel `#{channel}` not found".red
-          when 401
-            raise "Access denied for channel `#{channel}`".red
-          else
-            raise "Unexpected #{response.code} for `#{channel}` with response: #{response.body}".red
+        when 200, 204
+          true
+        when 404
+          raise "Channel `#{channel}` not found".red
+        when 401
+          raise "Access denied for channel `#{channel}`".red
+        else
+          raise "Unexpected #{response.code} for `#{channel}` with response: #{response.body}".red
         end
       end
 
@@ -97,11 +97,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "HIPCHAT_API_TOKEN",
                                        description: "Hipchat API Token",
-                                       verify_block: Proc.new do |value|
-                                        unless value.to_s.length > 0
-                                          Helper.log.fatal "Please add 'ENV[\"HIPCHAT_API_TOKEN\"] = \"your token\"' to your Fastfile's `before_all` section.".red
-                                          raise 'No HIPCHAT_API_TOKEN given.'.red
-                                        end
+                                       verify_block: proc do |value|
+                                         unless value.to_s.length > 0
+                                           Helper.log.fatal "Please add 'ENV[\"HIPCHAT_API_TOKEN\"] = \"your token\"' to your Fastfile's `before_all` section.".red
+                                           raise 'No HIPCHAT_API_TOKEN given.'.red
+                                         end
                                        end),
           FastlaneCore::ConfigItem.new(key: :success,
                                        env_name: "FL_HIPCHAT_SUCCESS",
@@ -112,11 +112,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "HIPCHAT_API_VERSION",
                                        description: "Version of the Hipchat API. Must be 1 or 2",
-                                       verify_block: Proc.new do |value|
-                                        if value.nil? || ![1, 2].include?(value.to_i)
-                                          Helper.log.fatal "Please add 'ENV[\"HIPCHAT_API_VERSION\"] = \"1 or 2\"' to your Fastfile's `before_all` section.".red
-                                          raise 'No HIPCHAT_API_VERSION given.'.red
-                                        end
+                                       verify_block: proc do |value|
+                                         if value.nil? || ![1, 2].include?(value.to_i)
+                                           Helper.log.fatal "Please add 'ENV[\"HIPCHAT_API_VERSION\"] = \"1 or 2\"' to your Fastfile's `before_all` section.".red
+                                           raise 'No HIPCHAT_API_VERSION given.'.red
+                                         end
                                        end),
           FastlaneCore::ConfigItem.new(key: :notify_room,
                                        env_name: "HIPCHAT_NOTIFY_ROOM",
@@ -129,7 +129,7 @@ module Fastlane
                                        description: "The host of the HipChat-Server API",
                                        default_value: "api.hipchat.com",
                                        optional: true)
-          ]
+        ]
       end
 
       def self.author

data/lib/fastlane/actions/hockey.rb

@@ -28,7 +28,7 @@ module Fastlane
           end
         end
 
-        raise "Symbols on path '#{File.expand_path(dsym_filename)}' not found".red if (dsym_filename && !File.exist?(dsym_filename))
+        raise "Symbols on path '#{File.expand_path(dsym_filename)}' not found".red if dsym_filename && !File.exist?(dsym_filename)
 
         Helper.log.info 'Starting with ipa upload to HockeyApp... this could take some time.'.green
 
@@ -42,16 +42,16 @@ module Fastlane
 
         response = client.upload_build(options[:ipa], values)
         case response.status
-          when 200...300
-            url = response.body['public_url']
+        when 200...300
+          url = response.body['public_url']
 
-            Actions.lane_context[SharedValues::HOCKEY_DOWNLOAD_LINK] = url
-            Actions.lane_context[SharedValues::HOCKEY_BUILD_INFORMATION] = response.body
+          Actions.lane_context[SharedValues::HOCKEY_DOWNLOAD_LINK] = url
+          Actions.lane_context[SharedValues::HOCKEY_BUILD_INFORMATION] = response.body
 
-            Helper.log.info "Public Download URL: #{url}" if url
-            Helper.log.info 'Build successfully uploaded to HockeyApp!'.green
-          else
-            raise "Error when trying to upload ipa to HockeyApp: #{response.body}".red
+          Helper.log.info "Public Download URL: #{url}" if url
+          Helper.log.info 'Build successfully uploaded to HockeyApp!'.green
+        else
+          raise "Error when trying to upload ipa to HockeyApp: #{response.body}".red
           end
       end
 
@@ -64,23 +64,23 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "FL_HOCKEY_API_TOKEN",
                                        description: "API Token for Hockey Access",
-                                       verify_block: Proc.new do |value|
-                                          raise "No API token for Hockey given, pass using `api_token: 'token'`".red unless (value and not value.empty?)
+                                       verify_block: proc do |value|
+                                         raise "No API token for Hockey given, pass using `api_token: 'token'`".red unless value and !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                        env_name: "FL_HOCKEY_IPA",
                                        description: "Path to your IPA file. Optional if you use the `ipa` or `xcodebuild` action. For Mac zip the .app",
                                        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: :dsym,
                                        env_name: "FL_HOCKEY_DSYM",
                                        description: "Path to your DSYM file",
                                        default_value: Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH],
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        # validation is done in the action
+                                       verify_block: proc do |value|
+                                         # validation is done in the action
                                        end),
           FastlaneCore::ConfigItem.new(key: :notes,
                                        env_name: "FL_HOCKEY_NOTES",
@@ -149,9 +149,8 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end
 end
-

data/lib/fastlane/actions/import.rb

@@ -21,7 +21,6 @@ module Fastlane
       end
 
       def self.available_options
-        
       end
 
       def self.output
@@ -37,4 +36,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/import_certificate.rb

@@ -29,7 +29,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :certificate_password,
                                        env_name: "",
                                        description: "Certificate password",
-                                       optional: true),
+                                       optional: true)
         ]
       end
 

data/lib/fastlane/actions/import_from_git.rb

@@ -25,11 +25,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :url,
                                        description: "The url of the repository to import the Fastfile from",
                                        default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :branch,
+                                       description: "The branch to check-out on the repository",
+                                       default_value: 'HEAD',
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :path,
                                        description: "The path of the Fastfile in the repository",
                                        default_value: 'fastlane/Fastfile',
                                        optional: true)
-      ]
+        ]
       end
 
       def self.authors
@@ -41,4 +45,4 @@ module Fastlane
       end
     end
   end
-end
+end

data/lib/fastlane/actions/increment_build_number.rb

@@ -8,7 +8,7 @@ module Fastlane
       require 'shellwords'
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.run(params)
@@ -16,36 +16,33 @@ module Fastlane
         # https://developer.apple.com/library/ios/qa/qa1827/_index.html
         # Attention: This is NOT the version number - but the build number
 
-        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',
-            params[:build_number] ? "new-version -all #{params[:build_number]}" : 'next-version -all'
-          ].join(' ')
+        command_prefix = [
+          'cd',
+          File.expand_path(folder).shellescape,
+          '&&'
+        ].join(' ')
 
-          if Helper.test?
-            Actions.lane_context[SharedValues::BUILD_NUMBER] = command
-          else
+        command = [
+          command_prefix,
+          'agvtool',
+          params[:build_number] ? "new-version -all #{params[:build_number]}" : 'next-version -all'
+        ].join(' ')
 
-            Actions.sh command
+        if Helper.test?
+          Actions.lane_context[SharedValues::BUILD_NUMBER] = command
+        else
+          Actions.sh command
 
-            # Store the new number in the shared hash
-            build_number = `#{command_prefix} agvtool what-version`.split("\n").last.to_i
+          # Store the new number in the shared hash
+          build_number = `#{command_prefix} agvtool what-version`.split("\n").last.strip
 
-            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
+          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
 
       def self.description
@@ -63,9 +60,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

data/lib/fastlane/actions/increment_version_number.rb

@@ -8,71 +8,69 @@ module Fastlane
       require 'shellwords'
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.run(params)
         # 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(' ')
 
-          current_version = `#{command_prefix} agvtool what-marketing-version -terse1`.split("\n").last || ''
+        current_version = `#{command_prefix} agvtool what-marketing-version -terse1`.split("\n").last || ''
 
-          if params[:version_number]
-            Helper.log.debug "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d.\d.\d/)
+        if params[:version_number]
+          Helper.log.debug "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d.\d.\d/)
 
-            # Specific version
-            next_version_number = params[:version_number]
+          # Specific version
+          next_version_number = params[:version_number]
+        else
+          if Helper.test?
+            version_array = [1, 0, 0]
           else
-            if Helper.test?
-              version_array = [1,0,0]
-            else
-              raise "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d+.\d+.\d+/)
-              version_array = current_version.split(".").map(&:to_i)
-            end
-
-            case params[:bump_type]
-              when "patch"
-                version_array[2] = version_array[2] + 1
-                next_version_number = version_array.join(".")
-              when "minor"
-                version_array[1] = version_array[1] + 1
-                version_array[2] = version_array[2] = 0
-                next_version_number = version_array.join(".")
-              when "major"
-                version_array[0] = version_array[0] + 1
-                version_array[1] = version_array[1] = 0
-                version_array[1] = version_array[2] = 0
-                next_version_number = version_array.join(".")
-              when "specific_version"
-                next_version_number = specific_version_number
-            end
+            raise "Your current version (#{current_version}) does not respect the format A.B.C" unless current_version.match(/\d+.\d+.\d+/)
+            version_array = current_version.split(".").map(&:to_i)
           end
 
-          command = [
-              command_prefix,
-              "agvtool new-marketing-version #{next_version_number}"
-          ].join(' ')
-
-          if Helper.test?
-            Actions.lane_context[SharedValues::VERSION_NUMBER] = command
-          else
-            Actions.sh command
-            Actions.lane_context[SharedValues::VERSION_NUMBER] = next_version_number
+          case params[:bump_type]
+          when "patch"
+            version_array[2] = version_array[2] + 1
+            next_version_number = version_array.join(".")
+          when "minor"
+            version_array[1] = version_array[1] + 1
+            version_array[2] = version_array[2] = 0
+            next_version_number = version_array.join(".")
+          when "major"
+            version_array[0] = version_array[0] + 1
+            version_array[1] = version_array[1] = 0
+            version_array[1] = version_array[2] = 0
+            next_version_number = version_array.join(".")
+          when "specific_version"
+            next_version_number = specific_version_number
           end
+        end
+
+        command = [
+          command_prefix,
+          "agvtool new-marketing-version #{next_version_number}"
+        ].join(' ')
 
-        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
+        if Helper.test?
+          Actions.lane_context[SharedValues::VERSION_NUMBER] = command
+        else
+          Actions.sh command
+          Actions.lane_context[SharedValues::VERSION_NUMBER] = next_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
 
       def self.description
@@ -81,7 +79,7 @@ module Fastlane
 
       def self.details
         [
-          "This action will increment the version number. ", 
+          "This action will increment the version number. ",
           "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(' ')
@@ -93,20 +91,20 @@ module Fastlane
                                        env_name: "FL_VERSION_NUMBER_BUMP_TYPE",
                                        description: "The type of this version bump. Available: patch, minor, major",
                                        default_value: "patch",
-                                       verify_block: Proc.new do |value|
-                                        raise "Available values are 'patch', 'minor' and 'major'" unless ['patch', 'minor', 'major'].include?value
+                                       verify_block: proc do |value|
+                                         raise "Available values are 'patch', 'minor' and 'major'" unless ['patch', 'minor', 'major'].include? value
                                        end),
           FastlaneCore::ConfigItem.new(key: :version_number,
                                        env_name: "FL_VERSION_NUMBER_VERSION_NUMBER",
                                        description: "Change to a specific version. This will replace the bump type value",
-                                       optional: true,
-                                       ),
+                                       optional: true
+                                      ),
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                                        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",
-                                       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,
                                        optional: true)
         ]

data/lib/fastlane/actions/install_carthage.rb

@@ -2,7 +2,6 @@ module Fastlane
   module Actions
     class CarthageAction < Action
       def self.run(params)
-
         cmd = ["carthage bootstrap"]
 
         cmd << "--use-ssh" if params[:use_ssh]
@@ -24,37 +23,37 @@ module Fastlane
                                        description: "Use SSH for downloading GitHub repositories",
                                        is_string: false,
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                         raise "Please pass a valid value for use_ssh. Use one of the following: true, false" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
+                                       verify_block: proc do |value|
+                                         raise "Please pass a valid value for use_ssh. Use one of the following: true, false" unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
                                        end),
           FastlaneCore::ConfigItem.new(key: :use_submodules,
                                        env_name: "FL_CARTHAGE_USE_SUBMODULES",
                                        description: "Add dependencies as Git submodules",
                                        is_string: false,
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                         raise "Please pass a valid value for use_submodules. Use one of the following: true, false" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
+                                       verify_block: proc do |value|
+                                         raise "Please pass a valid value for use_submodules. Use one of the following: true, false" unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
                                        end),
           FastlaneCore::ConfigItem.new(key: :use_binaries,
                                        env_name: "FL_CARTHAGE_USE_BINARIES",
                                        description: "Check out dependency repositories even when prebuilt frameworks exist",
                                        is_string: false,
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                         raise "Please pass a valid value for use_binaries. Use one of the following: true, false" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
+                                       verify_block: proc do |value|
+                                         raise "Please pass a valid value for use_binaries. Use one of the following: true, false" unless value.kind_of?(TrueClass) || value.kind_of?(FalseClass)
                                        end),
           FastlaneCore::ConfigItem.new(key: :platform,
                                        env_name: "FL_CARTHAGE_PLATFORM",
                                        description: "Define which platform to build for",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                         raise "Please pass a valid platform. Use one of the following: all, iOS, Mac, watchOS" unless ["all", "iOS", "Mac", "watchOS"].include?value
-                                       end),
+                                       verify_block: proc do |value|
+                                         raise "Please pass a valid platform. Use one of the following: all, iOS, Mac, watchOS" unless ["all", "iOS", "Mac", "watchOS"].include? value
+                                       end)
         ]
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.authors