fastlane 2.79.0.beta.20180123010002 → 2.79.0.beta.20180124010003

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599a6a8994d426abd49eb843006e6a06b79cbf6b
-  data.tar.gz: f758d58fdcc9e4e32fd6d7263792ce01dee2ef72
+  metadata.gz: 579b61a800e044e85c68ad8e8f2e530f0b134c0a
+  data.tar.gz: fc82399a894d4d8f3cb0bbe8c56a7dc6991e251e
 SHA512:
-  metadata.gz: 3eac737ce72a2ba7f316f532095d481495747a740d39438b1d988ff873008313d5f4e906dc86135f32f77a28fb5f9ac5a7bf5a5e3449feedb9daa2f929a69fe5
-  data.tar.gz: 6529b844211fc5ba6e1d9bda4b90eb807e14463b1fd53d8ed1bbf3ab41d80f904160462a761cc361695429e8f8875931dc0352cf7aeaadb790f893d4e61a792d
+  metadata.gz: d8629c6772657921a0f464128416520994af79754ba2c79d6fb1fd79382149971c37bb4c7a6593f44070cc124138a60dbf9ee7c0b126069d906e02c11ee3890c
+  data.tar.gz: a8a726bd15f676bba4a319d6804377958bc78162a76ff909baf7f32e8d6af29891f06c4ee5368b60a59c0666985b90064a522efa422ef13a2b4d3b823e26e72c

data/fastlane/lib/fastlane/plugins/plugin_fetcher.rb

@@ -12,7 +12,7 @@ module Fastlane
       page = 1
       plugins = []
       loop do
-        url = "https://rubygems.org/api/v1/search.json?query=#{PluginManager.plugin_prefix}#{search_query}&page=#{page}"
+        url = "https://rubygems.org/api/v1/search.json?query=#{PluginManager.plugin_prefix}&page=#{page}"
         FastlaneCore::UI.verbose("RubyGems API Request: #{url}")
         results = JSON.parse(open(url).read)
         break if results.count == 0
@@ -25,7 +25,7 @@ module Fastlane
 
       return plugins if search_query.to_s.length == 0
       plugins.keep_if do |current|
-        current.full_name.include?(search_query)
+        current.full_name.include?(search_query) or current.info.include?(search_query)
       end
 
       return plugins

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.79.0.beta.20180123010002'.freeze
+  VERSION = '2.79.0.beta.20180124010003'.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/fastlane_core/lib/fastlane_core/module.rb

@@ -24,7 +24,7 @@ module FastlaneCore
   # Since we don't want to access FastlaneCore from spaceship
   # this method is duplicated in spaceship/client.rb
   def self.fastlane_user_dir
-    path = File.expand_path(File.join("~", ".fastlane"))
+    path = File.expand_path(File.join(Dir.home, ".fastlane"))
     FileUtils.mkdir_p(path) unless File.directory?(path)
     return path
   end

data/frameit/lib/frameit/editor.rb

@@ -220,11 +220,10 @@ module Frameit
 
     def resize_text(text)
       width = text.width
-      ratio = (width + (keyword_padding + horizontal_frame_padding) * 2) / image.width.to_f
+      ratio = width / (image.width.to_f - horizontal_frame_padding * 2)
       if ratio > 1.0
         # too large - resizing now
-        smaller = (1.0 / ratio)
-        text.resize("#{(smaller * text.width).round}x")
+        text.resize("#{((1.0 / ratio) * text.width).round}x")
       end
     end
 
@@ -233,16 +232,12 @@ module Frameit
       resize_text(title)
       resize_text(keyword)
 
-      title_width = title.width
-      keyword_width = keyword.width
-
-      vertical_padding = vertical_frame_padding
+      vertical_padding = vertical_frame_padding # assign padding to variable
       keyword_top_space = vertical_padding
-
-      spacing_between_title_and_keyword = (title.height / 2)
+      spacing_between_title_and_keyword = (actual_font_size / 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
+      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.space_to_device += title.height + keyword.height + spacing_between_title_and_keyword + vertical_padding
       title_below_image = fetch_config['title_below_image']
@@ -252,8 +247,7 @@ module Frameit
         c.geometry("+#{keyword_left_space}+#{keyword_top_space}") unless title_below_image
         c.geometry("+#{keyword_left_space}+#{background.height - space_to_device + keyword_top_space}") if title_below_image
       end
-      # Then, put the title on top of the screenshot next to the keyword
-      # Then, put the title above/below of the screenshot next to the keyword
+      # Place the title below the keyword
       background = background.composite(title, "png") do |c|
         c.compose("Over")
         c.geometry("+#{title_left_space}+#{title_top_space}") unless title_below_image
@@ -263,7 +257,7 @@ module Frameit
     end
 
     def put_title_into_background(background, stack_title)
-      text_images = build_text_images(image.width - 2 * horizontal_frame_padding, image.height - 2 * vertical_frame_padding)
+      text_images = build_text_images(image.width - 2 * horizontal_frame_padding, image.height - 2 * vertical_frame_padding, stack_title)
 
       keyword = text_images[:keyword]
       title = text_images[:title]
@@ -277,24 +271,26 @@ module Frameit
       sum_width = title.width
       sum_width += keyword.width + keyword_padding if keyword
 
-      # Resize the 2 labels if necessary
-      smaller = 1.0 # default
-      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)
+      title_below_image = fetch_config['title_below_image']
 
-        UI.verbose("Text for image #{self.screenshot.path} is quite long, reducing font size by #{(ratio - 1.0).round(2)}")
+      # Resize the 2 labels if they exceed the available space either horizontally or vertically:
+      image_scale_factor = 1.0 # default
+      ratio_horizontal = sum_width / (image.width.to_f - horizontal_frame_padding * 2) # The fraction of the text images compared to the left and right padding
+      ratio_vertical = title.height.to_f / actual_font_size # The fraction of the actual height of the images compared to the available space
+      if ratio_horizontal > 1.0 || ratio_vertical > 1.0
+        # If either is too large, resize with the maximum ratio:
+        image_scale_factor = (1.0 / [ratio_horizontal, ratio_vertical].max)
 
-        title.resize("#{(smaller * title.width).round}x")
-        keyword.resize("#{(smaller * keyword.width).round}x") if keyword
-        sum_width *= smaller
+        UI.verbose("Text for image #{self.screenshot.path} is quite long, reducing font size by #{(100 * (1.0 - image_scale_factor)).round(1)}%")
+
+        title.resize("#{(image_scale_factor * title.width).round}x")
+        keyword.resize("#{(image_scale_factor * keyword.width).round}x") if keyword
+        sum_width *= image_scale_factor
       end
 
-      vertical_padding = vertical_frame_padding
+      vertical_padding = vertical_frame_padding # assign padding to variable
       top_space = vertical_padding + (actual_font_size - title.height) / 2
       left_space = (background.width / 2.0 - sum_width / 2.0).round
-      title_below_image = fetch_config['title_below_image']
 
       self.space_to_device += actual_font_size + vertical_padding
 
@@ -306,7 +302,7 @@ module Frameit
           c.geometry("+#{left_space}+#{background.height - space_to_device + top_space}") if title_below_image
         end
 
-        left_space += keyword.width + (keyword_padding * smaller)
+        left_space += keyword.width + (keyword_padding * image_scale_factor)
       end
 
       # Then, put the title on top of the screenshot next to the keyword
@@ -320,6 +316,7 @@ module Frameit
 
     def actual_font_size
       font_scale_factor = fetch_config['font_scale_factor'] || 0.1
+      UI.user_error!("Parameter 'font_scale_factor' can not be 0. Please provide a value larger than 0.0 (default = 0.1).") if font_scale_factor == 0.0
       [@image.width * font_scale_factor].max.round
     end
 
@@ -329,7 +326,7 @@ module Frameit
     end
 
     # This will build up to 2 individual images with the title and optional keyword, which will then be added to the real image
-    def build_text_images(max_width, max_height)
+    def build_text_images(max_width, max_height, stack_title)
       words = [:keyword, :title].keep_if { |a| fetch_text(a) } # optional keyword/title
       results = {}
       trim_boxes = {}
@@ -367,7 +364,7 @@ module Frameit
 
         results[key] = text_image
 
-        # Natively trimming the image with .trim will result in the loss of the common baseline between the text in all images.
+        # Natively trimming the image with .trim will result in the loss of the common baseline between the text in all images when side-by-side (e.g. stack_title is false).
         # Hence retrieve the calculated trim bounding box without actually trimming:
         calculated_trim_box = text_image.identify do |b|
           b.format("%@") # CALCULATED: trim bounding box (without actually trimming), see: http://www.imagemagick.org/script/escape.php
@@ -381,7 +378,7 @@ module Frameit
           top_vertical_trim_offset = trim_box.offset_y
         end
 
-        # Get the maximum bottom offset of the trimbox, this is the top offset + height:
+        # Get the maximum bottom offset of the trim box, 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
@@ -390,31 +387,34 @@ module Frameit
         trim_boxes[key] = trim_box
       end
 
-      # Crop images based on top_vertical_trim_offset and bottom_vertical_trim_offset to maintain text baseline:
+      # Crop text images:
       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
+        # For side-by-side text images (e.g. stack_title is false) adjust the trim box based on top_vertical_trim_offset and bottom_vertical_trim_offset to maintain the text baseline:
+        unless stack_title
+          # 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
+          # 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")
+            UI.verbose("Trim box for key \"#{key}\" is adjusted to align bottom: #{trim_box}\n")
+          end
         end
 
-        # Crop image with adjusted trim box parameters in MiniMagick string format:
+        # Crop image with (adjusted) trim box parameters in MiniMagick string format:
         results[key].crop(trim_box.string_format)
       end
 

data/frameit/lib/frameit/screenshot.rb

@@ -88,10 +88,10 @@ module Frameit
         orientation = block.call(filename)
         valid = [:landscape_left, :landscape_right, :portrait, nil]
         UI.user_error("orientation_block must return #{valid[0..-2].join(', ')} or nil") unless valid.include?(orientation)
-
-        puts("Forced orientation: #{orientation}")
       end
 
+      puts("Forced orientation: #{orientation}") unless orientation.nil?
+
       return orientation unless orientation.nil?
       return :portrait if self.orientation_name == Orientation::PORTRAIT
       return :landscape_right # Default landscape orientation

data/pem/lib/pem/module.rb

@@ -6,7 +6,8 @@ module PEM
     attr_accessor :config
   end
 
-  TMP_FOLDER = "/tmp/PEM/"
+  tmp_dir = Dir.tmpdir
+  TMP_FOLDER = "#{tmp_dir}/fastlane/PEM/"
   FileUtils.mkdir_p(TMP_FOLDER)
 
   ENV['FASTLANE_TEAM_ID'] ||= ENV["PEM_TEAM_ID"]

data/spaceship/lib/spaceship/portal/certificate.rb

@@ -243,7 +243,7 @@ module Spaceship
           klass.new(attrs)
         end
 
-        # @param mac [Bool] Fetches Mac certificates if true. (Ignored if callsed from a subclass)
+        # @param mac [Bool] Fetches Mac certificates if true. (Ignored if called from a subclass)
         # @return (Array) Returns all certificates of this account.
         #  If this is called from a subclass of Certificate, this will
         #  only include certificates matching the current type.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.79.0.beta.20180123010002
+  version: 2.79.0.beta.20180124010003
 platform: ruby
 authors:
 - Josh Holtz
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-23 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1613,24 +1613,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- supply/lib
-- screengrab/lib
-- match/lib
-- precheck/lib
-- sigh/lib
-- produce/lib
 - scan/lib
+- spaceship/lib
 - gym/lib
-- snapshot/lib
-- frameit/lib
-- fastlane/lib
-- cert/lib
+- precheck/lib
+- produce/lib
 - pilot/lib
-- spaceship/lib
+- fastlane/lib
+- supply/lib
 - credentials_manager/lib
+- pem/lib
 - deliver/lib
+- screengrab/lib
+- frameit/lib
+- match/lib
 - fastlane_core/lib
-- pem/lib
+- sigh/lib
+- snapshot/lib
+- cert/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="