fastlane 2.86.0.beta.20180316050051 → 2.86.0.beta.20180317050040

data/fastlane/lib/fastlane/actions/increment_build_number.rb

@@ -74,7 +74,7 @@ module Fastlane
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with?(".xcworkspace")
-                                         UI.user_error!("Could not find Xcode project") if !File.exist?(value) and !Helper.test?
+                                         UI.user_error!("Could not find Xcode project") if !File.exist?(value) && !Helper.test?
                                        end)
         ]
       end

data/fastlane/lib/fastlane/actions/installr.rb

@@ -70,7 +70,7 @@ module Fastlane
                                      sensitive: true,
                                      description: "API Token for Installr Access",
                                      verify_block: proc do |value|
-                                       UI.user_error!("No API token for Installr given, pass using `api_token: 'token'`") unless value and !value.empty?
+                                       UI.user_error!("No API token for Installr given, pass using `api_token: 'token'`") unless value && !value.empty?
                                      end),
           FastlaneCore::ConfigItem.new(key: :ipa,
                                      env_name: "INSTALLR_IPA_PATH",

data/fastlane/lib/fastlane/actions/oclint.rb

@@ -8,7 +8,7 @@ module Fastlane
       # rubocop:disable Metrics/PerceivedComplexity
       def self.run(params)
         oclint_path = params[:oclint_path]
-        if `which #{oclint_path}`.to_s.empty? and !Helper.test?
+        if `which #{oclint_path}`.to_s.empty? && !Helper.test?
           UI.user_error!("You have to install oclint or provide path to oclint binary. Fore more details: ") + "http://docs.oclint.org/en/stable/intro/installation.html".yellow
         end
 

data/fastlane/lib/fastlane/actions/set_changelog.rb

@@ -16,7 +16,7 @@ module Fastlane
         unless version_number
           # Automatically fetch the latest version
           UI.message("Fetching the latest version for this app")
-          if app.edit_version and app.edit_version.version
+          if app.edit_version && app.edit_version.version
             version_number = app.edit_version.version
           else
             UI.message("You have to specify a new version number: ")

data/fastlane/lib/fastlane/actions/slather.rb

@@ -126,7 +126,7 @@ Slather is available at https://github.com/SlatherOrg/slather
                                        env_name: "FL_SLATHER_PROJ", # The name of the environment variable
                                        description: "The project file that slather looks at", # a short description of this parameter
                                        verify_block: proc do |value|
-                                         UI.user_error!("No project file specified, pass using `proj: 'Project.xcodeproj'`") unless value and !value.empty?
+                                         UI.user_error!("No project file specified, pass using `proj: 'Project.xcodeproj'`") unless value && !value.empty?
                                        end,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :workspace,

data/fastlane/lib/fastlane/actions/sonar.rb

@@ -56,7 +56,7 @@ module Fastlane
                                         description: "The path to your sonar project configuration file; defaults to `sonar-project.properties`", # default is enforced by sonar-scanner binary
                                         optional: true,
                                         verify_block: proc do |value|
-                                          UI.user_error!("Couldn't find file at path '#{value}'") unless value.nil? or File.exist?(value)
+                                          UI.user_error!("Couldn't find file at path '#{value}'") unless value.nil? || File.exist?(value)
                                         end),
           FastlaneCore::ConfigItem.new(key: :project_key,
                                        env_name: "FL_SONAR_RUNNER_PROJECT_KEY",

data/fastlane/lib/fastlane/actions/swiftlint.rb

@@ -7,7 +7,7 @@ module Fastlane
         end
 
         version = swiftlint_version(executable: params[:executable])
-        if params[:mode] == :autocorrect and version < Gem::Version.new('0.5.0') and !Helper.test?
+        if params[:mode] == :autocorrect && version < Gem::Version.new('0.5.0') && !Helper.test?
           UI.user_error!("Your version of swiftlint (#{version}) does not support autocorrect mode.\nUpdate swiftlint using `brew update && brew upgrade swiftlint`")
         end
 

data/fastlane/lib/fastlane/actions/testfairy.rb

@@ -18,7 +18,7 @@ module Fastlane
           builder.adapter(:net_http)
         end
 
-        options[:file] = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa and File.exist?(ipa)
+        options[:file] = Faraday::UploadIO.new(ipa, 'application/octet-stream') if ipa && File.exist?(ipa)
 
         symbols_file = options.delete(:symbols_file)
         if symbols_file

data/fastlane/lib/fastlane/actions/tryouts.rb

@@ -71,14 +71,14 @@ module Fastlane
                                      env_name: "TRYOUTS_APP_ID",
                                      description: "Tryouts application hash",
                                      verify_block: proc do |value|
-                                       UI.user_error!("No application identifier for Tryouts given, pass using `app_id: 'application id'`") unless value and !value.empty?
+                                       UI.user_error!("No application identifier for Tryouts given, pass using `app_id: 'application id'`") unless value && !value.empty?
                                      end),
           FastlaneCore::ConfigItem.new(key: :api_token,
                                      env_name: "TRYOUTS_API_TOKEN",
                                      sensitive: true,
                                      description: "API Token for Tryouts Access",
                                      verify_block: proc do |value|
-                                       UI.user_error!("No API token for Tryouts given, pass using `api_token: 'token'`") unless value and !value.empty?
+                                       UI.user_error!("No API token for Tryouts given, pass using `api_token: 'token'`") unless value && !value.empty?
                                      end),
           FastlaneCore::ConfigItem.new(key: :build_file,
                                      env_name: "TRYOUTS_BUILD_FILE",

data/fastlane/lib/fastlane/actions/typetalk.rb

@@ -18,7 +18,7 @@ module Fastlane
         message = "#{emoticon} #{options[:message]}"
 
         note_path = File.expand_path(options[:note_path]) if options[:note_path]
-        if note_path and File.exist?(note_path)
+        if note_path && File.exist?(note_path)
           contents = File.read(note_path)
           message += "\n\n```\n#{contents}\n```"
         end

data/fastlane/lib/fastlane/actions/update_app_group_identifiers.rb

@@ -48,7 +48,7 @@ module Fastlane
                                        description: "The path to the entitlement file which contains the app group identifiers", # a short description of this parameter
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a path to an entitlements file. ") unless value.include?(".entitlements")
-                                         UI.user_error!("Could not find entitlements file") if !File.exist?(value) and !Helper.test?
+                                         UI.user_error!("Could not find entitlements file") if !File.exist?(value) && !Helper.test?
                                        end),
           FastlaneCore::ConfigItem.new(key: :app_group_identifiers,
                                        env_name: "FL_UPDATE_APP_GROUP_IDENTIFIER_APP_GROUP_IDENTIFIERS",

data/fastlane/lib/fastlane/actions/update_icloud_container_identifiers.rb

@@ -56,7 +56,7 @@ module Fastlane
                                        description: "The path to the entitlement file which contains the iCloud container identifiers",
                                        verify_block: proc do |value|
                                          UI.user_error!("Please pass a path to an entitlements file. ") unless value.include?(".entitlements")
-                                         UI.user_error!("Could not find entitlements file") if !File.exist?(value) and !Helper.test?
+                                         UI.user_error!("Could not find entitlements file") if !File.exist?(value) && !Helper.test?
                                        end),
           FastlaneCore::ConfigItem.new(key: :icloud_container_identifiers,
                                        env_name: "FL_UPDATE_ICLOUD_CONTAINER_IDENTIFIERS_IDENTIFIERS",

data/fastlane/lib/fastlane/actions/update_info_plist.rb

@@ -8,8 +8,8 @@ module Fastlane
         require 'xcodeproj'
 
         # Check if parameters are set
-        if params[:app_identifier] or params[:display_name] or params[:block]
-          if (params[:app_identifier] or params[:display_name]) and params[:block]
+        if params[:app_identifier] || params[:display_name] || params[:block]
+          if (params[:app_identifier] || params[:display_name]) && params[:block]
             UI.important("block parameter can not be specified with app_identifier or display_name")
             return false
           end

data/fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb

@@ -100,13 +100,13 @@ module Fastlane
                                        env_name: "SENTRY_ORG_SLUG",
                                        description: "Organization slug for Sentry project",
                                        verify_block: proc do |value|
-                                         UI.user_error!("No organization slug for SentryAction given, pass using `org_slug: 'org'`") unless value and !value.empty?
+                                         UI.user_error!("No organization slug for SentryAction given, pass using `org_slug: 'org'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :project_slug,
                                        env_name: "SENTRY_PROJECT_SLUG",
                                        description: "Project slug for Sentry",
                                        verify_block: proc do |value|
-                                         UI.user_error!("No project slug for SentryAction given, pass using `project_slug: 'project'`") unless value and !value.empty?
+                                         UI.user_error!("No project slug for SentryAction given, pass using `project_slug: 'project'`") unless value && !value.empty?
                                        end),
           FastlaneCore::ConfigItem.new(key: :dsym_path,
                                        env_name: "SENTRY_DSYM_PATH",

data/fastlane/lib/fastlane/actions/verify_xcode.rb

@@ -70,7 +70,7 @@ module Fastlane
 
         output = verify(command: command, must_includes: must_includes, params: params)
 
-        if output.include?("source=Mac App Store") or output.include?("source=Apple") or output.include?("source=Apple System")
+        if output.include?("source=Mac App Store") || output.include?("source=Apple") || output.include?("source=Apple System")
           UI.success("Successfully verified Xcode installation at path '#{params[:xcode_path]}' 🎧")
         else
           show_and_raise_error("Invalid Download Source of Xcode: #{output}", params[:xcode_path])

data/fastlane/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -186,7 +186,7 @@ module Fastlane
             'X-XCSAPIVersion' => 1 # XCS API version with this API, Xcode needs this otherwise it explodes in a 500 error fire. Currently Xcode 7 Beta 5 is on Version 5.
           }
 
-          if @username and @password
+          if @username && @password
             userpass = "#{@username}:#{@password}"
             headers['Authorization'] = "Basic #{Base64.strict_encode64(userpass)}"
           end

data/fastlane/lib/fastlane/configuration_helper.rb

@@ -3,7 +3,7 @@ module Fastlane
     def self.parse(action, params)
       first_element = (action.available_options || []).first
 
-      if first_element and first_element.kind_of?(FastlaneCore::ConfigItem)
+      if first_element && first_element.kind_of?(FastlaneCore::ConfigItem)
         # default use case
         return FastlaneCore::Configuration.create(action.available_options, params)
       elsif first_element

data/fastlane/lib/fastlane/lane_manager.rb

@@ -7,9 +7,9 @@ module Fastlane
     # @param parameters [Hash] The parameters passed from the command line to the lane
     # @param env Dot Env Information
     def self.cruise_lane(platform, lane, parameters = nil, env = nil)
-      UI.user_error!("lane must be a string") unless lane.kind_of?(String) or lane.nil?
-      UI.user_error!("platform must be a string") unless platform.kind_of?(String) or platform.nil?
-      UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) or parameters.nil?
+      UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
+      UI.user_error!("platform must be a string") unless platform.kind_of?(String) || platform.nil?
+      UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) || parameters.nil?
 
       ff = Fastlane::FastFile.new(FastlaneCore::FastlaneFolder.fastfile_path)
 
@@ -29,7 +29,7 @@ module Fastlane
         end
       end
 
-      if !platform and lane
+      if !platform && lane
         # Either, the user runs a specific lane in root or want to auto complete the available lanes for a platform
         # e.g. `fastlane ios` should list all available iOS actions
         if ff.is_platform_block?(lane)

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

@@ -90,7 +90,8 @@ Style/RedundantReturn:
 Style/IfUnlessModifier:
   Enabled: false
 Style/AndOr:
-  Enabled: false
+  Enabled: true
+  EnforcedStyle: conditionals
 Metrics/ClassLength:
   Max: 320
 Metrics/LineLength:

data/fastlane/lib/fastlane/runner.rb

@@ -238,7 +238,7 @@ module Fastlane
             # Since we usually just need the passed hash, we'll just use the first object if there is only one
             if arguments.count == 0
               arguments = ConfigurationHelper.parse(class_ref, {}) # no parameters => empty hash
-            elsif arguments.count == 1 and arguments.first.kind_of?(Hash)
+            elsif arguments.count == 1 && arguments.first.kind_of?(Hash)
               arguments = ConfigurationHelper.parse(class_ref, arguments.first) # Correct configuration passed
             elsif !class_ref.available_options
               # This action does not use the new action format
@@ -309,7 +309,7 @@ module Fastlane
     def add_lane(lane, override = false)
       lanes[lane.platform] ||= {}
 
