fastlane 2.74.1 → 2.75.0.beta.20180109010003

data/screengrab/lib/screengrab/reports_generator.rb

@@ -5,7 +5,7 @@ module Screengrab
     require 'erb'
 
     def generate
-      UI.message "Generating HTML Report"
+      UI.message("Generating HTML Report")
 
       screens_path = Screengrab.config[:output_directory]
 
@@ -29,7 +29,7 @@ module Screengrab
       File.write(export_path, html)
 
       export_path = File.expand_path(export_path)
-      UI.success "Successfully created HTML file with an overview of all the screenshots: '#{export_path}'"
+      UI.success("Successfully created HTML file with an overview of all the screenshots: '#{export_path}'")
       system("open '#{export_path}'") unless Screengrab.config[:skip_open_summary]
     end
   end

data/screengrab/lib/screengrab/runner.rb

@@ -32,8 +32,8 @@ module Screengrab
       apk_paths_provided = app_apk_path && !app_apk_path.empty? && tests_apk_path && !tests_apk_path.empty?
 
       unless apk_paths_provided || discovered_apk_paths.any?
-        UI.error 'No APK paths were provided and no APKs could be found'
-        UI.error "Please provide APK paths with 'app_apk_path' and 'tests_apk_path' and make sure you have assembled APKs prior to running this command."
+        UI.error('No APK paths were provided and no APKs could be found')
+        UI.error("Please provide APK paths with 'app_apk_path' and 'tests_apk_path' and make sure you have assembled APKs prior to running this command.")
         return
       end
 
@@ -41,13 +41,13 @@ module Screengrab
       test_packages_to_use = @config[:use_tests_in_packages]
 
       if test_classes_to_use && test_classes_to_use.any? && test_packages_to_use && test_packages_to_use.any?
-        UI.error "'use_tests_in_classes' and 'use_tests_in_packages' can not be combined. Please use one or the other."
+        UI.error("'use_tests_in_classes' and 'use_tests_in_packages' can not be combined. Please use one or the other.")
         return
       end
 
       if (test_classes_to_use.nil? || test_classes_to_use.empty?) && (test_packages_to_use.nil? || test_packages_to_use.empty?)
-        UI.important 'Limiting the test classes run by `screengrab` to just those that generate screenshots can make runs faster.'
-        UI.important 'Consider using the :use_tests_in_classes or :use_tests_in_packages option, and organize your tests accordingly.'
+        UI.important('Limiting the test classes run by `screengrab` to just those that generate screenshots can make runs faster.')
+        UI.important('Consider using the :use_tests_in_classes or :use_tests_in_packages option, and organize your tests accordingly.')
       end
 
       device_type_dir_name = "#{@config[:device_type]}Screenshots"
@@ -73,7 +73,7 @@ module Screengrab
 
       ReportsGenerator.new.generate
 
-      UI.success "Captured #{number_of_screenshots} screenshots! 📷✨"
+      UI.success("Captured #{number_of_screenshots} screenshots! 📷✨")
     end
 
     def select_device
@@ -87,18 +87,18 @@ module Screengrab
           '* daemon',                 # Messages printed when the daemon is starting up
           'List of devices attached', # Header of table for data we want
           "doesn't match this client" # Message printed when there is an ADB client/server version mismatch
-        ].any? { |status| device.include? status }
+        ].any? { |status| device.include?(status) }
       end
 
-      UI.user_error! 'There are no connected and authorized devices or emulators' if devices.empty?
+      UI.user_error!('There are no connected and authorized devices or emulators') if devices.empty?
 
       devices.select! { |d| d.include?(@config[:specific_device]) } if @config[:specific_device]
 
-      UI.user_error! "No connected devices matched your criteria: #{@config[:specific_device]}" if devices.empty?
+      UI.user_error!("No connected devices matched your criteria: #{@config[:specific_device]}") if devices.empty?
 
       if devices.length > 1
-        UI.important "Multiple connected devices, selecting the first one"
-        UI.important "To specify which connected device to use, use the -s (specific_device) config option"
+        UI.important("Multiple connected devices, selecting the first one")
+        UI.important("To specify which connected device to use, use the -s (specific_device) config option")
       end
 
       # grab the serial number. the lines of output can look like these:
@@ -109,18 +109,18 @@ module Screengrab
     end
 
     def select_app_apk(discovered_apk_paths)
-      UI.important "To not be asked about this value, you can specify it using 'app_apk_path'"
+      UI.important("To not be asked about this value, you can specify it using 'app_apk_path'")
       UI.select('Select your debug app APK', discovered_apk_paths)
     end
 
     def select_tests_apk(discovered_apk_paths)
-      UI.important "To not be asked about this value, you can specify it using 'tests_apk_path'"
+      UI.important("To not be asked about this value, you can specify it using 'tests_apk_path'")
       UI.select('Select your debug tests APK', discovered_apk_paths)
     end
 
     def clear_local_previous_screenshots(device_type_dir_name)
       if @config[:clear_previous_screenshots]
-        UI.message "Clearing #{device_type_dir_name} within #{@config[:output_directory]}"
+        UI.message("Clearing #{device_type_dir_name} within #{@config[:output_directory]}")
 
         # We'll clear the temporary directory where screenshots wind up after being pulled from
         # the device as well, in case those got stranded on a previous run/failure
@@ -147,7 +147,7 @@ module Screengrab
     end
 
     def clear_device_previous_screenshots(device_serial, device_screenshots_paths)
-      UI.message 'Cleaning screenshots on device'
+      UI.message('Cleaning screenshots on device')
 
       device_screenshots_paths.each do |device_path|
         if_device_path_exists(device_serial, device_path) do |path|
@@ -160,11 +160,11 @@ module Screengrab
 
     def validate_apk(app_apk_path)
       unless @android_env.aapt_path
-        UI.important "The `aapt` command could not be found on your system, so your app APK could not be validated"
+        UI.important("The `aapt` command could not be found on your system, so your app APK could not be validated")
         return
       end
 
-      UI.message 'Validating app APK'
+      UI.message('Validating app APK')
       apk_permissions = @executor.execute(command: "#{@android_env.aapt_path} dump permissions #{app_apk_path}",
                                           print_all: true,
                                           print_command: true)
@@ -172,38 +172,38 @@ module Screengrab
       missing_permissions = NEEDED_PERMISSIONS.reject { |needed| apk_permissions.include?(needed) }
 
       if missing_permissions.any?
-        UI.user_error! "The needed permission(s) #{missing_permissions.join(', ')} could not be found in your app APK"
+        UI.user_error!("The needed permission(s) #{missing_permissions.join(', ')} could not be found in your app APK")
       end
     end
 
     def install_apks(device_serial, app_apk_path, tests_apk_path)
-      UI.message 'Installing app APK'
+      UI.message('Installing app APK')
       apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{app_apk_path.shellescape}",
                                            print_all: true,
                                            print_command: true)
-      UI.user_error! "App APK could not be installed" if apk_install_output.include?("Failure [")
+      UI.user_error!("App APK could not be installed") if apk_install_output.include?("Failure [")
 
-      UI.message 'Installing tests APK'
+      UI.message('Installing tests APK')
       apk_install_output = run_adb_command("adb -s #{device_serial} install -r #{tests_apk_path.shellescape}",
                                            print_all: true,
                                            print_command: true)
-      UI.user_error! "Tests APK could not be installed" if apk_install_output.include?("Failure [")
+      UI.user_error!("Tests APK could not be installed") if apk_install_output.include?("Failure [")
     end
 
     def uninstall_apks(device_serial, app_package_name, tests_package_name)
-      UI.message 'Uninstalling app APK'
+      UI.message('Uninstalling app APK')
       run_adb_command("adb -s #{device_serial} uninstall #{app_package_name}",
                       print_all: true,
                       print_command: true)
 
-      UI.message 'Uninstalling tests APK'
+      UI.message('Uninstalling tests APK')
       run_adb_command("adb -s #{device_serial} uninstall #{tests_package_name}",
                       print_all: true,
                       print_command: true)
     end
 
     def grant_permissions(device_serial)
-      UI.message 'Granting the permission necessary to change locales on the device'
+      UI.message('Granting the permission necessary to change locales on the device')
       run_adb_command("adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.CHANGE_CONFIGURATION",
                       print_all: true,
                       print_command: true)
@@ -213,7 +213,7 @@ module Screengrab
                                            print_command: true).to_i
 
       if device_api_version >= 23
-        UI.message 'Granting the permissions necessary to access device external storage'
+        UI.message('Granting the permissions necessary to access device external storage')
         run_adb_command("adb -s #{device_serial} shell pm grant #{@config[:app_package_name]} android.permission.WRITE_EXTERNAL_STORAGE",
                         print_all: true,
                         print_command: true)
@@ -240,7 +240,7 @@ module Screengrab
     end
 
     def run_tests_for_locale(locale, device_serial, test_classes_to_use, test_packages_to_use, launch_arguments)
-      UI.message "Running tests for locale: #{locale}"
+      UI.message("Running tests for locale: #{locale}")
 
       instrument_command = ["adb -s #{device_serial} shell am instrument --no-window-animation -w",
                             "-e testLocale #{locale.tr('-', '_')}",
@@ -264,7 +264,7 @@ module Screengrab
     end
 
     def pull_screenshots_from_device(device_serial, device_screenshots_paths, device_type_dir_name)
-      UI.message "Pulling captured screenshots from the device"
+      UI.message("Pulling captured screenshots from the device")
       starting_screenshot_count = screenshot_file_names_in(@config[:output_directory], device_type_dir_name).length
 
       UI.verbose("Starting screenshot count is: #{starting_screenshot_count}")
@@ -295,8 +295,8 @@ module Screengrab
       # Because we can't guarantee the screenshot output directory will be empty when we pull, we determine
       # success based on whether there are more screenshots there than when we started.
       if starting_screenshot_count == ending_screenshot_count
-        UI.error "Make sure you've used Screengrab.screenshot() in your tests and that your expected tests are being run."
-        UI.abort_with_message! "No screenshots were detected 📷❌"
+        UI.error("Make sure you've used Screengrab.screenshot() in your tests and that your expected tests are being run.")
+        UI.abort_with_message!("No screenshots were detected 📷❌")
       end
 
       ending_screenshot_count - starting_screenshot_count
@@ -330,7 +330,7 @@ module Screengrab
 
         FileUtils.mkdir_p(dest_dir)
         FileUtils.cp_r(src_screenshots, dest_dir)
-        UI.success "Screenshots copied to #{dest_dir}"
+        UI.success("Screenshots copied to #{dest_dir}")
       end
     end
 
@@ -341,7 +341,7 @@ module Screengrab
                                 print_all: false,
                                 print_command: false).include?('No such file')
 
-      yield device_path
+      yield(device_path)
     rescue
       # Some versions of ADB will have a non-zero exit status for this, which will cause the executor to raise.
       # We can safely ignore that and treat it as if it returned 'No such file'

data/sigh/lib/sigh/commands_generator.rb

@@ -65,7 +65,7 @@ module Sigh
         c.syntax = 'fastlane sigh download_all'
         c.description = 'Downloads all valid provisioning profiles'
 
-        c.option '--download_xcode_profiles', 'Only works with `fastlane sigh download_all` command: Also download Xcode managed provisioning profiles'
+        c.option('--download_xcode_profiles', 'Only works with `fastlane sigh download_all` command: Also download Xcode managed provisioning profiles')
 
         FastlaneCore::CommanderGenerator.new.generate(Sigh::Options.available_options, command: c)
 
@@ -99,19 +99,19 @@ module Sigh
       command :resign do |c|
         c.syntax = 'fastlane sigh resign'
         c.description = 'Resigns an existing ipa file with the given provisioning profile'
