fastlane 2.14.2 → 2.15.0.beta.20170213032052

data/gym/lib/gym/runner.rb

@@ -96,7 +96,7 @@ module Gym
     # Builds the app and prepares the archive
     def build_app
       command = BuildCommandGenerator.generate
-      print_command(command, "Generated Build Command") if $verbose
+      print_command(command, "Generated Build Command") if FastlaneCore::Globals.verbose?
       FastlaneCore::CommandExecutor.execute(command: command,
                                           print_all: true,
                                       print_command: !Gym.config[:silent],
@@ -119,7 +119,7 @@ module Gym
 
     def package_app
       command = PackageCommandGenerator.generate
-      print_command(command, "Generated Package Command") if $verbose
+      print_command(command, "Generated Package Command") if FastlaneCore::Globals.verbose?
 
       FastlaneCore::CommandExecutor.execute(command: command,
                                           print_all: false,
@@ -168,7 +168,7 @@ module Gym
         # we have to remove it first, otherwise cp_r fails even with remove_destination
         # e.g.: there are symlinks in the .framework
         if File.exist?(existing_file)
-          UI.important "Removing #{File.basename(f)} from output directory" if $verbose
+          UI.important "Removing #{File.basename(f)} from output directory" if FastlaneCore::Globals.verbose?
           FileUtils.rm_rf(existing_file)
         end
         FileUtils.cp_r(f, File.expand_path(Gym.config[:output_directory]), remove_destination: true)

data/gym/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -29,11 +29,11 @@ module Gym
           Dir[File.join(Gym::ROOT, "lib/assets/package_application_patches/*.diff")].each do |patch|
             UI.verbose "Applying Package Application patch: #{File.basename(patch)}"
             command = ["patch '#{@patched_package_application_path}' < '#{patch}'"]
-            Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if $verbose
+            Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if FastlaneCore::Globals.verbose?
 
             FastlaneCore::CommandExecutor.execute(command: command,
                                                 print_all: false,
-                                            print_command: $verbose,
+                                            print_command: FastlaneCore::Globals.verbose?,
                                                     error: proc do |output|
                                                       ErrorHandler.handle_package_error(output)
                                                     end)

data/gym/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -55,7 +55,7 @@ module Gym
           # Add "SwiftSupport" to the .ipa archive
           Dir.chdir(tmpdir) do
             command_parts = ["zip --recurse-paths '#{PackageCommandGenerator.ipa_path}' SwiftSupport"]
-            command_parts << "> /dev/null" unless $verbose
+            command_parts << "> /dev/null" unless FastlaneCore::Globals.verbose?
 
             FastlaneCore::CommandExecutor.execute(command: command_parts,
                                                 print_all: false,

data/match/lib/match/commands_generator.rb

@@ -21,7 +21,7 @@ module Match
       program :help, 'GitHub', 'https://github.com/fastlane/match'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       FastlaneCore::CommanderGenerator.new.generate(Match::Options.available_options)
 

data/match/lib/match/encrypt.rb

@@ -43,7 +43,7 @@ module Match
         crypt(path: current,
           password: password(git_url),
            encrypt: true)
-        UI.success "🔒  Encrypted '#{File.basename(current)}'" if $verbose
+        UI.success "🔒  Encrypted '#{File.basename(current)}'" if FastlaneCore::Globals.verbose?
       end
       UI.success "🔒  Successfully encrypted certificates repo"
     end
@@ -61,7 +61,7 @@ module Match
           decrypt_repo(path: path, git_url: git_url)
           return
         end
-        UI.success "🔓  Decrypted '#{File.basename(current)}'" if $verbose
+        UI.success "🔓  Decrypted '#{File.basename(current)}'" if FastlaneCore::Globals.verbose?
       end
       UI.success "🔓  Successfully decrypted certificates repo"
     end
@@ -87,7 +87,7 @@ module Match
       command << "-out #{tmpfile.shellescape}"
       command << "-a"
       command << "-d" unless encrypt
-      command << "&> /dev/null" unless $verbose # to show show an error message is something goes wrong
+      command << "&> /dev/null" unless FastlaneCore::Globals.verbose? # to show show an error message is something goes wrong
       success = system(command.join(' '))
 
       UI.crash!("Error decrypting '#{path}'") unless success

data/match/lib/match/git_helper.rb

@@ -12,8 +12,8 @@ module Match
       begin
         # GIT_TERMINAL_PROMPT will fail the `git clone` command if user credentials are missing
         FastlaneCore::CommandExecutor.execute(command: "GIT_TERMINAL_PROMPT=0 #{command}",
-                                            print_all: $verbose,
-                                        print_command: $verbose)
+                                            print_all: FastlaneCore::Globals.verbose?,
+                                        print_command: FastlaneCore::Globals.verbose?)
       rescue
         UI.error("Error cloning certificates repo, please make sure you have read access to the repository you want to use")
         UI.error("Run the following command manually to make sure you're properly authenticated:")
@@ -75,8 +75,8 @@ module Match
 
         commands.each do |command|
           FastlaneCore::CommandExecutor.execute(command: command,
-                                              print_all: $verbose,
-                                          print_command: $verbose)
+                                              print_all: FastlaneCore::Globals.verbose?,
+                                          print_command: FastlaneCore::Globals.verbose?)
         end
       end
       FileUtils.rm_rf(path)
@@ -114,8 +114,8 @@ module Match
       Dir.chdir(@dir) do
         commands.each do |command|
           FastlaneCore::CommandExecutor.execute(command: command,
-                                                print_all: $verbose,
-                                                print_command: $verbose)
+                                                print_all: FastlaneCore::Globals.verbose?,
+                                                print_command: FastlaneCore::Globals.verbose?)
         end
       end
     end
@@ -126,8 +126,8 @@ module Match
 
       result = Dir.chdir(@dir) do
         FastlaneCore::CommandExecutor.execute(command: "git branch --list origin/#{branch.shellescape} --no-color -r",
-                                              print_all: $verbose,
-                                              print_command: $verbose)
+                                              print_all: FastlaneCore::Globals.verbose?,
+                                              print_command: FastlaneCore::Globals.verbose?)
       end
       return !result.empty?
     end

data/match/lib/match/options.rb

@@ -79,7 +79,7 @@ module Match
                                      is_string: false,
                                      default_value: false,
                                      verify_block: proc do |value|
-                                       $verbose = true if value
+                                       FastlaneCore::Globals.verbose = true if value
                                      end),
         FastlaneCore::ConfigItem.new(key: :force,
                                      env_name: "MATCH_FORCE",

data/match/lib/match/utils.rb

@@ -2,12 +2,12 @@ module Match
   class Utils
     def self.import(item_path, keychain, password: "")
       keychain_path = FastlaneCore::Helper.keychain_path(keychain)
-      FastlaneCore::KeychainImporter.import_file(item_path, keychain_path, keychain_password: password, output: $verbose)
+      FastlaneCore::KeychainImporter.import_file(item_path, keychain_path, keychain_password: password, output: FastlaneCore::Globals.verbose?)
     end
 
     # Fill in an environment variable, ready to be used in _xcodebuild_
     def self.fill_environment(key, value)
-      UI.important "Setting environment variable '#{key}' to '#{value}'" if $verbose
+      UI.important "Setting environment variable '#{key}' to '#{value}'" if FastlaneCore::Globals.verbose?
       ENV[key] = value
     end
 
@@ -26,7 +26,7 @@ module Match
     def self.get_cert_info(cer_certificate_path)
       command = "openssl x509 -inform der -in #{cer_certificate_path.shellescape} -subject -dates -noout"
       command << " &" # start in separate process
-      output = Helper.backticks(command, print: $verbose)
+      output = Helper.backticks(command, print: FastlaneCore::Globals.verbose?)
 
       # openssl output:
       # subject= /UID={User ID}/CN={Certificate Name}/OU={Certificate User}/O={Organisation}/C={Country}\n

data/pem/lib/pem/commands_generator.rb

@@ -20,7 +20,7 @@ module PEM
       program :help, 'GitHub', 'https://github.com/fastlane/PEM'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       FastlaneCore::CommanderGenerator.new.generate(PEM::Options.available_options)
 

data/pilot/lib/pilot/commands_generator.rb

@@ -48,7 +48,7 @@ module Pilot
       program :help, "GitHub", "https://github.com/fastlane/fastlane/tree/master/pilot"
       program :help_formatter, :compact
 
-      global_option("--verbose") { $verbose = true }
+      global_option("--verbose") { FastlaneCore::Globals.verbose = true }
 
       command :upload do |c|
         c.syntax = "fastlane pilot upload"

data/produce/README.md

@@ -79,7 +79,7 @@ To get a list of all available parameters:
 
 ```
   Commands:
-    associate_group  Associate with a group, which is create if needed or simply located otherwise
+    associate_group  Associate with a group, which is created if needed or simply located otherwise
     create           Creates a new app on iTunes Connect and the Apple Developer Portal
     disable_services Disable specific Application Services for a specific app on the Apple Developer Portal
     enable_services  Enable specific Application Services for a specific app on the Apple Developer Portal

data/produce/lib/produce/commands_generator.rb

@@ -20,7 +20,7 @@ module Produce
       program :help, 'GitHub', 'https://github.com/fastlane/produce'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       FastlaneCore::CommanderGenerator.new.generate(Produce::Options.available_options)
 
@@ -116,7 +116,7 @@ module Produce
 
       command :associate_group do |c|
         c.syntax = 'fastlane produce associate_group -a APP_IDENTIFIER GROUP_IDENTIFIER1, GROUP_IDENTIFIER2, ...'
-        c.description = 'Associate with a group, which is create if needed or simply located otherwise'
+        c.description = 'Associate with a group, which is created if needed or simply located otherwise'
         c.example 'Associate with group', 'produce associate-group -a com.example.app group.example.com'
 
         c.action do |args, options|

data/scan/lib/scan/commands_generator.rb

@@ -28,7 +28,7 @@ module Scan
       program :help, "GitHub", "https://github.com/fastlane/fastlane/tree/master/scan"
       program :help_formatter, :compact
 
-      global_option("--verbose") { $verbose = true }
+      global_option("--verbose") { FastlaneCore::Globals.verbose = true }
 
       command :tests do |c|
         c.syntax = "fastlane scan"

data/scan/lib/scan/options.rb

@@ -44,6 +44,12 @@ module Scan
                                      conflict_block: proc do |value|
                                        UI.user_error!("You can't use 'device' and 'devices' options in one run")
                                      end),
+        FastlaneCore::ConfigItem.new(key: :toolchain,
+                                     env_name: "SCAN_TOOLCHAIN",
+                                     conflicting_options: [:xctestrun],
+                                     description: "The toolchain that should be used for building the application (e.g. com.apple.dt.toolchain.Swift_2_3, org.swift.30p620160816a)",
+                                     optional: true,
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :devices,
                                      optional: true,
                                      is_string: false,

data/scan/lib/scan/runner.rb

@@ -97,8 +97,8 @@ module Scan
 
       UI.header("Collecting system logs")
       Scan.devices.each do |device|
-        logarchive_dest = File.join(Scan.config[:output_directory], "system_logs-#{device.name}_#{device.os_type}_#{device.os_version}.logarchive")
-        FastlaneCore::Simulator.copy_logarchive(device, logarchive_dest)
+        log_identity = "#{device.name}_#{device.os_type}_#{device.os_version}"
+        FastlaneCore::Simulator.copy_logs(device, log_identity, Scan.config[:output_directory])
       end
     end
 

data/scan/lib/scan/test_command_generator.rb

@@ -33,6 +33,7 @@ module Scan
         options += project_path_array unless config[:xctestrun]
         options << "-sdk '#{config[:sdk]}'" if config[:sdk]
         options << destination # generated in `detect_values`
+        options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
         options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
         options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
         options << "-enableCodeCoverage #{config[:code_coverage] ? 'YES' : 'NO'}" unless config[:code_coverage].nil?

data/screengrab/lib/screengrab/commands_generator.rb

@@ -20,7 +20,7 @@ module Screengrab
       program :help, 'GitHub', 'https://github.com/fastlane/screengrab'
       program :help_formatter, :compact
 
-      global_option('--verbose', 'Shows a more verbose output') { $verbose = true }
+      global_option('--verbose', 'Shows a more verbose output') { FastlaneCore::Globals.verbose = true }
 
       always_trace!
 

data/sigh/lib/sigh/commands_generator.rb

@@ -20,14 +20,14 @@ module Sigh
       program :help, 'GitHub', 'https://github.com/fastlane/sigh'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
-
-      FastlaneCore::CommanderGenerator.new.generate(Sigh::Options.available_options)
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
 
       command :renew do |c|
         c.syntax = 'fastlane sigh renew'
         c.description = 'Renews the certificate (in case it expired) and outputs the path to the generated file'
 
+        FastlaneCore::CommanderGenerator.new.generate(Sigh::Options.available_options, command: c)
+
         c.action do |args, options|
           user_input = options.__hash__
 

data/sigh/lib/sigh/local_manage.rb

@@ -86,7 +86,7 @@ module Sigh
     end
 
     def self.profile_info(profile)
-      if $verbose
+      if FastlaneCore::Globals.verbose?
         "#{profile['Name']} - #{File.basename profile['Path']}"
       else
         profile['Name']

data/sigh/lib/sigh/resign.rb

@@ -33,7 +33,7 @@ module Sigh
       display_name = "-d #{display_name.shellescape}" if display_name
       short_version = "--short-version #{short_version}" if short_version
       bundle_version = "--bundle-version #{bundle_version}" if bundle_version
-      verbose = "-v" if $verbose
+      verbose = "-v" if FastlaneCore::Globals.verbose?
       bundle_id = "-b '#{new_bundle_id}'" if new_bundle_id
       use_app_entitlements_flag = "--use-app-entitlements" if use_app_entitlements
       specific_keychain = "--keychain-path #{keychain_path.shellescape}" if keychain_path

data/sigh/lib/sigh/runner.rb

@@ -127,7 +127,7 @@ module Sigh
         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,
@@ -216,8 +216,13 @@ module Sigh
     # Downloads and stores the provisioning profile
     def download_profile(profile)
       UI.important "Downloading provisioning profile..."
-      profile_name ||= "#{profile_type.pretty_type}_#{Sigh.config[:app_identifier]}.mobileprovision" # default name
-      profile_name += '.mobileprovision' unless profile_name.include? 'mobileprovision'
+      profile_name ||= "#{profile_type.pretty_type}_#{Sigh.config[:app_identifier]}"
+
+      if Sigh.config[:platform].to_s == 'tvos'
+        profile_name += "_tvos"
+      end
+
+      profile_name += '.mobileprovision'
 
       tmp_path = Dir.mktmpdir("profile_download")
       output_path = File.join(tmp_path, profile_name)

data/snapshot/README.md

@@ -280,7 +280,7 @@ to update your `SnapshotHelper.swift` files. In case you modified your `Snapshot
 
 ## Launch Arguments
 
-You can provide additional arguments to your app on launch. These strings will be available in your app (eg. not in the testing target) through `NSProcessInfo.processInfo().arguments`. Alternatively, use user-default syntax (`-key value`) and they will be available as key-value pairs in `NSUserDefaults.standardUserDefaults()`.
+You can provide additional arguments to your app on launch. These strings will be available in your app (eg. not in the testing target) through `ProcessInfo.processInfo.arguments`. Alternatively, use user-default syntax (`-key value`) and they will be available as key-value pairs in `UserDefaults.standard`.
 
 ```ruby
 launch_arguments([
@@ -289,14 +289,14 @@ launch_arguments([
 ```
 
 ```swift
-name.text = NSUserDefaults.standardUserDefaults().stringForKey("firstName")
+name.text = UserDefaults.standard.string(forKey: "firstName")
 // name.text = "Felix"
 ```
 
 _snapshot_ includes `-FASTLANE_SNAPSHOT YES`, which will set a temporary user default for the key `FASTLANE_SNAPSHOT`, you may use this to detect when the app is run by _snapshot_.
 
 ```swift
-if NSUserDefaults.standardUserDefaults().boolForKey("FASTLANE_SNAPSHOT") {
+if UserDefaults.standard.bool(forKey: "FASTLANE_SNAPSHOT") {
     // runtime check that we are in snapshot mode
 }
 ```

data/snapshot/lib/snapshot/collector.rb

@@ -30,7 +30,7 @@ module Snapshot
         screenshot_name = device_name + "-" + name + "-" + Digest::MD5.hexdigest(components.join("-")) + ".png"
         output_path = File.join(language_folder, screenshot_name)
         from_path = File.join(attachments_path, filename)
-        if $verbose
+        if FastlaneCore::Globals.verbose?
           UI.success "Copying file '#{from_path}' to '#{output_path}'..."
         else
           UI.success "Copying '#{output_path}'..."

data/snapshot/lib/snapshot/commands_generator.rb

@@ -20,7 +20,7 @@ module Snapshot
       program :help, 'GitHub', 'https://github.com/fastlane/snapshot'
       program :help_formatter, :compact
 
-      global_option('--verbose', 'Shows a more verbose output') { $verbose = true }
+      global_option('--verbose', 'Shows a more verbose output') { FastlaneCore::Globals.verbose = true }
 
       always_trace!
 

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

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

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

@@ -13,7 +13,7 @@ module Snapshot
           simulator_name = simulator.name.tr("\s", "-")
           key = "SimulatorWindowLastScale-com.apple.CoreSimulator.SimDeviceType.#{simulator_name}"
 
-          Helper.backticks("defaults write '#{config_path}' '#{key}' '1.0'", print: $verbose)
+          Helper.backticks("defaults write '#{config_path}' '#{key}' '1.0'", print: FastlaneCore::Globals.verbose?)
         end
       end
 

data/snapshot/lib/snapshot/reset_simulators.rb

@@ -58,7 +58,7 @@ module Snapshot
     end
 
     def self.devices
-      all_devices = Helper.backticks('xcrun simctl list devices', print: $verbose)
+      all_devices = Helper.backticks('xcrun simctl list devices', print: FastlaneCore::Globals.verbose?)
       # == Devices ==
       # -- iOS 9.0 --
       #   iPhone 4s (32246EBC-33B0-47F9-B7BB-5C23C550DF29) (Shutdown)
@@ -85,7 +85,7 @@ module Snapshot
 
       if phones.any? && watches.any?
         puts "Creating device pair of #{phones.last} and #{watches.last}"
-        Helper.backticks("xcrun simctl pair #{watches.last} #{phones.last}", print: $verbose)
+        Helper.backticks("xcrun simctl pair #{watches.last} #{phones.last}", print: FastlaneCore::Globals.verbose?)
       end
     end
 

data/snapshot/lib/snapshot/runner.rb

@@ -81,7 +81,7 @@ module Snapshot
         UI.important "Tests failed, re-trying #{retries + 1} out of #{Snapshot.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 $verbose
+        UI.error "Backtrace:\n\t#{ex.backtrace.join("\n\t")}" if FastlaneCore::Globals.verbose?
         self.collected_errors << ex
         raise ex if Snapshot.config[:stop_after_first_error]
         return false # for the results
@@ -107,8 +107,8 @@ module Snapshot
       components = [launch_arguments].delete_if { |a| a.to_s.length == 0 }
 
       UI.header("Collecting system logs #{device_name} - #{language}")
-      logarchive_dest = File.join(language_folder, "system_logs-" + Digest::MD5.hexdigest(components.join("-")) + ".logarchive")
-      FastlaneCore::Simulator.copy_logarchive(device, logarchive_dest)
+      log_identity = Digest::MD5.hexdigest(components.join("-"))
+      FastlaneCore::Simulator.copy_logs(device, log_identity, language_folder)
     end
 
     def print_results(results)

data/spaceship/lib/spaceship.rb

@@ -1,3 +1,4 @@
+require 'spaceship/globals'
 require 'spaceship/base'
 require 'spaceship/client'
 require 'spaceship/launcher'
@@ -20,6 +21,7 @@ module Spaceship
   Device = Spaceship::Portal::Device
   App = Spaceship::Portal::App
   AppGroup = Spaceship::Portal::AppGroup
+  WebsitePush = Spaceship::Portal::WebsitePush
   AppService = Spaceship::Portal::AppService
 
   # iTunes Connect