-      if !override and lanes[lane.platform][lane.name]
+      if !override && lanes[lane.platform][lane.name]
         UI.user_error!("Lane '#{lane.name}' was defined multiple times!")
       end
 

data/fastlane/lib/fastlane/server/socket_server.rb

@@ -194,11 +194,18 @@ module Fastlane
           return_value: closure_arg,
           return_value_type: :string # always assume string for closure error_callback
         )
-        closure_arg = ', "closure_argument_value": ' + closure_arg
       end
 
       Thread.current[:exception] = nil
-      return '{"payload":{"status":"ready_for_next", "return_object":' + return_object + closure_arg + '}}'
+
+      payload = {
+        payload: {
+          status: "ready_for_next",
+          return_object: return_object,
+          closure_argument_value: closure_arg
+        }
+      }
+      return JSON.generate(payload)
     rescue StandardError => e
       Thread.current[:exception] = e
 
@@ -210,7 +217,14 @@ module Fastlane
         exception_array << "cause: #{e.class}"
         exception_array << e.backtrace
       end
-      return "{\"payload\":{\"status\":\"failure\",\"failure_information\":#{exception_array.flatten}}}"
+
+      payload = {
+        payload: {
+          status: "failure",
+          failure_information: exception_array.flatten
+        }
+      }
+      return JSON.generate(payload)
     end
   end
 end

