deliver 1.15.1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31899c3f8e4b64ece2a4ad5e34e5db8d39f6f4fd
-  data.tar.gz: ed6ec4f61f09b2e6abf6e64ef5fbd8ab82ba774b
+  metadata.gz: 0c99d8b6d17d2b023312440d362b54ac541e382c
+  data.tar.gz: 952141eed98bd4301bcb4703387ddf2e938cd897
 SHA512:
-  metadata.gz: 69b8ae06a957a90efc091b37b19cbf429133f80df3ff4a1541a1e98482c7bf3f4fc673a9b1843fd159bc12c9ba3d532b9f8c73a04db81ba804b986b3c4b69e6b
-  data.tar.gz: 8cd0dfb98097194fc775853c9b0ca1b96bd7ffd56d54ff77b7d02d33b0cbe2b01aa4bb8445b98929428c4df0175fd999b189fb4ac423fef6c8a63952d35c52a4
+  metadata.gz: 4075258ce3d1cbd13a7174ca217c8b021a3ce574cf33a2610dc3ac13a7fc2d9070b6a55737eb6bdc1854d5b259c52ae42101da84316f6b192c3d0b2cb3a1319e
+  data.tar.gz: f6a1a1a9532466ea270f7d92f904d10d086dfc0a1ef6184be65ddb8c20b7a65a74dbb5e787892609ebaded8d84582d8e529fe2d901127998dc2c6c6db2e5301a

data/lib/assets/ScreenshotsHelp

@@ -1,5 +1,7 @@
 Put all screenshots you want to use inside the folder of its language (e.g. en-US).
 The device type will automatically be recognized using the image resolution. Apple TV screenshots
-should be stored in a subdirectory named appleTV with language folders inside of it.
+should be stored in a subdirectory named appleTV with language folders inside of it. iMessage
+screenshots, like Apple TV screenshots, should also be stored in a subdirectory named iMessage
+with language folders inside of it.
 
-The screenshots can be named whatever you want, but keep in mind they are sorted alphabetically.
+The screenshots can be named whatever you want, but keep in mind they are sorted alphabetically.

data/lib/deliver/app_screenshot.rb

@@ -17,6 +17,16 @@ module Deliver
       IOS_IPAD = "iOS-iPad"
       # iPad Pro
       IOS_IPAD_PRO = "iOS-iPad-Pro"
+      # iPhone 5 iMessage
+      IOS_40_MESSAGES = "iOS-4-in-messages"
+      # iPhone 6 iMessage
+      IOS_47_MESSAGES = "iOS-4.7-in-messages"
+      # iPhone 6 Plus iMessage
+      IOS_55_MESSAGES = "iOS-5.5-in-messages"
+      # iPad iMessage
+      IOS_IPAD_MESSAGES = "iOS-iPad-messages"
+      # iPad Pro iMessage
+      IOS_IPAD_PRO_MESSAGES = "iOS-iPad-Pro-messages"
       # Apple Watch
       IOS_APPLE_WATCH = "iOS-Apple-Watch"
       # Mac
@@ -56,6 +66,11 @@ module Deliver
         ScreenSize::IOS_55 => "iphone6Plus",
         ScreenSize::IOS_IPAD => "ipad",
         ScreenSize::IOS_IPAD_PRO => "ipadPro",
+        ScreenSize::IOS_40_MESSAGES => "iphone4",
+        ScreenSize::IOS_47_MESSAGES => "iphone6",
+        ScreenSize::IOS_55_MESSAGES => "iphone6Plus",
+        ScreenSize::IOS_IPAD_MESSAGES => "ipad",
+        ScreenSize::IOS_IPAD_PRO_MESSAGES => "ipadPro",
         ScreenSize::MAC => "desktop",
         ScreenSize::IOS_APPLE_WATCH => "watch",
         ScreenSize::APPLE_TV => "appleTV"
@@ -72,6 +87,11 @@ module Deliver
         ScreenSize::IOS_55 => "iPhone 6 Plus",
         ScreenSize::IOS_IPAD => "iPad",
         ScreenSize::IOS_IPAD_PRO => "iPad Pro",
+        ScreenSize::IOS_40_MESSAGES => "iPhone 5 (iMessage)",
+        ScreenSize::IOS_47_MESSAGES => "iPhone 6 (iMessage)",
+        ScreenSize::IOS_55_MESSAGES => "iPhone 6 Plus (iMessage)",
+        ScreenSize::IOS_IPAD_MESSAGES => "iPad (iMessage)",
+        ScreenSize::IOS_IPAD_PRO_MESSAGES => "iPad Pro (iMessage)",
         ScreenSize::MAC => "Mac",
         ScreenSize::IOS_APPLE_WATCH => "Watch",
         ScreenSize::APPLE_TV => "Apple TV"
