concourse.rb 0.2.0 → 0.5.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e418cdfd2f7f6b6dcedd8ca3d7a9131bc604c2c6cd855f917a0aeebdb85e9b12
-  data.tar.gz: 6089cc188fcbcf8f6733d8f5f8d79acc13e79806f25e260854831264fdbc2ea2
+  metadata.gz: de769701f997cd906e1cee096307afce8c3f08b4a2eb4e68137fa66516417500
+  data.tar.gz: 4bc8c9b5ba34282cdb999d8e5e35093b62eeff428fda05e702727b98e90d2124
 SHA512:
-  metadata.gz: 94cf6b94a5a7d55bc53170ea34defdf80baa44023f23b9b72ed199c59907e91c59a15200bfd46a627d51b32be85dd289bedcd79ad0914424d60c0029aeeb8058
-  data.tar.gz: cbcd88a607aa38e55f7253813f57410c054137f58f869241630eb1aa0c7f2c41aa55bc7dc23cd192ea679851ac0d084dd54257883de9ecada5521874e2cf1b55
+  metadata.gz: 8aa1ffe5f928858f969e95922bb1d7d31f7b59eb526e2d4478bfdba0652526fd36eb242cf307b2f77ea07b481433e94d3af91df25682ad5a3f9ccc804ef88140
+  data.tar.gz: 3bf29fb22485c13fee35c7d399b9810291418d8dc640cb288f3c1c1611e64c05b8506e1c7534a3522f223a4e371b6f1a16b5145779073b65637ac1514701e317

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify dependencies in concourse.rb.gemspec

data/Gemfile.lock

@@ -1,15 +1,14 @@
 PATH
   remote: .
   specs:
-    concourse.rb (0.2.0)
-      dry-schema (~> 0.5)
-      excon (~> 0.72)
-      semantic (~> 1.5)
+    concourse.rb (0.5.0.pre.2)
+      excon (>= 0.72, < 1)
+      semantic (>= 1.5, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.0)
+    activesupport (6.1.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -17,63 +16,39 @@ GEM
       zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.2)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
-    dry-logic (1.1.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (0.6.0)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.0)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.0)
-    dry-types (1.4.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.3)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    excon (0.78.1)
-    faker (2.15.1)
+    excon (0.79.0)
+    faker (2.17.0)
       i18n (>= 1.6, < 2)
     faraday (1.3.0)
       faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
