controlling versions of io-console (as 0.8 is built for Ruby 3.3) and…

… bcrypt_pbkdf 1.1 fails to install with Ruby 3.2.5
DataDog · Dec 23, 2024 · 9231147 · 9231147
1 parent bdd7245
commit 9231147
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -34,6 +34,8 @@ group :development do
   gem "rubocop-performance", '= 1.16.0',         require: false
   gem "rubocop-rspec", '= 2.19.0',               require: false
   gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "io-console", '= 0.7.2',                   require: false
+  gem "bcrypt_pbkdf", '= 1.0.1',                 require: false
   gem "librarian-puppet", '~> 5.0'
   gem "kitchen-puppet"
   gem "kitchen-docker"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     ast (2.4.2)
     awesome_print (1.9.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1026.0)
+    aws-partitions (1.1027.0)
     aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -21,9 +21,10 @@ GEM
     aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     base64 (0.2.0)
+    bcrypt_pbkdf (1.0.1-x64-mingw32)
     bigdecimal (3.1.8)
     bindata (2.5.0)
-    bolt (3.30.0)
+    bolt (4.0.0)
       CFPropertyList (>= 2.2)
       addressable (~> 2.5)
       aws-sdk-ec2 (~> 1)
@@ -36,17 +37,19 @@ GEM
       net-scp (>= 1.2, < 5.0)
       net-ssh (>= 4.0, < 8.0)
       net-ssh-krb (~> 0.5)
-      orchestrator_client (~> 0.5)
+      orchestrator_client (~> 0.7)
       puppet (>= 6.18.0)
       puppet-resource_api (>= 1.8.1)
       puppet-strings (>= 2.3.0, < 5.0)
       puppetfile-resolver (>= 0.6.2, < 1.0)
-      r10k (~> 3.10)
+      r10k (>= 3.10, < 5)
       ruby_smb (~> 1.0)
       terminal-table (~> 3.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.3)
     builder (3.3.0)
+    chef-utils (18.6.2)
+      concurrent-ruby
     coderay (1.1.3)
     colored2 (3.1.2)
     concurrent-ruby (1.3.4)
@@ -64,6 +67,7 @@ GEM
       excon (>= 0.64.0)
       multi_json
     domain_name (0.6.20240107)
+    ed25519 (1.3.0)
     erubi (1.13.1)
     excon (1.2.2)
     facter (4.10.0)
@@ -86,6 +90,8 @@ GEM
     fast_gettext (2.4.0)
       prime
     ffi (1.16.3)
+    ffi-win32-extensions (1.0.4)
+      ffi
     forwardable (1.3.3)
     getoptlong (0.2.1)
     gettext (3.5.0)
@@ -117,9 +123,31 @@ GEM
     jgrep (1.5.4)
     jmespath (1.6.2)
     json (2.6.3)
-    json-schema (5.1.0)
+    json-schema (5.1.1)
       addressable (~> 2.8)
-    jwt (2.2.3)
+      bigdecimal (~> 3.1)
+    jwt (2.9.3)
+      base64
+    kitchen-docker (3.0.0)
+      test-kitchen (>= 1.0.0)
+    kitchen-puppet (3.7.0)
+      librarian-puppet (>= 3.0)
+      net-ssh (>= 3)
+      test-kitchen (>= 1.4)
+    kitchen-verifier-serverspec (0.7.2)
+      net-ssh (>= 3)
+      test-kitchen (>= 1.4)
+    librarian-puppet (5.0.0)
+      librarianp (>= 0.6.3)
+      puppet_forge (>= 2.1, < 5)
+      rsync
+    librarianp (1.1.2)
+      thor (~> 1.0)
+    license-acceptance (2.1.13)
+      pastel (~> 0.7)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
     little-plugger (1.1.4)
     locale (2.1.4)
     log4r (1.1.10)
@@ -137,6 +165,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1203)
     minitar (0.12.1)
+    mixlib-install (3.12.30)
+      mixlib-shellout
+      mixlib-versioning
+      thor
+    mixlib-shellout (3.3.4-universal-mingw32)
+      chef-utils
+      ffi-win32-extensions (~> 1.0.3)
+      win32-process (~> 0.9)
+      wmi-lite (~> 1.0)
+    mixlib-versioning (1.2.12)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     molinillo (0.8.0)
@@ -148,6 +186,8 @@ GEM
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.3.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     net-ssh-krb (0.5.1)
       gssapi (~> 1.3.0)
       net-ssh (>= 2.0)
@@ -165,6 +205,8 @@ GEM
     parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pathspec (2.1.0)
     pluginator (1.5.0)
     prime (0.1.3)
@@ -245,13 +287,13 @@ GEM
     puppet-syntax (4.1.1)
       puppet (>= 7, < 9)
       rake (~> 13.1)
-    puppet_forge (5.0.4)
+    puppet_forge (4.1.0)
       faraday (~> 2.0)
       faraday-follow_redirects (~> 0.3.0)
-      minitar (< 1.0.0)
+      minitar
       semantic_puppet (~> 1.0)
-    puppet_litmus (1.6.0)
-      bolt (~> 3.0)
+    puppet_litmus (1.6.1)
+      bolt (~> 4.0)
       docker-api (>= 1.34, < 3.0.0)
       parallel
       puppet-modulebuilder (>= 0.3.0)
@@ -268,23 +310,21 @@ GEM
       puppet-syntax (~> 4.1, >= 4.1.1)
       rspec-github (~> 2.0)
       rspec-puppet (~> 5.0)
-    r10k (3.15.3)
+    r10k (4.1.0)
       colored2 (= 3.1.2)
       cri (>= 2.15.10)
-      fast_gettext (>= 1.1.0, < 3.0.0)
-      gettext (>= 3.0.2, < 4.0.0)
-      gettext-setup (>= 0.24, < 2.0.0)
-      jwt (~> 2.2.3)
+      gettext-setup (>= 0.24, < 2.0)
+      jwt (>= 2.2.3, < 3)
       log4r (= 1.1.10)
       minitar (~> 0.9)
       multi_json (~> 1.10)
-      puppet_forge (>= 2.3.0)
+      puppet_forge (>= 4.1, < 6)
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-readline (0.5.5)
     regexp_parser (2.9.3)
-    reline (0.5.12)
+    reline (0.6.0)
       io-console (~> 0.5)
     rest-client (2.1.0-x64-mingw32)
       ffi (~> 1.9)
@@ -320,6 +360,7 @@ GEM
       facterdb (~> 2.1)
       puppet (>= 7, < 9)
     rspec-support (3.13.2)
+    rsync (1.0.9)
     rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -383,12 +424,39 @@ GEM
     table_print (1.5.7)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
+    test-kitchen (3.7.0)
+      bcrypt_pbkdf (~> 1.0)
+      chef-utils (>= 16.4.35)
+      ed25519 (~> 1.2)
+      license-acceptance (>= 1.0.11, < 3.0)
+      mixlib-install (~> 3.6)
+      mixlib-shellout (>= 1.2, < 4.0)
+      net-scp (>= 1.1, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
+      net-ssh-gateway (>= 1.2, < 3.0)
+      thor (>= 0.19, < 2.0)
+      winrm (~> 2.0)
+      winrm-elevated (~> 1.0)
+      winrm-fs (~> 1.1)
     text (1.3.1)
     thor (1.2.2)
+    tomlrb (2.0.3)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-cursor (~> 0.7)
+    tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-pager (0.14.0)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
@@ -414,6 +482,8 @@ GEM
       puppet-lint-unquoted_string-check (~> 3.0)
       puppet-lint-variable_contains_upcase (~> 2.0)
       puppet-lint-version_comparison-check (~> 2.0)
+    win32-process (0.10.0)
+      ffi (>= 1.0.0)
     windows_error (0.1.5)
     winrm (2.3.9)
       builder (>= 2.1.2)
@@ -425,23 +495,36 @@ GEM
       nori (~> 2.0, >= 2.7.1)
       rexml (~> 3.0)
       rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
     winrm-fs (1.3.5)
       erubi (~> 1.8)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 2.0)
       winrm (~> 2.0)
+    wisper (2.0.1)
+    wmi-lite (1.0.7)
     yard (0.9.36)
 
 PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
   CFPropertyList (< 3.0.7)
+  bcrypt_pbkdf (= 1.0.1)
   deep_merge (~> 1.2.2)
   dependency_checker (~> 1.0.0)
   facterdb (~> 2.1)
+  io-console (= 0.7.2)
   json (= 2.6.3)
+  kitchen-docker
+  kitchen-puppet
+  kitchen-verifier-serverspec
+  librarian-puppet (~> 5.0)
   metadata-json-lint (~> 4.0)
+  mixlib-shellout (~> 2.2.7)
   parallel_tests (= 3.12.1)
   pry (~> 0.10)
   puppet (= 8.10.0)
@@ -458,6 +541,7 @@ DEPENDENCIES
   rubocop-rspec (= 2.19.0)
   serverspec (~> 2.41)
   simplecov-console (~> 0.9)
+  test-kitchen (~> 3.7.0)
   voxpupuli-puppet-lint-plugins (~> 5.0)
 
 BUNDLED WITH