data/fastlane/lib/fastlane/setup/setup.rb

@@ -34,7 +34,7 @@ module Fastlane
     # Start the setup process
     # rubocop:disable Metrics/BlockNesting
     def self.start(user: nil, is_swift_fastfile: false)
-      if FastlaneCore::FastlaneFolder.setup? and !Helper.test?
+      if FastlaneCore::FastlaneFolder.setup? && !Helper.test?
         require 'fastlane/lane_list'
         Fastlane::LaneList.output(FastlaneCore::FastlaneFolder.fastfile_path)
         UI.important("------------------")

data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb

@@ -321,10 +321,7 @@ func parseInt(fromString: String, function: String = #function) -> Int {
     end
 
     def process_action(action: nil)
-      unless action.available_options
-        return nil
-      end
-      options = action.available_options
+      options = action.available_options || []
 
       action_name = action.action_name
       keys = []

data/fastlane/lib/fastlane/swift_lane_manager.rb

@@ -7,8 +7,8 @@ module Fastlane
     # @param parameters [Hash] The parameters passed from the command line to the lane
     # @param env Dot Env Information
     def self.cruise_lane(lane, parameters = nil, env = nil, disable_runner_upgrades: false)
-      UI.user_error!("lane must be a string") unless lane.kind_of?(String) or lane.nil?
-      UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) or parameters.nil?
+      UI.user_error!("lane must be a string") unless lane.kind_of?(String) || lane.nil?
+      UI.user_error!("parameters must be a hash") unless parameters.kind_of?(Hash) || parameters.nil?
 
       # xcodeproj has a bug in certain versions that causes it to change directories
       # and not return to the original working directory

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.86.0.beta.20180316050051'.freeze
+  VERSION = '2.86.0.beta.20180317050040'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane_core/lib/fastlane_core/command_executor.rb

@@ -43,7 +43,7 @@ module FastlaneCore
         command = command.join(" ") if command.kind_of?(Array)
         UI.command(command) if print_command
 
-        if print_all and loading # this is only used to show the "Loading text"...
+        if print_all && loading # this is only used to show the "Loading text"...
           UI.command_output(loading)
         end
 

data/fastlane_core/lib/fastlane_core/configuration/configuration.rb

@@ -216,9 +216,9 @@ module FastlaneCore
       option = verify_options_key!(key)
 
       # Same order as https://docs.fastlane.tools/advanced/#priorities-of-parameters-and-options
-      value = if @values.key?(key) and !@values[key].nil?
+      value = if @values.key?(key) && !@values[key].nil?
                 @values[key]
-              elsif option.env_name and !ENV[option.env_name].nil?
+              elsif option.env_name && !ENV[option.env_name].nil?
                 ENV[option.env_name].dup
               elsif self.config_file_options.key?(key)
                 self.config_file_options[key]
@@ -227,11 +227,11 @@ module FastlaneCore
               end
 
       value = option.auto_convert_value(value)
