spaceship 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13327e628a59af20edccc21b45b712a7369ba849
-  data.tar.gz: 899347df5eed63a08ab77a14f5bce260857260df
+  metadata.gz: e6a3472e6fb40f5531aa8ae2c860f26fe8594c37
+  data.tar.gz: af5a9f4a0b7c9115123b32c07ef642d3ad80cfe6
 SHA512:
-  metadata.gz: 66ca044745dff1f1e44d41e67fa149c407b95a1796391aa24bf07864d682815d35273813076d50895e196b5ac45ef7a3a624d02aea71e46fb3bf3bfcfa6f961b
-  data.tar.gz: c463fc2b1d2a5bf1adb4079d36815ebdd31e476429ab00774ec86f96517e22c2dee498e5142528ed2bc91ff0a196ef6f14fbd9c8183d0a9a92da00cbf18e9532
+  metadata.gz: 4b221fef762f3099d9893703b3959ba5302c595b23110af77a392febe04ae894b01d51065a877ebd8e0441c9e1210b09514ec87c3f9fb22264ac56c7fda2e2c9
+  data.tar.gz: 91d022c2ebacf26a18bdb8d1667ae886d0a91d709d1bacf214d9ed96e65c36d43e05ef75a0240540b40d138d51707fd0d55167f28725ec62940ae36d7fb961fd

data/lib/spaceship/client.rb

@@ -39,6 +39,9 @@ module Spaceship
     # Raised when 302 is received from portal request
     class AppleTimeoutError < StandardError; end
 
+    # Raised when 401 is received from portal request
+    class UnauthorizedAccessError < 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.
@@ -66,8 +69,14 @@ module Spaceship
     end
 
     def initialize
+      options = {
+       request: {
+          timeout:       300,
+          open_timeout:  300
+        }
+      }
       @cookie = HTTP::CookieJar.new
-      @client = Faraday.new(self.class.hostname) do |c|
+      @client = Faraday.new(self.class.hostname, options) do |c|
         c.response :json, content_type: /\bjson$/
         c.response :xml, content_type: /\bxml$/
         c.response :plist, content_type: /\bplist$/
@@ -168,9 +177,9 @@ module Spaceship
       end
 
       self.user = user
-
+      @password = password
       begin
-        send_login_request(user, password) # different in subclasses
+        do_login(user, password)
       rescue InvalidUserCredentialsError => ex
         raise ex unless keychain_entry
 
@@ -182,20 +191,36 @@ module Spaceship
       end
     end
 
-    def with_retry(tries = 5, &block)
-      return block.call
-    rescue Faraday::Error::TimeoutError, AppleTimeoutError => ex # New Faraday version: Faraday::TimeoutError => ex
+    def with_retry(tries = 5, &_block)
+      return yield
+    rescue Faraday::Error::ConnectionFailed, 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
+        sleep 3 unless defined? SpecHelper
+        retry
+      end
+      raise ex # re-raise the exception
+    rescue UnauthorizedAccessError => ex
+      if @loggedin
+        msg = "Auth error received: '#{ex.message}'. Login in again then retrying after 3 seconds (remaining: #{tries})..."
+        puts msg if $verbose
+        logger.warn msg
+        do_login(self.user, @password)
+        sleep 3 unless defined? SpecHelper
         retry
       end
-
       raise ex # re-raise the exception
     end
 
     private
 
+    def do_login(user, password)
+      @loggedin = false
+      ret = send_login_request(user, password) # different in subclasses
+      @loggedin = true
+      ret
+    end
+
     # Is called from `parse_response` to store the latest csrf_token (if available)
     def store_csrf_tokens(response)
       if response and response.headers
@@ -238,11 +263,11 @@ module Spaceship
       params_to_log = params_to_log.collect do |key, value|
         "{#{key}: #{value}}"
       end
-      logger.info("#{method.upcase}: #{url} #{params_to_log.join(', ')}")
+      logger.info(">> #{method.upcase}: #{url} #{params_to_log.join(', ')}")
     end
 
     def log_response(method, url, response)
-      logger.debug("#{method.upcase}: #{url}: #{response.body}")
+      logger.debug("<< #{method.upcase}: #{url}: #{response.body}")
     end
 
     # Actually sends the request to the remote server
@@ -250,6 +275,13 @@ module Spaceship
     def send_request(method, url_or_path, params, headers, &block)
       with_retry do
         response = @client.send(method, url_or_path, params, headers, &block)
