RubyGems - deliver - Versions diffs - 1.6.6 → 1.7.0 - Mend

deliver 1.6.6 → 1.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

checksums.yaml +4 -4
data/README.md +3 -3
data/lib/assets/DeliverfileDefault +1 -1
data/lib/assets/ScreenshotsHelp +2 -1
data/lib/assets/summary.html.erb +26 -30
data/lib/deliver/app_screenshot.rb +33 -12
data/lib/deliver/commands_generator.rb +1 -1
data/lib/deliver/download_screenshots.rb +8 -1
data/lib/deliver/loader.rb +4 -1
data/lib/deliver/upload_screenshots.rb +17 -5
data/lib/deliver/version.rb +1 -1
metadata +3 -3

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d4b948ca3c2697a5a602658d3887efc6a1fd88e
-  data.tar.gz: b003a658e9fc50e32f234bb16b7b4319d8dae43d
+  metadata.gz: f073822a6cd5ae489648e54a348982bc98b71122
+  data.tar.gz: a7deac2ad9c35042803c15bb4aff5b3d5ad21b36
 SHA512:
-  metadata.gz: 3020c6e2f2abd1972cbd7bc9c6706ca555f74e22a9a0d56adb740f526e6a94ff5d8fdea264284d9eb9f61b0a286d61f98c53dfd44cd045acba14314b7fd42b98
-  data.tar.gz: 30c7a6d82d5909ef53e4deb1dafdd2cbbf0a60fff0c9e4c95e288875521f852ead56db5ec6ca1f21f3badf2750990e8d0080d797cca0c36992ff26a3bfc3c30a
+  metadata.gz: d4c40f724deea58194fe74a1bbedb431f126a267ddbfa43ddf4427f5cadf6543d1ae4ad0183b5041946c94d32c3842476076ecab8fd9cf12693bdd29ebebf97f
+  data.tar.gz: e25d930ab3d631813f91bac218101961ad1ecce5ad04ad1acbb941c0768dec7bffd1aba26db5838a9e4bad325487400c59842e523070e673ca93db5f907b3646

data/README.md CHANGED

@@ -29,8 +29,8 @@
 deliver
 ============
-[![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
-[![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/KrauseFx/deliver/blob/master/LICENSE)
+[![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/deliver/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/deliver.svg?style=flat)](http://rubygems.org/gems/deliver)
 [![Build Status](https://img.shields.io/travis/fastlane/deliver/master.svg?style=flat)](https://travis-ci.org/fastlane/deliver)
@@ -38,7 +38,7 @@ deliver
 `deliver` can upload ipa files, app screenshots and more to iTunes Connect from the command line.
-Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
+Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
 -------
 <p align="center">

data/lib/assets/DeliverfileDefault CHANGED

@@ -1,6 +1,6 @@
 ###################### More Options ######################
 # If you want to have even more control, check out the documentation
-# https://github.com/KrauseFx/deliver/blob/master/Deliverfile.md
+# https://github.com/fastlane/deliver/blob/master/Deliverfile.md
 ###################### Automatically generated ######################

data/lib/assets/ScreenshotsHelp CHANGED

@@ -1,4 +1,5 @@
 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.
+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.
 The screenshots can be named whatever you want, but keep in mind they are sorted alphabetically.

data/lib/assets/summary.html.erb CHANGED

@@ -1,9 +1,10 @@
+<!DOCTYPE html>
 <html>
     <head>
         <title>deliver - <%= @app_name %></title>
-        <meta http-equiv="content-type" content="text/html; charset=UTF-16">
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8">
         <style>
-          #app-name {
+          .app-name {
               font-size: 42px;
               font-family: 'Helvetica Neue', HelveticaNeue, Helvetica Neue;
               font-weight: 300;
@@ -12,7 +13,7 @@
               margin-right: 25px;
           }
-          #app-urls {
+          .app-urls {
               margin-left: 25px;
               font-size: 14px;
               margin-top: 4px;
@@ -40,7 +41,7 @@
               margin-right: 10px;
           }
-          #app-keyword {
+          .app-keyword {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
@@ -53,24 +54,24 @@
-          #app-description {
+          .app-description {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
           }
-          #app-description-text {
+          .app-description-text {
               font-weight: 300;
           }
-          #app-changelog {
+          .app-changelog {
               margin-left: 25px;
               margin-right: 25px;
               margin-top: 22px;
               font-weight: 300;
           }
-          #app-screenshots {
+          .app-screenshots {
               margin-left: 15px;
               margin-right: 15px;
               margin-top: 22px;
@@ -112,16 +113,16 @@
     <body>
       <% @languages.each do |language| %>
         <% if @options[:name] %>
-          <div id="app-name">
+          <div class="app-name">
             <%= language %>: <%= @options[:name][language] %>
           </div>
         <% else %>
-          <div id="app-name">
+          <div class="app-name">
             <%= language %>
           </div>
         <% end %>
-        <div id="app-urls">
+        <div class="app-urls">
           <% all_keys = [:support_url, :marketing_url] %>
           <% all_keys.each do |key| %>
             <% value = @options[key][language] if @options[key] %>
@@ -134,7 +135,7 @@
         </div>
         <% if @options[:keywords] and @options[:keywords][language] %>
-          <div id="app-keyword">
+          <div class="app-keyword">
               <div class="cat-headline">Keywords</div>
               <ul class="app-keyword-list">
                 <% @options[:keywords][language].split(" ").each do |keyword| %>
@@ -145,22 +146,22 @@
         <% end %>
         <% if @options[:description] %>
-          <div id="app-description">
+          <div class="app-description">
                <div class="cat-headline">Description</div>
-               <div id="app-description-text">
+               <div class="app-description-text">
                   <%= (@options[:description][language] || '').gsub("\n", "<br />") %>
                </div>
           </div>
         <% end %>
         <% if @options[:release_notes] %>
-          <div id="app-changelog">
+          <div class="app-changelog">
               <div class="cat-headline">Changelog</div>
               <%= (@options[:release_notes][language] || '').gsub("\n", "<br />") %>
           </div>
         <% end %>
-        <div id="app-screenshots">
+        <div class="app-screenshots">
           <div class="cat-headline">Screenshots</div>
           <% if options[:skip_screenshots] %>
@@ -170,24 +171,19 @@
               </p>
             </div>
           <% elsif @screenshots.count > 0 %>
-            <% last_size = nil %>
             <% sc = @screenshots.find_all { |s| s.language == language } %>
-            <% sc.sort {|a, b| [a.screen_size, a.path] <=> [b.screen_size, b.path]}.each do |screenshot| %>
+            <% sc_by_size = sc.group_by { |i| i.screen_size } %>
-              <% new_row = (last_size != screenshot.screen_size or last_size == nil) %>
+            <% sc_by_size.keys.sort.each do |screen_size| %>
+              <% screenshots = sc_by_size[screen_size].sort { |a, b| [a.path] <=> [b.path] } %>
+              <%# we are guaranteed to have at least one element because of the group_by %>
+              <h4><%= screenshots[0].formatted_name %></h4>
+              <div class="app-screenshot-row">
-              <% if new_row and last_size != nil %>
-                </div>
+              <% screenshots.each_with_index do |screenshot, index| %>
+                <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>" title="Screenshot #<%=index%> for <%=language%>"></a>
               <% end %>
-              <% if new_row %>
-                <h4><%= screenshot.formatted_name %></h4>
-                <div class="app-screenshot-row">
-              <% end %>
-              <a href="<%= screenshot.path %>" target="_blank"><img class="app-screenshot" src="<%= screenshot.path %>"></a>
-              <% last_size = screenshot.screen_size %>
+              </div>
             <% end %>
           <% else %>
             <!-- no screenshots -->

data/lib/deliver/app_screenshot.rb CHANGED

@@ -21,6 +21,8 @@ module Deliver
       IOS_APPLE_WATCH = "iOS-Apple-Watch"
       # Mac
       MAC = "Mac"
+      # Apple TV
+      APPLE_TV = "Apple-TV"
     end
     # @return [Deliver::ScreenSize] the screen size (device type)
@@ -55,7 +57,8 @@ module Deliver
         ScreenSize::IOS_IPAD => "ipad",
         ScreenSize::IOS_IPAD_PRO => "ipadPro",
         ScreenSize::MAC => "desktop",
-        ScreenSize::IOS_APPLE_WATCH => "watch"
+        ScreenSize::IOS_APPLE_WATCH => "watch",
+        ScreenSize::APPLE_TV => "appleTV"
       }
       return matching[self.screen_size]
     end
@@ -70,7 +73,8 @@ module Deliver
         ScreenSize::IOS_IPAD => "iPad",
         ScreenSize::IOS_IPAD_PRO => "iPad Pro",
         ScreenSize::MAC => "Mac",
-        ScreenSize::IOS_APPLE_WATCH => "Watch"
+        ScreenSize::IOS_APPLE_WATCH => "Watch",
+        ScreenSize::APPLE_TV => "Apple TV"
       }
       return matching[self.screen_size]
     end
@@ -84,12 +88,8 @@ module Deliver
     end
     # rubocop:enable Style/PredicateName
-    def self.calculate_screen_size(path)
-      size = FastImage.size(path)
-      raise "Could not find or parse file at path '#{path}'" if size.nil? or size.count == 0
-      devices = {
+    def self.devices
+      return {
         ScreenSize::IOS_55 => [
           [1080, 1920],
           [1242, 2208]
@@ -129,14 +129,35 @@ module Deliver
         ],
         ScreenSize::IOS_APPLE_WATCH => [
           [312, 390]
+        ],
+        ScreenSize::APPLE_TV => [
+          [1920, 1080]
         ]
       }
+    end
+    def self.calculate_screen_size(path)
+      size = FastImage.size(path)
+      raise "Could not find or parse file at path '#{path}'" if size.nil? or size.count == 0
+      # Walk up two directories and test if we need to handle a platform that doesn't support landscape
+      path_component = Pathname.new(path).each_filename.to_a[-3]
+      if path_component.eql? "appleTV"
+        skip_landscape = true
+      end
-      devices.each do |device_type, array|
+      self.devices.each do |device_type, array|
         array.each do |resolution|
-          if (size[0] == resolution[0] and size[1] == resolution[1]) or # portrait
-             (size[1] == resolution[0] and size[0] == resolution[1]) # landscape
-            return device_type
+          if skip_landscape
+            if size[0] == resolution[0] and size[1] == resolution[1] # portrait
+              return device_type
+            end
+          else
+            if (size[0] == resolution[0] and size[1] == resolution[1]) or # portrait
+               (size[1] == resolution[0] and size[0] == resolution[1]) # landscape
+              return device_type
+            end
           end
         end
       end

data/lib/deliver/commands_generator.rb CHANGED

@@ -21,7 +21,7 @@ module Deliver
       program :description, Deliver::DESCRIPTION
       program :help, 'Author', 'Felix Krause <deliver@krausefx.com>'
       program :help, 'Website', 'https://fastlane.tools'
-      program :help, 'GitHub', 'https://github.com/krausefx/deliver'
+      program :help, 'GitHub', 'https://github.com/fastlane/deliver'
       program :help_formatter, :compact
       FastlaneCore::CommanderGenerator.new.generate(Deliver::Options.available_options)

data/lib/deliver/download_screenshots.rb CHANGED

@@ -20,7 +20,14 @@ module Deliver
           Helper.log.info "Downloading existing screenshot '#{file_name}'"
-          containing_folder = File.join(folder_path, "screenshots", screenshot.language)
+          # If the screen shot is for an appleTV we need to store it in a way that we'll know it's an appleTV
+          # screen shot later as the screen size is the same as an iPhone 6 Plus in landscape.
+          if screenshot.device_type == "appleTV"
+            containing_folder = File.join(folder_path, "screenshots", "appleTV", screenshot.language)
+          else
+            containing_folder = File.join(folder_path, "screenshots", screenshot.language)
+          end
           begin
             FileUtils.mkdir_p(containing_folder)
           rescue

data/lib/deliver/loader.rb CHANGED

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

data/lib/deliver/upload_screenshots.rb CHANGED

@@ -54,21 +54,33 @@ module Deliver
     def collect_screenshots(options)
       return [] if options[:skip_screenshots]
+      return collect_screenshots_for_languages(options[:screenshots_path])
+    end
+    def collect_screenshots_for_languages(path)
       screenshots = []
       extensions = '{png,jpg,jpeg}'
-      Loader.language_folders(options[:screenshots_path]).each do |lng_folder|
+      Loader.language_folders(path).each do |lng_folder|
+        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
+          screenshots.concat(collect_screenshots_for_languages(File.join(path, language)))
+          next
+        end
         files = Dir.glob(File.join(lng_folder, "*.#{extensions}"))
         next if files.count == 0
         prefer_framed = Dir.glob(File.join(lng_folder, "*_framed.#{extensions}")).count > 0
         language = File.basename(lng_folder)
-        files.each do |path|
-          if path.downcase.include?("_framed.")
+        files.each do |file_path|
+          if file_path.downcase.include?("_framed.")
             # That's cool
           else
-            if path.downcase.include?("watch")
+            if file_path.downcase.include?("watch")
               # Watch doesn't support frames (yet)
             else
               # That might not be cool... if that screenshot is not framed but we only want framed
@@ -76,7 +88,7 @@ module Deliver
             end
           end
-          screenshots << AppScreenshot.new(path, language)
+          screenshots << AppScreenshot.new(file_path, language)
         end
       end

data/lib/deliver/version.rb CHANGED

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

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deliver
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -289,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.0
 signing_key:
 specification_version: 4
 summary: Upload screenshots, metadata and your app to the App Store using a single