spaceship 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c40879ad0c738029f303c172a1212db068e4df7
-  data.tar.gz: a8f4120544500767bdf36f58d990f44f002beded
+  metadata.gz: c3bf9dd05d81a6abd26ea7c1c92fe391a21fead6
+  data.tar.gz: 8a3416e6fdc98ed27a59014dbb8a8f1a34bc668e
 SHA512:
-  metadata.gz: 914e806100ebb6edba58d80b7567fe18180ac36d13e72560b7791ffbc86a61bfd32293c909b781424eb9d8101fbae36b4d129507d3d4be13a26d8fc586b7a368
-  data.tar.gz: 8ff9ba50fc4c241973a53da1a15a01416189747ea9783b71f0c343a2bf7661f2b9537e614d00d501dec6f24def8a2ec0cd781583d049d4994475686745eca2ff
+  metadata.gz: c46595feaf1b4c8e39f578eb271653b89617b0e15395ae4c949cafda4acf846a1fc443d8306da7056cd049468554123a5bebd7bcf8519acb4932f397ae264297
+  data.tar.gz: 2fa7bf1a5c6297f4767318d80987cfafd8233a3ca936cffec85d9d873e08fb0b5694d4235b3402138f22a78152d67540866cd0011d6ff2982e3543c89c2d5ba9

data/lib/spaceship/client.rb

@@ -1,8 +1,8 @@
 require 'faraday' # HTTP Client
 require 'logger'
 require 'faraday_middleware'
-require 'faraday-cookie_jar'
 require 'spaceship/ui'
+require 'spaceship/helper/cookie_jar_middleware'
 require 'spaceship/helper/plist_middleware'
 require 'spaceship/helper/net_http_generic_request'
 
@@ -66,12 +66,12 @@ module Spaceship
     end
 
     def initialize
-      @cookie = HTTP::CookieJar.new
+      @cookie_jar = CookieJar::Jar.new
       @client = Faraday.new(self.class.hostname) do |c|
         c.response :json, content_type: /\bjson$/
         c.response :xml, content_type: /\bxml$/
         c.response :plist, content_type: /\bplist$/
-        c.use :cookie_jar, jar: @cookie
+        c.use :cookie_jar, jar: @cookie_jar
         c.adapter Faraday.default_adapter
 
         if ENV['DEBUG']
@@ -108,7 +108,8 @@ module Spaceship
     #
     # @return (String) the cookie-string in the RFC6265 format: https://tools.ietf.org/html/rfc6265#section-4.2.1
     def cookie
-      @cookie.map(&:to_s).join(';')
+      # this gets the cookie for allowed under the entire apple domain
+      @cookie_jar.get_cookie_header('https://apple.com/')
     end
 
     #####################################################

data/lib/spaceship/helper/cookie_jar_middleware.rb

@@ -0,0 +1,34 @@
+require 'cookiejar'
+
+module Faraday
+  class CookieJar < Faraday::Middleware
+    def initialize(app, options = {})
+      super(app)
+      @jar = options[:jar] || CookieJar::Jar.new
+    end
+
+    def call(env)
+      cookies = @jar.get_cookies(env[:url])
+
+      unless cookies.empty?
+        if env[:request_headers]["Cookie"]
+          env[:request_headers]["Cookie"] = @jar.get_cookie_header(env[:url]) + ";" + env[:request_headers]["Cookie"]
+        else
+          env[:request_headers]["Cookie"] = @jar.get_cookie_header(env[:url])
+        end
+      end
+
+      @app.call(env).on_complete do |res|
+        if res[:response_headers]
+          @jar.set_cookies_from_headers(env[:url], res[:response_headers])
+        end
+      end
+    end
+  end
+end
+
+if Faraday.respond_to?(:register_middleware)
+  Faraday.register_middleware cookie_jar: -> { Faraday::CookieJar }
+elsif Faraday::Middleware.respond_to?(:register_middleware)
+  Faraday::Middleware.register_middleware cookie_jar: Faraday::CookieJar
+end

data/lib/spaceship/tunes/tunes_client.rb

@@ -710,10 +710,10 @@ module Spaceship
               value: email
             },
             firstName: {
-              value: first_name
+              value: first_name || ""
             },
             lastName: {
-              value: last_name
+              value: last_name || ""
             },
             testing: {
               value: true

data/lib/spaceship/version.rb

@@ -1,3 +1,3 @@
 module Spaceship
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: credentials_manager
@@ -82,33 +82,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: faraday-cookie_jar
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: fastimage
+  name: cookiejar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +270,7 @@ files:
 - lib/spaceship/du/du_client.rb
 - lib/spaceship/du/upload_file.rb
 - lib/spaceship/du/utilities.rb
+- lib/spaceship/helper/cookie_jar_middleware.rb
 - lib/spaceship/helper/net_http_generic_request.rb
 - lib/spaceship/helper/plist_middleware.rb
 - lib/spaceship/launcher.rb