-    faraday-net_http (1.0.0)
-    gem-release (2.2.0)
+    faraday-net_http (1.0.1)
+    gem-release (2.2.1)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    i18n (1.8.6)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jwt (2.2.2)
-    lino (1.7.0)
+    lino (1.9.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multipart-post (2.1.1)
     octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
     openssl (2.2.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
     public_suffix (4.0.6)
+    rainbow (3.0.0)
     rake (13.0.3)
     rake_circle_ci (0.9.0)
       colored2 (~> 3.1)
@@ -95,6 +70,8 @@ GEM
       colored2 (~> 3.1)
       rake_factory (~> 0.23)
       sshkey (~> 2.0)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -104,11 +81,28 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    ruby2_keywords (0.0.2)
+    rspec-support (3.10.2)
+    rubocop (1.12.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
     ruby_gpg2 (0.8.0)
       lino (>= 1.5)
     sawyer (0.8.2)
@@ -118,6 +112,7 @@ GEM
     sshkey (2.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
@@ -126,18 +121,21 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  bundler (~> 2.0)
+  bundler
   concourse.rb!
-  faker (~> 2.15)
-  gem-release (~> 2.0)
-  jwt (~> 2.2)
-  openssl (~> 2.2)
-  rake (~> 13.0)
-  rake_circle_ci (~> 0.9)
-  rake_github (~> 0.5)
-  rake_gpg (~> 0.12)
-  rake_ssh (~> 0.4)
-  rspec (~> 3.9)
+  faker
+  gem-release
+  jwt
+  openssl
+  rake
+  rake_circle_ci
+  rake_github
+  rake_gpg
+  rake_ssh
+  rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
 
 BUNDLED WITH
-   2.2.4
+   2.2.15

data/README.md

@@ -24,15 +24,35 @@ Add usage here.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run 
-`rake spec` to run the tests. You can also run `bin/console` for an interactive 
-prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To 
-release a new version, update the version number in `version.rb`, and then run 
-`bundle exec rake release`, which will create a git tag for the version, push 
-git commits and tags, and push the `.gem` file to 
-[rubygems.org](https://rubygems.org).
+To install dependencies and run the build, run the pre-commit build:
+
+```shell script
+./go
+```
+
+This runs all unit tests and other checks including coverage and code linting / 
+formatting.
+
+To run only the unit tests, including coverage:
+
+```shell script
+./go test:unit
+```
+
+To attempt to fix any code linting / formatting issues:
+
+```shell script
+./go library:fix
+```
+
+To check for code linting / formatting issues without fixing:
+
+```shell script
+./go library:check
+```
+
+You can also run `bin/console` for an interactive prompt that will allow you to 
+experiment.
 
 ### Common Tasks
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'rake_circle_ci'
 require 'rake_github'
@@ -5,13 +7,16 @@ require 'rake_ssh'
 require 'rake_gpg'
 require 'securerandom'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-task :default => :spec
-
-RSpec::Core::RakeTask.new(:spec)
+task default: %i[
+  library:fix
+  test:unit
+]
 
 namespace :encryption do
   namespace :passphrase do
+    desc 'Generate encryption passphrase for CI GPG key'
     task :generate do
       File.open('config/secrets/ci/encryption.passphrase', 'w') do |f|
         f.write(SecureRandom.base64(36))
@@ -23,86 +28,103 @@ end
 namespace :keys do
   namespace :deploy do
     RakeSSH.define_key_tasks(
-        path: 'config/secrets/ci/',
-        comment: 'maintainers@infrablocks.io')
+      path: 'config/secrets/ci/',
+      comment: 'maintainers@infrablocks.io'
+    )
   end
 
   namespace :gpg do
     RakeGPG.define_generate_key_task(
-        output_directory: 'config/secrets/ci',
-        name_prefix: 'gpg',
-        owner_name: 'InfraBlocks Maintainers',
-        owner_email: 'maintainers@infrablocks.io',
-        owner_comment: 'concourse.rb CI Key')
+      output_directory: 'config/secrets/ci',
+      name_prefix: 'gpg',
+      owner_name: 'InfraBlocks Maintainers',
+      owner_email: 'maintainers@infrablocks.io',
+      owner_comment: 'concourse.rb CI Key'
+    )
   end
 end
 
+RuboCop::RakeTask.new
+
+namespace :library do
+  desc 'Run all checks of the library'
+  task check: [:rubocop]
+
+  desc 'Attempt to automatically fix issues with the library'
+  task fix: [:'rubocop:auto_correct']
+end
+
+namespace :test do
+  RSpec::Core::RakeTask.new(:unit)
+end
+
 RakeCircleCI.define_project_tasks(
-    namespace: :circle_ci,
-    project_slug: 'github/infrablocks/concourse.rb'
+  namespace: :circle_ci,
+  project_slug: 'github/infrablocks/concourse.rb'
 ) do |t|
   circle_ci_config =
-      YAML.load_file('config/secrets/circle_ci/config.yaml')
+    YAML.load_file('config/secrets/circle_ci/config.yaml')
 
-  t.api_token = circle_ci_config["circle_ci_api_token"]
+  t.api_token = circle_ci_config['circle_ci_api_token']
   t.environment_variables = {
-      ENCRYPTION_PASSPHRASE:
-          File.read('config/secrets/ci/encryption.passphrase')
-              .chomp
+    ENCRYPTION_PASSPHRASE:
+        File.read('config/secrets/ci/encryption.passphrase')
+            .chomp
   }
   t.checkout_keys = []
   t.ssh_keys = [
-      {
-          hostname: "github.com",
-          private_key: File.read('config/secrets/ci/ssh.private')
-      }
+    {
+      hostname: 'github.com',
+      private_key: File.read('config/secrets/ci/ssh.private')
+    }
   ]
 end
 
 RakeGithub.define_repository_tasks(
-    namespace: :github,
-    repository: 'infrablocks/concourse.rb',
+  namespace: :github,
+  repository: 'infrablocks/concourse.rb'
 ) do |t|
   github_config =
-      YAML.load_file('config/secrets/github/config.yaml')
+    YAML.load_file('config/secrets/github/config.yaml')
 
-  t.access_token = github_config["github_personal_access_token"]
+  t.access_token = github_config['github_personal_access_token']
   t.deploy_keys = [
-      {
-          title: 'CircleCI',
-          public_key: File.read('config/secrets/ci/ssh.public')
-      }
+    {
+      title: 'CircleCI',
+      public_key: File.read('config/secrets/ci/ssh.public')
+    }
   ]
 end
 
 namespace :pipeline do
-  task :prepare => [
-      :'circle_ci:project:follow',
-      :'circle_ci:env_vars:ensure',
-      :'circle_ci:checkout_keys:ensure',
-      :'circle_ci:ssh_keys:ensure',
-      :'github:deploy_keys:ensure'
+  desc 'Prepare CircleCI Pipeline'
+  task prepare: %i[
+    circle_ci:project:follow
+    circle_ci:env_vars:ensure
+    circle_ci:checkout_keys:ensure
+    circle_ci:ssh_keys:ensure
+    github:deploy_keys:ensure
   ]
 end
 
 namespace :version do
-  desc "Bump version for specified type (pre, major, minor, patch)"
+  desc 'Bump version for specified type (pre, major, minor, patch)'
   task :bump, [:type] do |_, args|
     bump_version_for(args.type)
   end
 end
 
-desc "Release gem"
+desc 'Release gem'
 task :release do
-  sh "gem release --tag --push"
+  sh 'gem release --tag --push'
 end
 
 def bump_version_for(version_type)
-  sh "gem bump " +
-      "--skip-ci " +
-      "--version #{version_type} " +
-      "--file lib/concourse/version.rb " +
-      "&& bundle install " +
-      "&& export LAST_MESSAGE=\"$(git log -1 --pretty=%B)\" " +
-      "&& git commit -a --amend -m \"${LAST_MESSAGE}\""
+  sh 'gem bump ' \
+     '--skip-ci ' \
+     "--version #{version_type} " \
+     '--file lib/concourse/version.rb ' \
+     '&& bundle install ' \
+     '&& export LAST_MESSAGE="$(git log -1 --pretty=%B)" ' \
+     '&& git commit -a --amend -m "${LAST_MESSAGE}"'
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'concourse'

data/concourse.rb.gemspec

@@ -1,23 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'concourse/version'
 require 'date'
 
+files = %w[
+  bin
+  lib
+  CODE_OF_CONDUCT.md
+  concourse.rb.gemspec
+  Gemfile
+  LICENSE.txt
+  Rakefile
+  README.md
+]
+
 Gem::Specification.new do |spec|
   spec.name = 'concourse.rb'
   spec.version = Concourse::VERSION
   spec.authors = ['Toby Clemson']
   spec.email = ['tobyclemson@gmail.com']
 
-  spec.date = Date.today.to_s
   spec.summary = 'A Ruby SDK for the Concourse CI API.'
   spec.description = 'A Ruby SDK for the Concourse CI API.'
   spec.homepage = 'https://github.com/infrablocks/concourse.rb'
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").select do |f|
-    f.match(%r{^(bin|lib|CODE_OF_CONDUCT\.md|concourse\.rb\.gemspec|Gemfile|LICENSE\.txt|Rakefile|README\.md)})
+    f.match(/^(#{files.map { |g| Regexp.escape(g) }.join('|')})/)
   end
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -25,19 +36,21 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'excon', '~> 0.72'
-  spec.add_dependency 'dry-schema', '~> 0.5'
-  spec.add_dependency 'semantic', '~> 1.5'
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rake_circle_ci', '~> 0.9'
-  spec.add_development_dependency 'rake_github', '~> 0.5'
-  spec.add_development_dependency 'rake_ssh', '~> 0.4'
-  spec.add_development_dependency 'rake_gpg', '~> 0.12'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'jwt', '~> 2.2'
-  spec.add_development_dependency 'openssl', '~> 2.2'
-  spec.add_development_dependency 'faker', '~> 2.15'
-  spec.add_development_dependency 'gem-release', '~> 2.0'
+  spec.add_dependency 'excon', '>= 0.72', '< 1'
+  spec.add_dependency 'semantic', '>= 1.5', '< 2'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'faker'
+  spec.add_development_dependency 'gem-release'
+  spec.add_development_dependency 'jwt'
+  spec.add_development_dependency 'openssl'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake_circle_ci'
+  spec.add_development_dependency 'rake_github'
+  spec.add_development_dependency 'rake_gpg'
+  spec.add_development_dependency 'rake_ssh'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/concourse.rb

@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+
 require_relative 'concourse/version'
+require_relative 'concourse/models'
+require_relative 'concourse/errors'
+require_relative 'concourse/http'
 require_relative 'concourse/client'
 require_relative 'concourse/urls'
 require_relative 'concourse/headers'

data/lib/concourse/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'excon'
 require 'json'
 
@@ -11,15 +13,19 @@ module Concourse
 
     def for_skymarshal
       Concourse::SubClients::SkymarshalClient.new(
-          @options.merge(version: get_info[:version]))
+        @options.merge(version: get_info[:version])
+      )
     end
 
+    # rubocop:disable Naming/AccessorMethodName
     def get_info
       JSON.parse(
-          Excon.get(Concourse::Urls.info_url(@options[:url]))
-              .body,
-          symbolize_names: true)
+        Excon.get(Concourse::Urls.info_url(@options[:url]))
+            .body,
+        symbolize_names: true
+      )
     end
+    # rubocop:enable Naming/AccessorMethodName
 
     def ==(other)
       other.class == self.class && other.state == state

data/lib/concourse/errors.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Concourse
+  module Errors
+    class ApiError < StandardError
+      def initialize(parameters)
+        @request = parameters[:request]
+        @response = parameters[:response]
+
+        super("Request to #{@request.url} failed " \
+          "with status #{@response.status} " \
+          "and body #{@response.body}")
+      end
+    end
+  end
+end

data/lib/concourse/headers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'base64'
 
 module Concourse
@@ -17,25 +19,25 @@ module Concourse
 
   module HeaderNames
     def self.content_type
-      "Content-Type"
+      'Content-Type'
     end
-    
+
     def self.authorization
-      "Authorization"
+      'Authorization'
     end
 
     def self.date
-      "Date"
+      'Date'
     end
   end
 
   module Headers
     def self.content_type(content_type)
-      {Concourse::HeaderNames.content_type => content_type}
+      { Concourse::HeaderNames.content_type => content_type }
     end
 
     def self.authorization(authorization)
-      {Concourse::HeaderNames.authorization => authorization}
+      { Concourse::HeaderNames.authorization => authorization }
     end
   end
-end
+end

data/lib/concourse/http.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Concourse
+  module Http
+    class Request
+      attr_reader :url, :headers, :body
+
+      def initialize(url, headers = {}, body = nil)
+        @url = url
+        @headers = headers
+        @body = body
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        state.hash
+      end
+
+      protected
+
+      def state
+        [@url, @headers, @body]
+      end
+    end
+
+    def assert_successful(request, response)
+      raise api_error(request, response) unless response.status < 400
+    end
+
+    private
+
+    def api_error(request, response)
+      Errors::ApiError.new(request: request, response: response)
+    end
+  end
+end

data/lib/concourse/models.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require 'concourse/models/token'
+
+module Concourse
+  module Models
+  end
+end

data/lib/concourse/models/token.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Concourse
+  module Models
+    class Token
+      attr_reader :access_token, :token_type, :expires_at, :id_token
+
+      def initialize(parameters)
+        @access_token = parameters[:access_token]
+        @token_type = parameters[:token_type]
+        @expires_at = parameters[:expires_at]
+        @id_token = parameters[:id_token]
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == state
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        state.hash
+      end
+
+      protected
+
+      def state
+        [@access_token, @token_type, @expires_at, @id_token]
+      end
+    end
+  end
+end

data/lib/concourse/sub_clients.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'concourse/sub_clients/skymarshal_client'
 
 module Concourse
   module SubClients
   end
-end
+end

data/lib/concourse/sub_clients/skymarshal_client.rb

@@ -1,15 +1,20 @@
+# frozen_string_literal: true
+
 require 'semantic'
 require 'time'
 require 'json'
 
 require 'concourse/urls'
 require 'concourse/headers'
+require 'concourse/http'
 
 module Concourse
   module SubClients
     class SkymarshalClient
       VERSION_6_1 = Semantic::Version.new('6.1.0')
 
+      include Concourse::Http
+
       def initialize(options)
         @url = options[:url]
         @version = Semantic::Version.new(options[:version])
@@ -20,8 +25,10 @@ module Concourse
         headers = create_token_headers
         body = create_token_body(parameters)
 
+        token_request = Http::Request.new(url, headers, body)
         token_response = Excon.post(url, headers: headers, body: body)
 
+        assert_successful(token_request, token_response)
         token(token_response)
       end
 
@@ -38,60 +45,87 @@ module Concourse
       private
 
       def create_token_url
-        @version >= VERSION_6_1 ?
-            Concourse::Urls.sky_issuer_token_url(@url) :
-            Concourse::Urls.sky_token_url(@url)
+        if @version >= VERSION_6_1
+          Concourse::Urls.sky_issuer_token_url(@url)
+        else
+          Concourse::Urls.sky_token_url(@url)
+        end
       end
 
       def create_token_headers
         {}
-            .merge(Concourse::Headers.content_type(
-                Concourse::ContentTypes::APPLICATION_WWW_FORM_URLENCODED))
-            .merge(Concourse::Headers.authorization(
-                Concourse::Authorization.basic(
-                    "fly", "Zmx5")))
+          .merge(Concourse::Headers.content_type(
+                   Concourse::ContentTypes::APPLICATION_WWW_FORM_URLENCODED
+                 ))
+          .merge(Concourse::Headers.authorization(
+                   Concourse::Authorization.basic(
+                     'fly', 'Zmx5'
+                   )
+                 ))
       end
 
       def create_token_body(parameters)
         username = parameters[:username]
         password = parameters[:password]
 
-        scope = @version >= VERSION_6_1 ?
-            'openid profile email federated:id groups' :
-            'openid+profile+email+federated:id+groups'
-
-        URI.encode_www_form({
+        URI.encode_www_form(
+          {
             grant_type: 'password',
             username: username,
             password: password,
             scope: scope
-        })
+          }
+        )
       end
 
       def token(token_response)
-        token_response_date = @version >= VERSION_6_1 ?
-            Time.parse(
-                token_response.headers[Concourse::HeaderNames.date]) :
-            nil
-        token_response_body =
-            JSON.parse(token_response.body, symbolize_names: true)
-
-        @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])
-                        .iso8601,
-                id_token: token_response_body[:id_token]
-            } :
-            {
-                access_token: token_response_body[:access_token],
-                token_type: token_response_body[:token_type].downcase,
-                expires_at: token_response_body[:expiry],
-                id_token: token_response_body[:access_token]
-            }
+        if @version >= VERSION_6_1
+          post_version_6_1_token(token_response)
+        else
+          pre_version_6_1_token(token_response)
+        end
+      end
+
+      def scope
+        if @version >= VERSION_6_1
+          'openid profile email federated:id groups'
+        else
+          'openid+profile+email+federated:id+groups'
+        end
+      end
+
+      def token_response_date(token_response)
+        Time.parse(token_response.headers[Concourse::HeaderNames.date])
+      end
+
+      def token_response_body(token_response)
+        JSON.parse(token_response.body, symbolize_names: true)
+      end
+
+      def pre_version_6_1_token(token_response)
+        token_response_body = token_response_body(token_response)
+
+        Models::Token.new(
+          access_token: token_response_body[:access_token],
+          token_type: token_response_body[:token_type].downcase,
+          expires_at: token_response_body[:expiry],
+          id_token: token_response_body[:access_token]
+        )
+      end
+
+      def post_version_6_1_token(token_response)
+        token_response_body = token_response_body(token_response)
+        token_response_date = token_response_date(token_response)
+
+        Models::Token.new(
+          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])
+              .iso8601,
+          id_token: token_response_body[:id_token]
+        )
       end
     end
   end
-end
+end

data/lib/concourse/urls.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Concourse
   module Urls
     def self.api_url(concourse_url)
@@ -16,8 +18,6 @@ module Concourse
       "#{api_url(concourse_url)}/info"
     end
 
-    private
-
     def self.base_url(concourse_url)
       concourse_url.chomp('/')
     end

data/lib/concourse/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Concourse
-  VERSION = '0.2.0'
+  VERSION = '0.5.0.pre.2'
 end

metadata

@@ -1,211 +1,251 @@
 --- !ruby/object:Gem::Specification
 name: concourse.rb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0.pre.2
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-03 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.72'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.72'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: dry-schema
+  name: semantic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: semantic
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_circle_ci
+  name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_github
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake_ssh
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake_circle_ci
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake_github
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake_gpg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake_ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jwt
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: openssl
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem-release
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 description: A Ruby SDK for the Concourse CI API.
 email:
 - tobyclemson@gmail.com
@@ -224,7 +264,11 @@ files:
 - concourse.rb.gemspec
 - lib/concourse.rb
 - lib/concourse/client.rb
+- lib/concourse/errors.rb
 - lib/concourse/headers.rb
+- lib/concourse/http.rb
+- lib/concourse/models.rb
+- lib/concourse/models/token.rb
 - lib/concourse/sub_clients.rb
 - lib/concourse/sub_clients/skymarshal_client.rb
 - lib/concourse/urls.rb
@@ -244,9 +288,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: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: