fastlane 2.14.2 → 2.15.0.beta.20170213032052

data/fastlane_core/lib/fastlane_core/globals.rb

@@ -0,0 +1,27 @@
+module FastlaneCore
+  class Globals
+    def self.captured_output
+      @captured_output ||= ""
+    end
+
+    class << self
+      attr_writer :captured_output
+      attr_writer :capture_output
+      attr_writer :verbose
+    end
+
+    def self.capture_output?
+      return nil unless @capture_output
+      return true
+    end
+
+    def self.captured_output?
+      @capture_output && @captured_output.length > 0
+    end
+
+    def self.verbose?
+      return nil unless @verbose
+      return true
+    end
+  end
+end

data/fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb

@@ -26,7 +26,7 @@ module FastlaneCore
       xml = ERB.new(File.read(xml_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
 
       File.write(File.join(self.package_path, METADATA_FILE_NAME), xml)
-      UI.success("Wrote XML data to '#{self.package_path}'") if $verbose
+      UI.success("Wrote XML data to '#{self.package_path}'") if FastlaneCore::Globals.verbose?
 
       return package_path
     end

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -269,7 +269,7 @@ module FastlaneCore
 
     # This will be called from the Deliverfile, and disables the logging of the transporter output
     def self.hide_transporter_output
-      @hide_transporter_output = !$verbose
+      @hide_transporter_output = !FastlaneCore::Globals.verbose?
     end
 
     def self.hide_transporter_output?
@@ -358,9 +358,7 @@ module FastlaneCore
       end
 
       if result
-        UI.success("-" * 102)
-        UI.success("Successfully uploaded package to iTunes Connect. It might take a few minutes until it's visible online.")
-        UI.success("-" * 102)
+        UI.header("Successfully uploaded package to iTunes Connect. It might take a few minutes until it's visible online.")
 
         FileUtils.rm_rf(actual_dir) unless Helper.is_test? # we don't need the package any more, since the upload was successful
       else

data/fastlane_core/lib/fastlane_core/keychain_importer.rb

@@ -1,6 +1,6 @@
 module FastlaneCore
   class KeychainImporter
-    def self.import_file(path, keychain_path, keychain_password: "", certificate_password: "", output: $verbose)
+    def self.import_file(path, keychain_path, keychain_password: "", certificate_password: "", output: FastlaneCore::Globals.verbose?)
       UI.user_error!("Could not find file '#{path}'") unless File.exist?(path)
 
       command = "security import #{path.shellescape} -k '#{keychain_path.shellescape}'"

data/fastlane_core/lib/fastlane_core/pkg_upload_package_builder.rb

@@ -26,7 +26,7 @@ module FastlaneCore
       xml = ERB.new(File.read(xml_path)).result(binding) # http://www.rrn.dk/rubys-erb-templating-system
 
       File.write(File.join(self.package_path, METADATA_FILE_NAME), xml)
-      UI.success("Wrote XML data to '#{self.package_path}'") if $verbose
+      UI.success("Wrote XML data to '#{self.package_path}'") if FastlaneCore::Globals.verbose?
 
       package_path
     end

data/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb

@@ -40,7 +40,7 @@ module Commander
         abort "#{e}. Use --help for more information"
       rescue Interrupt => ex
         # We catch it so that the stack trace is hidden by default when using ctrl + c
-        if $verbose
+        if FastlaneCore::Globals.verbose?
           raise ex
         else
           puts "\nCancelled... use --verbose to show the stack trace"
@@ -159,7 +159,7 @@ module Commander
     end
 
     def display_user_error!(e, message)
-      if $verbose # with stack trace
+      if FastlaneCore::Globals.verbose? # with stack trace
         reraise_formatted!(e, message)
       else
         abort "\n[!] #{message}".red # without stack trace
@@ -177,7 +177,7 @@ module Commander
       require 'gh_inspector'
       require 'fastlane_core/ui/github_issue_inspector_reporter'
 
-      inspector = GhInspector::Inspector.new("fastlane", "fastlane", verbose: $verbose)
+      inspector = GhInspector::Inspector.new("fastlane", "fastlane", verbose: FastlaneCore::Globals.verbose?)
       delegate = Fastlane::InspectorReporter.new
       if message_or_error.kind_of?(String)
         inspector.search_query(message_or_error, delegate)
@@ -185,7 +185,7 @@ module Commander
         inspector.search_exception(message_or_error, delegate)
       end
     rescue => ex
-      FastlaneCore::UI.error("Error finding relevant GitHub issues: #{ex}") if $verbose
+      FastlaneCore::UI.error("Error finding relevant GitHub issues: #{ex}") if FastlaneCore::Globals.verbose?
     end
   end
 end

data/fastlane_core/lib/fastlane_core/ui/github_issue_inspector_reporter.rb

@@ -8,7 +8,7 @@ module Fastlane
     def inspector_started_query(query, inspector)
       puts ""
       puts "Looking for related GitHub issues on #{inspector.repo_owner}/#{inspector.repo_name}..."
-      puts "Search query: #{query}" if $verbose
+      puts "Search query: #{query}" if FastlaneCore::Globals.verbose?
       puts ""
     end
 

data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb

@@ -2,6 +2,8 @@ module FastlaneCore
   # Shell is the terminal output of things
   # For documentation for each of the methods open `interface.rb`
   class Shell < Interface
+    require 'tty-screen'
+
     def log
       return @log if @log
 
@@ -15,22 +17,22 @@ module FastlaneCore
       end
 
       @log.formatter = proc do |severity, datetime, progname, msg|
-        if $verbose
-          string = "#{severity} [#{datetime.strftime('%Y-%m-%d %H:%M:%S.%2N')}]: "
-        elsif FastlaneCore::Env.truthy?("FASTLANE_HIDE_TIMESTAMP")
-          string = ""
-        else
-          string = "[#{datetime.strftime('%H:%M:%S')}]: "
-        end
-
-        string += "#{msg}\n"
-
-        string
+        "#{format_string(datetime, severity)}#{msg}\n"
       end
 
       @log
     end
 
+    def format_string(datetime, severity)
+      if FastlaneCore::Globals.verbose?
+        return "#{severity} [#{datetime.strftime('%Y-%m-%d %H:%M:%S.%2N')}]: "
+      elsif FastlaneCore::Env.truthy?("FASTLANE_HIDE_TIMESTAMP")
+        return ""
+      else
+        return "[#{datetime.strftime('%H:%M:%S')}]: "
+      end
+    end
+
     #####################################################
     # @!group Messaging: show text to the user
     #####################################################
@@ -68,13 +70,19 @@ module FastlaneCore
     end
 
     def verbose(message)
-      log.debug(message.to_s) if $verbose
+      log.debug(message.to_s) if FastlaneCore::Globals.verbose?
     end
 
     def header(message)
-      i = message.length + 8
+      format = format_string(Time.now, "")
+      if message.length + 8 < TTY::Screen.width - format.length
+        message = "--- #{message} ---"
+        i = message.length
+      else
+        i = TTY::Screen.width - format.length
+      end
       success("-" * i)
-      success("--- " + message + " ---")
+      success(message)
       success("-" * i)
     end
 

data/fastlane_core/lib/fastlane_core/ui/interface.rb

@@ -63,7 +63,7 @@ module FastlaneCore
 
     # Level Verbose: Print out additional information for the
     #   users that are interested. Will only be printed when
-    #   $verbose = true
+    #   FastlaneCore::Globals.verbose? = true
     #
     #   By default those messages are shown in white
     def verbose(_message)
@@ -118,9 +118,11 @@ module FastlaneCore
     # raised from user_error!
     class FastlaneError < StandardError
       attr_reader :show_github_issues
+      attr_reader :error_info
 
-      def initialize(show_github_issues: false)
+      def initialize(show_github_issues: false, error_info: nil)
         @show_github_issues = show_github_issues
+        @error_info = error_info
       end
     end
 
@@ -141,8 +143,7 @@ module FastlaneCore
     # Basically this should be used when you actively catch the error
     # and want to show a nice error message to the user
     def user_error!(error_message, options = {})
-      options = { show_github_issues: false }.merge(options)
-      raise FastlaneError.new(show_github_issues: options[:show_github_issues]), error_message.to_s
+      raise FastlaneError.new(options), error_message.to_s
     end
 
     #####################################################

data/frameit/README.md

@@ -138,7 +138,8 @@ Use it to define the general information:
     },
     "background": "./background.jpg",
     "padding": 50,
-    "show_complete_frame": false
+    "show_complete_frame": false,
+    "stack_title" : false
   },
 
   "data": [
@@ -169,6 +170,8 @@ Use it to define the general information:
   ]
 }
 ```
+The `stack_title` value specifies whether `frameit` should display the keyword above the title when both keyword and title are defined.
+
 The `show_complete_frame` value specifies whether `frameit` should shrink the device and frame so that they show in full in the framed screenshot. If it is false, then they can hang over the bottom of the screenshot.
 
 The `filter` value is a part of the screenshot named for which the given option should be used. If a screenshot is named `iPhone5_Brainstorming.png` the first entry in the `data` array will be used.

data/frameit/lib/frameit/commands_generator.rb

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

data/frameit/lib/frameit/editor.rb

@@ -70,7 +70,7 @@ module Frameit
     def offset
       return @offset_information if @offset_information
 
-      @offset_information = fetch_config['offset'] || Offsets.image_offset(screenshot)
+      @offset_information = fetch_config['offset'] || Offsets.image_offset(screenshot).dup
 
       if @offset_information and (@offset_information['offset'] or @offset_information['offset'])
         return @offset_information
@@ -104,19 +104,23 @@ module Frameit
     def complex_framing
       background = generate_background
 
+      self.top_space_above_device = vertical_frame_padding
+
+      if fetch_config['title']
+        background = put_title_into_background(background, fetch_config['stack_title'])
+      end
+
       if self.frame # we have no frame on le mac
         resize_frame!
         put_into_frame
 
         # Decrease the size of the framed screenshot to fit into the defined padding + background
         frame_width = background.width - horizontal_frame_padding * 2
+        frame_height = background.height - top_space_above_device - vertical_frame_padding
         @image.resize "#{frame_width}x"
-      end
-
-      self.top_space_above_device = vertical_frame_padding
-
-      if fetch_config['title']
-        background = put_title_into_background(background)
+        if @image.height > frame_height
+          @image.resize "x#{frame_height.to_i}"
+        end
       end
 
       @image = put_device_into_background(background)
@@ -184,17 +188,60 @@ module Frameit
 
       multiplicator = (screenshot_width.to_f / offset['width'].to_f) # by how much do we have to change this?
       new_frame_width = multiplicator * frame.width # the new width for the frame
-      frame.resize "#{new_frame_width.round}x" # resize it to the calculated witdth
+      frame.resize "#{new_frame_width.round}x" # resize it to the calculated width
       modify_offset(multiplicator) # modify the offset to properly insert the screenshot into the frame later
     end
 
+    def resize_text(text)
+      width = text.width
+      ratio = (width + (keyword_padding + horizontal_frame_padding) * 2) / image.width.to_f
+      if ratio > 1.0
+        # too large - resizing now
+        smaller = (1.0 / ratio)
+        text.resize "#{(smaller * text.width).round}x"
+      end
+    end
     # Add the title above the device
-    def put_title_into_background(background)
-      title_images = build_title_images(image.width, image.height)
+
+    def put_title_into_background_stacked(background, title, keyword)
+      resize_text(title)
+      resize_text(keyword)
+
+      title_width = title.width
+      keyword_width = keyword.width
+
+      vertical_padding = vertical_frame_padding
+      keyword_top_space = vertical_padding
+
+      spacing_between_title_and_keyword = (title.height / 2)
+      title_top_space = vertical_padding + keyword.height + spacing_between_title_and_keyword
+      title_left_space = (background.width / 2.0 - title_width / 2.0).round
+      keyword_left_space = (background.width / 2.0 - keyword_width / 2.0).round
+
+      self.top_space_above_device += title.height + keyword.height + spacing_between_title_and_keyword + vertical_padding
+      # keyword
+      background = background.composite(keyword, "png") do |c|
+        c.compose "Over"
+        c.geometry "+#{keyword_left_space}+#{keyword_top_space}"
+      end
+      # Then, put the title on top of the screenshot next to the keyword
+      background = background.composite(title, "png") do |c|
+        c.compose "Over"
+        c.geometry "+#{title_left_space}+#{title_top_space}"
+      end
+      background
+    end
+
+    def put_title_into_background(background, stack_title)
+      title_images = build_title_images(image.width - 2 * horizontal_frame_padding, image.height - 2 * vertical_frame_padding)
 
       keyword = title_images[:keyword]
       title = title_images[:title]
 
+      if stack_title && !keyword.nil? && !title.nil? && keyword.width > 0 && title.width > 0
+        background = put_title_into_background_stacked(background, title, keyword)
+        return background
+      end
       # sum_width: the width of both labels together including the space inbetween
       #   is used to calculate the ratio
       sum_width = title.width
@@ -202,7 +249,7 @@ module Frameit
 
       # Resize the 2 labels if necessary
       smaller = 1.0 # default
-      ratio = (sum_width + keyword_padding * 2) / image.width.to_f
+      ratio = (sum_width + (keyword_padding + horizontal_frame_padding) * 2) / image.width.to_f
       if ratio > 1.0
         # too large - resizing now
         smaller = (1.0 / ratio)
@@ -215,10 +262,10 @@ module Frameit
       end
 
       vertical_padding = vertical_frame_padding
-      top_space = vertical_padding
+      top_space = vertical_padding + (actual_font_size - title.height) / 2
       left_space = (background.width / 2.0 - sum_width / 2.0).round
 
-      self.top_space_above_device += title.height + vertical_padding
+      self.top_space_above_device += actual_font_size + vertical_padding
 
       # First, put the keyword on top of the screenshot, if we have one
       if keyword

data/frameit/lib/frameit/runner.rb

@@ -34,7 +34,7 @@ module Frameit
             screenshot.frame!
           rescue => ex
             UI.error ex.to_s
-            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?
           end
         end
       else

data/gym/README.md

@@ -192,8 +192,22 @@ lane :beta do
   gym(scheme: "MyApp")
   crashlytics
 end
+
+# error block is executed when a error occurs
+error do |lane, exception|
+  slack(
+    # message with short human friendly message
+    message: exception.to_s, 
+    success: false, 
+    # Output containing extended log output
+    payload: { "Output" => exception.error_info.to_s } 
+  )
+end
 ```
 
+When gym raises an error the `error_info` property will contain the process output
+in case you want to display the error in 3rd party tools such as Slack.
+
 You can then easily switch between the beta provider (e.g. `testflight`, `hockey`, `s3` and more).
 
 For more information visit the [fastlane GitHub page](https://github.com/fastlane/fastlane/tree/master/fastlane).

data/gym/lib/gym/commands_generator.rb

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

data/gym/lib/gym/error_handler.rb

@@ -53,7 +53,7 @@ module Gym
         print_full_log_path
         print_xcode_path_instructions
         print_xcode_version
-        UI.user_error!("Error building the application - see the log above")
+        UI.user_error!("Error building the application - see the log above", error_info: output)
       end
 
       # @param [Array] The output of the errored build (line by line)
@@ -84,7 +84,7 @@ module Gym
           print "provisioning profile and code signing identity."
         end
         print_full_log_path
-        UI.user_error!("Error packaging up the application")
+        UI.user_error!("Error packaging up the application", error_info: output)
       end
 
       def handle_empty_archive

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -164,7 +164,7 @@ module Gym
         UI.command_output("-----------------------------------------")
         UI.command_output(JSON.pretty_generate(hash))
         UI.command_output("-----------------------------------------")
-        if $verbose
+        if FastlaneCore::Globals.verbose?
           UI.message("This results in the following plist file:")
           UI.command_output("-----------------------------------------")
           UI.command_output(to_plist(hash))