frameit 2.7.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 473c89d064c18c60ed9e3f220c5b7fa990a800ef
-  data.tar.gz: de0abe10f92581d5853559d30b076f731590610c
+  metadata.gz: a5d29de960084e2ece56a732f13b8ec0d8a1833a
+  data.tar.gz: bbdf114d3489c4c8d908fff8501a7e1a43343c70
 SHA512:
-  metadata.gz: a872266a0ea54cbb28ffed9fb4bc8da10bce63d4b86fe75562ba6ac56d3d8b8c3867049c497e8b1de2299e469cdfac5e548d5b5bd6f0494e3959ac8fa65577e1
-  data.tar.gz: b54f1413b1f8177a8e73a9d3e37480d79ab69cf72118f2c6ed4fe651aa6c6538a8f79c70307f3905273b3935b96e424c59cd02d4e6e287caefe4e71196b5e2c4
+  metadata.gz: f425e0880bd3e12085471ebc0caef3ccbe3b56c3dbe890c790b73c4e8afc6e22eeaa87ea27423a705fcb817930cd899f1b221f1590d6139e041bba9e41440e18
+  data.tar.gz: c39aac2349ea4f6685fe759864d42083b88a3f51a0a6ba942a72f99d5104b54bab2a9b2b752192bd878fa47d92ab0942be5c2cda675585badbecc34113eb5f6c

data/README.md

@@ -36,6 +36,9 @@ frameit
 
 ###### Quickly put your screenshots into the right device frames
 
+`frameit` allows you to put a gorgeous device frame around your iOS screenshots just by running one simple command. Use `frameit` to prepare perfect screenshots for the App Store, your website, QA or emails.
+
+
 Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
 
 
@@ -52,7 +55,6 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 <h5 align="center"><code>frameit</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate building and releasing your iOS and Android apps.</h5>
 
 
-
 # Features
 
 Put a gorgeous device frame around your iOS screenshots just by running one simple command. Support for:
@@ -173,7 +175,7 @@ Use it to define the general information:
   ]
 }
 ```
-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 `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.
 
@@ -189,6 +191,7 @@ The `keyword.strings` and `title.strings` are standard `.strings` file you alrea
 
 **Note:** These `.strings` files **MUST** be utf-16 encoded (UTF-16 LE with BOM).  They also must begin with an empty line. If you are having trouble see [issue #1740](https://github.com/fastlane/fastlane/issues/1740)
 
+**Note:** You **MUST** provide a background if you want titles. `frameit` will not add the tiles if a background is not specified.
 
 #### Uploading screenshots to iTC
 
@@ -196,7 +199,7 @@ Use [deliver](https://github.com/fastlane/fastlane/tree/master/deliver) to uploa
 
 ### Mac
 
-With `frameit` 2.0 it's possible to also frame Mac OS X Application screenshots. You have to provide the following:
+With `frameit` 2.0 it's possible to also frame macOS Application screenshots. You have to provide the following:
 
 - The `offset` information so `frameit` knows where to put your screenshots
 - A path to a `background`, which should contain both the background and the Mac

data/lib/frameit.rb

@@ -22,6 +22,7 @@ module Frameit
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
   UI = FastlaneCore::UI
+  ROOT = Pathname.new(File.expand_path('../..', __FILE__))
 end
 
 # rubocop:disable all

data/lib/frameit/editor.rb

@@ -231,7 +231,7 @@ module Frameit
       results = {}
       words.each do |key|
         # Create empty background
-        empty_path = File.join(Helper.gem_path('frameit'), "lib/assets/empty.png")
+        empty_path = File.join(Frameit::ROOT, "lib/assets/empty.png")
         title_image = MiniMagick::Image.open(empty_path)
         image_height = max_height # gets trimmed afterwards anyway, and on the iPad the `y` would get cut
         title_image.combine_options do |i|
@@ -245,6 +245,9 @@ module Frameit
         UI.verbose("Adding text '#{text}'")
 
         text.gsub! '\n', "\n"
+        text.gsub!(/(?<!\\)(')/) { |s| "\\#{s}" } # escape unescaped apostrophes with a backslash
+
+        interline_spacing = fetch_config['interline_spacing']
 
         # Add the actual title
         title_image.combine_options do |i|
@@ -252,6 +255,7 @@ module Frameit
           i.gravity "Center"
           i.pointsize actual_font_size
           i.draw "text 0,0 '#{text}'"
+          i.interline_spacing interline_spacing if interline_spacing
           i.fill fetch_config[key.to_s]['color']
         end
         title_image.trim # remove white space

data/lib/frameit/offsets.rb

@@ -2,7 +2,6 @@ module Frameit
   class Offsets
     # Returns the image offset needed for a certain device type for a given orientation
     # uses deliver to detect the screen size
-    # rubocop:disable Metrics/MethodLength
     def self.image_offset(screenshot)
       size = Deliver::AppScreenshot::ScreenSize
       case screenshot.orientation_name
@@ -88,6 +87,5 @@ module Frameit
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/frameit/screenshot.rb

@@ -4,7 +4,7 @@ module Frameit
     attr_accessor :path # path to the screenshot
     attr_accessor :size # size in px array of 2 elements: height and width
     attr_accessor :screen_size # deliver screen size type, is unique per device type, used in device_name
-    attr_accessor :color # the color to use for the frame
+    attr_accessor :color # the color to use for the frame (from Frameit::Color)
 
     # path: Path to screenshot
     # color: Color to use for the frame

data/lib/frameit/strings_parser.rb

@@ -25,6 +25,10 @@ module Frameit
         end
       end
 
+      if result.empty?
+        UI.error "Empty parsing result for #{path}. Please make sure the file is valid and UTF16 Big-endian encoded"
+      end
+
       result
     end
   end

data/lib/frameit/template_finder.rb

@@ -1,7 +1,6 @@
 module Frameit
   # Responsible for finding the correct device
   class TemplateFinder
-
     class FilenameTransform
       def initialize(device_name)
         @device_name = device_name

data/lib/frameit/version.rb

@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "2.7.0".freeze
+  VERSION = "2.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-01 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.52.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.1
+        version: 0.52.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Quickly put your screenshots into the right device frames