deliver 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8b650f488ed63a642a8e64f7e08747b32c1751
-  data.tar.gz: f93802deb4101f138b6dc1cffd419c68bfd55ae3
+  metadata.gz: ffed9f20a1ffa1f977ffdc5e4834b9746aff0969
+  data.tar.gz: c7d8303e3f631c689841aef920db146d00724c1c
 SHA512:
-  metadata.gz: 70b724356499554a47cd489d87bdbadb1ae5da1b1405acd2dc87272fdf015b50ba9424d03bd920a9bae68bf5136dbe37aeb4202aa775d1c42d4bb8a876f8c4de
-  data.tar.gz: 50bfbd3edc106c63721a3f4679e38dd75c6b0a3bae9095bd3ee59d97def77d7ee4816a958bdcd4975b51d52bc963c15d23cb7e3477e2f07783daa86cd31568ed
+  metadata.gz: 0c153be49bb375ee14e6298653e12529fd563106a9467ffb125bd1d7977e53b36bb542335c460699417a87d5d094f4da4e0a35278019554a5e8246748cd726ae
+  data.tar.gz: 43b50e4c92f00ad72e77d00b6eb515eb5004655bad47236bf703c136fd1c38fb9ca77d73b363e4af2d3bfcbaa6d9ccc3db40594635018a90d439295b2bdd3888

data/lib/deliver/app_screenshot.rb

@@ -52,7 +52,7 @@ module Deliver
         ScreenSize::IOS_55 => "iphone6Plus",
         ScreenSize::IOS_IPAD => "ipad",
         ScreenSize::MAC => "mac",
-        ScreenSize::IOS_APPLE_WATCH => "Watch"
+        ScreenSize::IOS_APPLE_WATCH => "watch"
       }
       return matching[self.screen_size]
     end

data/lib/deliver/upload_screenshots.rb

@@ -46,16 +46,20 @@ module Deliver
 
     def collect_screenshots(options)
       screenshots = []
+      extensions = '{png,jpg,jpeg}'
       Dir.glob(File.join(options[:screenshots_path], "*"), File::FNM_CASEFOLD).sort.each do |lng_folder|
         language = File.basename(lng_folder)
 
-        files = Dir.glob(File.join(lng_folder, '*.{png,PNG,jpg,JPG}'))
+        files = Dir.glob(File.join(lng_folder, "*.#{extensions}"))
         next if files.count == 0
 
-        prefer_framed = Dir.glob(File.join(lng_folder, '*_framed.{png,PNG,jpg,JPG}')).count > 0
+        prefer_framed = Dir.glob(File.join(lng_folder, '*_framed.#{extensions}')).count > 0
 
         files.each do |path|
-          next if prefer_framed && !path.include?("_framed.{png,PNG,jpg,JPG}")
+          if prefer_framed && !path.downcase.include?("_framed.#{extensions}") && !path.downcase.include?("watch")
+            next
+          end
+
           screenshots << AppScreenshot.new(path, language)
         end
       end

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
   DESCRIPTION = 'Upload screenshots, metadata and your app to the App Store using a single command'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core