-        c.option '-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.'
-        c.option '-x', '--version_number STRING', String, 'Version number to force binary and all nested binaries to use. Changes both CFBundleShortVersionString and CFBundleVersion.'
-        c.option '-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used. '\
+        c.option('-i', '--signing_identity STRING', String, 'The signing identity to use. Must match the one defined in the provisioning profile.')
+        c.option('-x', '--version_number STRING', String, 'Version number to force binary and all nested binaries to use. Changes both CFBundleShortVersionString and CFBundleVersion.')
+        c.option('-p', '--provisioning_profile PATH', String, '(or BUNDLE_ID=PATH) The path to the provisioning profile which should be used. '\
                  'Can be provided multiple times if the application contains nested applications and app extensions, which need their own provisioning profile. '\
                  'The path may be prefixed with a identifier in order to determine which provisioning profile should be used on which app.',
-                 &multiple_values_option_proc(c, "provisioning_profile", &proc { |value| value.split('=', 2) })
-        c.option '-d', '--display_name STRING', String, 'Display name to use'
-        c.option '-e', '--entitlements PATH', String, 'The path to the entitlements file to use.'
-        c.option '--short_version STRING', String, 'Short version string to force binary and all nested binaries to use (CFBundleShortVersionString).'
-        c.option '--bundle_version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleVersion).'
-        c.option '--use_app_entitlements', 'Extract app bundle codesigning entitlements and combine with entitlements from new provisionin profile.'
-        c.option '-g', '--new_bundle_id STRING', String, 'New application bundle ID (CFBundleIdentifier)'
-        c.option '--keychain_path STRING', String, 'Path to the keychain that /usr/bin/codesign should use'
+                 &multiple_values_option_proc(c, "provisioning_profile", &proc { |value| value.split('=', 2) }))
+        c.option('-d', '--display_name STRING', String, 'Display name to use')
+        c.option('-e', '--entitlements PATH', String, 'The path to the entitlements file to use.')
+        c.option('--short_version STRING', String, 'Short version string to force binary and all nested binaries to use (CFBundleShortVersionString).')
+        c.option('--bundle_version STRING', String, 'Bundle version to force binary and all nested binaries to use (CFBundleVersion).')
+        c.option('--use_app_entitlements', 'Extract app bundle codesigning entitlements and combine with entitlements from new provisionin profile.')
+        c.option('-g', '--new_bundle_id STRING', String, 'New application bundle ID (CFBundleIdentifier)')
+        c.option('--keychain_path STRING', String, 'Path to the keychain that /usr/bin/codesign should use')
 
         c.action do |args, options|
           Sigh::Resign.new.run(options, args)
@@ -122,18 +122,18 @@ module Sigh
         c.syntax = 'fastlane sigh manage'
         c.description = 'Manage installed provisioning profiles on your system.'
 
-        c.option '-f', '--force', 'Force remove all expired provisioning profiles. Required on CI.'
-        c.option '-e', '--clean_expired', 'Remove all expired provisioning profiles.'
+        c.option('-f', '--force', 'Force remove all expired provisioning profiles. Required on CI.')
+        c.option('-e', '--clean_expired', 'Remove all expired provisioning profiles.')
 
-        c.option '-p', '--clean_pattern STRING', String, 'Remove any provisioning profiles that matches the regular expression.'
-        c.example 'Remove all "iOS Team Provisioning" provisioning profiles', 'fastlane sigh manage -p "iOS\ ?Team Provisioning Profile"'
+        c.option('-p', '--clean_pattern STRING', String, 'Remove any provisioning profiles that matches the regular expression.')
+        c.example('Remove all "iOS Team Provisioning" provisioning profiles', 'fastlane sigh manage -p "iOS\ ?Team Provisioning Profile"')
 
         c.action do |args, options|
           Sigh::LocalManage.start(options, args)
         end
       end
 
-      default_command :renew
+      default_command(:renew)
 
       run!
     end
@@ -145,7 +145,7 @@ module Sigh
         values = option[1] || []
         values << value
 
