spaceship 0.19.2 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3bf9dd05d81a6abd26ea7c1c92fe391a21fead6
-  data.tar.gz: 8a3416e6fdc98ed27a59014dbb8a8f1a34bc668e
+  metadata.gz: eef0b3daccd7d674a5e4262b3e53ac22b217c45a
+  data.tar.gz: 3f880a9b11397d309969408d2c3cf3204692d446
 SHA512:
-  metadata.gz: c46595feaf1b4c8e39f578eb271653b89617b0e15395ae4c949cafda4acf846a1fc443d8306da7056cd049468554123a5bebd7bcf8519acb4932f397ae264297
-  data.tar.gz: 2fa7bf1a5c6297f4767318d80987cfafd8233a3ca936cffec85d9d873e08fb0b5694d4235b3402138f22a78152d67540866cd0011d6ff2982e3543c89c2d5ba9
+  metadata.gz: b793b4ec731b8f47a32cb97b44d8ee316424d2fcd55a642ebea0cb3275ca355eeac2acbc21afa799f0f0c42f647882de347ad8f2ba2cd270c825aae54576d2fe
+  data.tar.gz: 12f2544aecadb004e3ceb516c2a68ca420ebac1acb90589a5c22d691ccc4c8fc55fcd9910ee5403cfb815db12c2796e492f99f0a1dc6f8d4430683ffed19dd23

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_jar = CookieJar::Jar.new
+      @cookie = HTTP::CookieJar.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_jar
+        c.use :cookie_jar, jar: @cookie
         c.adapter Faraday.default_adapter
 
         if ENV['DEBUG']
@@ -108,8 +108,7 @@ module Spaceship
     #
     # @return (String) the cookie-string in the RFC6265 format: https://tools.ietf.org/html/rfc6265#section-4.2.1
     def cookie
-      # this gets the cookie for allowed under the entire apple domain
-      @cookie_jar.get_cookie_header('https://apple.com/')
+      @cookie.map(&:to_s).join(';')
     end
 
     #####################################################

data/lib/spaceship/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spaceship
 version: !ruby/object:Gem::Version
-  version: 0.19.2
+  version: 0.19.3
 platform: ruby
 authors:
 - Felix Krause
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-22 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: fastimage
+  name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: cookiejar
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,6 @@ 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
@@ -329,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Because you would rather spend your time building stuff than fighting provisioning

data/lib/spaceship/helper/cookie_jar_middleware.rb

@@ -1,34 +0,0 @@
-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