buildkit 1.4.2 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb6ca6eafcc3ad71c019207e36894e60ee31b31053ec2e3aee60930a5d6998b0
-  data.tar.gz: 9eb250b35103fad340404e0b08ece58be85e76158c8ece673cc9e8d733654374
+  metadata.gz: 03b8e45ebac5e4d266640db473fa71aba8cb6c9a819b5e760c6e728053294463
+  data.tar.gz: 5f37ba01f369f0e679ed389f7d1cdf6c79151a01d4c74f2a23b51d46a864963b
 SHA512:
-  metadata.gz: fd6916b102128b7bd3d6b0627d9f57462a14c565811732d56137691faf96778078536c1011ef3a633c06b499daf0711a9ea3edff4bd7d6689c9342f33ac98cc0
-  data.tar.gz: e5caef77cd0cb5016a7794b040445562456daab5b29a3f344598fe04345d47e259e674a6b3ff0964d22e6dc5e89958004cb6a4dccc1695caefcb9e2b3228cc0c
+  metadata.gz: 8225bf1b1508e2ac4d995f6c7e321c5495022441befe47934d3530f88d358073eb25a9779a850d22af0875f327d18fd06e4ffaf8f3c954f3ef14951023a11356
+  data.tar.gz: 6d4f3ab03f90c4f1314288454f377aaaea7bdb119ae6be91b1f20ed79679a0e10f152f9ce51a8e68f6988dec2f917b34ef1cd0a41dfddcabcd4cd7bcce68cfe4

data/.github/workflows/ci.yml

@@ -3,19 +3,16 @@ name: Test Buildkit Gem
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5', '2.6', '2.7' ]
+        ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1' ]
     name: Ruby ${{ matrix.ruby }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-      - name: bundle install
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true # 'bundle install' and cache
       - name: Run rspec
         run: 'bundle exec rspec spec'

data/Gemfile

@@ -4,12 +4,12 @@ source 'https://rubygems.org'
 
 gem 'byebug'
 gem 'rake'
-gem 'rubocop'
 gem 'yard'
 
 group :test do
   gem 'rspec', '~> 3.2'
-  gem 'vcr', '~> 2.9', github: 'vcr/vcr', branch: 'master', ref: '480304be6d73803e6c4a0eb21a4ab4091da558d8'
+  gem 'rubocop', '~> 0.81.0'
+  gem 'vcr', '~> 3.0'
 end
 
 gemspec

data/buildkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.metadata['allowed_push_host'] = "https://rubygems.org"
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.required_ruby_version = '>= 2.3'
 

data/lib/buildkit/client.rb

@@ -147,10 +147,12 @@ module Buildkit
 
         response.concat @last_response.data
 
+        break if @last_response.headers[:link].nil?
         link_header = parse_link_header(@last_response.headers[:link])
         break if link_header[:next].nil?
 
-        path = next_page(link_header[:next])
+        unescaped_next = CGI.unescape(link_header[:next])
+        path = next_page(unescaped_next)
       end
       response
     end
@@ -168,7 +170,11 @@ module Buildkit
         http.headers[:accept] = 'application/json'
         http.headers[:content_type] = 'application/json'
         http.headers[:user_agent] = "Buildkit v#{Buildkit::VERSION}"
-        http.authorization 'Bearer', @token
+        if Gem::Version.new(Faraday::VERSION) >= Gem::Version.new("1.7.1")
+          http.request :authorization, 'Bearer', @token
+        else
+          http.authorization 'Bearer', @token
+        end
       end
     end
 

data/lib/buildkit/error.rb

@@ -89,26 +89,31 @@ module Buildkit
     def response_error_summary
       return nil unless data.is_a?(Hash) && !Array(data[:errors]).empty?
 
-      summary = "\nError summary:\n"
-      summary << data[:errors].map do |hash|
+      errors = data[:errors].map do |hash|
         hash.map { |k, v| "  #{k}: #{v}" }
-      end.join("\n")
+      end
 
-      summary
+      <<~MSG.chomp
+        Error summary:
+        #{errors.join("\n")}
+      MSG
     end
 
     def build_error_message
       return nil if @response.nil?
 
-      message = +"#{@response[:method].to_s.upcase} #{redact_url(@response[:url].to_s)}: #{@response[:status]} - "
-      message << "#{response_message}#{response_error}#{response_error_summary}"
-      message << " // See: #{documentation_url}" unless documentation_url.nil?
-      message
+      documentation_text = ''
+      documentation_text = "// See: #{documentation_url}" if documentation_url
+
+      <<~MSG.strip
+        #{@response[:method].to_s.upcase} #{redact_url(@response[:url].to_s)}: #{@response[:status]} - #{response_message}#{response_error}#{response_error_summary}
+        #{documentation_text}
+      MSG
     end
 
     def redact_url(url_string)
       %w[client_secret access_token].each do |token|
-        url_string.gsub!(/#{token}=\S+/, "#{token}=(redacted)") if url_string.include? token
+        url_string = url_string.gsub(/#{token}=\S+/, "#{token}=(redacted)") if url_string.include? token
       end
       url_string
     end

data/lib/buildkit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Buildkit
-  VERSION = '1.4.2'
+  VERSION = '1.4.6'
 end

data/lib/buildkit.rb

@@ -4,7 +4,10 @@ require 'buildkit/version'
 require 'buildkit/client'
 
 module Buildkit
-  def self.new(*args)
-    Client.new(*args)
+  class << self
+    def new(*args)
+      Client.new(*args)
+    end
+    ruby2_keywords :new if respond_to?(:ruby2_keywords, true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildkit
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.6
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sawyer
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Ruby toolkit for working with the Buildkite API