fastlane 2.14.2 → 2.15.0.beta.20170213032052

data/fastlane/lib/fastlane/actions/slack.rb

@@ -46,7 +46,7 @@ module Fastlane
           UI.success('Successfully sent Slack notification')
         else
           UI.verbose(result)
-          UI.user_error!("Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile.")
+          UI.user_error!("Error pushing Slack message, maybe the integration has no permission to post on this channel? Try removing the channel parameter in your Fastfile, this is usually caused by a mispelled or changed group/channel name or an expired SLACK_URL")
         end
       end
 

data/fastlane/lib/fastlane/cli_tools_distributor.rb

@@ -8,6 +8,10 @@ module Fastlane
         ARGV.include?('-v') || ARGV.include?('--version')
       end
 
+      def running_help_command?
+        ARGV.include?('-h') || ARGV.include?('--help')
+      end
+
       def take_off
         before_import_time = Time.now
 

data/fastlane/lib/fastlane/commands_generator.rb

@@ -10,20 +10,20 @@ module Fastlane
     def self.start
       # since at this point we haven't yet loaded commander
       # however we do want to log verbose information in the PluginManager
-      FastlaneCore::Swag.show_loader
-      $verbose = true if ARGV.include?("--verbose")
-
+      FastlaneCore::Globals.verbose = true if ARGV.include?("--verbose")
+      FastlaneCore::Globals.capture_output = true  if ARGV.include?("--capture_output")
       if ARGV.include?("--capture_output")
-        $capture_output = true
-        $verbose = true
+        FastlaneCore::Globals.verbose = true
+        FastlaneCore::Globals.capture_output = true
       end
+      FastlaneCore::Swag.show_loader
 
       # has to be checked here - in case we wan't to troubleshoot plugin related issues
       if ARGV.include?("--troubleshoot")
         self.confirm_troubleshoot
       end
 
-      if $capture_output
+      if FastlaneCore::Globals.capture_output?
         # Trace mode is enabled
         # redirect STDOUT and STDERR
         out_channel = StringIO.new
@@ -34,7 +34,7 @@ module Fastlane
       Fastlane.load_actions
       FastlaneCore::Swag.stop_loader
       # do not use "include" as it may be some where in the commandline where "env" is required, therefore explicit index->0
-      unless ARGV[0] == "env" || CLIToolsDistributor.running_version_command?
+      unless ARGV[0] == "env" || CLIToolsDistributor.running_version_command? || CLIToolsDistributor.running_help_command?
         # *after* loading the plugins
         Fastlane.plugin_manager.load_plugins
         Fastlane::PluginUpdateManager.start_looking_for_updates
@@ -43,8 +43,8 @@ module Fastlane
     ensure
       FastlaneCore::UpdateChecker.show_update_status('fastlane', Fastlane::VERSION)
       Fastlane::PluginUpdateManager.show_update_status
-      if $capture_output
-        $captured_output = Helper.strip_ansi_colors($stdout.string)
+      if FastlaneCore::Globals.capture_output?
+        FastlaneCore::Globals.captured_output = Helper.strip_ansi_colors($stdout.string)
         $stdout = STDOUT
         $stderr = STDERR
 
@@ -86,10 +86,10 @@ module Fastlane
       program :help, 'GitHub', 'https://github.com/fastlane/fastlane'
       program :help_formatter, :compact
 
-      global_option('--verbose') { $verbose = true }
+      global_option('--verbose') { FastlaneCore::Globals.verbose = true }
       global_option('--capture_output', 'Captures the output of the current run, and generates a markdown issue template') do
-        $capture_output = true
-        $verbose = true
+        FastlaneCore::Globals.capture_output = true
+        FastlaneCore::Globals.verbose = true
       end
       global_option('--troubleshoot', 'Enables extended verbose mode. Use with caution, as this even includes ALL sensitive data. Cannot be used on CI.')
 

data/fastlane/lib/fastlane/documentation/docs_generator.rb

@@ -64,7 +64,7 @@ module Fastlane
       output << ""
 
       File.write(output_path, output.join("\n"))
-      UI.success "Successfully generated documentation at path '#{File.expand_path(output_path)}'" if $verbose
+      UI.success "Successfully generated documentation at path '#{File.expand_path(output_path)}'" if FastlaneCore::Globals.verbose?
     end
 
     #####################################################

