spaceship 0.29.1 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d4e75e36b96e235ad42ccf5b079606cb07035d7
-  data.tar.gz: c9fc39ec8e35fe6f33742aef5de6060319dc6f4d
+  metadata.gz: 0c8703b43554cede5448efcfdca163bd53a68bab
+  data.tar.gz: f36dc587a3b0b35f7822a2239842c938f8ff960b
 SHA512:
-  metadata.gz: 821dba04783f7d0562570e94e090bddc5c5a1f57b792b41ebac591392d72bb829967ad12bbb6aa572c1e0992d3f4d3df100a264d0193bea78d8b7eb29b6644f2
-  data.tar.gz: af3c621980ae4195d17f4871b52f20c568f940147a7820ff0d5d5ad2f8a5cf77f0d4c868d5111161626350c793becf1f71ce119fe2f14d87a13ebc382654fa64
+  metadata.gz: cee57e7c7ce91123da67e7ea96b701ca14995f2d8d846f181f969be2173953be2c850fbafe5eb0162ad16978670b7e80e8ccdb14673ccad2fed76e0ea597899c
+  data.tar.gz: 3eef484c169b9b547659e9898ded742a1fd717ed8eee91e6db4794c659699a65e8ff25d21b8294f8ef0def0d90a296abd0a2ace0f9d35ce4d6a8984e9aded644

data/lib/spaceship/tunes/app_version.rb

@@ -358,6 +358,7 @@ module Spaceship
         raise "sort_order must not be > 5" if sort_order > 5
         # this will also check both language and device parameters
         device_lang_screenshots = screenshots_data_for_language_and_device(language, device)["value"]
+
         existing_sort_orders = device_lang_screenshots.map { |s| s["value"]["sortOrder"] }
         if screenshot_path # adding / replacing
           upload_file = UploadFile.from_path screenshot_path
@@ -372,6 +373,15 @@ module Spaceship
                   "originalFileName" => upload_file.file_name
               }
           }
+
+          # We disable "scaling" for this device type / language combination
+          # We only set this, if we actually successfully uploaded a new screenshot
+          # for this device / language combination
+          # if this value is not set, iTC will fallback to another device type for screenshots
+          language_details = raw_data_details.find { |d| d["language"] == language }["displayFamilies"]["value"]
+          device_language_details = language_details.find { |display_family| display_family['name'] == device }
+          device_language_details["scaled"]["value"] = false
+
           if existing_sort_orders.include?(sort_order) # replace
             device_lang_screenshots[existing_sort_orders.index(sort_order)] = new_screenshot
           else # add
@@ -528,13 +538,17 @@ module Spaceship
         # IDEA: better error for non existing language
         raise "#{language} isn't an activated language" unless languages.count > 0
         lang_details = languages[0]
-        devices_details = lang_details[data_field]["value"]
-        raise "Unexpected state: missing device details for #{device}" unless devices_details.key? device
-        devices_details[device]
+        display_families = lang_details["displayFamilies"]["value"]
+        device_details = display_families.find { |display_family| display_family['name'] == device }
+        raise "Unexpected state: missing device details for #{device}" unless device_details.key?(data_field)
+        return device_details[data_field]
+      rescue => ex
+        raise "iTunes Connect error: #{ex}"
       end
 
       def setup_screenshots
         @screenshots = {}
+
         raw_data_details.each do |row|
           # Now that's one language right here
           @screenshots[row['language']] = setup_screenshots_for(row)
@@ -543,16 +557,58 @@ module Spaceship
 
       # generates the nested data structure to represent screenshots
       def setup_screenshots_for(row)
-        screenshots = row.fetch("screenshots", {}).fetch("value", nil)
-        return [] unless screenshots
+        display_families = row.fetch("displayFamilies", {}).fetch("value", nil)
+        return [] unless display_families
 
         result = []
 
-        screenshots.each do |device_type, value|
-          value["value"].each do |screenshot|
+        display_families.each do |display_family|
+          # {
+          #   "name": "iphone6Plus",
+          #   "scaled": {
+          #     "value": false,
+          #     "isEditable": false,
+          #     "isRequired": false,
+          #     "errorKeys": null
+          #   },
+          #   "screenshots": {
+          #     "value": [{
+          #       "value": {
+          #         "assetToken": "Purple62/v4/08/0a/04/080a0430-c2cc-2577-f491-9e0a09c58ffe/mzl.pbcpzqyg.jpg",
+          #         "sortOrder": 1,
+          #         "type": null,
+          #         "originalFileName": "ios-414-1.jpg"
+          #       },
+          #       "isEditable": true,
+          #       "isRequired": false,
+          #       "errorKeys": null
+          #     }, {
+          #       "value": {
+          #         "assetToken": "Purple71/v4/de/81/aa/de81aa10-64f6-332e-c974-9ee46adab675/mzl.cshkjvwl.jpg",
+          #         "sortOrder": 2,
+          #         "type": null,
+          #         "originalFileName": "ios-414-2.jpg"
+          #       },
+          #       "isEditable": true,
+          #       "isRequired": false,
+          #       "errorKeys": null
+          #     }],
+          #     "isEditable": true,
+          #     "isRequired": false,
+          #     "errorKeys": null
+          #   },
+          #   "trailer": {
+          #     "value": null,
+          #     "isEditable": true,
+          #     "isRequired": false,
+          #     "errorKeys": null
+          #   }
+          # }
+
+          display_family.fetch("screenshots", {}).fetch("value", []).each do |screenshot|
             screenshot_data = screenshot["value"]
             data = {
-                device_type: device_type,
+                device_type: display_family['name'],
                 language: row["language"]
             }.merge(screenshot_data)
             result << Tunes::AppScreenshot.factory(data)
@@ -572,19 +628,24 @@ module Spaceship
 
       # generates the nested data structure to represent trailers
       def setup_trailers_for(row)
-        trailers = row.fetch("appTrailers", {}).fetch("value", nil)
-        return [] unless trailers
+        display_families = row.fetch("displayFamilies", {}).fetch("value", nil)
+        return [] unless display_families
 
         result = []
 
-        trailers.each do |device_type, value|
-          trailer_data = value["value"]
-          next if trailer_data.nil?
-          data = {
-              device_type: device_type,
-              language: row["language"]
-          }.merge(trailer_data)
-          result << Tunes::AppTrailer.factory(data)
+        display_families.each do |display_family|
+          trailers = display_family.fetch("trailer", {}).fetch("value")
+          next if trailers.nil?
+
+          trailers.each do |trailer|
+            trailer_data = trailer["value"]
+            next if trailer_data.nil?
+            data = {
+                device_type: display_family['name'],
+                language: row["language"]
+            }.merge(trailer_data)
+            result << Tunes::AppTrailer.factory(data)
+          end
         end
 
         return result

data/lib/spaceship/version.rb

@@ -1,4 +1,4 @@
 module Spaceship
-  VERSION = "0.29.1".freeze
+  VERSION = "0.30.0".freeze
   DESCRIPTION = "Ruby library to access the Apple Dev Center and iTunes Connect".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.29.1
+  version: 0.30.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager