fastlane 2.74.1 → 2.75.0.beta.20180109010003

data/snapshot/lib/snapshot/screenshot_flatten.rb

@@ -5,7 +5,7 @@ module Snapshot
   class ScreenshotFlatten
     # @param (String) The path in which the screenshots are located in
     def run(path)
-      UI.message "Removing the alpha channel from generated png files"
+      UI.message("Removing the alpha channel from generated png files")
       flatten(path)
     end
 

data/snapshot/lib/snapshot/screenshot_rotate.rb

@@ -8,20 +8,20 @@ module Snapshot
 
     # @param (String) The path in which the screenshots are located in
     def run(path)
-      UI.verbose "Rotating the screenshots (if necessary)"
+      UI.verbose("Rotating the screenshots (if necessary)")
       rotate(path)
     end
 
     def rotate(path)
       Dir.glob([path, '/**/*.png'].join('/')).each do |file|
-        UI.verbose "Rotating '#{file}'"
+        UI.verbose("Rotating '#{file}'")
 
         command = nil
-        if file.end_with? "landscapeleft.png"
+        if file.end_with?("landscapeleft.png")
           command = "sips -r -90 '#{file}'"
-        elsif file.end_with? "landscaperight.png"
+        elsif file.end_with?("landscaperight.png")
           command = "sips -r 90 '#{file}'"
-        elsif file.end_with? "portrait_upsidedown.png"
+        elsif file.end_with?("portrait_upsidedown.png")
           command = "sips -r 180 '#{file}'"
         end
 
@@ -33,7 +33,7 @@ module Snapshot
           r.each do |line|
             # We need to read this otherwise things hang
           end
-          ::Process.wait pid
+          ::Process.wait(pid)
         end
       end
     end

data/snapshot/lib/snapshot/setup.rb

@@ -25,23 +25,23 @@ module Snapshot
       # ensure that upgrade is cause when going from 8 to 9
       File.write(File.join(path, snapshot_helper_filename), File.read("#{Snapshot::ROOT}/lib/assets/#{snapshot_helper_filename}"))
 
-      puts "✅  Successfully created #{snapshot_helper_filename} '#{File.join(path, snapshot_helper_filename)}'".green
-      puts "✅  Successfully created new Snapfile at '#{snapfile_path}'".green
+      puts("✅  Successfully created #{snapshot_helper_filename} '#{File.join(path, snapshot_helper_filename)}'".green)
+      puts("✅  Successfully created new Snapfile at '#{snapfile_path}'".green)
 
-      puts "-------------------------------------------------------".yellow
-      puts "Open your Xcode project and make sure to do the following:".yellow
-      puts "1) Add a new UI Test target to your project".yellow
-      puts "2) Add the ./fastlane/#{snapshot_helper_filename} to your UI Test target".yellow
-      puts "   You can move the file anywhere you want".yellow
-      puts "3) Call `setupSnapshot(app)` when launching your app".yellow
-      puts ""
-      puts "  let app = XCUIApplication()"
-      puts "  setupSnapshot(app)"
-      puts "  app.launch()"
-      puts ""
-      puts "4) Add `snapshot(\"0Launch\")` to wherever you want to create the screenshots".yellow
-      puts ""
-      puts "More information: https://docs.fastlane.tools/actions/snapshot/".green
+      puts("-------------------------------------------------------".yellow)
+      puts("Open your Xcode project and make sure to do the following:".yellow)
+      puts("1) Add a new UI Test target to your project".yellow)
+      puts("2) Add the ./fastlane/#{snapshot_helper_filename} to your UI Test target".yellow)
+      puts("   You can move the file anywhere you want".yellow)
+      puts("3) Call `setupSnapshot(app)` when launching your app".yellow)
+      puts("")
+      puts("  let app = XCUIApplication()")
+      puts("  setupSnapshot(app)")
+      puts("  app.launch()")
+      puts("")
+      puts("4) Add `snapshot(\"0Launch\")` to wherever you want to create the screenshots".yellow)
+      puts("")
+      puts("More information: https://docs.fastlane.tools/actions/snapshot/".green)
     end
   end
 end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -118,7 +118,7 @@ module Snapshot
                                                 cleanup_after_failure(devices, language, locale, launch_args, return_code)
 
                                                 # no exception raised... that means we need to retry
-                                                UI.error "Caught error... #{return_code}"
+                                                UI.error("Caught error... #{return_code}")
 
                                                 self.current_number_of_retries_due_to_failing_simulator += 1
                                                 if self.current_number_of_retries_due_to_failing_simulator < 20 && return_code != 65

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -69,28 +69,28 @@ module Snapshot
       media_type = media_type.to_s
 
       device_types.each do |device_type|
-        UI.verbose "Adding #{media_type}s to #{device_type}..."
+        UI.verbose("Adding #{media_type}s to #{device_type}...")
         device_udid = TestCommandGenerator.device_udid(device_type)
 
-        UI.message "Launch Simulator #{device_type}"
+        UI.message("Launch Simulator #{device_type}")
         Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
 
         paths.each do |path|
-          UI.message "Adding '#{path}'"
+          UI.message("Adding '#{path}'")
           Helper.backticks("xcrun simctl add#{media_type} #{device_udid} #{path.shellescape} &> /dev/null")
         end
       end
     end
 
     def uninstall_app(device_type)
-      UI.verbose "Uninstalling app '#{launcher_config.app_identifier}' from #{device_type}..."
+      UI.verbose("Uninstalling app '#{launcher_config.app_identifier}' from #{device_type}...")
       launcher_config.app_identifier ||= UI.input("App Identifier: ")
       device_udid = TestCommandGenerator.device_udid(device_type)
 
-      UI.message "Launch Simulator #{device_type}"
+      UI.message("Launch Simulator #{device_type}")
       Helper.backticks("xcrun instruments -w #{device_udid} &> /dev/null")
 
-      UI.message "Uninstall application #{launcher_config.app_identifier}"
+      UI.message("Uninstall application #{launcher_config.app_identifier}")
       Helper.backticks("xcrun simctl uninstall #{device_udid} #{launcher_config.app_identifier} &> /dev/null")
     end
 
@@ -111,7 +111,7 @@ module Snapshot
           AppleLocale: locale,
           AppleLanguages: [language]
         }
-        UI.message "Localizing #{device_type} (AppleLocale=#{locale} AppleLanguages=[#{language}])"
+        UI.message("Localizing #{device_type} (AppleLocale=#{locale} AppleLanguages=[#{language}])")
         plist_path = "#{ENV['HOME']}/Library/Developer/CoreSimulator/Devices/#{device_udid}/data/Library/Preferences/.GlobalPreferences.plist"
         File.write(plist_path, Plist::Emit.dump(plist))
       end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_xcode_8.rb

@@ -34,13 +34,13 @@ module Snapshot
     def run_for_device_and_language(language, locale, device, launch_arguments, retries = 0)
       return launch_one_at_a_time(language, locale, device, launch_arguments)
     rescue => ex
-      UI.error ex.to_s # show the reason for failure to the user, but still maybe retry
+      UI.error(ex.to_s) # show the reason for failure to the user, but still maybe retry
 
       if retries < launcher_config.number_of_retries
-        UI.important "Tests failed, re-trying #{retries + 1} out of #{launcher_config.number_of_retries + 1} times"
+        UI.important("Tests failed, re-trying #{retries + 1} out of #{launcher_config.number_of_retries + 1} times")
         run_for_device_and_language(language, locale, device, launch_arguments, retries + 1)
       else
-        UI.error "Backtrace:\n\t#{ex.backtrace.join("\n\t")}" if FastlaneCore::Globals.verbose?
+        UI.error("Backtrace:\n\t#{ex.backtrace.join("\n\t")}") if FastlaneCore::Globals.verbose?
         self.collected_errors << ex
         raise ex if launcher_config.stop_after_first_error
         return false # for the results
@@ -91,7 +91,7 @@ module Snapshot
                                                 ErrorHandler.handle_test_error(output, return_code)
 
                                                 # no exception raised... that means we need to retry
-                                                UI.error "Caught error... #{return_code}"
+                                                UI.error("Caught error... #{return_code}")
 
                                                 self.current_number_of_retries_due_to_failing_simulator += 1
                                                 if self.current_number_of_retries_due_to_failing_simulator < 20

data/snapshot/lib/snapshot/update.rb

@@ -15,22 +15,22 @@ module Snapshot
       paths = self.class.find_helper
       UI.user_error!("Couldn't find any SnapshotHelper files in current directory") if paths.count == 0
 
-      UI.message "Found the following SnapshotHelper:"
-      paths.each { |p| UI.message "\t#{p}" }
-      UI.important "Are you sure you want to automatically update the helpers listed above?"
-      UI.message "This will overwrite all its content with the latest code."
-      UI.message "The underlying API will not change. You can always migrate manually by looking at"
-      UI.message "https://github.com/fastlane/fastlane/blob/master/snapshot/lib/assets/SnapshotHelper.swift"
+      UI.message("Found the following SnapshotHelper:")
+      paths.each { |p| UI.message("\t#{p}") }
+      UI.important("Are you sure you want to automatically update the helpers listed above?")
+      UI.message("This will overwrite all its content with the latest code.")
+      UI.message("The underlying API will not change. You can always migrate manually by looking at")
+      UI.message("https://github.com/fastlane/fastlane/blob/master/snapshot/lib/assets/SnapshotHelper.swift")
 
       return 1 unless UI.confirm("Overwrite configuration files?")
 
       paths.each do |path|
-        UI.message "Updating '#{path}'..."
+        UI.message("Updating '#{path}'...")
         input_path = Snapshot::Runner.path_to_helper_file_from_gem
         File.write(path, File.read(input_path))
       end
 
-      UI.success "Successfully updated helper files"
+      UI.success("Successfully updated helper files")
     end
   end
 end

data/spaceship/lib/spaceship/base.rb

@@ -231,7 +231,7 @@ module Spaceship
     # This will store a list of defined attr_accessors to easily access them when inspecting the values
     def self.attr_accessor(*vars)
       @attributes ||= []
-      @attributes.concat vars
+      @attributes.concat(vars)
       super(*vars)
     end
 
@@ -261,12 +261,12 @@ module Spaceship
       tree_root = thread[:inspected_objects].nil?
       thread[:inspected_objects] = Set.new if tree_root
 
-      if thread[:inspected_objects].include? self
+      if thread[:inspected_objects].include?(self)
         # already inspected objects have a default value,
         # let's follow Ruby's convention for circular references
         value = "#<Object ...>"
       else
-        thread[:inspected_objects].add self
+        thread[:inspected_objects].add(self)
         begin
           value = inspect_value
         ensure

data/spaceship/lib/spaceship/client.rb

@@ -144,7 +144,7 @@ module Spaceship
       return @current_team_id if @current_team_id
 
       if teams.count > 1
-        puts "The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now."
+        puts("The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now.")
       end
       @current_team_id ||= teams[0]['contentProvider']['contentProviderId']
     end
@@ -173,7 +173,7 @@ module Spaceship
       end
 
       response = request(:post) do |req|
-        req.url "ra/v1/session/webSession"
+        req.url("ra/v1/session/webSession")
         req.body = {
           contentProviderId: team_id,
           dsId: user_detail_data.ds_id # https://github.com/fastlane/fastlane/issues/6711
@@ -210,22 +210,22 @@ module Spaceship
       @current_team_id = current_team_id
       @cookie = cookie || HTTP::CookieJar.new
       @client = Faraday.new(self.class.hostname, options) do |c|
-        c.response :json, content_type: /\bjson$/
-        c.response :xml, content_type: /\bxml$/
-        c.response :plist, content_type: /\bplist$/
-        c.use :cookie_jar, jar: @cookie
-        c.use FaradayMiddleware::RelsMiddleware
-        c.adapter Faraday.default_adapter
+        c.response(:json, content_type: /\bjson$/)
+        c.response(:xml, content_type: /\bxml$/)
+        c.response(:plist, content_type: /\bplist$/)
+        c.use(:cookie_jar, jar: @cookie)
+        c.use(FaradayMiddleware::RelsMiddleware)
+        c.adapter(Faraday.default_adapter)
 
         if ENV['SPACESHIP_DEBUG']
           # for debugging only
           # This enables tracking of networking requests using Charles Web Proxy
-          c.proxy "https://127.0.0.1:8888"
+          c.proxy("https://127.0.0.1:8888")
           c.ssl[:verify_mode] = OpenSSL::SSL::VERIFY_NONE
         end
 
         if ENV["DEBUG"]
-          puts "To run _spaceship_ through a local proxy, use SPACESHIP_DEBUG"
+          puts("To run _spaceship_ through a local proxy, use SPACESHIP_DEBUG")
         end
       end
     end
@@ -429,7 +429,7 @@ module Spaceship
         end
 
         response = request(:post) do |req|
-          req.url "https://idmsa.apple.com/appleauth/auth/signin"
+          req.url("https://idmsa.apple.com/appleauth/auth/signin")
           req.body = data.to_json
           req.headers['Content-Type'] = 'application/json'
           req.headers['X-Requested-With'] = 'XMLHttpRequest'
@@ -507,7 +507,7 @@ module Spaceship
 
       return @service_key
     rescue => ex
-      puts ex.to_s
+      puts(ex.to_s)
       raise AppleTimeoutError.new, "Could not receive latest API key from iTunes Connect, this might be a server issue."
     end
 
@@ -526,22 +526,22 @@ module Spaceship
       tries -= 1
       unless tries.zero?
         logger.warn("Timeout received: '#{ex.message}'. Retrying after 3 seconds (remaining: #{tries})...")
-        sleep 3 unless Object.const_defined?("SpecHelper")
+        sleep(3) unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex # re-raise the exception
     rescue UnauthorizedAccessError => ex
       if @loggedin && !(tries -= 1).zero?
         msg = "Auth error received: '#{ex.message}'. Login in again then retrying after 3 seconds (remaining: #{tries})..."
-        puts msg if Spaceship::Globals.verbose?
-        logger.warn msg
+        puts(msg) if Spaceship::Globals.verbose?
+        logger.warn(msg)
 
         if self.class.spaceship_session_env.to_s.length > 0
           raise UnauthorizedAccessError.new, "Authentication error, you passed an invalid session using the environment variable FASTLANE_SESSION or SPACESHIP_SESSION"
         end
 
         do_login(self.user, @password)
-        sleep 3 unless Object.const_defined?("SpecHelper")
+        sleep(3) unless Object.const_defined?("SpecHelper")
         retry
       end
       raise ex # re-raise the exception
@@ -685,7 +685,7 @@ module Spaceship
         resp_hash = response.to_hash
         if resp_hash[:status] == 401
           msg = "Auth lost"
-          logger.warn msg
+          logger.warn(msg)
           raise UnauthorizedAccessError.new, "Unauthorized Access"
         end
 

data/spaceship/lib/spaceship/commands_generator.rb

@@ -43,7 +43,7 @@ module Spaceship
         end
       end
 
-      default_command :playground
+      default_command(:playground)
 
       run!
     end

data/spaceship/lib/spaceship/du/du_client.rb

@@ -48,7 +48,7 @@ module Spaceship
     def get_picture_type(upload_file)
       resolution = Utilities.resolution(upload_file.file_path)
       result = device_resolution_map.find do |key, resolutions|
-        resolutions.include? resolution
+        resolutions.include?(resolution)
       end
       raise "Unknown device for screen resolution #{resolution}" if result.nil?
 
@@ -73,7 +73,7 @@ module Spaceship
       end
 
       r = request(:post) do |req|
-        req.url "#{self.class.hostname}#{path}"
+        req.url("#{self.class.hostname}#{path}")
         req.body = upload_file.bytes
         req.headers['Accept'] = 'application/json, text/plain, */*'
         req.headers['Content-Type'] = upload_file.content_type
@@ -104,6 +104,7 @@ module Spaceship
         watch:        "MZPFT.SortedN27ScreenShot",
         ipad:         "MZPFT.SortedTabletScreenShot",
         ipadPro:      "MZPFT.SortedJ99ScreenShot",
+        ipad105:      "MZPFT.SortedJ207ScreenShot",
         iphone6:      "MZPFT.SortedN61ScreenShot",
         iphone6Plus:  "MZPFT.SortedN56ScreenShot",
         iphone58:     "MZPFT.SortedD22ScreenShot",
@@ -119,6 +120,7 @@ module Spaceship
       {
         ipad:         "MZPFT.SortedTabletMessagesScreenShot",
         ipadPro:      "MZPFT.SortedJ99MessagesScreenShot",
+        ipad105:      "MZPFT.SortedJ207MessagesScreenShot",
         iphone6:      "MZPFT.SortedN61MessagesScreenShot",
         iphone6Plus:  "MZPFT.SortedN56MessagesScreenShot",
         iphone58:     "MZPFT.SortedD22MessagesScreenShot",
@@ -132,6 +134,7 @@ module Spaceship
         watch:        [[312, 390]],
         ipad:         [[1024, 748], [1024, 768], [2048, 1496], [2048, 1536], [768, 1004], [768, 1024], [1536, 2008], [1536, 2048]],
         ipadPro:      [[2048, 2732], [2732, 2048]],
+        ipad105:      [[1668, 2224], [2224, 1668]],
         iphone6:      [[750, 1334], [1334, 750]],
         iphone6Plus:  [[1242, 2208], [2208, 1242]],
         iphone4:      [[640, 1096], [640, 1136], [1136, 600], [1136, 640]],
@@ -144,7 +147,7 @@ module Spaceship
     def screenshot_picture_type(device, is_messages)
       map = is_messages ? messages_picture_type_map : picture_type_map
       device = device.to_sym
-      raise "Unknown picture type for device: #{device}" unless map.key? device
+      raise "Unknown picture type for device: #{device}" unless map.key?(device)
       map[device]
     end
 

data/spaceship/lib/spaceship/globals.rb

@@ -4,7 +4,7 @@ module Spaceship
     # otherwise fallback to $verbose
     def self.verbose?
       if Object.const_defined?("FastlaneCore")
-        return FastlaneCore::Globals.verbose? # rubocop:disable Lint/MissingRequireStatement
+        return FastlaneCore::Globals.verbose? # rubocop:disable Require/MissingRequireStatement
       end
       return $verbose
     end

data/spaceship/lib/spaceship/playground.rb

@@ -33,37 +33,37 @@ module Spaceship
 
     def run
       begin
-        puts "Logging into to iTunes Connect (#{@username})..."
+        puts("Logging into to iTunes Connect (#{@username})...")
         Spaceship::Tunes.login(@username)
-        puts "Successfully logged in to iTunes Connect".green
-        puts ""
+        puts("Successfully logged in to iTunes Connect".green)
+        puts("")
       rescue
-        puts "Could not login to iTunes Connect...".red
+        puts("Could not login to iTunes Connect...".red)
       end
       begin
-        puts "Logging into the Developer Portal (#{@username})..."
+        puts("Logging into the Developer Portal (#{@username})...")
         Spaceship::Portal.login(@username)
-        puts "Successfully logged in to the Developer Portal".green
-        puts ""
+        puts("Successfully logged in to the Developer Portal".green)
+        puts("")
       rescue
-        puts "Could not login to the Developer Portal...".red
+        puts("Could not login to the Developer Portal...".red)
       end
 
-      puts "---------------------------------------".green
-      puts "| Welcome to the spaceship playground |".green
-      puts "---------------------------------------".green
-      puts ""
-      puts "Enter #{'docs'.yellow} to open up the documentation"
-      puts "Enter #{'exit'.yellow} to exit the spaceship playground"
-      puts "Enter #{'_'.yellow} to access the return value of the last executed command"
-      puts ""
-      puts "Just enter the commands and confirm with Enter".green
+      puts("---------------------------------------".green)
+      puts("| Welcome to the spaceship playground |".green)
+      puts("---------------------------------------".green)
+      puts("")
+      puts("Enter #{'docs'.yellow} to open up the documentation")
+      puts("Enter #{'exit'.yellow} to exit the spaceship playground")
+      puts("Enter #{'_'.yellow} to access the return value of the last executed command")
+      puts("")
+      puts("Just enter the commands and confirm with Enter".green)
 
       # rubocop:disable Lint/Debugger
       binding.pry(quiet: true)
       # rubocop:enable Lint/Debugger
 
-      puts "" # Fixes https://github.com/fastlane/spaceship/issues/203
+      puts("") # Fixes https://github.com/fastlane/spaceship/issues/203
     end
 
     def docs