spaceship 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e10edaa81463ade7270eab6924946ba77d9d5c
-  data.tar.gz: da2ba6567d281e66330b93ad1de33a8d77008beb
+  metadata.gz: 7f320dc10c8beb481061cee00b00952c4d656eb3
+  data.tar.gz: 750140edc4537b38f80b782456d49eefeec4ea82
 SHA512:
-  metadata.gz: a6e16adf655c57aa21706b3695ffa5508b0d9ec1ea9c03e104e439bddc485c7b00963994903eb2fc42967c7ce5fe8101f914bbe20288a189e56349dcdb693298
-  data.tar.gz: 4d5af58985c1131466d504b433244cb7dfd522d451b5a6dce990191c6ff376851e58da4654302902759174e7346a0b0fea970d2af2fd971752697558f369c0e2
+  metadata.gz: 421a933e650f90764d5e738d576a11bf651128e9c1f44f92d164609ed21327f1aaded3c2cf86290be74c0b93ec11fd661baf937c989c0fab58cb8e554b269114
+  data.tar.gz: dc02e790d92efceda4cfea894a0c098ee4d13887c06f4366c6ca911071086e582dfe170b729c15a250cb9457bc1fc7f8addb196c0219cd9c5aff0f771a345792

data/lib/spaceship/client.rb

@@ -33,6 +33,9 @@ module Spaceship
 
     class UnexpectedResponse < StandardError; end
 
+    # Raised when 302 is received from portal request
+    class AppleTimeoutError < StandardError; end
+
     # Authenticates with Apple's web services. This method has to be called once
     # to generate a valid session. The session will automatically be used from then
     # on.
@@ -173,8 +176,9 @@ module Spaceship
 
     def with_retry(tries = 5, &block)
       return block.call
-    rescue Faraday::Error::TimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
+    rescue Faraday::Error::TimeoutError, AppleTimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
       unless (tries -= 1).zero?
+        logger.warn("Timeout received: '#{ex.message}'.  Retrying after 3 seconds (remaining: #{tries})...")
         sleep 3
         retry
       end
@@ -240,7 +244,11 @@ module Spaceship
     # Automatically retries the request up to 3 times if something goes wrong
     def send_request(method, url_or_path, params, headers, &block)
       with_retry do
-        @client.send(method, url_or_path, params, headers, &block)
+        response = @client.send(method, url_or_path, params, headers, &block)
+        if response.body.to_s.include?("<title>302 Found</title>")
+          raise AppleTimeoutError.new, "Apple 302 detected"
+        end
+        return response
       end
     end
 

data/lib/spaceship/du/du_client.rb

@@ -73,15 +73,19 @@ module Spaceship
       parse_upload_response(r)
     end
 
+    # You can find this by uploading an image in iTunes connect
+    # then look for the X-Apple-Upload-Validation-RuleSets value
     def picture_type_map
       # rubocop:enable Style/ExtraSpacing
       {
         watch:        "MZPFT.SortedN27ScreenShot",
         ipad:         "MZPFT.SortedTabletScreenShot",
+        ipadPro:      "MZPFT.SortedJ99ScreenShot",
         iphone6:      "MZPFT.SortedN61ScreenShot",
         iphone6Plus:  "MZPFT.SortedN56ScreenShot",
         iphone4:      "MZPFT.SortedN41ScreenShot",
-        iphone35:     "MZPFT.SortedScreenShot"
+        iphone35:     "MZPFT.SortedScreenShot",
+        appleTV:      "MZPFT.SortedATVScreenShot"
       }
     end
 

data/lib/spaceship/portal/provisioning_profile.rb

@@ -164,9 +164,10 @@ module Spaceship
                     raise "Can't find class '#{attrs['distributionMethod']}'"
                   end
 
-          attrs['appId'] = App.factory(attrs['appId'])
-          attrs['devices'].map! { |device| Device.factory(device) }
-          attrs['certificates'].map! { |cert| Certificate.factory(cert) }
+          # eagerload the Apps, Devices, and Certificates using the same client if we have to.
+          attrs['appId'] = App.set_client(@client).factory(attrs['appId'])
+          attrs['devices'].map! { |device| Device.set_client(@client).factory(device) }
+          attrs['certificates'].map! { |cert| Certificate.set_client(@client).factory(cert) }
 
           klass.client = @client
           klass.new(attrs)

data/lib/spaceship/tunes/app_version.rb

@@ -279,7 +279,7 @@ module Spaceship
         @app_status = Tunes::AppStatus.get_from_string(status)
         setup_large_app_icon
         setup_watch_app_icon
-        setup_transit_app_file
+        setup_transit_app_file if supports_app_transit?
         setup_screenshots
         setup_trailers
       end
@@ -467,6 +467,10 @@ module Spaceship
         @watch_app_icon = Tunes::AppImage.factory(watch_app_icon) if watch_app_icon
       end
 
+      def supports_app_transit?
+        raw_data["transitAppFile"] != nil
+      end
+
       def setup_transit_app_file
         transit_app_file = raw_data["transitAppFile"]["value"]
         @transit_app_file = nil

data/lib/spaceship/tunes/device_type.rb

@@ -1,7 +1,7 @@
 module Spaceship
   module Tunes
     class DeviceType
-      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'ipad', 'watch']
+      @types = ['iphone4', 'iphone35', 'iphone6', 'iphone6Plus', 'ipad', 'ipadPro', 'watch', 'appleTV']
       class << self
         attr_accessor :types
 

data/lib/spaceship/tunes/tunes_client.rb

@@ -20,7 +20,8 @@ module Spaceship
             'iphone4' => [1136, 640],
             'iphone6' => [1334, 750],
             'iphone6Plus' => [2208, 1242],
-            'ipad' => [1024, 768]
+            'ipad' => [1024, 768],
+            'ipadPro' => [2732, 2048]
         }
 
         r = resolutions[device]
@@ -252,16 +253,17 @@ module Spaceship
       r = request(:get, "ra/apps/#{app_id}/overview")
       platforms = parse_response(r, 'data')['platforms']
 
-      # An app can only have either ios or mac, but we ignore apple tv right now
+      # We only support platforms that exist ATM
       platform = platforms.find do |p|
-        p['platformString'] == 'ios' or p['platformString'] == 'osx'
+        ['ios', 'osx', 'appletvos'].include? p['platformString']
       end
 
       version = platform[(is_live ? 'deliverableVersion' : 'inFlightVersion')]
       return nil unless version
       version_id = version['id']
+      version_platform = platform['platformString']
 
-      r = request(:get, "ra/apps/#{app_id}/platforms/ios/versions/#{version_id}")
+      r = request(:get, "ra/apps/#{app_id}/platforms/#{version_platform}/versions/#{version_id}")
       parse_response(r, 'data')
     end
 

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.12.3"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager