spaceship 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573cfe1106b081189c609f460d4faf09ddf544bd
-  data.tar.gz: 3066593ad3d06583a4fba5d818de9125a22fdc8c
+  metadata.gz: 7892cbc5a93927bef1d796eb45fc84c1017dc1dc
+  data.tar.gz: df314307a70c527c622414cdcde805c0ab3c273f
 SHA512:
-  metadata.gz: f97841711348281ba089286fa7930934f005ee26da88c39e228c4624641c0d6d064938bca5a1709e92624d522e84280c3fff0937ee909b57d5d1ed7b74d0ab96
-  data.tar.gz: f1a581473976d86d81b7c55685efb51690b3348e7eabf9545c10041fe968de166859157df6c54cc27c8655f024ff5a5c681123f7773be54cbdb141b1137a5ed4
+  metadata.gz: 347d01092e1fcd5c0f5ac9de94bb2da604224fb022a7840ff8f7c0549ac547f75a6e07b7a85dc9bcfe0a6ba9fcdbba8c2e10e73a7933df3e0d4080ba80c6e9d2
+  data.tar.gz: e545770c5d1e129f3b85ebf6240ffa2b1730c106b4143a0700ce4f4828d5ee9e59fc5dd0e261e720edc5a9e6584f68eee8d735fc1ae44b43456d522fd657bfba

data/lib/spaceship/client.rb

@@ -142,9 +142,9 @@ module Spaceship
       if user.to_s.empty? or password.to_s.empty?
         require 'credentials_manager'
 
-        data = CredentialsManager::AccountManager.new(user: user, password: password)
-        user ||= data.user
-        password = data.password
+        keychain_entry = CredentialsManager::AccountManager.new(user: user, password: password)
+        user ||= keychain_entry.user
+        password = keychain_entry.password
       end
 
       if user.to_s.strip.empty? or password.to_s.strip.empty?
@@ -152,7 +152,18 @@ module Spaceship
       end
 
       self.user = user
-      send_login_request(user, password) # different in subclasses
+
+      begin
+        send_login_request(user, password) # different in subclasses
+      rescue InvalidUserCredentialsError => ex
+        raise ex unless keychain_entry
+
+        if keychain_entry.invalid_credentials
+          login(user)
+        else
+          puts "Please run this tool again to apply the new password"
+        end
+      end
     end
 
     # @return (Bool) Do we have a valid session?

data/lib/spaceship/portal/portal_client.rb

@@ -41,8 +41,14 @@ module Spaceship
         @cookie = "myacinfo=#{$1};"
         return @client
       else
-        # User Credentials are wrong
-        raise InvalidUserCredentialsError.new, response
+        # Something went wrong. Was it invalid credentials or server issue
+        if (response.body || "").include?("Your Apple ID or password was entered incorrectly")
+          # User Credentials are wrong
+          raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
+        else
+          info = [response.body, response['Set-Cookie']]
+          raise UnexpectedResponse.new, info.join("\n")
+        end
       end
     end
 

data/lib/spaceship/tunes/tunes_client.rb

@@ -88,7 +88,7 @@ module Spaceship
 
         return @client
       else
-        if (response.body || "").include?("You have successfully signed out")
+        if (response.body || "").include?("Your Apple ID or password was entered incorrectly")
           # User Credentials are wrong
           raise InvalidUserCredentialsError.new, "Invalid username and password combination. Used '#{user}' as the username."
         else

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement