frameit 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae5b2a61b61d15ef95e284805becd33d3065083a
-  data.tar.gz: 3fbf7039b8199813d8a6ee553eb87d3759ced1d6
+  metadata.gz: 473c89d064c18c60ed9e3f220c5b7fa990a800ef
+  data.tar.gz: de0abe10f92581d5853559d30b076f731590610c
 SHA512:
-  metadata.gz: d75de50c72ad4ae38c93897140d1f334c567c25a585f1f82ec2ed44fc370d6f046a3da0a8c03aa578917f4934a66493776fe98fc011169af98d0201038f7f686
-  data.tar.gz: cd98080626e3d436cc3e916fd585f1928d25d2d00b35a57291ec58816b483dd1d0334686ae8d4a2cc41c79ce94f1f644b26e7dc0dae6461930dfe64012baf30a
+  metadata.gz: a872266a0ea54cbb28ffed9fb4bc8da10bce63d4b86fe75562ba6ac56d3d8b8c3867049c497e8b1de2299e469cdfac5e548d5b5bd6f0494e3959ac8fa65577e1
+  data.tar.gz: b54f1413b1f8177a8e73a9d3e37480d79ab69cf72118f2c6ed4fe651aa6c6538a8f79c70307f3905273b3935b96e424c59cd02d4e6e287caefe4e71196b5e2c4

data/README.md

@@ -141,7 +141,8 @@ Use it to define the general information:
       "color": "#545454"
     },
     "background": "./background.jpg",
-    "padding": 50
+    "padding": 50,
+    "show_complete_frame": false
   },
 
   "data": [
@@ -172,6 +173,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 `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.
 

data/bin/frameit

@@ -3,73 +3,5 @@
 $:.push File.expand_path("../../lib", __FILE__)
 
 require 'frameit'
-require 'commander'
-
-HighLine.track_eof = false
-
-class FrameItApplication
-  include Commander::Methods
-
-  def run
-    program :version, Frameit::VERSION
-    program :description, 'Quickly put your screenshots into the right device frames'
-    program :help, 'Author', 'Felix Krause <frameit@krausefx.com>'
-    program :help, 'Website', 'https://fastlane.tools'
-    program :help, 'GitHub', 'https://github.com/fastlane/frameit'
-    program :help_formatter, :compact
-
-    global_option('--verbose') { $verbose = true }
-    FastlaneCore::CommanderGenerator.new.generate(Frameit::Options.available_options)
-
-    default_command :run
-
-    command :run do |c|
-      c.syntax = 'frameit black'
-      c.description = "Adds a black frame around all screenshots."
-
-      c.action do |args, options|
-        load_config(options)
-        Frameit::Runner.new.run('.', nil)
-      end
-    end
-
-    command :silver do |c|
-      c.syntax = 'frameit silver'
-      c.description = "Adds a silver frame around all screenshots."
-
-      c.action do |args, options|
-        load_config(options)
-        Frameit::Runner.new.run('.', Frameit::Color::SILVER)
-      end
-    end
-
-    command :setup do |c|
-      c.syntax = 'frameit setup'
-      c.description = "Helps you adding new frames."
-
-      c.action do |args, options|
-        Frameit::FrameConverter.new.run
-      end
-    end
-
-    alias_command :white, :silver
-
-    run!
-  end
-
-  private
-
-  def load_config(options)
-    o = options.__hash__.dup
-    o.delete(:verbose)
-    Frameit.config = FastlaneCore::Configuration.create(Frameit::Options.available_options, o)
-  end
-end
-
-begin
-  FastlaneCore::UpdateChecker.start_looking_for_update('frameit')
-  Frameit::DependencyChecker.check_dependencies
-  FrameItApplication.new.run
-ensure
-  FastlaneCore::UpdateChecker.show_update_status('frameit', Frameit::VERSION)
-end
+require 'frameit/commands_generator'
+Frameit::CommandsGenerator.start

data/lib/frameit/commands_generator.rb

@@ -0,0 +1,72 @@
+require 'commander'
+
+HighLine.track_eof = false
+
+module Frameit
+  class CommandsGenerator
+    include Commander::Methods
+
+    def self.start
+      FastlaneCore::UpdateChecker.start_looking_for_update('frameit')
+      Frameit::DependencyChecker.check_dependencies
+      self.new.run
+    ensure
+      FastlaneCore::UpdateChecker.show_update_status('frameit', Frameit::VERSION)
+    end
+
+    def run
+      program :version, Frameit::VERSION
+      program :description, 'Quickly put your screenshots into the right device frames'
+      program :help, 'Author', 'Felix Krause <frameit@krausefx.com>'
+      program :help, 'Website', 'https://fastlane.tools'
+      program :help, 'GitHub', 'https://github.com/fastlane/frameit'
+      program :help_formatter, :compact
+
+      global_option('--verbose') { $verbose = true }
+      FastlaneCore::CommanderGenerator.new.generate(Frameit::Options.available_options)
+
+      default_command :run
+
+      command :run do |c|
+        c.syntax = 'frameit black'
+        c.description = "Adds a black frame around all screenshots."
+
+        c.action do |args, options|
+          load_config(options)
+          Frameit::Runner.new.run('.', nil)
+        end
+      end
+
+      command :silver do |c|
+        c.syntax = 'frameit silver'
+        c.description = "Adds a silver frame around all screenshots."
+
+        c.action do |args, options|
+          load_config(options)
+          Frameit::Runner.new.run('.', Frameit::Color::SILVER)
+        end
+      end
+
+      command :setup do |c|
+        c.syntax = 'frameit setup'
+        c.description = "Helps you adding new frames."
+
+        c.action do |args, options|
+          Frameit::FrameConverter.new.run
+        end
+      end
+
+      alias_command :white, :silver
+
+      run!
+    end
+
+    private
+
+    def load_config(options)
+      o = options.__hash__.dup
+      o.delete(:verbose)
+      Frameit.config = FastlaneCore::Configuration.create(Frameit::Options.available_options, o)
+    end
+  end
+end

data/lib/frameit/config_parser.rb

@@ -2,7 +2,7 @@ module Frameit
   class ConfigParser
     def load(path)
       return nil unless File.exist?(path) # we are okay with no config at all
-      UI.message "Parsing config file '#{path}'" if $verbose
+      UI.verbose("Parsing config file '#{path}'")
       @path = path
       self.parse(File.read(path))
     end
@@ -59,33 +59,35 @@ module Frameit
     # Make sure the paths/colors are valid
     def validate_values(values)
       values.each do |key, value|
-        if value.kind_of? Hash
+        if value.kind_of?(Hash)
           validate_values(value) # recursive call
         else
           if key == 'font'
-            UI.user_error! "Could not find font at path '#{File.expand_path(value)}'" unless File.exist? value
+            UI.user_error!("Could not find font at path '#{File.expand_path(value)}'") unless File.exist?(value)
           end
 
           if key == 'fonts'
-            UI.user_error! "`fonts` must be an array" unless value.kind_of? Array
+            UI.user_error!("`fonts` must be an array") unless value.kind_of?(Array)
 
             value.each do |current|
-              UI.user_error! "You must specify a font path" if current.fetch('font', '').length == 0
-              UI.user_error! "Could not find font at path '#{File.expand_path(current.fetch('font'))}'" unless File.exist? current.fetch('font')
-              UI.user_error! "`supported` must be an array" unless current.fetch('supported', []).kind_of? Array
+              UI.user_error!("You must specify a font path") if current.fetch('font', '').length == 0
+              UI.user_error!("Could not find font at path '#{File.expand_path(current.fetch('font'))}'") unless File.exist?(current.fetch('font'))
+              UI.user_error!("`supported` must be an array") unless current.fetch('supported', []).kind_of? Array
             end
           end
 
           if key == 'background'
-            UI.user_error! "Could not find background image at path '#{File.expand_path(value)}'" unless File.exist? value
+            UI.user_error!("Could not find background image at path '#{File.expand_path(value)}'") unless File.exist? value
           end
 
           if key == 'color'
-            UI.user_error! "Invalid color '#{value}'. Must be valid Hex #123123" unless value.include? "#"
+            UI.user_error!("Invalid color '#{value}'. Must be valid Hex #123123") unless value.include?("#")
           end
 
           if key == 'padding'
-            UI.user_error! "padding must be type integer or pair of integers of format 'AxB'" unless value.kind_of?(Integer) || value.split('x').length == 2
+            unless value.kind_of?(Integer) || value.split('x').length == 2
+              UI.user_error!("padding must be type integer or pair of integers of format 'AxB'")
+            end
           end
         end
       end

data/lib/frameit/editor.rb

@@ -142,6 +142,12 @@ module Frameit
     end
 
     def put_device_into_background(background)
+      show_complete_frame = fetch_config['show_complete_frame']
+      if show_complete_frame
+        max_height = background.height - top_space_above_device
+        image.resize "x#{max_height}>"
+      end
+
       left_space = (background.width / 2.0 - image.width / 2.0).round
 
       @image = background.composite(image, "png") do |c|
@@ -179,7 +185,7 @@ module Frameit
         # too large - resizing now
         smaller = (1.0 / ratio)
 
-        UI.message "Text for image #{self.screenshot.path} is quite long, reducing font size by #{(ratio - 1.0).round(2)}" if $verbose
+        UI.verbose("Text for image #{self.screenshot.path} is quite long, reducing font size by #{(ratio - 1.0).round(2)}")
 
         title.resize "#{(smaller * title.width).round}x"
         keyword.resize "#{(smaller * keyword.width).round}x" if keyword
@@ -235,8 +241,8 @@ module Frameit
 
         current_font = font(key)
         text = fetch_text(key)
-        UI.message "Using #{current_font} as font the #{key} of #{screenshot.path}" if $verbose and current_font
-        UI.message "Adding text '#{text}'" if $verbose
+        UI.verbose("Using #{current_font} as font the #{key} of #{screenshot.path}") if current_font
+        UI.verbose("Adding text '#{text}'")
 
         text.gsub! '\n', "\n"
 
@@ -281,7 +287,7 @@ module Frameit
 
       # No string files, fallback to Framefile config
       result = fetch_config[type.to_s]['text'] if fetch_config[type.to_s]
-      UI.message "Falling back to default text as there was nothing specified in the .strings file" if $verbose
+      UI.verbose("Falling back to default text as there was nothing specified in the .strings file")
 
       if type == :title and !result
         # title is mandatory
@@ -307,13 +313,13 @@ module Frameit
             end
           else
             # No `supported` array, this will always be true
-            UI.message "Found a font with no list of supported languages, using this now" if $verbose
+            UI.verbose("Found a font with no list of supported languages, using this now")
             return font["font"]
           end
         end
       end
 
-      UI.message "No custom font specified for #{screenshot}, using the default one" if $verbose
+      UI.verbose("No custom font specified for #{screenshot}, using the default one")
       return nil
     end
   end

data/lib/frameit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -225,6 +225,7 @@ files:
 - bin/frameit
 - lib/assets/empty.png
 - lib/frameit.rb
+- lib/frameit/commands_generator.rb
 - lib/frameit/config_parser.rb
 - lib/frameit/dependency_checker.rb
 - lib/frameit/device_types.rb
@@ -258,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Quickly put your screenshots into the right device frames