@@ -86,6 +106,41 @@ module Deliver
       return self.screen_size == self.class.calculate_screen_size(self.path)
     end
 
+    def is_messages?
+      return [ScreenSize::IOS_40_MESSAGES, ScreenSize::IOS_47_MESSAGES, ScreenSize::IOS_55_MESSAGES, ScreenSize::IOS_IPAD_MESSAGES, ScreenSize::IOS_IPAD_PRO_MESSAGES].include?(self.screen_size)
+    end
+
+    def self.device_messages
+      return {
+        ScreenSize::IOS_55_MESSAGES => [
+          [1080, 1920],
+          [1242, 2208]
+        ],
+        ScreenSize::IOS_47_MESSAGES => [
+          [750, 1334]
+        ],
+        ScreenSize::IOS_40_MESSAGES => [
+          [640, 1136],
+          [640, 1096],
+          [1136, 600] # landscape status bar is smaller
+        ],
+        ScreenSize::IOS_IPAD_MESSAGES => [
+          [1024, 748],
+          [1024, 768],
+          [2048, 1496],
+          [2048, 1536],
+          [768, 1004],
+          [768, 1024],
+          [1536, 2008],
+          [1536, 2048]
+        ],
+        ScreenSize::IOS_IPAD_PRO_MESSAGES => [
+          [2732, 2048],
+          [2048, 2732]
+        ]
+      }
+    end
+
     def self.devices
       return {
         ScreenSize::IOS_55 => [
@@ -145,7 +200,10 @@ module Deliver
         skip_landscape = true
       end
 
-      self.devices.each do |device_type, array|
+      # iMessage screenshots have same resolution as app screenshots so we need to distinguish them
+      devices = path_component.eql?("iMessage") ? self.device_messages : self.devices
+
+      devices.each do |device_type, array|
         array.each do |resolution|
           if skip_landscape
             if size[0] == resolution[0] and size[1] == resolution[1] # portrait

data/lib/deliver/detect_values.rb

@@ -4,7 +4,9 @@ module Deliver
       find_app_identifier(options)
       find_app(options)
       find_folders(options)
+      ensure_folders_created(options)
       find_version(options) unless skip_params[:skip_version]
+      find_platform(options)
     end
 
     def find_app_identifier(options)
@@ -34,10 +36,12 @@ module Deliver
     end
 
     def find_folders(options)
-      containing = Helper.fastlane_enabled? ? './fastlane' : '.'
+      containing = Helper.fastlane_enabled? ? FastlaneCore::FastlaneFolder.path : '.'
       options[:screenshots_path] ||= File.join(containing, 'screenshots')
       options[:metadata_path] ||= File.join(containing, 'metadata')
+    end
 
+    def ensure_folders_created(options)
       FileUtils.mkdir_p(options[:screenshots_path])
       FileUtils.mkdir_p(options[:metadata_path])
     end
@@ -53,5 +57,13 @@ module Deliver
     rescue
       UI.user_error!("Could not infer your app's version")
     end
+
+    def find_platform(options)
+      if options[:ipa]
+        options[:platform] ||= FastlaneCore::IpaFileAnalyser.fetch_app_platform(options[:ipa])
+      elsif options[:pkg]
+        options[:platform] = 'osx'
+      end
+    end
   end
 end

data/lib/deliver/loader.rb

@@ -2,11 +2,12 @@ require 'fastlane_core/languages'
 
 module Deliver
   module Loader
-    # The directory 'appleTV' is a special folder that will cause our screenshot gathering code to iterate
+    # The directory 'appleTV' and `iMessage` are special folders that will cause our screenshot gathering code to iterate
     # through it as well searching for language folders.
     APPLE_TV_DIR_NAME = "appleTV".freeze
+    IMESSAGE_DIR_NAME = "iMessage".freeze
     DEFAULT_DIR_NAME = "default".freeze
-    ALL_LANGUAGES = (FastlaneCore::Languages::ALL_LANGUAGES + [APPLE_TV_DIR_NAME, APPLE_TV_DIR_NAME, DEFAULT_DIR_NAME]).map(&:downcase).freeze
+    ALL_LANGUAGES = (FastlaneCore::Languages::ALL_LANGUAGES + [APPLE_TV_DIR_NAME, APPLE_TV_DIR_NAME, IMESSAGE_DIR_NAME, DEFAULT_DIR_NAME]).map(&:downcase).freeze
 
     def self.language_folders(root)
       Dir.glob(File.join(root, '*')).select do |path|

data/lib/deliver/options.rb

@@ -52,6 +52,15 @@ module Deliver
                                      conflict_block: proc do |value|
                                        UI.user_error!("You can't use 'pkg' and '#{value.key}' options in one run.")
                                      end),
+        FastlaneCore::ConfigItem.new(key: :platform,
+                                     short_option: "-j",
+                                     env_name: "DELIVER_PLATFORM",
+                                     description: "The platform to use (optional)",
+                                     optional: true,
+                                     default_value: "ios",
+                                     verify_block: proc do |value|
+                                       UI.user_error!("The platform can only be ios, appletvos, or osx") unless %('ios', 'appletvos', 'osx').include? value
+                                     end),
         FastlaneCore::ConfigItem.new(key: :metadata_path,
                                      short_option: '-m',
                                      description: "Path to the folder containing the metadata files",

data/lib/deliver/runner.rb

@@ -36,7 +36,8 @@ module Deliver
       app_version = options[:app_version]
       UI.message("Making sure the latest version on iTunes Connect matches '#{app_version}' from the ipa file...")
 
-      changed = options[:app].ensure_version!(app_version)
+      changed = options[:app].ensure_version!(app_version, platform: options[:pkg] ? 'osx' : 'ios')
+
       if changed
         UI.success("Successfully set the version to '#{app_version}'")
       else

data/lib/deliver/upload_assets.rb

@@ -3,7 +3,7 @@ module Deliver
     def upload(options)
       app = options[:app]
 
-      v = app.edit_version
+      v = app.edit_version(platform: options[:platform])
       UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
 
       if options[:app_icon]

data/lib/deliver/upload_metadata.rb

@@ -23,7 +23,7 @@ module Deliver
       app = options[:app]
 
       details = app.details
-      v = app.edit_version
+      v = app.edit_version(platform: options[:platform])
 
       (LOCALISED_VERSION_VALUES + LOCALISED_APP_VALUES).each do |key|
         current = options[key]

data/lib/deliver/upload_screenshots.rb

@@ -6,7 +6,7 @@ module Deliver
 
       app = options[:app]
 
-      v = app.edit_version
+      v = app.edit_version(platform: options[:platform])
       UI.user_error!("Could not find a version to edit for app '#{app.name}'") unless v
 
       UI.message("Starting with the upload of screenshots...")
@@ -40,13 +40,13 @@ module Deliver
         UI.message("Uploading #{screenshots_for_language.length} screenshots for language #{language}")
         screenshots_for_language.each do |screenshot|
           indized[screenshot.language] ||= {}
-          indized[screenshot.language][screenshot.device_type] ||= 0
-          indized[screenshot.language][screenshot.device_type] += 1 # we actually start with 1... wtf iTC
+          indized[screenshot.language][screenshot.formatted_name] ||= 0
+          indized[screenshot.language][screenshot.formatted_name] += 1 # we actually start with 1... wtf iTC
 
-          index = indized[screenshot.language][screenshot.device_type]
+          index = indized[screenshot.language][screenshot.formatted_name]
 
           if index > 5
-            UI.error("Too many screenshots found for device '#{screenshot.device_type}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
+            UI.error("Too many screenshots found for device '#{screenshot.formatted_name}' in '#{screenshot.language}', skipping this one (#{screenshot.path})")
             next
           end
 
@@ -54,7 +54,8 @@ module Deliver
           v.upload_screenshot!(screenshot.path,
                                index,
                                screenshot.language,
-                               screenshot.device_type)
+                               screenshot.device_type,
+                               screenshot.is_messages?)
         end
         # ideally we should only save once, but itunes server can't cope it seems
         # so we save per language. See issue #349
@@ -77,7 +78,7 @@ module Deliver
         language = File.basename(lng_folder)
 
         # Check to see if we need to traverse multiple platforms or just a single platform
-        if language == Loader::APPLE_TV_DIR_NAME
+        if language == Loader::APPLE_TV_DIR_NAME || language == Loader::IMESSAGE_DIR_NAME
           screenshots.concat(collect_screenshots_for_languages(File.join(path, language)))
           next
         end

data/lib/deliver/version.rb

@@ -1,4 +1,4 @@
 module Deliver
-  VERSION = "1.15.1"
+  VERSION = "1.16.0"
   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.15.1
+  version: 1.16.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-28 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.56.0
+        version: 0.57.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.57.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.38.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single