fastlane 2.74.1 → 2.75.0.beta.20180109010003

data/sigh/lib/sigh/resign.rb

@@ -58,14 +58,14 @@ module Sigh
         ipa.shellescape # Output path must always be last argument
       ].join(' ')
 
-      puts command.magenta
-      puts `#{command}`
+      puts(command.magenta)
+      puts(`#{command}`)
 
       if $?.to_i == 0
-        UI.success "Successfully signed #{ipa}!"
+        UI.success("Successfully signed #{ipa}!")
         true
       else
-        UI.error "Something went wrong while code signing #{ipa}"
+        UI.error("Something went wrong while code signing #{ipa}")
         false
       end
     end
@@ -84,7 +84,7 @@ module Sigh
       keychain_path = options.keychain_path || nil
 
       if options.provisioning_name
-        UI.important "The provisioning_name (-n) option is not applicable to resign. You should use provisioning_profile (-p) instead"
+        UI.important("The provisioning_name (-n) option is not applicable to resign. You should use provisioning_profile (-p) instead")
       end
 
       return ipa, signing_identity, provisioning_profiles, entitlements, version, display_name, short_version, bundle_version, new_bundle_id, use_app_entitlements, keychain_path
@@ -104,7 +104,7 @@ module Sigh
 
     def find_signing_identity(signing_identity)
       until (signing_identity = sha1_for_signing_identity(signing_identity))
-        UI.error "Couldn't find signing identity '#{signing_identity}'."
+        UI.error("Couldn't find signing identity '#{signing_identity}'.")
         signing_identity = ask_for_signing_identity
       end
 
@@ -160,7 +160,7 @@ module Sigh
     end
 
     def print_available_identities
-      UI.message "Available identities: \n\t#{installed_identity_descriptions.join("\n\t")}\n"
+      UI.message("Available identities: \n\t#{installed_identity_descriptions.join("\n\t")}\n")
     end
 
     def ask_for_signing_identity

data/sigh/lib/sigh/runner.rb

@@ -15,27 +15,27 @@ module Sigh
                                          hide_keys: [:output_path],
                                              title: "Summary for sigh #{Fastlane::VERSION}")
 
-      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")
 
       profiles = [] if Sigh.config[:skip_fetch_profiles]
       profiles ||= fetch_profiles # download the profile if it's there
 
       if profiles.count > 0
-        UI.success "Found #{profiles.count} matching profile(s)"
+        UI.success("Found #{profiles.count} matching profile(s)")
         profile = profiles.first
 
         if Sigh.config[:force]
           # Recreating the profile ensures it has all of the requested properties (cert, name, etc.)
-          UI.important "Recreating the profile"
+          UI.important("Recreating the profile")
           profile.delete!
           profile = create_profile!
         end
       else
         UI.user_error!("No matching provisioning profile found and can not create a new one because you enabled `readonly`") if Sigh.config[:readonly]
-        UI.important "No existing profiles found, that match the certificates you have installed locally! Creating a new provisioning profile for you"
+        UI.important("No existing profiles found, that match the certificates you have installed locally! Creating a new provisioning profile for you")
         ensure_app_exists!
         profile = create_profile!
       end
@@ -65,7 +65,7 @@ module Sigh
 
     # Fetches a profile matching the user's search requirements
     def fetch_profiles
-      UI.message "Fetching profiles..."
+      UI.message("Fetching profiles...")
       results = profile_type.find_by_bundle_id(bundle_id: Sigh.config[:app_identifier],
                                                      mac: Sigh.config[:platform].to_s == 'macos',
                                             sub_platform: Sigh.config[:platform].to_s == 'tvos' ? 'tvOS' : nil)
@@ -89,7 +89,7 @@ module Sigh
 
       return results if Sigh.config[:skip_certificate_verification]
 
-      UI.message "Verifying certificates..."
+      UI.message("Verifying certificates...")
       return results.find_all do |current_profile|
         installed = false
 
@@ -132,12 +132,12 @@ module Sigh
 
       unless Sigh.config[:skip_fetch_profiles]
         if Spaceship.provisioning_profile.all.find { |p| p.name == name }
-          UI.error "The name '#{name}' is already taken, using another one."
+          UI.error("The name '#{name}' is already taken, using another one.")
           name += " #{Time.now.to_i}"
         end
       end
 
