frameit 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32952cb239015de93e58ac8009c60a89f1bbd258
-  data.tar.gz: 0e0acf5884ca2258e2aabd59c29e6a0bdc6d7b78
+  metadata.gz: ae5b2a61b61d15ef95e284805becd33d3065083a
+  data.tar.gz: 3fbf7039b8199813d8a6ee553eb87d3759ced1d6
 SHA512:
-  metadata.gz: aa7abbdf75902a1eae255281cf539c8206eb537a73cc2a738abeb7bfcb10686f45387e59981d3a2768b9cddaaee98ea03820197b47ad9d473c5fd853e67e2b5f
-  data.tar.gz: 3520a641590f43d6824482fa9388bec5017d2b1c0994bf5a309bbf5f8d4462dd0faf5a680d5830eb6b0583d32a1892c8adfd5402e214ad80ac0078ce75bb5e06
+  metadata.gz: d75de50c72ad4ae38c93897140d1f334c567c25a585f1f82ec2ed44fc370d6f046a3da0a8c03aa578917f4934a66493776fe98fc011169af98d0201038f7f686
+  data.tar.gz: cd98080626e3d436cc3e916fd585f1928d25d2d00b35a57291ec58816b483dd1d0334686ae8d4a2cc41c79ce94f1f644b26e7dc0dae6461930dfe64012baf30a

data/bin/frameit

@@ -21,15 +21,15 @@ class FrameItApplication
     global_option('--verbose') { $verbose = true }
     FastlaneCore::CommanderGenerator.new.generate(Frameit::Options.available_options)
 
-    default_command :black
+    default_command :run
 
-    command :black do |c|
+    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('.', Frameit::Color::BLACK)
+        Frameit::Runner.new.run('.', nil)
       end
     end
 

data/lib/frameit/options.rb

@@ -2,12 +2,32 @@ module Frameit
   class Options
     def self.available_options
       @options ||= [
-        FastlaneCore::ConfigItem.new(key: :use_legacy_iphone5s,
-                                     env_name: "FRAMEIT_USE_LEGACY_IPHONE_5_S",
+
+        FastlaneCore::ConfigItem.new(key: :white,
+                                       env_name: "FRAMEIT_WHITE_FRAME",
+                                       description: "Use white device frames",
+                                       optional: true,
+                                       is_string: false),
+        FastlaneCore::ConfigItem.new(key: :silver,
+                                     description: "Use white device frames. Alias for :white",
+                                     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",
                                      optional: true,
-                                     is_string: false,
-                                     description: "use iPhone 5s instead of iPhone SE frames",
-                                     default_value: false)
+                                     verify_block: proc do |value|
+                                       available = ['iPhone_6_Plus', 'iPhone_5s', 'iPhone_4', 'iPad_mini', 'Mac']
+                                       unless available.include? value
+                                         UI.user_error!("Invalid device type '#{value}'. Available values: #{available}")
+                                       end
+                                     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)
       ]
     end
   end

data/lib/frameit/runner.rb

@@ -14,7 +14,12 @@ module Frameit
       end
     end
 
-    def run(path, color = Color::BLACK)
+    def run(path, color = nil)
+      unless color
+        color = Frameit::Color::BLACK
+        color = Frameit::Color::SILVER if Frameit.config[:white] || Frameit.config[:silver]
+      end
+
       screenshots = Dir.glob("#{path}/**/*.{png,PNG}").uniq # uniq because thanks to {png,PNG} there are duplicates
 
       if screenshots.count > 0

data/lib/frameit/version.rb

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

metadata

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