concourse.rb 0.1.0.pre.3 → 0.1.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d3b78394c237f40be7120c376a08f2589674df770193621459b707dcb5a82b
-  data.tar.gz: fc30e4e5ac9607112f39e1a6e08373d26757c43a5383de9de6034acf9e466724
+  metadata.gz: 95949c5aec21e80ba572a7a3c9f3f33742d0eb4d52bad1800e07ba815dbaad25
+  data.tar.gz: d4c56d5242e052a58d082c84f758e15e88e9cc687d8a1f3b5f3c9e04138813bc
 SHA512:
-  metadata.gz: 29db3b96e36cf7fd5031087804b0344548f062b62e74d44d71ad6cdb390a1010ea120d26b5f67b4d23b77f3423376399595785a90a6b9c029e3ef086de75ed58
-  data.tar.gz: a91efec92fe4b9261576c37581098345c376ed21387f85123577ab9b27ec025a60126c1cc891e06c86db5d1365abcea6c5c09c60b9122145abdb6fa0d98ce6d4
+  metadata.gz: f2c790b51bbb1a1cfb24ddf3d16d2bc4b6db67616cb4d1113e74e3dffe77a666b009e6ef97d489079734c55c70c915e1c1a5f1f97f12154d4297fcaf0bc263ff
+  data.tar.gz: b92c61bf4927030a9791a10813ef50f5f0433a323e1c9d803acd5584c9fc554734d0e394ad5cbebfca614369bfcbafc64cfb6eae2af5d82cc72031d63916538d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    concourse.rb (0.1.0.pre.3)
+    concourse.rb (0.1.0.pre.8)
       dry-schema (~> 0.5)
       excon (~> 0.72)
       semantic (~> 1.5)

data/lib/concourse/client.rb

@@ -1,4 +1,6 @@
 require 'excon'
+require 'json'
+
 require 'concourse/sub_clients'
 
 module Concourse

data/lib/concourse/headers.rb

@@ -11,7 +11,7 @@ module Concourse
     end
 
     def self.basic(username, password)
-      "Basic #{Base64.encode64("#{username}:#{password}")}"
+      "Basic #{Base64.strict_encode64("#{username}:#{password}")}"
     end
   end
 

data/lib/concourse/sub_clients/skymarshal_client.rb

@@ -1,5 +1,6 @@
 require 'semantic'
-require 'date'
+require 'time'
+require 'json'
 
 require 'concourse/urls'
 require 'concourse/headers'
@@ -69,22 +70,18 @@ module Concourse
 
       def token(token_response)
         token_response_date = @version >= VERSION_6_1 ?
-            DateTime.parse(
+            Time.parse(
                 token_response.headers[Concourse::HeaderNames.date]) :
             nil
         token_response_body =
             JSON.parse(token_response.body, symbolize_names: true)
 
-        seconds_in_a_day = 60 * 60 * 24
-
         @version >= VERSION_6_1 ?
             {
                 access_token: token_response_body[:access_token],
                 token_type: token_response_body[:token_type].downcase,
                 expires_at:
-                    (token_response_date +
-                        (token_response_body[:expires_in] /
-                            seconds_in_a_day))
+                    (token_response_date + token_response_body[:expires_in])
                         .iso8601,
                 id_token: token_response_body[:id_token]
             } :

data/lib/concourse/urls.rb

@@ -1,19 +1,25 @@
 module Concourse
   module Urls
     def self.api_url(concourse_url)
-      "#{concourse_url}/api/v1"
+      "#{base_url(concourse_url)}/api/v1"
     end
 
     def self.sky_token_url(concourse_url)
-      "#{concourse_url}/sky/token"
+      "#{base_url(concourse_url)}/sky/token"
     end
 
     def self.sky_issuer_token_url(concourse_url)
-      "#{concourse_url}/sky/issuer/token"
+      "#{base_url(concourse_url)}/sky/issuer/token"
     end
 
     def self.info_url(concourse_url)
       "#{api_url(concourse_url)}/info"
     end
+
+    private
+
+    def self.base_url(concourse_url)
+      concourse_url.chomp('/')
+    end
   end
 end

data/lib/concourse/version.rb

@@ -1,3 +1,3 @@
 module Concourse
-  VERSION = '0.1.0.pre.3'
+  VERSION = '0.1.0.pre.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concourse.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.3
+  version: 0.1.0.pre.8
 platform: ruby
 authors:
 - Toby Clemson