-      UI.important "Creating new provisioning profile for '#{Sigh.config[:app_identifier]}' with name '#{name}' for '#{Sigh.config[:platform]}' platform"
+      UI.important("Creating new provisioning profile for '#{Sigh.config[:app_identifier]}' with name '#{name}' for '#{Sigh.config[:platform]}' platform")
       profile = profile_type.create!(name: name,
                                 bundle_id: bundle_id,
                               certificate: cert,
@@ -223,11 +223,11 @@ module Sigh
       end
 
       if certificates.count > 1 and !Sigh.config[:development]
-        UI.important "Found more than one code signing identity. Choosing the first one. Check out `fastlane sigh --help` to see all available options."
-        UI.important "Available Code Signing Identities for current filters:"
+        UI.important("Found more than one code signing identity. Choosing the first one. Check out `fastlane sigh --help` to see all available options.")
+        UI.important("Available Code Signing Identities for current filters:")
         certificates.each do |c|
           str = ["\t- Name:", c.owner_name, "- ID:", c.id + " - Expires", c.expires.strftime("%d/%m/%Y")].join(" ")
-          UI.message str.green
+          UI.message(str.green)
         end
       end
 
@@ -235,7 +235,7 @@ module Sigh
         filters = ""
         filters << "Owner Name: '#{Sigh.config[:cert_owner_name]}' " if Sigh.config[:cert_owner_name]
         filters << "Certificate ID: '#{Sigh.config[:cert_id]}' " if Sigh.config[:cert_id]
-        UI.important "No certificates for filter: #{filters}" if filters.length > 0
+        UI.important("No certificates for filter: #{filters}") if filters.length > 0
         message = "Could not find a matching code signing identity for type '#{profile_type.to_s.split(':').last}'. "
         message += "It is recommended to use match to manage code signing for you, more information on https://codesigning.guide."
         message += "If you don't want to do so, you can also use cert to generate a new one: https://fastlane.tools/cert"
@@ -248,7 +248,7 @@ module Sigh
 
     # Downloads and stores the provisioning profile
     def download_profile(profile)
-      UI.important "Downloading provisioning profile..."
+      UI.important("Downloading provisioning profile...")
       profile_name ||= "#{profile_type.pretty_type}_#{Sigh.config[:app_identifier]}"
 
       if Sigh.config[:platform].to_s == 'tvos'
@@ -263,7 +263,7 @@ module Sigh
         f.write(profile.download)
       end
 
-      UI.success "Successfully downloaded provisioning profile..."
+      UI.success("Successfully downloaded provisioning profile...")
       return output_path
     end
 
@@ -275,17 +275,17 @@ module Sigh
     end
 
     def print_produce_command(config)
-      UI.message ""
-      UI.message "==========================================".yellow
-      UI.message "Could not find App ID with bundle identifier '#{config[:app_identifier]}'"
-      UI.message "You can easily generate a new App ID on the Developer Portal using 'produce':"
-      UI.message ""
-      UI.message "fastlane produce -u #{config[:username]} -a #{config[:app_identifier]} --skip_itc".yellow
-      UI.message ""
-      UI.message "You will be asked for any missing information, like the full name of your app"
-      UI.message "If the app should also be created on iTunes Connect, remove the " + "--skip_itc".yellow + " from the command above"
-      UI.message "==========================================".yellow
-      UI.message ""
+      UI.message("")
+      UI.message("==========================================".yellow)
+      UI.message("Could not find App ID with bundle identifier '#{config[:app_identifier]}'")
+      UI.message("You can easily generate a new App ID on the Developer Portal using 'produce':")
+      UI.message("")
+      UI.message("fastlane produce -u #{config[:username]} -a #{config[:app_identifier]} --skip_itc".yellow)
+      UI.message("")
+      UI.message("You will be asked for any missing information, like the full name of your app")
+      UI.message("If the app should also be created on iTunes Connect, remove the " + "--skip_itc".yellow + " from the command above")
+      UI.message("==========================================".yellow)
+      UI.message("")
     end
   end
 end

data/snapshot/lib/snapshot/collector.rb

@@ -30,7 +30,7 @@ module Snapshot
       end
 
       if matches.count != to_store.count
-        UI.error "Looks like the number of screenshots (#{to_store.count}) doesn't match the number of names (#{matches.count})"
+        UI.error("Looks like the number of screenshots (#{to_store.count}) doesn't match the number of names (#{matches.count})")
       end
 
       matches.each_with_index do |current, index|
@@ -65,21 +65,21 @@ module Snapshot
 
     def self.copy(from_path, to_path)
       if FastlaneCore::Globals.verbose?
-        UI.success "Copying file '#{from_path}' to '#{to_path}'..."
+        UI.success("Copying file '#{from_path}' to '#{to_path}'...")
       else
-        UI.success "Copying '#{to_path}'..."
+        UI.success("Copying '#{to_path}'...")
       end
       FileUtils.cp(from_path, to_path)
     end
 
     def self.attachments(containing)
-      UI.message "Collecting screenshots..."
+      UI.message("Collecting screenshots...")
       plist_path = Dir[File.join(containing, "*.plist")].last # we clean the folder before each run
       return attachments_in_file(plist_path)
     end
 
     def self.attachments_in_file(plist_path)
-      UI.verbose "Loading up '#{plist_path}'..."
+      UI.verbose("Loading up '#{plist_path}'...")
       report = Plist.parse_xml(plist_path)
 
       to_store = [] # contains the names of all the attachments we want to use
@@ -98,8 +98,8 @@ module Snapshot
         end
       end
 
-      UI.message "Found #{to_store.count} screenshots..."
-      UI.verbose "Found #{to_store.join(', ')}"
+      UI.message("Found #{to_store.count} screenshots...")
+      UI.verbose("Found #{to_store.join(', ')}")
       return to_store
     end
 

data/snapshot/lib/snapshot/commands_generator.rb

@@ -66,11 +66,11 @@ module Snapshot
       command :reset_simulators do |c|
         c.syntax = 'fastlane snapshot reset_simulators'
         c.description = "This will remove all your existing simulators and re-create new ones"
-        c.option '-i', '--ios_version String', String, 'The comma separated list of iOS Versions you want to use'
-        c.option '--force', 'Disables confirmation prompts'
+        c.option('-i', '--ios_version String', String, 'The comma separated list of iOS Versions you want to use')
+        c.option('--force', 'Disables confirmation prompts')
 
         c.action do |args, options|
-          options.default ios_version: Snapshot::LatestOsVersion.ios_version
+          options.default(ios_version: Snapshot::LatestOsVersion.ios_version)
           versions = options.ios_version.split(',') if options.ios_version
           require 'snapshot/reset_simulators'
 
@@ -89,17 +89,17 @@ module Snapshot
           derived_data_path = Snapshot.config[:derived_data_path]
 
           if !derived_data_path
-            Snapshot::UI.user_error! "No derived_data_path"
+            Snapshot::UI.user_error!("No derived_data_path")
           elsif !Dir.exist?(derived_data_path)
-            Snapshot::UI.important "Path #{derived_data_path} does not exist"
+            Snapshot::UI.important("Path #{derived_data_path} does not exist")
           else
             FileUtils.rm_rf(derived_data_path)
-            Snapshot::UI.success "Removed #{derived_data_path}"
+            Snapshot::UI.success("Removed #{derived_data_path}")
           end
         end
       end
 
-      default_command :run
+      default_command(:run)
 
       run!
     end

data/snapshot/lib/snapshot/dependency_checker.rb

@@ -6,28 +6,36 @@ module Snapshot
   class DependencyChecker
     def self.check_dependencies
       return if FastlaneCore::Helper.test?
+      return unless FastlaneCore::Helper.mac?
 
       self.check_xcode_select
       self.check_simctl
     end
 
     def self.check_xcode_select
-      unless `xcode-select -v`.include? "xcode-select version"
-        FastlaneCore::UI.error '#############################################################'
-        FastlaneCore::UI.error "# You have to install Xcode command line tools to use snapshot"
-        FastlaneCore::UI.error "# Install the latest version of Xcode from the AppStore"
-        FastlaneCore::UI.error "# Run xcode-select --install to install the developer tools"
-        FastlaneCore::UI.error '#############################################################'
+      xcode_available = nil
+      begin
+        xcode_available = `xcode-select -v`.include?("xcode-select version")
+      rescue
+        xcode_available = true
+      end
+
+      unless xcode_available
+        FastlaneCore::UI.error('#############################################################')
+        FastlaneCore::UI.error("# You have to install Xcode command line tools to use snapshot")
+        FastlaneCore::UI.error("# Install the latest version of Xcode from the AppStore")
+        FastlaneCore::UI.error("# Run xcode-select --install to install the developer tools")
+        FastlaneCore::UI.error('#############################################################')
         FastlaneCore::UI.user_error!("Run 'xcode-select --install' and start snapshot again")
       end
 
       if Snapshot::LatestOsVersion.ios_version.to_f < 9 # to_f is bad, but should be good enough
-        FastlaneCore::UI.error '#############################################################'
-        FastlaneCore::UI.error "# Your xcode-select Xcode version is below 7.0"
-        FastlaneCore::UI.error "# To use snapshot 1.0 and above you need at least iOS 9"
-        FastlaneCore::UI.error "# Set the path to the Xcode version that supports UI Tests"
-        FastlaneCore::UI.error "# or downgrade to versions older than snapshot 1.0"
-        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.error('#############################################################')
+        FastlaneCore::UI.error("# Your xcode-select Xcode version is below 7.0")
+        FastlaneCore::UI.error("# To use snapshot 1.0 and above you need at least iOS 9")
+        FastlaneCore::UI.error("# Set the path to the Xcode version that supports UI Tests")
+        FastlaneCore::UI.error("# or downgrade to versions older than snapshot 1.0")
+        FastlaneCore::UI.error('#############################################################')
         FastlaneCore::UI.user_error!("Run 'sudo xcode-select -s /Applications/Xcode-beta.app'")
       end
     end
@@ -35,18 +43,25 @@ module Snapshot
     def self.check_simulators
       FastlaneCore::UI.verbose("Found #{FastlaneCore::Simulator.all.count} simulators.")
       if FastlaneCore::Simulator.all.count == 0
-        FastlaneCore::UI.error '#############################################################'
-        FastlaneCore::UI.error "# You have to add new simulators using Xcode"
-        FastlaneCore::UI.error "# You can let snapshot create new simulators: 'fastlane snapshot reset_simulators'"
-        FastlaneCore::UI.error "# Manually: Xcode => Window => Devices"
-        FastlaneCore::UI.error "# Please run `instruments -s` to verify your xcode path"
-        FastlaneCore::UI.error '#############################################################'
+        FastlaneCore::UI.error('#############################################################')
+        FastlaneCore::UI.error("# You have to add new simulators using Xcode")
+        FastlaneCore::UI.error("# You can let snapshot create new simulators: 'fastlane snapshot reset_simulators'")
+        FastlaneCore::UI.error("# Manually: Xcode => Window => Devices")
+        FastlaneCore::UI.error("# Please run `instruments -s` to verify your xcode path")
+        FastlaneCore::UI.error('#############################################################')
         FastlaneCore::UI.user_error!("Create the new simulators and run this script again")
       end
     end
 
     def self.check_simctl
-      unless `xcrun simctl`.include? "openurl"
+      simctl_available = nil
+      begin
+        simctl_available = `xcrun simctl`.include?("openurl")
+      rescue
+        simctl_available = true
+      end
+
+      unless simctl_available
         FastlaneCore::UI.user_error!("Could not find `xcrun simctl`. Make sure you have the latest version of Xcode and macOS installed.")
       end
     end

data/snapshot/lib/snapshot/detect_values.rb

@@ -1,6 +1,8 @@
 require 'fastlane_core/project'
 require 'fastlane_core/device_manager'
 
+require_relative 'module'
+
 module Snapshot
   class DetectValues
     # This is needed as these are more complex default values

data/snapshot/lib/snapshot/error_handler.rb

@@ -14,7 +14,7 @@ module Snapshot
 
         case output
         when /com\.apple\.CoreSimulator\.SimError/
-          UI.important "The simulator failed to launch - retrying..."
+          UI.important("The simulator failed to launch - retrying...")
         when /is not configured for Running/
           UI.user_error!("Scheme is not properly configured, make sure to check out the snapshot README")
         end

data/snapshot/lib/snapshot/fixes/hardware_keyboard_fix.rb

@@ -7,7 +7,7 @@ module Snapshot
 
     class HardwareKeyboardFix
       def self.patch
-        UI.verbose "Patching simulator to work with secure text fields"
+        UI.verbose("Patching simulator to work with secure text fields")
 
         Helper.backticks("defaults write com.apple.iphonesimulator ConnectHardwareKeyboard 0", print: FastlaneCore::Globals.verbose?)
       end

data/snapshot/lib/snapshot/fixes/simulator_zoom_fix.rb

@@ -9,7 +9,7 @@ module Snapshot
 
     class SimulatorZoomFix
       def self.patch
-        UI.message "Patching simulators '#{config_path}' to scale to 100%"
+        UI.message("Patching simulators '#{config_path}' to scale to 100%")
 
         FastlaneCore::DeviceManager.simulators.each do |simulator|
           simulator_name = simulator.name.tr("\s", "-")

data/snapshot/lib/snapshot/reports_generator.rb

@@ -6,7 +6,7 @@ module Snapshot
     require 'fastimage'
 
     def generate
-      UI.message "Generating HTML Report"
+      UI.message("Generating HTML Report")
 
       screens_path = Snapshot.config[:output_directory]
 
@@ -35,7 +35,7 @@ module Snapshot
       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 Snapshot.config[:skip_open_summary]
     end
 

data/snapshot/lib/snapshot/reset_simulators.rb

@@ -68,7 +68,7 @@ module Snapshot
 
     def self.create(device_type, os_versions, os_name = 'iOS')
       os_versions.each do |os_version|
-        puts "Creating #{device_type[0]} for #{os_name} version #{os_version[0]}"
+        puts("Creating #{device_type[0]} for #{os_name} version #{os_version[0]}")
         command = "xcrun simctl create '#{device_type[0]}' #{device_type[1]} #{os_version[1]}"
         UI.command(command) if FastlaneCore::Globals.verbose?
         `#{command}`
@@ -110,7 +110,7 @@ module Snapshot
       end
 
       if phones.any? && watches.any?
-        puts "Creating device pair of #{phones.last} and #{watches.last}"
+        puts("Creating device pair of #{phones.last} and #{watches.last}")
         Helper.backticks("xcrun simctl pair #{watches.last} #{phones.last}", print: FastlaneCore::Globals.verbose?)
       end
     end

data/snapshot/lib/snapshot/runner.rb

@@ -17,11 +17,11 @@ module Snapshot
   class Runner
     def work
       if File.exist?("./fastlane/snapshot.js") or File.exist?("./snapshot.js")
-        UI.error "Found old snapshot configuration file 'snapshot.js'"
-        UI.error "You updated to snapshot 1.0 which now uses UI Automation"
-        UI.error "Please follow the migration guide: https://github.com/fastlane/fastlane/blob/master/snapshot/MigrationGuide.md"
-        UI.error "And read the updated documentation: https://docs.fastlane.tools/actions/snapshot/"
-        sleep 3 # to be sure the user sees this, as compiling clears the screen
+        UI.error("Found old snapshot configuration file 'snapshot.js'")
+        UI.error("You updated to snapshot 1.0 which now uses UI Automation")
+        UI.error("Please follow the migration guide: https://github.com/fastlane/fastlane/blob/master/snapshot/MigrationGuide.md")
+        UI.error("And read the updated documentation: https://docs.fastlane.tools/actions/snapshot/")
+        sleep(3) # to be sure the user sees this, as compiling clears the screen
       end
 
       Snapshot.config[:output_directory] = File.expand_path(Snapshot.config[:output_directory])
@@ -36,7 +36,7 @@ module Snapshot
 
       clear_previous_screenshots if Snapshot.config[:clear_previous_screenshots]
 
-      UI.success "Building and running project - this might take some time..."
+      UI.success("Building and running project - this might take some time...")
 
       launcher_config = SimulatorLauncherConfiguration.new(snapshot_config: Snapshot.config)
 
@@ -79,16 +79,16 @@ module Snapshot
         headings: ["Device"] + results.values.first.keys,
         title: "snapshot results"
       }
-      puts ""
-      puts Terminal::Table.new(params)
-      puts ""
+      puts("")
+      puts(Terminal::Table.new(params))
+      puts("")
     end
 
     def clear_previous_screenshots
-      UI.important "Clearing previously generated screenshots"
+      UI.important("Clearing previously generated screenshots")
       path = File.join(Snapshot.config[:output_directory], "*", "*.png")
       Dir[path].each do |current|
-        UI.verbose "Deleting #{current}"
+        UI.verbose("Deleting #{current}")
         File.delete(current)
       end
     end
@@ -119,15 +119,15 @@ module Snapshot
     def verify_helper_is_current
       return if Snapshot.config[:skip_helper_version_check]
       current_version = version_of_bundled_helper
-      UI.verbose "Checking that helper files contain #{current_version}"
+      UI.verbose("Checking that helper files contain #{current_version}")
 
       helper_files = Update.find_helper
       helper_files.each do |path|
         content = File.read(path)
 
         unless content.include?(current_version)
-          UI.error "Your '#{path}' is outdated, please run `fastlane snapshot update`"
-          UI.error "to update your Helper file"
+          UI.error("Your '#{path}' is outdated, please run `fastlane snapshot update`")
+          UI.error("to update your Helper file")
           UI.user_error!("Please update your Snapshot Helper file using `fastlane snapshot update`")
         end
       end