data/fastlane/lib/fastlane/environment_printer.rb

@@ -34,10 +34,10 @@ module Fastlane
       env_tail = "</details>"
       final_output = ""
 
-      if $captured_output
+      if FastlaneCore::Globals.captured_output?
         final_output << "### Captured Output\n\n"
         final_output << "Command Used: `#{ARGV.join(' ')}`\n"
-        final_output << "<details><summary>Output/Log</summary>\n\n```\n\n#{$captured_output}\n\n```\n\n</details>\n\n"
+        final_output << "<details><summary>Output/Log</summary>\n\n```\n\n#{FastlaneCore::Globals.captured_output}\n\n```\n\n</details>\n\n"
       end
 
       final_output << env_header + env_output + env_tail

data/fastlane/lib/fastlane/fastlane_require.rb

@@ -6,7 +6,7 @@ module Fastlane
 
         # check if it's installed
         if gem_installed?(gem_name)
-          UI.success("gem '#{gem_name}' is already installed") if $verbose
+          UI.success("gem '#{gem_name}' is already installed") if FastlaneCore::Globals.verbose?
           require gem_require_name if require_gem
           return true
         end

data/fastlane/lib/fastlane/helper/git_helper.rb

@@ -2,20 +2,24 @@ module Fastlane
   module Actions
     GIT_MERGE_COMMIT_FILTERING_OPTIONS = [:include_merges, :exclude_merges, :only_include_merges].freeze
 
-    def self.git_log_between(pretty_format, from, to, merge_commit_filtering)
-      command = 'git log'
-      command << " --pretty=\"#{pretty_format}\" #{from.shellescape}...#{to.shellescape}"
+    def self.git_log_between(pretty_format, from, to, merge_commit_filtering, date_format = nil)
+      command = ['git log']
+      command << "--pretty=\"#{pretty_format}\""
+      command << "--date=\"#{date_format}\"" if date_format
+      command << "#{from.shellescape}...#{to.shellescape}"
       command << git_log_merge_commit_filtering_option(merge_commit_filtering)
-      Actions.sh(command, log: false).chomp
+      Actions.sh(command.compact.join(' '), log: false).chomp
     rescue
       nil
     end
 
-    def self.git_log_last_commits(pretty_format, commit_count, merge_commit_filtering)
-      command = 'git log'
-      command << " --pretty=\"#{pretty_format}\" -n #{commit_count}"
+    def self.git_log_last_commits(pretty_format, commit_count, merge_commit_filtering, date_format = nil)
+      command = ['git log']
+      command << "--pretty=\"#{pretty_format}\""
+      command << "--date=\"#{date_format}\"" if date_format
+      command << "-n #{commit_count}"
       command << git_log_merge_commit_filtering_option(merge_commit_filtering)
-      Actions.sh(command, log: false).chomp
+      Actions.sh(command.compact.join(' '), log: false).chomp
     rescue
       nil
     end
@@ -26,7 +30,7 @@ module Fastlane
       command = ['git describe']
       command << '--tags' if match_lightweight
       command << "`git rev-list --tags#{tag_pattern_param} --max-count=1`"
-      Actions.sh(command.join(' '), log: false).chomp
+      Actions.sh(command.compact.join(' '), log: false).chomp
     rescue
       nil
     end
@@ -44,8 +48,11 @@ module Fastlane
 
     # Gets the last git commit information formatted into a String by the provided
     # pretty format String. See the git-log documentation for valid format placeholders
-    def self.last_git_commit_formatted_with(pretty_format)
-      Actions.sh("git log -1 --pretty=#{pretty_format}", log: false).chomp
+    def self.last_git_commit_formatted_with(pretty_format, date_format = nil)
+      command = ['git log -1']
+      command << "--pretty=\"#{pretty_format}\""
+      command << "--date=\"#{date_format}\"" if date_format
+      Actions.sh(command.compact.join(' '), log: false).chomp
     rescue
       nil
     end
@@ -93,11 +100,11 @@ module Fastlane
     def self.git_log_merge_commit_filtering_option(merge_commit_filtering)
       case merge_commit_filtering
       when :exclude_merges
-        " --no-merges"
+        "--no-merges"
       when :only_include_merges
-        " --merges"
-      else
-        ""
+        "--merges"
+      when :include_merges
+        nil
       end
     end
   end

data/fastlane/lib/fastlane/lane_manager.rb

@@ -211,13 +211,13 @@ module Fastlane
     def self.print_lane_context
       return if Actions.lane_context.empty?
 
-      if $verbose
+      if FastlaneCore::Globals.verbose?
         UI.important 'Lane Context:'.yellow
         UI.message Actions.lane_context
         return
       end
 
-      # Print a nice table unless in $verbose mode
+      # Print a nice table unless in FastlaneCore::Globals.verbose? mode
       rows = Actions.lane_context.collect do |key, content|
         [key, content.to_s]
       end

data/fastlane/lib/fastlane/plugins/plugin_info_collector.rb

@@ -95,7 +95,7 @@ module Fastlane
     #
 
     def detect_author
-      git_name = Helper.backticks('git config --get user.name', print: $verbose).strip
+      git_name = Helper.backticks('git config --get user.name', print: FastlaneCore::Globals.verbose?).strip
       return git_name.empty? ? nil : git_name
     end
 
@@ -121,7 +121,7 @@ module Fastlane
     #
 
     def detect_email
-      git_email = Helper.backticks('git config --get user.email', print: $verbose).strip
+      git_email = Helper.backticks('git config --get user.email', print: FastlaneCore::Globals.verbose?).strip
       return git_email.empty? ? nil : git_email
     end
 

data/fastlane/lib/fastlane/plugins/plugin_manager.rb

@@ -169,9 +169,9 @@ module Fastlane
       ensure_plugins_attached!
       with_clean_bundler_env do
         cmd = "bundle install"
-        cmd << " --quiet" unless $verbose
+        cmd << " --quiet" unless FastlaneCore::Globals.verbose?
         cmd << " && echo 'Successfully installed plugins'"
-        UI.command(cmd) if $verbose
+        UI.command(cmd) if FastlaneCore::Globals.verbose?
         exec(cmd)
       end
     end
@@ -183,9 +183,9 @@ module Fastlane
       ensure_plugins_attached!
       with_clean_bundler_env do
         cmd = "bundle update"
-        cmd << " --quiet" unless $verbose
+        cmd << " --quiet" unless FastlaneCore::Globals.verbose?
         cmd << " && echo 'Successfully updated plugins'"
-        UI.command(cmd) if $verbose
+        UI.command(cmd) if FastlaneCore::Globals.verbose?
         exec(cmd)
       end
     end
@@ -279,7 +279,7 @@ module Fastlane
 
           store_plugin_reference(gem_name)
           loaded_plugins = true
-        rescue => ex
+        rescue StandardError, ScriptError => ex # some errors, like ScriptError are not caught unless explicitly
           UI.error("Error loading plugin '#{gem_name}': #{ex}")
 
           # We'll still add it to the table, to make the error

data/fastlane/lib/fastlane/runner.rb

@@ -58,10 +58,14 @@ module Fastlane
       rescue => ex
         Dir.chdir(path_to_use) do
           # Provide error block exception without colour code
-          error_ex = ex.exception(ex.message.gsub(/\033\[\d+m/, ''))
-
-          error_blocks[current_platform].call(current_lane, error_ex, parameters) if error_blocks[current_platform] && current_platform
-          error_blocks[nil].call(current_lane, error_ex, parameters) if error_blocks[nil]
+          begin
+            error_blocks[current_platform].call(current_lane, ex, parameters) if current_platform && error_blocks[current_platform]
+            error_blocks[nil].call(current_lane, ex, parameters) if error_blocks[nil]
+          rescue => error_block_exception
+            UI.error("An error occured while executing the `error` block:")
+            UI.error(error_block_exception.to_s)
+            raise ex # raise the original error message
+          end
         end
 
         raise ex
@@ -258,12 +262,11 @@ module Fastlane
 
     def verify_supported_os(name, class_ref)
       if class_ref.respond_to?(:is_supported?)
-        if Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
-          # This value is filled in based on the executed platform block. Might be nil when lane is in root of Fastfile
-          platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
-
+        # This value is filled in based on the executed platform block. Might be nil when lane is in root of Fastfile
+        platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
+        if platform
           unless class_ref.is_supported?(platform)
-            UI.user_error!("Action '#{name}' doesn't support required operating system '#{platform}'.")
+            UI.important("Action '#{name}' isn't known to support operating system '#{platform}'.")
           end
         end
       end

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

@@ -9,10 +9,7 @@ module Fastlane
     end
 
     def header(text)
-      i = text.length + 8
-      success("-" * i)
-      success("--- " + text + " ---")
-      success("-" * i)
+      FastlaneCore::UI.header(text)
     end
 
     def important(text)

data/fastlane/lib/fastlane/supported_platforms.rb

@@ -1,17 +1,27 @@
 module Fastlane
   class SupportedPlatforms
+    class << self
+      attr_accessor :extra
+      attr_reader :default
+
+      def extra=(value)
+        value ||= []
+        UI.important("Setting '#{value}' as extra SupportedPlatforms")
+        @extra = value
+      end
+    end
+
+    @default = [:ios, :mac, :android]
+    @extra = []
+
     def self.all
-      [
-        :ios,
-        :mac,
-        :android
-      ]
+      (@default + @extra).flatten
     end
 
-    # this will throw an exception if the passed platform is not supported
+    # this will log a warning if the passed platform is not supported
     def self.verify!(platform)
       unless all.include? platform.to_s.to_sym
-        UI.user_error!("Platform '#{platform}' is not supported. Must be either #{self.all}")
+        UI.important("Platform '#{platform}' is not officially supported. Currently supported plaforms are #{self.all}.")
       end
     end
   end

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.14.2'.freeze
+  VERSION = '2.15.0.beta.20170213032052'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/fastlane_core/lib/fastlane_core.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'fastlane/version'
 
+require 'fastlane_core/globals'
 # Ruby monkey-patches - should be before almost all else
 require 'fastlane_core/core_ext/string'
 

data/fastlane_core/lib/fastlane_core/cert_checker.rb

@@ -49,7 +49,7 @@ module FastlaneCore
     def self.wwdr_certificate_installed?
       certificate_name = "Apple Worldwide Developer Relations Certification Authority"
       keychain = wwdr_keychain
-      response = Helper.backticks("security find-certificate -c '#{certificate_name}' #{keychain.shellescape}", print: $verbose)
+      response = Helper.backticks("security find-certificate -c '#{certificate_name}' #{keychain.shellescape}", print: FastlaneCore::Globals.verbose?)
       return response.include?("attributes:")
     end
 
@@ -59,7 +59,7 @@ module FastlaneCore
         filename = File.basename(url)
         keychain = wwdr_keychain
         keychain = "-k #{keychain.shellescape}" unless keychain.empty?
-        Helper.backticks("curl -O #{url} && security import #{filename} #{keychain}", print: $verbose)
+        Helper.backticks("curl -O #{url} && security import #{filename} #{keychain}", print: FastlaneCore::Globals.verbose?)
         UI.user_error!("Could not install WWDR certificate") unless $?.success?
       end
     end
@@ -70,7 +70,7 @@ module FastlaneCore
         "security default-keychain -d user"
       ]
       priority.each do |command|
-        keychains = Helper.backticks(command, print: $verbose).split("\n")
+        keychains = Helper.backticks(command, print: FastlaneCore::Globals.verbose?).split("\n")
         unless keychains.empty?
           # Select first keychain name from returned keychains list
           return keychains[0].strip.tr('"', '')

data/fastlane_core/lib/fastlane_core/command_executor.rb

@@ -31,7 +31,7 @@ module FastlaneCore
       # @param loading [String] A loading string that is shown before the first output
       # @return [String] All the output as string
       def execute(command: nil, print_all: false, print_command: true, error: nil, prefix: nil, loading: nil)
-        print_all = true if $verbose
+        print_all = true if FastlaneCore::Globals.verbose?
         prefix ||= {}
 
         output = []

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

@@ -6,7 +6,7 @@ module FastlaneCore
     include Commander::Methods
 
     # Calls the appropriate methods for commander to show the available parameters
-    def generate(options)
+    def generate(options, command: nil)
       # First, enable `always_trace`, to show the stack trace
       always_trace!
 
@@ -64,8 +64,12 @@ module FastlaneCore
         # automatically coerced or otherwise handled by the ConfigItem for others.
         args = [short_switch, long_switch, (type || String), description].compact
 
-        # This is the call to Commander to set up the option we've been building.
-        global_option(*args)
+        if command
+          command.option(*args)
+        else
+          # This is the call to Commander to set up the option we've been building.
+          global_option(*args)
+        end
       end
     end
 

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -194,21 +194,6 @@ module FastlaneCore
         all.each(&:reset)
       end
 
-      def copy_logarchive(device, dest)
-        sim_resource_dir = FastlaneCore::CommandExecutor.execute(command: "xcrun simctl getenv #{device.udid} SIMULATOR_SHARED_RESOURCES_DIRECTORY 2>/dev/null", print_all: false, print_command: true)
-        logarchive_src = File.join(sim_resource_dir, "system_logs.logarchive")
-
-        # if logarchive already exists it fails as the .logarchive is a directory, so delete it. to be sure its gone
-        FileUtils.rm_rf(logarchive_src)
-        FileUtils.rm_rf(dest)
-
-        command = "xcrun simctl spawn #{device.udid} log collect 2>/dev/null"
-        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
-
-        FileUtils.cp_r(logarchive_src, dest)
-        UI.success "Copying file '#{logarchive_src}' to '#{dest}'..."
-      end
-
       def reset_all_by_version(os_version: nil)
         return false unless os_version
         all.select { |device| device.os_version == os_version }.each(&:reset)
@@ -232,7 +217,49 @@ module FastlaneCore
 
         UI.verbose "Launching #{simulator_path} for device: #{device.name} (#{device.udid})"
 
-        Helper.backticks("open -a #{simulator_path} --args -CurrentDeviceUDID #{device.udid}", print: $verbose)
+        Helper.backticks("open -a #{simulator_path} --args -CurrentDeviceUDID #{device.udid}", print: FastlaneCore::Globals.verbose?)
+      end
+
+      def copy_logs(device, log_identity, logs_destination_dir)
+        logs_destination_dir = File.expand_path(logs_destination_dir)
+        os_version = FastlaneCore::CommandExecutor.execute(command: 'sw_vers -productVersion', print_all: false, print_command: false)
+
+        if Gem::Version.new(os_version) >= Gem::Version.new('10.12.0')
+          copy_logarchive(device, log_identity, logs_destination_dir)
+        else
+          copy_logfile(device, log_identity, logs_destination_dir)
+        end
+      end
+
+      private
+
+      def copy_logfile(device, log_identity, logs_destination_dir)
+        logfile_src = File.expand_path("~/Library/Logs/CoreSimulator/#{device.udid}/system.log")
+        return unless File.exist?(logfile_src)
+
+        FileUtils.mkdir_p(logs_destination_dir)
+        logfile_dst = File.join(logs_destination_dir, "system-#{log_identity}.log")
+
+        FileUtils.rm_f(logfile_dst)
+        FileUtils.cp(logfile_src, logfile_dst)
+        UI.success "Copying file '#{logfile_src}' to '#{logfile_dst}'..."
+      end
+
+      def copy_logarchive(device, log_identity, logs_destination_dir)
+        sim_resource_dir = FastlaneCore::CommandExecutor.execute(command: "xcrun simctl getenv #{device.udid} SIMULATOR_SHARED_RESOURCES_DIRECTORY 2>/dev/null", print_all: false, print_command: true)
+        logarchive_src = File.join(sim_resource_dir, "system_logs.logarchive")
+        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive")
+
+        # if logarchive already exists it fails as the .logarchive is a directory, so delete it. to be sure its gone
+        FileUtils.rm_rf(logarchive_src)
+        FileUtils.rm_rf(logarchive_dst)
+
+        command = "xcrun simctl spawn #{device.udid} log collect 2>/dev/null"
+        FastlaneCore::CommandExecutor.execute(command: command, print_all: false, print_command: true)
+
+        FileUtils.mkdir_p(logarchive_dst)
+        FileUtils.cp_r("#{logarchive_src}/.", logarchive_dst)
+        UI.success "Copying file '#{logarchive_src}' to '#{logarchive_dst}'..."
       end
     end
   end