-      value = nil if value.nil? and !option.string? # by default boolean flags are false
-      return value unless value.nil? and !option.optional and ask
+      value = nil if value.nil? && !option.string? # by default boolean flags are false
+      return value unless value.nil? && !option.optional && ask
 
       # fallback to asking
-      if Helper.test? or !UI.interactive?
+      if Helper.test? || !UI.interactive?
         # Since we don't want to be asked on tests, we'll just call the verify block with no value
         # to raise the exception that is shown when the user passes an invalid value
         set(key, '')

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -342,7 +342,7 @@ module FastlaneCore
     def self.gem_path(gem_name)
       UI.deprecated('`Helper.gem_path` is deprecated. Use the `ROOT` constant from the appropriate tool module instead.')
 
-      if !Helper.test? and Gem::Specification.find_all_by_name(gem_name).any?
+      if !Helper.test? && Gem::Specification.find_all_by_name(gem_name).any?
         return Gem::Specification.find_by_name(gem_name).gem_dir
       else
         return './'

data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb

@@ -51,7 +51,7 @@ module FastlaneCore
           end
           result = CFPropertyList.native_types(CFPropertyList::List.new(file: tmp_path).value)
 
-          if result['CFBundleIdentifier'] or result['CFBundleVersion']
+          if result['CFBundleIdentifier'] || result['CFBundleVersion']
             return result
           end
         end

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -118,7 +118,7 @@ module FastlaneCore
         UI.error("[Transporter Error Output]: #{$1}")
 
         # Check if it's a login error
-        if $1.include?("Your Apple ID or password was entered incorrectly") or
+        if $1.include?("Your Apple ID or password was entered incorrectly") ||
            $1.include?("This Apple ID has been locked for security reasons")
 
           unless Helper.test?
@@ -148,7 +148,7 @@ module FastlaneCore
         end
       end
 
-      if !hide_output and line =~ OUTPUT_REGEX
+      if !hide_output && line =~ OUTPUT_REGEX
         # General logging for debug purposes
         unless output_done
           UI.verbose("[Transporter]: #{$1}")

data/fastlane_core/lib/fastlane_core/project.rb

@@ -7,7 +7,7 @@ module FastlaneCore
     class << self
       # Project discovery
       def detect_projects(config)
-        if config[:workspace].to_s.length > 0 and config[:project].to_s.length > 0
+        if config[:workspace].to_s.length > 0 && config[:project].to_s.length > 0
           UI.user_error!("You can only pass either a workspace or a project path, not both")
         end
 
@@ -25,7 +25,7 @@ module FastlaneCore
 
         return if config[:workspace].to_s.length > 0
 
-        if config[:workspace].to_s.length == 0 and config[:project].to_s.length == 0
+        if config[:workspace].to_s.length == 0 && config[:project].to_s.length == 0
           project = Dir["./*.xcodeproj"]
           if project.count > 1
             puts("Select Project: ")
@@ -35,7 +35,7 @@ module FastlaneCore
           end
         end
 
-        if config[:workspace].nil? and config[:project].nil?
+        if config[:workspace].nil? && config[:project].nil?
           select_project(config)
         end
       end
@@ -83,7 +83,7 @@ module FastlaneCore
       self.xcodebuild_list_silent = xcodebuild_list_silent
       self.xcodebuild_suppress_stderr = xcodebuild_suppress_stderr
 
-      if !path or !File.directory?(path)
+      if !path || !File.directory?(path)
         UI.user_error!("Could not find project at path '#{path}'")
       end
     end
@@ -144,7 +144,7 @@ module FastlaneCore
           preferred = schemes.find_all { |a| a.downcase.include?(preferred_to_include.downcase) }
         end
 
-        if preferred_to_include and preferred.count == 1
+        if preferred_to_include && preferred.count == 1
           options[:scheme] = preferred.last
         elsif automated_scheme_selection? && schemes.include?(project_name)
           UI.important("Using scheme matching project name (#{project_name}).")
@@ -309,6 +309,7 @@ module FastlaneCore
       proj << "-scheme #{options[:scheme].shellescape}" if options[:scheme]
       proj << "-project #{options[:project].shellescape}" if options[:project]
       proj << "-configuration #{options[:configuration].shellescape}" if options[:configuration]
+      proj << "-xcconfig #{options[:xcconfig].shellescape}" if options[:xcconfig]
 
       return proj
     end