fastlane 2.69.0.beta.20171207010003 → 2.69.0.beta.20171208010004

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683a48dde4c63b92cbca51350a34d5fab6bae5aa
-  data.tar.gz: 08fe1b44414f8a5b714dcf5e08f2cdc4fa084034
+  metadata.gz: 3b3c2b5cbef74d7bad0828ec4fe2decf402fc5fa
+  data.tar.gz: d0ac8dcc81ba78412ed83ca48a65028dd763b919
 SHA512:
-  metadata.gz: 263e9bc87a97b40aa765f4712caf7f9dff5f300cefb5af520dcabbcca74e3ed1f0b7a4d1517ae8823483b80d278d4e5e02f60b0422dd11f85338e4148a66290d
-  data.tar.gz: 3c686d55b00176f7db095cc6e51a08817af0c4434646603ab338a8db370fe7d0cf421065602824151775e5de3a6e742849521495b9cf988a74522a1368326d45
+  metadata.gz: 3f09cb8afd547b0c4f3750774e6ac16c2054feda350ab4dab37ff32cbf58c39f320d0f4112c10c100b76ec86ea2d7b63717b07546420442a4371986d468c53f0
+  data.tar.gz: cca562e98a5de53bc8de2287ed060ede6a441dabf9348d614896ebc8ddfa703192780137d5a899bf20e105a19a28218fdff81a06e1564ad2cebc95e1d6cedbda

data/fastlane/lib/fastlane/action.rb

@@ -94,8 +94,8 @@ module Fastlane
     end
 
     # to allow a simple `sh` in the custom actions
-    def self.sh(command, print_command: true, print_command_output: true, error_callback: nil)
-      Fastlane::Actions.sh_control_output(command, print_command: print_command, print_command_output: print_command_output, error_callback: error_callback)
+    def self.sh(*command, print_command: true, print_command_output: true, error_callback: nil)
+      Fastlane::Actions.sh_control_output(*command, print_command: print_command, print_command_output: print_command_output, error_callback: error_callback)
     end
 
     # Documentation category, available values defined in AVAILABLE_CATEGORIES

data/fastlane/lib/fastlane/actions/git_branch.rb

@@ -1,7 +1,7 @@
 module Fastlane
   module Actions
     module SharedValues
-      GIT_BRANCH_ENV_VARS = %w(GIT_BRANCH BRANCH_NAME TRAVIS_BRANCH BITRISE_GIT_BRANCH CI_BUILD_REF_NAME CI_COMMIT_REF_NAME WERCKER_GIT_BRANCH).freeze
+      GIT_BRANCH_ENV_VARS = %w(GIT_BRANCH BRANCH_NAME TRAVIS_BRANCH BITRISE_GIT_BRANCH CI_BUILD_REF_NAME CI_COMMIT_REF_NAME WERCKER_GIT_BRANCH BUILDKITE_BRANCH).freeze
     end
 
     class GitBranchAction < Action

data/fastlane/lib/fastlane/actions/sh.rb

@@ -54,7 +54,7 @@ module Fastlane
       def self.example_code
         [
           'sh("ls")',
-          'sh("git commit -m \'My message\'")'
+          'sh("git", "commit", "-m", "My message")'
         ]
       end
 

data/fastlane/lib/fastlane/fast_file.rb

@@ -174,11 +174,10 @@ module Fastlane
     end
 
     # Execute shell command
-    def sh(command, log: true, error_callback: nil)
-      command = Shellwords.join(command) if command.kind_of?(Array)
-      command_header = log ? command : "shell command"
+    def sh(*command, log: true, error_callback: nil)
+      command_header = log ? Actions.shell_command_from_args(*command) : "shell command"
       Actions.execute_action(command_header) do
-        Actions.sh_no_action(command, log: log, error_callback: error_callback)
+        Actions.sh_no_action(*command, log: log, error_callback: error_callback)
       end
     end
 

data/fastlane/lib/fastlane/helper/sh_helper.rb

@@ -8,32 +8,41 @@ module Fastlane
     # When running this in tests, it will return the actual command instead of executing it
     # @param log [Boolean] should fastlane print out the executed command
     # @param error_callback [Block] a callback invoked with the command output if there is a non-zero exit status
-    def self.sh(command, log: true, error_callback: nil)
-      sh_control_output(command, print_command: log, print_command_output: log, error_callback: error_callback)
+    def self.sh(*command, log: true, error_callback: nil)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback)
     end
 
-    def self.sh_no_action(command, log: true, error_callback: nil)
-      sh_control_output(command, print_command: log, print_command_output: log, error_callback: error_callback)
+    def self.sh_no_action(*command, log: true, error_callback: nil)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback)
     end
 
-    # @param command [String] The command to be executed
+    # @param command The command to be executed (variadic)
     # @param print_command [Boolean] Should we print the command that's being executed
     # @param print_command_output [Boolean] Should we print the command output during execution
     # @param error_callback [Block] A block that's called if the command exits with a non-zero status
-    def self.sh_control_output(command, print_command: true, print_command_output: true, error_callback: nil)
+    def self.sh_control_output(*command, print_command: true, print_command_output: true, error_callback: nil)
       print_command = print_command_output = true if $troubleshoot
       # Set the encoding first, the user might have set it wrong
       previous_encoding = [Encoding.default_external, Encoding.default_internal]
       Encoding.default_external = Encoding::UTF_8
       Encoding.default_internal = Encoding::UTF_8
 
-      command = Shellwords.join(command) if command.kind_of?(Array) # since it's an array of one element when running from the Fastfile
-      UI.command(command) if print_command
+      shell_command = shell_command_from_args(*command)
+      UI.command(shell_command) if print_command
 
       result = ''
       if Helper.sh_enabled?
         exit_status = nil
-        Open3.popen2e(command) do |stdin, io, thread|
+
+        # The argument list is passed directly to Open3.popen2e, which
+        # handles the variadic argument list in the same way as Kernel#spawn.
+        # (http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-spawn) or
+        # Process.spawn (http://ruby-doc.org/core-2.4.2/Process.html#method-c-spawn).
+        #
+        # sh "ls -la /Applications/Xcode\ 7.3.1.app"
+        # sh "ls", "-la", "/Applications/Xcode 7.3.1.app"
+        # sh({ "FOO" => "Hello" }, "echo $FOO")
+        Open3.popen2e(*command) do |stdin, io, thread|
           io.sync = true
           io.each do |line|
             UI.command_output(line.strip) if print_command_output
@@ -44,7 +53,7 @@ module Fastlane
 
         if exit_status != 0
           message = if print_command
-                      "Exit status of command '#{command}' was #{exit_status} instead of 0."
+                      "Exit status of command '#{shell_command}' was #{exit_status} instead of 0."
                     else
                       "Shell command exited with exit status #{exit_status} instead of 0."
                     end
@@ -58,7 +67,7 @@ module Fastlane
           end
         end
       else
-        result << command # only for the tests
+        result << shell_command # only for the tests
       end
 
       result
@@ -68,5 +77,37 @@ module Fastlane
       Encoding.default_external = previous_encoding.first
       Encoding.default_internal = previous_encoding.last
     end
+
+    # Used to produce a shell command string from a list of arguments that may
+    # be passed to methods such as Kernel#system, Kernel#spawn and Open3.popen2e
+    # in order to print the command to the terminal. The same *args are passed
+    # directly to a system call (Open3.popen2e). This interpretation is not
+    # used when executing a command.
+    #
+    # @param args Any number of arguments used to construct a command
+    # @raise [ArgumentError] If no arguments passed
+    # @return [String] A shell command representing the arguments passed in
+    def self.shell_command_from_args(*args)
+      raise ArgumentError, "sh requires at least one argument" unless args.count > 0
+
+      command = ""
+
+      # Optional initial environment Hash
+      if args.first.kind_of?(Hash)
+        command = args.shift.map { |k, v| "#{k}=#{v.shellescape}" }.join(" ") + " "
+      end
+
+      # Support [ "/usr/local/bin/foo", "foo" ], "-x", ...
+      if args.first.kind_of?(Array)
+        command += args.shift.first.shellescape + " " + args.shelljoin
+        command.chomp! " "
+      elsif args.count == 1 && args.first.kind_of?(String)
+        command += args.first
+      else
+        command += args.shelljoin
+      end
+
+      command
+    end
   end
 end

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.69.0.beta.20171207010003'.freeze
+  VERSION = '2.69.0.beta.20171208010004'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/frameit/lib/frameit/editor.rb

@@ -318,6 +318,9 @@ module Frameit
     def build_title_images(max_width, max_height)
       words = [:keyword, :title].keep_if { |a| fetch_text(a) } # optional keyword/title
       results = {}
+      trim_boxes = {}
+      top_vertical_trim_offset = Float::INFINITY # Init at a large value, as the code will search for a minimal value.
+      bottom_vertical_trim_offset = 0
       words.each do |key|
         # Create empty background
         empty_path = File.join(Frameit::ROOT, "lib/assets/empty.png")
@@ -347,10 +350,60 @@ module Frameit
           i.interline_spacing interline_spacing if interline_spacing
           i.fill fetch_config[key.to_s]['color']
         end
-        title_image.trim # remove white space
 
         results[key] = title_image
+
+        # Natively trimming the image with .trim will result in the loss of the common baseline between the text in all images.
+        # Hence retrieve the calculated trim bounding box without actually trimming:
+        calculated_trim_box = title_image.identify do |b|
+          b.format("%@") # CALCULATED: trim bounding box (without actually trimming), see: http://www.imagemagick.org/script/escape.php
+        end
+
+        # Create a Trimbox object from the MiniMagick .identify string with syntax "<width>x<height>+<offset_x>+<offset_y>":
+        trim_box = Frameit::Trimbox.new(calculated_trim_box)
+
+        # Get the minimum top offset of the trim box:
+        if trim_box.offset_y < top_vertical_trim_offset
+          top_vertical_trim_offset = trim_box.offset_y
+        end
+
+        # Get the maximum bottom offset of the trimbox, this is the top offset + height:
+        if (trim_box.offset_y + trim_box.height) > bottom_vertical_trim_offset
+          bottom_vertical_trim_offset = trim_box.offset_y + trim_box.height
+        end
+
+        # Store for the crop action:
+        trim_boxes[key] = trim_box
       end
+
+      # Crop images based on top_vertical_trim_offset and bottom_vertical_trim_offset to maintain text baseline:
+      words.each do |key|
+        # Get matching trim box:
+        trim_box = trim_boxes[key]
+
+        # Determine the trim area by maintaining the same vertical top offset based on the smallest value from all trim boxes (top_vertical_trim_offset).
+        # When the vertical top offset is larger than the smallest vertical top offset, the trim box needs to be adjusted:
+        if trim_box.offset_y > top_vertical_trim_offset
+          # Increase the height of the trim box with the difference in vertical top offset:
+          trim_box.height += trim_box.offset_y - top_vertical_trim_offset
+          # Change the vertical top offset to match that of the others:
+          trim_box.offset_y = top_vertical_trim_offset
+
+          UI.verbose("Trim box for key \"#{key}\" is adjusted to align top: #{trim_box}\n")
+        end
+
+        # Check if the height needs to be adjusted to reach the bottom offset:
+        if (trim_box.offset_y + trim_box.height) < bottom_vertical_trim_offset
+          # Set the height of the trim box to the difference between vertical bottom and top offset:
+          trim_box.height = bottom_vertical_trim_offset - trim_box.offset_y
+
+          UI.verbose("Trim box for key \"#{key}\" is adjusted to align bottom: #{trim_box}\n")
+        end
+
+        # Crop image with adjusted trim box parameters in MiniMagick string format:
+        results[key].crop(trim_box.string_format)
+      end
+
       results
     end
 

data/frameit/lib/frameit/trim_box.rb

@@ -0,0 +1,33 @@
+module Frameit
+  # Represents the MiniMagick trim bounding box for cropping a text image
+  class Trimbox
+    attr_accessor :width # width of the trim box
+    attr_accessor :height # height of the trim box
+    attr_accessor :offset_x # horizontal offset from the canvas to the trim box
+    attr_accessor :offset_y # vertical offset from the canvas to the trim box
+
+    # identify_string: A string with syntax "<width>x<height>+<offset_x>+<offset_y>". This is returned by MiniMagick when using function .identify with format("%@"). It is also required for the MiniMagick .crop function.
+    def initialize(identify_string)
+      UI.user_error!("Trimbox can not be initialised with an empty 'identify_string'.") unless identify_string.length > 0
+
+      # Parse the input syntax "<width>x<height>+<offset_x>+<offset_y>".
+      # Extract these 4 parameters into an integer array, by using multiple string separators: "x" and "+":
+      trim_values = identify_string.split(/[x+]/).map(&:to_i)
+
+      # If 'identify_string' doesn't have the expected syntax with 4 parameters, show error:
+      UI.user_error!("Trimbox is initialised with an invalid value for 'identify_string'.") unless trim_values.length == 4
+
+      # Assign instance variables:
+      @width = trim_values[0]
+      @height = trim_values[1]
+      @offset_x = trim_values[2]
+      @offset_y = trim_values[3]
+    end
+
+    # Get the trimbox parameters in the MiniMagick string format
+    def string_format
+      # Convert trim box parameters to string with syntax: "<width>x<height>+<offset_x>+<offset_y>":
+      return "#{@width}x#{@height}+#{@offset_x}+#{@offset_y}"
+    end
+  end
+end

data/frameit/lib/frameit.rb

@@ -11,6 +11,7 @@ require 'frameit/strings_parser'
 require 'frameit/mac_editor'
 require 'frameit/dependency_checker'
 require 'frameit/options'
+require 'frameit/trim_box'
 
 require 'fastlane_core'
 

data/spaceship/lib/spaceship/client.rb

@@ -436,8 +436,15 @@ module Spaceship
           # We use the olympus session to determine if the old session is still valid
           # As this will raise an exception if the old session has expired
           # If the old session is still valid, we don't have to do anything else in this method
+          # that's why we return true
           return true if fetch_olympus_session.count > 0
         rescue
+          # If the `fetch_olympus_session` method raises an exception
+          # we'll land here, and therefore continue doing a full login process
+          # This happens if the session we loaded from the cache isn't valid any more
+          # which is common, as the session automatically invalidates after x hours (we don't know x)
+          # In this case we don't actually care about the exact exception, and why it was failing
+          # because either way, we'll have to do a fresh login, where we do the actual error handling
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.69.0.beta.20171207010003
+  version: 2.69.0.beta.20171208010004
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1260,6 +1260,7 @@ files:
 - frameit/lib/frameit/screenshot.rb
 - frameit/lib/frameit/strings_parser.rb
 - frameit/lib/frameit/template_finder.rb
+- frameit/lib/frameit/trim_box.rb
 - gym/README.md
 - gym/lib/assets/GymfileTemplate
 - gym/lib/assets/wrap_xcodebuild/xcbuild-safe.sh