-        command.proxy_options.delete option
+        command.proxy_options.delete(option)
         command.proxy_options << [name, values]
       end
     end

data/sigh/lib/sigh/download_all.rb

@@ -7,17 +7,17 @@ module Sigh
   class DownloadAll
     # Download all valid provisioning profiles
     def download_all(download_xcode_profiles: false)
-      UI.message "Starting login with user '#{Sigh.config[:username]}'"
+      UI.message("Starting login with user '#{Sigh.config[:username]}'")
       Spaceship.login(Sigh.config[:username], nil)
       Spaceship.select_team
-      UI.message "Successfully logged in"
+      UI.message("Successfully logged in")
 
       Spaceship.provisioning_profile.all(xcode: download_xcode_profiles).each do |profile|
         if profile.valid?
-          UI.message "Downloading profile '#{profile.name}'..."
+          UI.message("Downloading profile '#{profile.name}'...")
           download_profile(profile)
         else
-          UI.important "Skipping invalid/expired profile '#{profile.name}'"
+          UI.important("Skipping invalid/expired profile '#{profile.name}'")
         end
       end
 

data/sigh/lib/sigh/local_manage.rb

@@ -18,7 +18,7 @@ module Sigh
     end
 
     def self.install_profile(profile)
-      UI.message "Installing provisioning profile..."
+      UI.message("Installing provisioning profile...")
       profile_path = File.expand_path("~") + "/Library/MobileDevice/Provisioning Profiles/"
       uuid = ENV["SIGH_UUID"] || ENV["SIGH_UDID"]
       profile_filename = uuid + ".mobileprovision"
@@ -30,10 +30,10 @@ module Sigh
       end
 
       # copy to Xcode provisioning profile directory
-      FileUtils.copy profile, destination
+      FileUtils.copy(profile, destination)
 
-      if File.exist? destination
-        UI.success "Profile installed at \"#{destination}\""
+      if File.exist?(destination)
+        UI.success("Profile installed at \"#{destination}\"")
       else
         UI.user_error!("Failed installation of provisioning profile at location: #{destination}")
       end
@@ -55,44 +55,44 @@ module Sigh
 
       profiles_valid = profiles.select { |profile| profile["ExpirationDate"] > now && profile["ExpirationDate"] > soon }
       if profiles_valid.count > 0
-        UI.message "Provisioning profiles installed"
-        UI.message "Valid:"
+        UI.message("Provisioning profiles installed")
+        UI.message("Valid:")
         profiles_valid.each do |profile|
-          UI.message profile_info(profile).green
+          UI.message(profile_info(profile).green)
         end
       end
 
       profiles_soon = profiles.select { |profile| profile["ExpirationDate"] > now && profile["ExpirationDate"] < soon }
       if profiles_soon.count > 0
-        UI.message ""
-        UI.message "Expiring within 30 days:"
+        UI.message("")
+        UI.message("Expiring within 30 days:")
         profiles_soon.each do |profile|
-          UI.message profile_info(profile).yellow
+          UI.message(profile_info(profile).yellow)
         end
       end
 
       profiles_expired = profiles.select { |profile| profile["ExpirationDate"] < now }
       if profiles_expired.count > 0
-        UI.message ""
-        UI.message "Expired:"
+        UI.message("")
+        UI.message("Expired:")
         profiles_expired.each do |profile|
-          UI.message profile_info(profile).red
+          UI.message(profile_info(profile).red)
         end
       end
 
-      UI.message ""
-      UI.message "Summary"
-      UI.message "#{profiles.count} installed profiles"
-      UI.message "#{profiles_expired.count} are expired".red if profiles_expired.count > 0
-      UI.message "#{profiles_soon.count} are valid but will expire within 30 days".yellow
-      UI.message "#{profiles_valid.count} are valid".green
+      UI.message("")
+      UI.message("Summary")
+      UI.message("#{profiles.count} installed profiles")
+      UI.message("#{profiles_expired.count} are expired".red) if profiles_expired.count > 0
+      UI.message("#{profiles_soon.count} are valid but will expire within 30 days".yellow)
+      UI.message("#{profiles_valid.count} are valid".green)
 
