concourse.rb 0.1.0.pre.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da79ec973440bf36e7f6d0dc07c73b50554280c714f51eab7b07ba20ea097e6
-  data.tar.gz: 44f0d8652e9a270498d21722450f3e4583b408bc6b5a76b00354f04f90a80ca9
+  metadata.gz: e418cdfd2f7f6b6dcedd8ca3d7a9131bc604c2c6cd855f917a0aeebdb85e9b12
+  data.tar.gz: 6089cc188fcbcf8f6733d8f5f8d79acc13e79806f25e260854831264fdbc2ea2
 SHA512:
-  metadata.gz: 770f0a543b35e5e971a2effe88044e0ec4bf22ca979484eb44e44bdfc1ca5d86a9d32f74aef458bcc949aac2fab89b766c281a19e314a3e00b8cb7759d8c9260
-  data.tar.gz: b9721083e6add845ceecb79ff356e9e07190dc4ab265e79dac5cee05bdec01157ae41fce24d67e83f3024d810ad25d564f8e07fde3d055a5196e633193a4ced6
+  metadata.gz: 94cf6b94a5a7d55bc53170ea34defdf80baa44023f23b9b72ed199c59907e91c59a15200bfd46a627d51b32be85dd289bedcd79ad0914424d60c0029aeeb8058
+  data.tar.gz: cbcd88a607aa38e55f7253813f57410c054137f58f869241630eb1aa0c7f2c41aa55bc7dc23cd192ea679851ac0d084dd54257883de9ecada5521874e2cf1b55

data/Gemfile.lock

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

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,5 @@
 require 'semantic'
-require 'date'
+require 'time'
 require 'json'
 
 require 'concourse/urls'
@@ -70,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.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concourse.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Toby Clemson
@@ -244,9 +244,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: