frameit 2.8.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d29de960084e2ece56a732f13b8ec0d8a1833a
-  data.tar.gz: bbdf114d3489c4c8d908fff8501a7e1a43343c70
+  metadata.gz: 5f153eb5635aba47fe4f2404223b06181bf98fd2
+  data.tar.gz: 48ef840b23d480681a43a256503c146f3bd8d928
 SHA512:
-  metadata.gz: f425e0880bd3e12085471ebc0caef3ccbe3b56c3dbe890c790b73c4e8afc6e22eeaa87ea27423a705fcb817930cd899f1b221f1590d6139e041bba9e41440e18
-  data.tar.gz: c39aac2349ea4f6685fe759864d42083b88a3f51a0a6ba942a72f99d5104b54bab2a9b2b752192bd878fa47d92ab0942be5c2cda675585badbecc34113eb5f6c
+  metadata.gz: 736c49029deb88bdee79e932d4e1d0e807d1d89f1b461e5419dc3d3cd1bd9c050000f5844171c65e46fe5aa4a17bc2da078b7b022252abb65ee5a531bc5f9e76
+  data.tar.gz: 604c1f3b9918d28788ccefb101208a37973461ee447655dc8e8cdef716628da338a2b21b678566d869f6142c112aa052c93866279a81208d1447307153fd3b71

data/README.md

@@ -32,7 +32,6 @@ frameit
 [![Twitter: @KauseFx](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/fastlane/blob/master/frameit/LICENSE)
 [![Gem](https://img.shields.io/gem/v/frameit.svg?style=flat)](http://rubygems.org/gems/frameit)
-[![Build Status](https://img.shields.io/circleci/project/fastlane/fastlane/master.svg?style=flat)](https://circleci.com/gh/fastlane/fastlane)
 
 ###### Quickly put your screenshots into the right device frames
 
@@ -52,7 +51,7 @@ Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.c
 </p>
 
 -------
-<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>
+<h5 align="center"><code>frameit</code> is part of <a href="https://fastlane.tools">fastlane</a>: The easiest way to automate beta deployments and releases for your iOS and Android apps.</h5>
 
 
 # Features
@@ -116,9 +115,9 @@ To use the silver version of the frames:
 
     frameit silver
 
-To run the setup process again to add new frames use:
+To download the latest frames
 
-    frameit setup
+    frameit download_frames
 
 When using `frameit` without titles on top, the screenshots will have the full resolution, which means they can't be uploaded to the App Store directly. They are supposed to be used for websites, print media and emails. Check out the section below to use the screenshots for the App Store.
 
@@ -134,6 +133,7 @@ Use it to define the general information:
 
 ```json
 {
+  "device_frame_version": "latest",
   "default": {
     "keyword": {
       "font": "./fonts/MyFont-Rg.otf"
@@ -235,7 +235,7 @@ Check out the [MindNode example project](https://github.com/fastlane/examples/tr
 
 ## [`fastlane`](https://fastlane.tools) Toolchain
 
-- [`fastlane`](https://fastlane.tools): The easiest way to automate building and releasing your iOS and Android apps
+- [`fastlane`](https://fastlane.tools): The easiest way to automate beta deployments and releases for your iOS and Android apps
 - [`deliver`](https://github.com/fastlane/fastlane/tree/master/deliver): Upload screenshots, metadata and your app to the App Store
 - [`snapshot`](https://github.com/fastlane/fastlane/tree/master/snapshot): Automate taking localized screenshots of your iOS app on every device
 - [`pem`](https://github.com/fastlane/fastlane/tree/master/pem): Automatically generate and renew your push notification profiles

data/lib/frameit.rb

@@ -1,6 +1,6 @@
 require 'mini_magick'
 require 'frameit/version'
-require 'frameit/frame_converter'
+require 'frameit/frame_downloader'
 require 'frameit/device_types'
 require 'frameit/runner'
 require 'frameit/screenshot'
@@ -23,6 +23,24 @@ 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__))
+
+  # Defaults to latest, might be a time stamp if defined in the Framefile.json
+  def self.frames_version
+    return @frames_version if @frames_version
+    @frames_version = "latest"
+
+    config_files = Dir["./**/Framefile.json"]
+    if config_files.count > 0
+      config = ConfigParser.new.load(config_files.first)
+      if config.data["device_frame_version"].to_s.length > 0
+        @frames_version = config.data["device_frame_version"]
+      end
+    end
+
+    UI.success("Using device frames version '#{@frames_version}'")
+
+    return @frames_version
+  end
 end
 
 # rubocop:disable all

data/lib/frameit/commands_generator.rb

@@ -29,7 +29,7 @@ module Frameit
 
       command :run do |c|
         c.syntax = 'frameit black'
-        c.description = "Adds a black frame around all screenshots."
+        c.description = "Adds a black frame around all screenshots"
 
         c.action do |args, options|
           load_config(options)
@@ -39,7 +39,7 @@ module Frameit
 
       command :silver do |c|
         c.syntax = 'frameit silver'
-        c.description = "Adds a silver frame around all screenshots."
+        c.description = "Adds a silver frame around all screenshots"
 
         c.action do |args, options|
           load_config(options)
@@ -47,12 +47,41 @@ module Frameit
         end
       end
 
+      command :gold do |c|
+        c.syntax = 'frameit gold'
+        c.description = "Adds a gold frame around all screenshots"
+
+        c.action do |args, options|
+          load_config(options)
+          Frameit::Runner.new.run('.', Frameit::Color::GOLD)
+        end
+      end
+
+      command :rose_gold do |c|
+        c.syntax = 'frameit rose_gold'
+        c.description = "Adds a rose gold frame around all screenshots"
+
+        c.action do |args, options|
+          load_config(options)
+          Frameit::Runner.new.run('.', Frameit::Color::ROSE_GOLD)
+        end
+      end
+
       command :setup do |c|
         c.syntax = 'frameit setup'
-        c.description = "Helps you adding new frames."
+        c.description = "Downloads and sets up the latest device frames"
+
+        c.action do |args, options|
+          Frameit::FrameDownloader.new.download_frames
+        end
+      end
+
+      command :download_frames do |c|
+        c.syntax = 'frameit download_frames'
+        c.description = "Downloads and sets up the latest device frames"
 
         c.action do |args, options|
-          Frameit::FrameConverter.new.run
+          Frameit::FrameDownloader.new.download_frames
         end
       end
 

data/lib/frameit/config_parser.rb

@@ -1,5 +1,7 @@
 module Frameit
   class ConfigParser
+    attr_reader :data
+
     def load(path)
       return nil unless File.exist?(path) # we are okay with no config at all
       UI.verbose("Parsing config file '#{path}'")

data/lib/frameit/device_types.rb

@@ -1,11 +1,13 @@
 module Frameit
   module Color
-    BLACK = "SpaceGray"
-    SILVER = "Slvr"
+    BLACK = "Space Gray"
+    SILVER = "Silver"
+    ROSE_GOLD = "Rose Gold"
+    GOLD = "Gold"
   end
 
   module Orientation
-    PORTRAIT = "Vert"
-    LANDSCAPE = "Horz"
+    PORTRAIT = "PORTRAIT"
+    LANDSCAPE = "LANDSCAPE"
   end
 end

data/lib/frameit/editor.rb

@@ -9,8 +9,13 @@ module Frameit
       self.screenshot = screenshot
       prepare_image
 
-      if load_frame # e.g. Mac doesn't need a frame
+      if load_frame # Mac doesn't need a frame
         self.frame = MiniMagick::Image.open(load_frame)
+        self.frame.rotate(90) unless self.screenshot.portrait? # we use portrait device frames for landscape screenshots
+      elsif self.class == Editor
+        # Couldn't find device frame (probably an iPhone 4, for which there are no images available any more)
+        # Message is already shown elsewhere
+        return
       end
 
       if should_add_title?
@@ -37,17 +42,31 @@ module Frameit
 
     def store_result
       output_path = screenshot.path.gsub('.png', '_framed.png').gsub('.PNG', '_framed.png')
-      image.format "png"
-      image.write output_path
+      image.format("png")
+      image.write(output_path)
       UI.success "Added frame: '#{File.expand_path(output_path)}'"
     end
 
     # puts the screenshot into the frame
     def put_into_frame
+      # We have to rotate the screenshot, since the offset information is for portrait
+      # only. Instead of doing the calculations ourselves, it's much easier to let
+      # imagemagick do the hard lifting for landscape screenshots
+      unless self.screenshot.portrait?
+        frame.rotate(-90)
+        @image.rotate(-90)
+      end
+
       @image = frame.composite(image, "png") do |c|
         c.compose "Over"
         c.geometry offset['offset']
       end
+
+      # We have to revert the state to be landscape screenshots
+      unless self.screenshot.portrait?
+        frame.rotate(90)
+        @image.rotate(90)
+      end
     end
 
     def offset
@@ -89,11 +108,11 @@ module Frameit
 
       if self.frame # we have no frame on le mac
         resize_frame!
-        @image = put_into_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
-        image.resize "#{frame_width}x"
+        @image.resize "#{frame_width}x"
       end
 
       self.top_space_above_device = vertical_frame_padding
@@ -160,7 +179,9 @@ module Frameit
 
     # Resize the frame as it's too low quality by default
     def resize_frame!
-      multiplicator = (screenshot.size[0].to_f / offset['width'].to_f) # by how much do we have to change this?
+      screenshot_width = self.screenshot.portrait? ? screenshot.size[0] : screenshot.size[1]
+
+      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
       modify_offset(multiplicator) # modify the offset to properly insert the screenshot into the frame later
@@ -271,7 +292,7 @@ module Frameit
       return @config if @config
 
       config_path = File.join(File.expand_path("..", screenshot.path), "Framefile.json")
-      config_path = File.join(File.expand_path("../..", screenshot.path), "Framefile.json") unless File.exist? config_path
+      config_path = File.join(File.expand_path("../..", screenshot.path), "Framefile.json") unless File.exist?(config_path)
       file = ConfigParser.new.load(config_path)
       return {} unless file # no config file at all
       @config = file.fetch_value(screenshot.path)

data/lib/frameit/frame_downloader.rb

@@ -0,0 +1,71 @@
+module Frameit
+  class FrameDownloader
+    FRAME_PATH = '.frameit/devices_frames_2'
+    HOST_URL = "https://fastlane.github.io/frameit-frames"
+
+    def download_frames
+      print_disclaimer
+
+      require 'json'
+      require 'fileutils'
+
+      UI.message("Downloading device frames...")
+      FileUtils.mkdir_p(templates_path)
+
+      frames_version = download_file("version.txt")
+      File.write(File.join(templates_path, "version.txt"), frames_version)
+      UI.important("Using frame version '#{frames_version}', you can optionally lock that version in your Framefile.json using `device_frame_version`")
+
+      files = JSON.parse(download_file("files.json"))
+      files.each_with_index do |current, index|
+        content = download_file(current, txt: "#{index + 1} of #{files.count} files")
+        File.write(File.join(templates_path, current), content)
+      end
+      File.write(File.join(templates_path, "offsets.json"), download_file("offsets.json"))
+
+      UI.success("Successfully downloaded all required image assets")
+    end
+
+    def frames_exist?(version: "latest")
+      Dir["#{templates_path}/*.png"].count > 0 && File.read(File.join(templates_path, "version.txt")).to_i > 0
+    end
+
+    def self.templates_path
+      File.join(ENV['HOME'], FRAME_PATH, Frameit.frames_version)
+    end
+
+    def templates_path
+      self.class.templates_path
+    end
+
+    def print_disclaimer
+      UI.header "Device frames disclaimer"
+      UI.important "All used device frames are available via Facebook Design: http://facebook.design/devices"
+      UI.message "----------------------------------------"
+      UI.message "While Facebook has redrawn and shares these assets for the benefit"
+      UI.message "of the design community, Facebook does not own any of the underlying"
+      UI.message "product or user interface designs."
+      UI.message "By accessing these assets, you agree to obtain all necessary permissions"
+      UI.message "from the underlying rights holders and/or adhere to any applicable brand"
+      UI.message "use guidelines before using them."
+      UI.message "Facebook disclaims all express or implied warranties with respect to these assets, including"
+      UI.message "non-infringement of intellectual property rights."
+      UI.message "----------------------------------------"
+    end
+
+    private
+
+    def download_file(path, txt: "file")
+      require 'uri'
+
+      url = File.join(HOST_URL, Frameit.frames_version, URI.escape(path))
+      UI.message("Downloading #{txt} from '#{url}' ...")
+      body = Excon.get(url).body
+      raise body if body.include?("<Error>")
+      return body
+    rescue => ex
+      UI.error(ex)
+      UI.user_error!("Error accessing URL '#{url}'")
+    end
+  end
+end

data/lib/frameit/offsets.rb

@@ -3,89 +3,17 @@ module Frameit
     # Returns the image offset needed for a certain device type for a given orientation
     # uses deliver to detect the screen size
     def self.image_offset(screenshot)
-      size = Deliver::AppScreenshot::ScreenSize
-      case screenshot.orientation_name
-      when Orientation::PORTRAIT
-        case screenshot.screen_size
-        when size::IOS_55
-          return {
-            'offset' => '+41+146',
-            'width' => 541
-          }
-        when size::IOS_47
-          return {
-            'offset' => "+43+154",
-            'width' => 530
-          }
-        when size::IOS_40
-          if Frameit.config[:use_legacy_iphone5s]
-            return {
-              'offset' => "+54+197",
-              'width' => 544
-            }
-          else
-            return {
-             'offset' => "+48+178",
-             'width' => 485
-            }
-          end
-        when size::IOS_35
-          return {
-            'offset' => "+59+260",
-            'width' => 647
-          }
-        when size::IOS_IPAD
-          return {
-            'offset' => '+47+135',
-            'width' => 737
-          }
-        when size::IOS_IPAD_PRO
-          return {
-            'offset' => '+48+90',
-            'width' => 805
-          }
-        end
-      when Orientation::LANDSCAPE
-        case screenshot.screen_size
-        when size::IOS_55
-          return {
-            'offset' => "+146+41",
-            'width' => 960
-          }
-        when size::IOS_47
-          return {
-            'offset' => "+153+41",
-            'width' => 946
-          }
-        when size::IOS_40
-          if Frameit.config[:use_legacy_iphone5s]
-            return {
-              'offset' => "+201+48",
-              'width' => 970
-            }
-          else
-            return {
-              'offset' => "+177+41",
-              'width' => 859
-            }
-          end
-        when size::IOS_35
-          return {
-            'offset' => "+258+52",
-            'width' => 966
-          }
-        when size::IOS_IPAD
-          return {
-            'offset' => '+135+47',
-            'width' => 983
-          }
-        when size::IOS_IPAD_PRO
-          return {
-            'offset' => '+88+48',
-            'width' => 1075
-          }
-        end
+      require 'json'
+
+      unless @offsets
+        offsets_json_path = File.join(FrameDownloader.new.templates_path, "offsets.json")
+        UI.user_error!("Could not find offsets.json file at path '#{offsets_json_path}'") unless File.exist?(offsets_json_path)
+        @offsets = JSON.parse(File.read(offsets_json_path))
       end
+
+      offset_value = @offsets["portrait"][screenshot.device_name]
+      UI.error("Tried looking for offset information for 'portrait', #{screenshot.device_name}") unless offset_value
+      return offset_value
     end
   end
 end

data/lib/frameit/options.rb

@@ -12,6 +12,14 @@ module Frameit
                                      description: "Use white device frames. Alias for :white",
                                      optional: true,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :rose_gold,
+                                     description: "Use rose gold device frames. Alias for :rose_gold",
+                                     optional: true,
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :gold,
+                                     description: "Use gold device frames. Alias for :gold",
+                                     optional: true,
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :force_device_type,
                                      env_name: "FRAMEIT_FORCE_DEVICE_TYPE",
                                      description: "Forces a given device type, useful for Mac screenshots, as their sizes vary",
@@ -24,9 +32,13 @@ module Frameit
                                      end),
         FastlaneCore::ConfigItem.new(key: :use_legacy_iphone5s,
                            env_name: "FRAMEIT_USE_LEGACY_IPHONE_5_S",
-                           optional: true,
                            is_string: false,
                            description: "use iPhone 5s instead of iPhone SE frames",
+                           default_value: false),
+        FastlaneCore::ConfigItem.new(key: :use_legacy_iphone6s,
+                           env_name: "FRAMEIT_USE_LEGACY_IPHONE_6_S",
+                           is_string: false,
+                           description: "Use iPhone 6s frames instead of iPhone 7 frames",
                            default_value: false)
       ]
     end

data/lib/frameit/runner.rb

@@ -4,13 +4,9 @@ require 'fastimage'
 module Frameit
   class Runner
     def initialize
-      converter = FrameConverter.new
-      if converter.frames_exist?
-        # Just make sure, the PSD files are converted to PNG
-        converter.convert_frames
-      else
-        # First run
-        converter.run
+      downloader = FrameDownloader.new
+      unless downloader.frames_exist?
+        downloader.download_frames
       end
     end
 
@@ -18,6 +14,8 @@ module Frameit
       unless color
         color = Frameit::Color::BLACK
         color = Frameit::Color::SILVER if Frameit.config[:white] || Frameit.config[:silver]
+        color = Frameit::Color::GOLD if Frameit.config[:gold]
+        color = Frameit::Color::ROSE_GOLD if Frameit.config[:rose_gold]
       end
 
       screenshots = Dir.glob("#{path}/**/*.{png,PNG}").uniq # uniq because thanks to {png,PNG} there are duplicates
@@ -29,6 +27,8 @@ module Frameit
           next if full_path.include? "device_frames/" # these are the device frames the user is using
           next if full_path.downcase.include? "watch" # we don't care about watches right now
 
+          UI.message("Framing screenshot '#{full_path}'")
+
           begin
             screenshot = Screenshot.new(full_path, color)
             screenshot.frame!
@@ -38,7 +38,7 @@ module Frameit
           end
         end
       else
-        UI.error "Could not find screenshots"
+        UI.error "Could not find screenshots in current directory: '#{File.expand_path(path)}'"
       end
     end
   end

data/lib/frameit/screenshot.rb

@@ -22,30 +22,39 @@ module Frameit
       sizes = Deliver::AppScreenshot::ScreenSize
       case @screen_size
       when sizes::IOS_55
-        return 'iPhone-6s-Plus'
+        return Frameit.config[:use_legacy_iphone6s] ? 'iPhone 6s Plus' : 'iPhone 7 Plus'
       when sizes::IOS_47
-        return 'iPhone-6s'
+        return Frameit.config[:use_legacy_iphone6s] ? 'iPhone 6s' : 'iPhone 7'
       when sizes::IOS_40
-        return Frameit.config[:use_legacy_iphone5s] ? 'iPhone_5s' : 'iPhone-SE'
+        return Frameit.config[:use_legacy_iphone5s] ? 'iPhone 5s' : 'iPhone SE'
       when sizes::IOS_35
-        return 'iPhone_4'
+        return 'iPhone 4'
       when sizes::IOS_IPAD
-        return 'iPad-mini'
+        return 'iPad Air 2'
       when sizes::IOS_IPAD_PRO
-        return 'iPad-Pro'
+        return 'iPad Pro'
       when sizes::MAC
-        return 'Mac'
+        return 'MacBook'
       else
         UI.error "Unknown device type for size #{@screen_size} for path '#{path}'"
       end
     end
 
+    def color
+      if !Frameit.config[:use_legacy_iphone6s] && @color == Frameit::Color::BLACK
+        if @screen_size == Deliver::AppScreenshot::ScreenSize::IOS_55 || @screen_size == Deliver::AppScreenshot::ScreenSize::IOS_47
+          return "Matte Black" # RIP space gray
+        end
+      end
+      return @color
+    end
+
     # Is the device a 3x device? (e.g. 6 Plus)
     def triple_density?
       (screen_size == Deliver::AppScreenshot::ScreenSize::IOS_55)
     end
 
-    # Super old devices
+    # Super old devices (iPhone 4)
     def mini?
       (screen_size == Deliver::AppScreenshot::ScreenSize::IOS_35)
     end

data/lib/frameit/template_finder.rb

@@ -1,84 +1,32 @@
 module Frameit
   # Responsible for finding the correct device
   class TemplateFinder
-    class FilenameTransform
-      def initialize(device_name)
-        @device_name = device_name
-      end
-    end
-
-    # Example: iPhone_5s_Vert_SpaceGray_sRGB
-    class Type1Transform < FilenameTransform
-      def transform(color, orientation)
-        # Note the * on the end to handle the _sRGB part
-        "#{@device_name}_#{orientation}_#{color}*"
-      end
-    end
-
-    # Example: iPad-Pro-Space-Gray-vertical.png
-    class Type2Transform < FilenameTransform
-      def transform(color, orientation)
-        fixed_color = color == 'SpaceGray' ? "Space-Gray" : "Silver"
-        fixed_orientation = orientation == 'Horz' ? 'horizontal' : 'vertical'
-        "#{@device_name}-#{fixed_color}-#{fixed_orientation}"
-      end
-    end
-
-    # Example: iPhone-SE-Space-Gray
-    # Note that 'vertical' is implied
-    class Type3Transform < FilenameTransform
-      def transform(color, orientation)
-        fixed_color = color == 'SpaceGray' ? "Space-Gray" : "Silver"
-        filename = "#{@device_name}-#{fixed_color}"
-        if orientation == 'Horz'
-          "#{filename}-horizontal"
-        else
-          filename
-        end
-      end
-    end
-
-    DEVICE_TO_TRANSFORM_TYPE = {
-      'iPhone-SE' => Type3Transform.new('iPhone-SE'),
-      'iPad-Pro' => Type2Transform.new('iPad-Pro'),
-      'iPad-mini' => Type2Transform.new('iPad-mini'),
-      'iPhone-6s' => Type2Transform.new('iPhone-6s'),
-      'iPhone-6s-Plus' => Type2Transform.new('iPhone-6s-Plus')
-    }
-
     # This will detect the screen size and choose the correct template
     def self.get_template(screenshot)
       return nil if screenshot.mac?
 
-      transformer = DEVICE_TO_TRANSFORM_TYPE[screenshot.device_name]
-
-      # The "original" pattern is the type 1 transform
-      # so if we don't have something more specific, go for that
-      transformer ||= Type1Transform.new(screenshot.device_name)
-      filename = transformer.transform(screenshot.color, screenshot.orientation_name)
+      filename = "Apple #{screenshot.device_name} #{screenshot.color}"
 
-      templates_path = [ENV['HOME'], FrameConverter::FRAME_PATH].join('/')
-      templates = Dir["../**/#{filename}.{png,jpg}"] # local directory
-      templates += Dir["#{templates_path}/**/#{filename}.{png,jpg}"] # ~/.frameit folder
+      templates = Dir["#{FrameDownloader.templates_path}/#{filename}.{png,jpg}"] # ~/.frameit folder
 
-      UI.verbose "Looking for #{filename} and found #{templates.count}"
+      UI.verbose "Looking for #{filename} and found #{templates.count} template(s)"
 
       if templates.count == 0
         if screenshot.screen_size == Deliver::AppScreenshot::ScreenSize::IOS_35
           UI.important "Unfortunately 3.5\" device frames were discontinued. Skipping screen '#{screenshot.path}'"
           UI.error "Looked for: '#{filename}.png'"
-        elsif screenshot.device_name == 'iPhone-SE'
-          UI.error "By default frameit uses the iPhone SE for screenshots"
-          UI.error "Unable to find a frame #{filename}.png"
-          UI.error "You can download iPhone-SE templates from '#{FrameConverter::DOWNLOAD_URL}'"
-          UI.error "and store them in '#{templates_path}'"
-          UI.error "\nIf you'd prefer to use the old iPhone 5s templates, add the option --use_legacy_iphone5s"
+        elsif screenshot.color == Frameit::Color::ROSE_GOLD || screenshot.color == Frameit::Color::GOLD
+          # Unfortunately not every device type is available in rose gold or gold
+          # This is why we can't have nice things #yatusabes
+          # fallback to a white iPhone, which looks similar
+          UI.important("Unfortunatey device type '#{screenshot.device_name}' is not available in #{screenshot.color}, falling back to silver...")
+          screenshot.color = Frameit::Color::SILVER
+          return self.get_template(screenshot)
         else
-          UI.error "Could not find a valid template for screenshot '#{screenshot.path}'"
-          UI.error "You can download new templates from '#{FrameConverter::DOWNLOAD_URL}'"
-          UI.error "and store them in '#{templates_path}'"
-          UI.error "Missing file: '#{filename}.png'"
+          UI.error("Couldn't find template for screenshot type '#{filename}'")
+          UI.error("Please run `frameit download_frames` to download the latest frames")
         end
+        return filename if Helper.test?
         return nil
       else
         return templates.first.tr(" ", "\ ")

data/lib/frameit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-24 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.52.1
+        version: 0.53.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.53.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.38.0
+        version: 0.44.0
 description: Quickly put your screenshots into the right device frames
 email:
 - frameit@krausefx.com
@@ -230,7 +230,7 @@ files:
 - lib/frameit/dependency_checker.rb
 - lib/frameit/device_types.rb
 - lib/frameit/editor.rb
-- lib/frameit/frame_converter.rb
+- lib/frameit/frame_downloader.rb
 - lib/frameit/mac_editor.rb
 - lib/frameit/offsets.rb
 - lib/frameit/options.rb

data/lib/frameit/frame_converter.rb

@@ -1,99 +0,0 @@
-module Frameit
-  class FrameConverter
-    DOWNLOAD_URL = 'https://developer.apple.com/app-store/marketing/guidelines/#images'
-    FRAME_PATH = '.frameit/devices_frames'
-
-    def run
-      self.setup_frames
-    end
-
-    def setup_frames
-      UI.success "----------------------------------------------------"
-      UI.success "Looks like you'd like to install new device templates"
-      UI.success "The images can not be pre-installed due to licensing"
-      UI.success "Press Enter to get started"
-      UI.success "----------------------------------------------------"
-      STDIN.gets
-
-      system("open '#{DOWNLOAD_URL}'")
-      UI.success "----------------------------------------------------"
-      UI.success "Download the zip files for the following devices"
-      UI.success "iPhone 6s, iPhone 6s Plus, iPhone SE, iPad mini 4 and iPad Pro"
-      UI.success "You only need to download the devices you want to use"
-      UI.success "Press Enter when you downloaded the zip files"
-      UI.success "----------------------------------------------------"
-      STDIN.gets
-
-      loop do
-        system("mkdir -p '#{templates_path}' && open '#{templates_path}'")
-        UI.success "----------------------------------------------------"
-        UI.success "Extract the downloaded files into the folder"
-        UI.success "'#{templates_path}', which should be open in your Finder"
-        UI.success "You can just copy the whole content into it."
-        UI.success "Press Enter when you extracted the files into the given folder"
-        UI.success "----------------------------------------------------"
-        STDIN.gets
-
-        if !frames_exist?
-          UI.error "Sorry, I can't find the PSD files. Make sure you unzipped them into '#{templates_path}'"
-        else
-          break # everything is finished
-        end
-      end
-
-      convert_frames
-    end
-
-    def frames_exist?
-      (Dir["#{templates_path}/**/*.psd"].count + Dir["../**/*sRGB.png"].count) > 0
-    end
-
-    def templates_path
-      "#{ENV['HOME']}/#{FRAME_PATH}"
-    end
-
-    # Converts all the PSD files to trimmed PNG files
-    def convert_frames
-      MiniMagick.configure do |config|
-        config.validate_on_create = false
-      end
-
-      Dir["#{templates_path}/**/*.psd"].each do |psd|
-        resulting_path = psd.gsub('.psd', '.png')
-        next if File.exist?(resulting_path)
-
-        UI.important "Converting PSD file '#{psd}'"
-        image = MiniMagick::Image.open(psd)
-
-        if psd =~ /iPhone-SE/
-          UI.success "Removing white background 🚫 ⬜️"
-
-          # The iPhone-SE screenshots from April 2016 have
-          # 3 layers, a background, a product, and the 'put your image here' layer
-          # imagemagick seems to add an additional layer with no label which this the
-          # composite of all three.  We want to remove the background and composite layer
-          good_layers = image.layers.reject do |layer|
-            label = layer.details['Properties']['label']
-            label.to_s.length == 0 || label =~ /White B/i
-          end
-          product_layer = good_layers.shift
-
-          good_layers.each do |layer|
-            product_layer.layers << layer
-          end
-
-          image = product_layer
-        end
-
-        if image
-          image.format 'png'
-          image.trim
-
-          image.write(resulting_path)
-        else
-          UI.error "Could not parse PSD file at path '#{psd}'"
-        end
-      end
-    end
-  end
-end