-      UI.message "You can remove all expired profiles using `fastlane sigh manage -e`" if profiles_expired.count > 0
+      UI.message("You can remove all expired profiles using `fastlane sigh manage -e`") if profiles_expired.count > 0
     end
 
     def self.profile_info(profile)
       if FastlaneCore::Globals.verbose?
-        "#{profile['Name']} - #{File.basename profile['Path']}"
+        "#{profile['Name']} - #{File.basename(profile['Path'])}"
       else
         profile['Name']
       end
@@ -103,15 +103,15 @@ module Sigh
 
       profiles = load_profiles.select { |profile| (expired && profile["ExpirationDate"] < now) || (!pattern.nil? && profile["Name"] =~ pattern) }
 
-      UI.message "The following provisioning profiles are either expired or matches your pattern:"
+      UI.message("The following provisioning profiles are either expired or matches your pattern:")
       profiles.each do |profile|
-        UI.message profile["Name"].red
+        UI.message(profile["Name"].red)
       end
 
       delete = force
       unless delete
         if Helper.ci?
-          UI.user_error! "On a CI server, cleanup cannot be used without the --force option"
+          UI.user_error!("On a CI server, cleanup cannot be used without the --force option")
         else
           delete = UI.confirm("Delete these provisioning profiles #{profiles.length}?")
         end
@@ -119,14 +119,14 @@ module Sigh
 
       if delete
         profiles.each do |profile|
-          File.delete profile["Path"]
+          File.delete(profile["Path"])
         end
-        UI.success "\n\nDeleted #{profiles.length} profiles"
+        UI.success("\n\nDeleted #{profiles.length} profiles")
       end
     end
 
     def self.load_profiles
-      UI.message "Loading Provisioning profiles from ~/Library/MobileDevice/Provisioning Profiles/"
+      UI.message("Loading Provisioning profiles from ~/Library/MobileDevice/Provisioning Profiles/")
       profiles_path = File.expand_path("~") + "/Library/MobileDevice/Provisioning Profiles/*.mobileprovision"
       profile_paths = Dir[profiles_path]
 

data/sigh/lib/sigh/manager.rb

@@ -25,7 +25,7 @@ module Sigh
 
       install_profile(output) unless Sigh.config[:skip_install]
 
-      puts output.green
+      puts(output.green)
 
       return File.expand_path(output)
     end

data/sigh/lib/sigh/repair.rb

@@ -5,10 +5,10 @@ require_relative 'module'
 module Sigh
   class Repair
     def repair_all
-      UI.message "Starting login with user '#{Sigh.config[:username]}'"
+      UI.message("Starting login with user '#{Sigh.config[:username]}'")
       Spaceship.login(Sigh.config[:username], nil)
       Spaceship.select_team
-      UI.message "Successfully logged in"
+      UI.message("Successfully logged in")
 
       # Select all 'Invalid' or 'Expired' provisioning profiles
       broken_profiles = Spaceship.provisioning_profile.all.find_all do |profile|
@@ -16,19 +16,19 @@ module Sigh
       end
 
       if broken_profiles.count == 0
-        UI.success "All provisioning profiles are valid, nothing to do"
+        UI.success("All provisioning profiles are valid, nothing to do")
         return
       end
 
-      UI.success "Going to repair #{broken_profiles.count} provisioning profiles"
+      UI.success("Going to repair #{broken_profiles.count} provisioning profiles")
 
       # Iterate over all broken profiles and repair them
       broken_profiles.each do |profile|
-        UI.message "Repairing profile '#{profile.name}'..."
+        UI.message("Repairing profile '#{profile.name}'...")
         profile.repair! # yes, that's all you need to repair a profile
       end
 
-      UI.success "Successfully repaired #{broken_profiles.count} provisioning profiles"
+      UI.success("Successfully repaired #{broken_profiles.count} provisioning profiles")
     end
   end
 end