+        resp_hash = response.to_hash
+        if resp_hash[:status] == 401
+          msg = "Auth lost"
+          logger.warn msg
+          raise UnauthorizedAccessError.new, "Unauthorized Access"
+        end
+
         if response.body.to_s.include?("<title>302 Found</title>")
           raise AppleTimeoutError.new, "Apple 302 detected"
         end

data/lib/spaceship/tunes/tunes_client.rb

@@ -5,6 +5,10 @@ module Spaceship
     class ITunesConnectError < StandardError
     end
 
+    # raised if the server failed to save temporarily
+    class ITunesConnectTemporaryError < ITunesConnectError
+    end
+
     attr_reader :du_client
 
     def initialize
@@ -120,18 +124,24 @@ module Spaceship
     end
 
     def send_login_request(user, password)
+      clear_user_cached_data
+
       data = {
         accountName: user,
         password: password,
         rememberMe: true
       }
 
-      response = request(:post) do |req|
-        req.url "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{service_key}"
-        req.body = data.to_json
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Requested-With'] = 'XMLHttpRequest'
-        req.headers['Accept'] = 'application/json, text/javascript'
+      begin
+        response = request(:post) do |req|
+          req.url "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=#{service_key}"
+          req.body = data.to_json
+          req.headers['Content-Type'] = 'application/json'
+          req.headers['X-Requested-With'] = 'XMLHttpRequest'
+          req.headers['Accept'] = 'application/json, text/javascript'
+        end
+      rescue UnauthorizedAccessError
+        raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
       end
 
       # get woinst, wois, and itctx cookie values
@@ -139,7 +149,7 @@ module Spaceship
       request(:get, "https://itunesconnect.apple.com/WebObjects/iTunesConnect.woa")
 
       case response.status
-      when 403, 401
+      when 403
         raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
       when 200
         return response
@@ -203,6 +213,8 @@ module Spaceship
       if errors.count > 0 # they are separated by `.` by default
         if errors.count == 1 and errors.first == "You haven't made any changes."
           # This is a special error which we really don't care about
+        elsif errors.count == 1 and errors.first.include?("try again later")
+          raise ITunesConnectTemporaryError.new, errors.first
         else
           raise ITunesConnectError.new, errors.join(' ')
         end
@@ -338,13 +350,15 @@ module Spaceship
       raise "app_id is required" unless app_id
       raise "version_id is required" unless version_id.to_i > 0
 
-      r = request(:post) do |req|
-        req.url "ra/apps/#{app_id}/platforms/ios/versions/#{version_id}"
-        req.body = data.to_json
-        req.headers['Content-Type'] = 'application/json'
-      end
+      with_tunes_retry do
+        r = request(:post) do |req|
+          req.url "ra/apps/#{app_id}/platforms/ios/versions/#{version_id}"
+          req.body = data.to_json
+          req.headers['Content-Type'] = 'application/json'
+        end
 
-      handle_itc_response(r.body)
+        handle_itc_response(r.body)
+      end
     end
 
     #####################################################
@@ -780,19 +794,38 @@ module Spaceship
 
     private
 
+    def with_tunes_retry(tries = 5, &_block)
+      return yield
+    rescue Spaceship::TunesClient::ITunesConnectTemporaryError => ex
+      unless (tries -= 1).zero?
+        msg = "ITC temporary save error received: '#{ex.message}'. Retrying after 60 seconds (remaining: #{tries})..."
+        puts msg
+        logger.warn msg
+        sleep 60 unless defined? SpecHelper # unless FastlaneCore::Helper.is_test?
+        retry
+      end
+      raise ex # re-raise the exception
+    end
+
+    def clear_user_cached_data
+      @content_provider_id = nil
+      @sso_token_for_image = nil
+      @sso_token_for_video = nil
+    end
+
     # the contentProviderIr found in the UserDetail instance
     def content_provider_id
-      user_detail_data.content_provider_id
+      @content_provider_id ||= user_detail_data.content_provider_id
     end
 
     # the ssoTokenForImage found in the AppVersionRef instance
     def sso_token_for_image
-      ref_data.sso_token_for_image
+      @sso_token_for_image ||= ref_data.sso_token_for_image
     end
 
     # the ssoTokenForVideo found in the AppVersionRef instance
     def sso_token_for_video
-      ref_data.sso_token_for_video
+      @sso_token_for_video ||= ref_data.sso_token_for_video
     end
 
     def update_tester_from_app!(tester, app_id, testing)

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.20.0"
+  VERSION = "0.21.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager