Add support for Ruby v2.6 (#311)

* Add support for Ruby 2.6 * Use Ruby 2.5 Gemfile on Windows * Pin prerelease of gh This prerelease relaxes an overly restrictive dependency on addressable which is breaking the dependency graph.
newcontext-oss · Dec 29, 2018 · afd30e3 · afd30e3
1 parent fa58a26
commit afd30e3
Show file tree

Hide file tree

Showing 12 changed files with 641 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -57,8 +57,26 @@ jobs:
     language: ruby
     rvm: '2.5'
     before_install:
-    - gem install bundler --conservative --minimal-deps --no-document
-      --version="~> 1.17"
+    - gem install bundler --conservative --minimal-deps --no-document --version="~>
+      1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
+    - bundle config --local deployment true
+    - bundle config --local jobs $(nproc --ignore=1)
+    - bundle config --local without backend_ssh
+    install:
+    - bundle install
+    script:
+    - bundle exec rake
+    cache:
+      directories:
+      - ruby-2.5/vendor/bundle
+  - name: Ruby 2.6 on Ubuntu
+    dist: trusty
+    language: ruby
+    rvm: '2.6'
+    before_install:
+    - gem install bundler --conservative --minimal-deps --no-document --version="~>
+      1.17"
     - bundle config --local deployment true
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh
@@ -533,6 +551,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:
@@ -555,6 +574,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:
@@ -577,6 +597,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:
@@ -599,6 +620,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:
@@ -621,6 +643,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:
@@ -643,6 +666,7 @@ jobs:
     before_install:
     - gem install bundler --conservative --minimal-deps --no-document
       --version="~> 1.17"
+    - bundle config --local gemfile ruby-2.5/Gemfile
     - bundle config --local jobs $(nproc --ignore=1)
     - bundle config --local without backend_ssh:development
     install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,14 +8,16 @@ adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased][unreleased]
 
-## [4.2.0] - 2018-12-24
+## [4.2.0] - 2018-12-29
 
 ### Added
 
 - The driver gained a `:verify_version` configuration attribute which
   toggles verification of support for the available Terraform version.
   This feature allows unsupported versions of Terraform to be used.
 
+- The gem supports Ruby v2.6.
+
 ## [4.1.1] - 2018-12-13
 
 ### Fixed

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby "~> 2.5"
+ruby "~> 2.6"
 
 source "https://rubygems.org/" do
   gemspec
@@ -11,6 +11,10 @@ source "https://rubygems.org/" do
     gem "rbnacl-libsodium", "~> 1.0"
   end
 
+  group :development do
+    gem "gh", git: "https://github.com/travis-ci/gh", ref: "38fb339510ff9ae67cb08c6df7698f4c393f5a44"
+  end
+
   group :test do
     gem "rake", "~> 12.3"
   end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/travis-ci/gh
+  revision: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  ref: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  specs:
+    gh (0.15.1)
+      addressable (~> 2.4)
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (~> 2.9)
+      net-http-pipeline
+
 PATH
   remote: .
   specs:
@@ -46,7 +59,6 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.1.4)
-    connection_pool (2.2.2)
     contracts (0.13.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
@@ -110,13 +122,6 @@ GEM
       docile (~> 1.1)
     ffi (1.9.25)
     formatador (0.2.5)
-    gh (0.14.0)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -284,8 +289,7 @@ GEM
     multipart-post (2.0.0)
     necromancer (0.4.0)
     nenv (0.3.0)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
+    net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -375,7 +379,7 @@ GEM
     temple (0.8.0)
     term-ansicolor (1.7.0)
       tins (~> 1.0)
-    test-kitchen (1.23.5)
+    test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -418,7 +422,7 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
-    tty-prompt (0.18.0)
+    tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
@@ -474,6 +478,7 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt_pbkdf (~> 1.0)!
+  gh!
   guard (~> 2.14)!
   guard-bundler (~> 2.1)!
   guard-rspec (~> 4.7)!
@@ -496,7 +501,7 @@ DEPENDENCIES
   yard (~> 0.9)!
 
 RUBY VERSION
-   ruby 2.5.3p105
+   ruby 2.6.0p0
 
 BUNDLED WITH
    1.17.2
diff --git a/kitchen-terraform.gemspec b/kitchen-terraform.gemspec
@@ -43,7 +43,7 @@ require "rubygems"
   specification.add_runtime_dependency "test-kitchen", "~> 1.23"
   specification.add_runtime_dependency "tty-which", "~> 0.4.0"
   specification.cert_chain = ["certs/gem-public_cert.pem"]
-  specification.required_ruby_version = [">= 2.3", "< 2.6"]
+  specification.required_ruby_version = [">= 2.3", "< 2.7"]
   specification.requirements = ["Terraform >= 0.11.4, < 0.12.0"]
   specification.signing_key = "certs/gem-private_key.pem"
 end
diff --git a/ruby-2.3/Gemfile b/ruby-2.3/Gemfile
@@ -11,6 +11,10 @@ source "https://rubygems.org/" do
     gem "rbnacl-libsodium", "~> 1.0"
   end
 
+  group :development do
+    gem "gh", git: "https://github.com/travis-ci/gh", ref: "38fb339510ff9ae67cb08c6df7698f4c393f5a44"
+  end
+
   group :test do
     gem "rake", "~> 12.3"
   end

diff --git a/ruby-2.3/Gemfile.lock b/ruby-2.3/Gemfile.lock
@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/travis-ci/gh
+  revision: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  ref: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  specs:
+    gh (0.15.1)
+      addressable (~> 2.4)
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (~> 2.9)
+      net-http-pipeline
+
 PATH
   remote: ..
   specs:
@@ -46,7 +59,6 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.1.4)
-    connection_pool (2.2.2)
     contracts (0.13.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
@@ -110,13 +122,6 @@ GEM
       docile (~> 1.1)
     ffi (1.9.25)
     formatador (0.2.5)
-    gh (0.14.0)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -284,8 +289,7 @@ GEM
     multipart-post (2.0.0)
     necromancer (0.4.0)
     nenv (0.3.0)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
+    net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -375,7 +379,7 @@ GEM
     temple (0.8.0)
     term-ansicolor (1.7.0)
       tins (~> 1.0)
-    test-kitchen (1.23.5)
+    test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -418,7 +422,7 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
-    tty-prompt (0.18.0)
+    tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
@@ -474,6 +478,7 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt_pbkdf (~> 1.0)!
+  gh!
   guard (~> 2.14)!
   guard-bundler (~> 2.1)!
   guard-rspec (~> 4.7)!

diff --git a/ruby-2.4/Gemfile b/ruby-2.4/Gemfile
@@ -11,6 +11,10 @@ source "https://rubygems.org/" do
     gem "rbnacl-libsodium", "~> 1.0"
   end
 
+  group :development do
+    gem "gh", git: "https://github.com/travis-ci/gh", ref: "38fb339510ff9ae67cb08c6df7698f4c393f5a44"
+  end
+
   group :test do
     gem "rake", "~> 12.3"
   end

diff --git a/ruby-2.4/Gemfile.lock b/ruby-2.4/Gemfile.lock
@@ -1,3 +1,16 @@
+GIT
+  remote: https://github.com/travis-ci/gh
+  revision: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  ref: 38fb339510ff9ae67cb08c6df7698f4c393f5a44
+  specs:
+    gh (0.15.1)
+      addressable (~> 2.4)
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (~> 2.9)
+      net-http-pipeline
+
 PATH
   remote: ..
   specs:
@@ -46,7 +59,6 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.1.4)
-    connection_pool (2.2.2)
     contracts (0.13.0)
     coolline (0.5.0)
       unicode_utils (~> 1.4)
@@ -110,13 +122,6 @@ GEM
       docile (~> 1.1)
     ffi (1.9.25)
     formatador (0.2.5)
-    gh (0.14.0)
-      addressable
-      backports
-      faraday (~> 0.8)
-      multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
-      net-http-pipeline
     google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
@@ -284,8 +289,7 @@ GEM
     multipart-post (2.0.0)
     necromancer (0.4.0)
     nenv (0.3.0)
-    net-http-persistent (3.0.0)
-      connection_pool (~> 2.2)
+    net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -375,7 +379,7 @@ GEM
     temple (0.8.0)
     term-ansicolor (1.7.0)
       tins (~> 1.0)
-    test-kitchen (1.23.5)
+    test-kitchen (1.24.0)
       mixlib-install (~> 3.6)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -418,7 +422,7 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     tty-color (0.4.3)
     tty-cursor (0.6.0)
-    tty-prompt (0.18.0)
+    tty-prompt (0.18.1)
       necromancer (~> 0.4.0)
       pastel (~> 0.7.0)
       timers (~> 4.0)
@@ -474,6 +478,7 @@ PLATFORMS
 
 DEPENDENCIES
   bcrypt_pbkdf (~> 1.0)!
+  gh!
   guard (~> 2.14)!
   guard-bundler (~> 2.1)!
   guard-rspec (~> 4.7)!

diff --git a/ruby-2.5/.bundle/config b/ruby-2.5/.bundle/config
@@ -0,0 +1,4 @@
+---
+BUNDLE_IGNORE_MESSAGES: "true"
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_RETRY: "3"