spaceship 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a3472e6fb40f5531aa8ae2c860f26fe8594c37
-  data.tar.gz: af5a9f4a0b7c9115123b32c07ef642d3ad80cfe6
+  metadata.gz: 5ce52c239b938c9368777decf6b3b239a32c93de
+  data.tar.gz: 6c5cc9ef074cc1216b07d76c2454ea8fb593e501
 SHA512:
-  metadata.gz: 4b221fef762f3099d9893703b3959ba5302c595b23110af77a392febe04ae894b01d51065a877ebd8e0441c9e1210b09514ec87c3f9fb22264ac56c7fda2e2c9
-  data.tar.gz: 91d022c2ebacf26a18bdb8d1667ae886d0a91d709d1bacf214d9ed96e65c36d43e05ef75a0240540b40d138d51707fd0d55167f28725ec62940ae36d7fb961fd
+  metadata.gz: 0f2e0c03d6ecb1695326598096e8356d6894db28c206d55c27898ba720f87c9c41dfd6c429b31bd41a43404201252691f640f3be6aa0b25e103a901cf6857f46
+  data.tar.gz: f7a42c64841df2afd1cef01e8660b2e69ecc76c6d40a847d01033e0b6a95b3010786fc206bcd717b98884c397fd661faf13aeca98f8b7d1488cd6b046781a995

data/lib/spaceship/client.rb

@@ -193,7 +193,7 @@ module Spaceship
 
     def with_retry(tries = 5, &_block)
       return yield
-    rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, AppleTimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
+    rescue Faraday::Error::ConnectionFailed, Faraday::Error::TimeoutError, AppleTimeoutError, Errno::EPIPE => 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 unless defined? SpecHelper
@@ -201,7 +201,7 @@ module Spaceship
       end
       raise ex # re-raise the exception
     rescue UnauthorizedAccessError => ex
-      if @loggedin
+      if @loggedin && !(tries -= 1).zero?
         msg = "Auth error received: '#{ex.message}'. Login in again then retrying after 3 seconds (remaining: #{tries})..."
         puts msg if $verbose
         logger.warn msg

data/lib/spaceship/portal/certificate.rb

@@ -155,6 +155,16 @@ module Spaceship
         "4APLUP237T" => ApplePay
       }
 
+      OLDER_IOS_CERTIFICATE_TYPES = [
+        # those are also sent by the browser, but not sure what they represent
+        "T44PTHVNID",
+        "DZQUP8189Y",
+        "FGQUP4785Z",
+        "S5WE21TULA",
+        "3BQKVH9I2X", # ProductionPush,
+        "FUOY7LWJET"
+      ]
+
       MAC_CERTIFICATE_TYPE_IDS = {
         "749Y1QAGU7" => MacDevelopment,
         "HXZEUKP0FP" => MacAppDistribution,
@@ -239,6 +249,7 @@ module Spaceship
           if self == Certificate # are we the base-class?
             type_ids = mac ? MAC_CERTIFICATE_TYPE_IDS : IOS_CERTIFICATE_TYPE_IDS
             types = type_ids.keys
+            types += OLDER_IOS_CERTIFICATE_TYPES unless mac
           else
             types = [CERTIFICATE_TYPE_IDS.key(self)]
             mac = MAC_CERTIFICATE_TYPE_IDS.values.include? self

data/lib/spaceship/tunes/app_version.rb

@@ -159,8 +159,15 @@ module Spaceship
         # @param app_id (String) The unique Apple ID of this app
         # @param is_live (Boolean)
         def find(application, app_id, is_live)
+          # we only support applications
+          platform = Spaceship::Tunes::AppVersionCommon.find_platform(application.raw_data['versionSets'])
+          raise "We do not support BUNDLE types right now" if platform['type'] == 'BUNDLE'
+
+          # too bad the "id" field is empty, it forces us to make more requests to the server
+          # these could also be cached
           attrs = client.app_version(app_id, is_live)
           return nil unless attrs
+
           attrs.merge!(application: application)
           attrs.merge!(is_live: is_live)
 

data/lib/spaceship/tunes/app_version_common.rb

@@ -0,0 +1,31 @@
+module Spaceship
+  module Tunes
+    # internal to spaceship
+    # Represents the common structure between application['versionSets'] and app_version['platform']
+    class AppVersionCommon
+      class << self
+        def find_version_id(platform, is_live)
+          version = platform[(is_live ? 'deliverableVersion' : 'inFlightVersion')]
+          return nil unless version
+          version['id']
+        end
+
+        def find_platform(versions)
+          # We only support platforms that exist ATM
+          platform = versions.detect do |p|
+            ['ios', 'osx', 'appletvos'].include? p['platformString']
+          end
+
+          raise "Could not find platform ios, osx or appletvos for app #{app_id}" unless platform
+
+          # If your app has versions for both iOS and tvOS we will default to returning the iOS version for now.
+          # This is intentional as we need to do more work to support apps that have hybrid versions.
+          if versions.length > 1
+            platform = versions.detect { |p| p['platformString'] == "ios" }
+          end
+          platform
+        end
+      end
+    end
+  end
+end

data/lib/spaceship/tunes/application.rb

@@ -11,11 +11,6 @@ module Spaceship
       #   "Spaceship App"
       attr_accessor :name
 
-      # @return (String) the supported platform of this app
-      # @example
-      #   "ios"
-      attr_accessor :platform
-
       # @return (String) The Vendor ID provided by iTunes Connect
       # @example
       #   "1435592086"
@@ -42,7 +37,6 @@ module Spaceship
       attr_mapping(
         'adamId' => :apple_id,
         'name' => :name,
-        'appType' => :platform,
         'vendorId' => :vendor_id,
         'bundleId' => :bundle_id,
         'lastModifiedDate' => :last_modified,
@@ -100,13 +94,6 @@ module Spaceship
       # @return (Spaceship::AppVersion) Receive the version that is currently live on the
       #  App Store. You can't modify all values there, so be careful.
       def live_version
-        if (raw_data['versions'] || []).count == 1
-          v = raw_data['versions'].last
-          if ['Prepare for Upload', 'prepareForUpload'].include?(v['state']) # this only applies for the initial version
-            return nil
-          end
-        end
-
         Spaceship::AppVersion.find(self, self.apple_id, true)
       end
 
@@ -116,9 +103,9 @@ module Spaceship
       end
 
       # @return (Spaceship::AppVersion) This will return the `edit_version` if available
-      #   and fallback to the `edit_version`. Use this to just access the latest data
+      #   and fallback to the `live_version`. Use this to just access the latest data
       def latest_version
-        edit_version || live_version || Spaceship::AppVersion.find(self, self.apple_id, false) # we want to get *any* version, prefered the latest one
+        edit_version || live_version
       end
 
       # @return (String) An URL to this specific resource. You can enter this URL into your browser
@@ -133,6 +120,14 @@ module Spaceship
         client.get_resolution_center(apple_id, platform)
       end
 
+      # kept for backward compatibility
+      # tries to guess the platform of the currently submitted apps
+      # note that as ITC now supports multiple app types, this might break
+      # if your app supports more than one
+      def platform
+        Spaceship::Tunes::AppVersionCommon.find_platform(raw_data['versionSets'])['platformString']
+      end
+
       def details
         attrs = client.app_details(apple_id)
         attrs.merge!(application: self)

data/lib/spaceship/tunes/tunes.rb

@@ -1,6 +1,7 @@
 require 'spaceship/tunes/tunes_base'
 require 'spaceship/tunes/application'
 require 'spaceship/tunes/app_version'
+require 'spaceship/tunes/app_version_common'
 require 'spaceship/tunes/app_submission'
 require 'spaceship/tunes/tunes_client'
 require 'spaceship/tunes/language_item'

data/lib/spaceship/tunes/tunes_client.rb

@@ -324,24 +324,22 @@ module Spaceship
       r = request(:get, "ra/apps/#{app_id}/overview")
       platforms = parse_response(r, 'data')['platforms']
 
-      # We only support platforms that exist ATM
-      platform = platforms.find do |p|
-        ['ios', 'osx', 'appletvos'].include? p['platformString']
-      end
-
-      raise "Could not find platform ios, osx or appletvos for app #{app_id}" unless platform
+      platform = Spaceship::Tunes::AppVersionCommon.find_platform(platforms)
+      return nil unless platform
 
-      # If your app has versions for both iOS and tvOS we will default to returning the iOS version for now.
-      # This is intentional as we need to do more work to support apps that have hybrid versions.
-      if platforms.length > 1
-        platform = platforms.detect { |p| p['platformString'] == "ios" }
-      end
+      version_id = Spaceship::Tunes::AppVersionCommon.find_version_id(platform, is_live)
+      return nil unless version_id
 
-      version = platform[(is_live ? 'deliverableVersion' : 'inFlightVersion')]
-      return nil unless version
-      version_id = version['id']
       version_platform = platform['platformString']
 
+      app_version_data(app_id, version_platform: version_platform, version_id: version_id)
+    end
+
+    def app_version_data(app_id, version_platform: nil, version_id:nil)
+      raise "app_id is required" unless app_id
+      raise "version_platform is required" unless version_platform
+      raise "version_id is required" unless 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.21.0"
+  VERSION = "0.21.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -291,6 +291,7 @@ files:
 - lib/spaceship/tunes/app_submission.rb
 - lib/spaceship/tunes/app_trailer.rb
 - lib/spaceship/tunes/app_version.rb
+- lib/spaceship/tunes/app_version_common.rb
 - lib/spaceship/tunes/app_version_ref.rb
 - lib/spaceship/tunes/application.rb
 - lib/spaceship/tunes/build.rb
@@ -328,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning