frameit 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34abb8d5461e92d27d8ee707a1e6fae13c1d1b16
-  data.tar.gz: f5a0190aaf203cc07ec3244a9c3bd8636d3244bd
+  metadata.gz: b3051f6bc614da778f504a828173c4dbf3704f99
+  data.tar.gz: 9ce4a4ab91e660e59d1ec28df45f888923ef68db
 SHA512:
-  metadata.gz: cbab4d88a66db2754bd73f34458e8d3eac2a47e29a38430775025cc7399c38e5391933c605a226437235c94cf5a53cb8655dd2297edd6cd76178acd97e285093
-  data.tar.gz: 24a29d8ef715756269fb3265e013ec76e35b343c60c0225f890dcd81ff59acfe4849c958bbef2df5e91a5fdd749e988ed52673c705272120a3cdcc724942d2d4
+  metadata.gz: e1583fcdc2ffbfd3d359d8b710325fd35f12cfb3be6132958890b88257d13433f71a24551111558bde84dd6a682ea6f6a6af71ea60c3b96c1f14a281399b3b6f
+  data.tar.gz: 0618a55cf147c1aef93b1dadc5ab7dcd329d25f3ca87b510879ae4fce9e00345bfccc5dee47819f0772d3ff1663ac9eac313a2ed04c677fea741b3eb323ad6aa

data/README.md

@@ -1,18 +1,18 @@
 <h3 align="center">
-  <a href="https://github.com/KrauseFx/fastlane">
+  <a href="https://github.com/fastlane/fastlane">
     <img src="assets/fastlane.png" width="150" />
     <br />
     fastlane
   </a>
 </h3>
 <p align="center">
-  <a href="https://github.com/KrauseFx/deliver">deliver</a> &bull; 
-  <a href="https://github.com/KrauseFx/snapshot">snapshot</a> &bull; 
+  <a href="https://github.com/fastlane/deliver">deliver</a> &bull; 
+  <a href="https://github.com/fastlane/snapshot">snapshot</a> &bull; 
   <b>frameit</b> &bull; 
-  <a href="https://github.com/KrauseFx/PEM">PEM</a> &bull; 
-  <a href="https://github.com/KrauseFx/sigh">sigh</a> &bull; 
-  <a href="https://github.com/KrauseFx/produce">produce</a> &bull;
-  <a href="https://github.com/KrauseFx/cert">cert</a> &bull;
+  <a href="https://github.com/fastlane/PEM">PEM</a> &bull; 
+  <a href="https://github.com/fastlane/sigh">sigh</a> &bull; 
+  <a href="https://github.com/fastlane/produce">produce</a> &bull;
+  <a href="https://github.com/fastlane/cert">cert</a> &bull;
   <a href="https://github.com/fastlane/spaceship">spaceship</a> &bull;
   <a href="https://github.com/fastlane/pilot">pilot</a> &bull;
   <a href="https://github.com/fastlane/boarding">boarding</a> &bull;
@@ -29,7 +29,7 @@ frameit
 ============
 
 [![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
-[![License](http://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/KrauseFx/frameit/blob/master/LICENSE)
+[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/KrauseFx/frameit/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/frameit.svg?style=flat)](http://rubygems.org/gems/frameit)
 [![Build Status](https://img.shields.io/travis/fastlane/frameit/master.svg?style=flat)](https://travis-ci.org/fastlane/frameit)
 
@@ -186,7 +186,7 @@ The `keyword.strings` and `title.strings` are standard `.strings` file you alrea
 
 #### Uploading screenshots to iTC
 
-Use [deliver](https://github.com/KrauseFx/deliver) to upload all screenshots to iTunes Connect completely automatically :rocket:
+Use [deliver](https://github.com/fastlane/deliver) to upload all screenshots to iTunes Connect completely automatically :rocket:
 
 ### Mac
 
@@ -227,12 +227,12 @@ Check out the [MindNode example project](https://github.com/fastlane/examples/tr
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
 - [`fastlane`](https://fastlane.tools): Connect all deployment tools into one streamlined workflow
-- [`deliver`](https://github.com/KrauseFx/deliver): Upload screenshots, metadata and your app to the App Store
-- [`snapshot`](https://github.com/KrauseFx/snapshot): Automate taking localized screenshots of your iOS app on every device
-- [`PEM`](https://github.com/KrauseFx/pem): Automatically generate and renew your push notification profiles
-- [`sigh`](https://github.com/KrauseFx/sigh): Because you would rather spend your time building stuff than fighting provisioning
-- [`produce`](https://github.com/KrauseFx/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
-- [`cert`](https://github.com/KrauseFx/cert): Automatically create and maintain iOS code signing certificates
+- [`deliver`](https://github.com/fastlane/deliver): Upload screenshots, metadata and your app to the App Store
+- [`snapshot`](https://github.com/fastlane/snapshot): Automate taking localized screenshots of your iOS app on every device
+- [`PEM`](https://github.com/fastlane/PEM): Automatically generate and renew your push notification profiles
+- [`sigh`](https://github.com/fastlane/sigh): Because you would rather spend your time building stuff than fighting provisioning
+- [`produce`](https://github.com/fastlane/produce): Create new iOS apps on iTunes Connect and Dev Portal using the command line
+- [`cert`](https://github.com/fastlane/cert): Automatically create and maintain iOS code signing certificates
 - [`spaceship`](https://github.com/fastlane/spaceship): Ruby library to access the Apple Dev Center and iTunes Connect
 - [`pilot`](https://github.com/fastlane/pilot): The best way to manage your TestFlight testers and builds from your terminal
 - [`boarding`](https://github.com/fastlane/boarding): The easiest way to invite your TestFlight beta testers 
@@ -242,7 +242,7 @@ Check out the [MindNode example project](https://github.com/fastlane/examples/tr
 ##### [Like this tool? Be the first to know about updates and new fastlane tools](https://tinyletter.com/krausefx)
 
 ## Generate localized screenshots
-Check out [`snapshot`](https://github.com/KrauseFx/snapshot) to automatically generate screenshots using ```UI Automation```.
+Check out [`snapshot`](https://github.com/fastlane/snapshot) to automatically generate screenshots using ```UI Automation```.
 
 ## Alternative location to store device_frames
 

data/lib/frameit/frame_converter.rb

@@ -18,7 +18,7 @@ module Frameit
       system("open '#{DOWNLOAD_URL}'")
       puts "----------------------------------------------------".green
       puts "Download the zip files for the following devices".green
-      puts "iPhone 6, iPhone 6 Plus, iPhone 5s and iPad mini 3".green
+      puts "iPhone 6s, iPhone 6s Plus, iPhone 5s, iPad mini 4 and iPad Pro".green
       puts "You only need to download the devices you want to use".green
       puts "Press Enter when you downloaded the zip files".green
       puts "----------------------------------------------------".green

data/lib/frameit/offsets.rb

@@ -2,6 +2,7 @@ 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
@@ -32,6 +33,11 @@ module Frameit
             'offset' => '+47+135',
             'width' => 737
           }
+        when size::IOS_IPAD_PRO
+          return {
+            'offset' => '+48+90',
+            'width' => 805
+          }
         end
       when Orientation::LANDSCAPE
         case screenshot.screen_size
@@ -60,8 +66,14 @@ module Frameit
             'offset' => '+135+47',
             'width' => 983
           }
+        when size::IOS_IPAD_PRO
+          return {
+            'offset' => '+88+48',
+            'width' => 1075
+          }
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/lib/frameit/screenshot.rb

@@ -30,9 +30,13 @@ module Frameit
       when sizes::IOS_35
         return 'iPhone_4'
       when sizes::IOS_IPAD
-        return 'iPad_mini'
+        return 'iPad-mini'
+      when sizes::IOS_IPAD_PRO
+        return 'iPad-Pro'
       when sizes::MAC
         return 'Mac'
+      else
+        Helper.log.error "Unknown device type for size #{@screen_size} for path '#{path}'"
       end
     end
 

data/lib/frameit/template_finder.rb

@@ -9,21 +9,30 @@ module Frameit
         screenshot.orientation_name,
         screenshot.color
       ]
-      parts << "sRGB" if screenshot.device_name == 'iPad_mini'
+      joiner = "_"
+
+      if screenshot.device_name.include?('iPad')
+        parts = [
+          screenshot.device_name,
+          (screenshot.color == 'SpaceGray' ? "Space-Gray" : "Silver"),
+          (screenshot.orientation_name == "Horz" ? "horizontal" : "vertical")
+        ]
+        joiner = "-"
+      end
 
       templates_path = [ENV['HOME'], FrameConverter::FRAME_PATH].join('/')
-      templates = Dir["../**/#{parts.join('_')}*.{png,jpg}"] # local directory
-      templates += Dir["#{templates_path}/**/#{parts.join('_')}*.{png,jpg}"] # ~/.frameit folder
+      templates = Dir["../**/#{parts.join(joiner)}*.{png,jpg}"] # local directory
+      templates += Dir["#{templates_path}/**/#{parts.join(joiner)}*.{png,jpg}"] # ~/.frameit folder
 
       if templates.count == 0
         if screenshot.screen_size == Deliver::AppScreenshot::ScreenSize::IOS_35
           Helper.log.warn "Unfortunately 3.5\" device frames were discontinued. Skipping screen '#{screenshot.path}'".yellow
-          Helper.log.debug "Looked for: '#{parts.join('_')}.png'".red
+          Helper.log.debug "Looked for: '#{parts.join(joiner)}.png'".red
         else
           Helper.log.error "Could not find a valid template for screenshot '#{screenshot.path}'".red
           Helper.log.error "You can download new templates from '#{FrameConverter::DOWNLOAD_URL}'"
           Helper.log.error "and store them in '#{templates_path}'"
-          Helper.log.error "Missing file: '#{parts.join('_')}.png'".red
+          Helper.log.error "Missing file: '#{parts.join(joiner)}.png'".red
         end
         return nil
       else

data/lib/frameit/version.rb

@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Quickly put your screenshots into the right device frames