diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5879612..bbb023d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,6 +13,11 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number }} cancel-in-progress: true +# Set a global environment variable for the PUPPET_AUTH_TOKEN for all jobs as well as the BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM +env: + PUPPET_AUTH_TOKEN: ${{ secrets.PUPPET_AUTH_TOKEN }} + BUNDLE_RUBYGEMS___PUPPETCORE__PUPPET__COM: "forge-key:${{ secrets.PUPPET_AUTH_TOKEN }}" + jobs: rspec: runs-on: ubuntu-latest diff --git a/Gemfile b/Gemfile index 3636474..999f3d1 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,7 @@ source "https://rubygems.org" +gem 'puppet', '>= 7.0.0', source: 'https://rubygems-puppetcore.puppet.com' if ENV['PUPPET_AUTH_TOKEN'] + # Specify your gem's dependencies in abide_dev_utils.gemspec gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 1760d2d..ffb93c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,70 +9,124 @@ PATH jira-ruby (~> 2.2) metadata-json-lint (~> 4.0) nokogiri (~> 1.13) - puppet (>= 7.0.0) puppet-strings (>= 2.7) ruby-progressbar (~> 1.11) selenium-webdriver (~> 4.0.0.beta4) +GEM + remote: https://rubygems-puppetcore.puppet.com/ + specs: + facter (4.11.0) + hocon (~> 1.3) + thor (>= 1.0.1, < 1.3) + puppet (8.11.0) + concurrent-ruby (~> 1.0) + deep_merge (~> 1.0) + facter (>= 4.3.0, < 5) + fast_gettext (>= 2.1, < 4) + getoptlong (~> 0.2.0) + locale (~> 2.1) + multi_json (~> 1.13) + puppet-resource_api (~> 1.5) + scanf (~> 1.0) + semantic_puppet (~> 1.0) + puppet (8.11.0-universal-darwin) + CFPropertyList (>= 3.0.6, < 4) + concurrent-ruby (~> 1.0) + deep_merge (~> 1.0) + facter (>= 4.3.0, < 5) + fast_gettext (>= 2.1, < 4) + getoptlong (~> 0.2.0) + locale (~> 2.1) + multi_json (~> 1.13) + puppet-resource_api (~> 1.5) + scanf (~> 1.0) + semantic_puppet (~> 1.0) + GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) - activesupport (7.0.7.2) - concurrent-ruby (~> 1.0, >= 1.0.2) + CFPropertyList (3.0.7) + base64 + nkf + rexml + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - ast (2.4.2) - async (1.30.2) - console (~> 1.10) - nio4r (~> 2.3) - timers (~> 4.1) - async-http (0.60.2) - async (>= 1.25) - async-io (>= 1.28) - async-pool (>= 0.2) - protocol-http (~> 0.24.0) - protocol-http1 (~> 0.15.0) - protocol-http2 (~> 0.15.0) - traces (>= 0.10.0) - async-http-faraday (0.12.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + ast (2.4.3) + async (2.23.1) + console (~> 1.29) + fiber-annotation + io-event (~> 1.9) + metrics (~> 0.12) + traces (~> 0.15) + async-http (0.88.0) + async (>= 2.10.2) + async-pool (~> 0.9) + io-endpoint (~> 0.14) + io-stream (~> 0.6) + metrics (~> 0.12) + protocol-http (~> 0.49) + protocol-http1 (~> 0.30) + protocol-http2 (~> 0.22) + traces (~> 0.10) + async-http-faraday (0.21.0) async-http (~> 0.42) faraday - async-io (1.33.0) - async - async-pool (0.3.10) + async-pool (0.10.3) async (>= 1.25) atlassian-jwt (0.2.1) jwt (~> 2.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) childprocess (4.1.0) cmdparse (3.0.7) coderay (1.1.3) - concurrent-ruby (1.1.10) - console (1.15.3) - fiber-local + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + console (1.30.2) + fiber-annotation + fiber-local (~> 1.1) + json declarative (0.0.20) deep_merge (1.2.2) - diff-lcs (1.5.0) - digest-crc (0.6.4) + diff-lcs (1.6.1) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) - facter (4.4.1) - hocon (~> 1.3) - thor (>= 1.0.1, < 2.0) + drb (2.2.1) facterdb (2.1.0) facter (< 5.0.0) jgrep (~> 1.5, >= 1.5.4) - faraday (2.3.0) - faraday-net_http (~> 2.0) - ruby2_keywords (>= 0.0.4) - faraday-http-cache (2.3.0) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-http-cache (2.5.1) faraday (>= 0.8) - faraday-net_http (2.0.3) - fast_gettext (2.3.0) - fiber-local (1.0.0) - gem-release (2.2.2) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + fast_gettext (3.1.0) + prime + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.0) + forwardable (1.3.3) + gem-release (2.2.4) + getoptlong (0.2.1) github_changelog_generator (1.16.4) activesupport async (>= 1.25.0) @@ -82,203 +136,233 @@ GEM octokit (~> 4.6) rainbow (>= 2.2.1) rake (>= 10.0) - google-apis-core (0.11.0) + google-apis-core (0.16.0) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.16.2, < 2.a) - httpclient (>= 2.8.1, < 3.a) + googleauth (~> 1.9) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml - webrick - google-apis-iamcredentials_v1 (0.17.0) - google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-iamcredentials_v1 (0.22.0) + google-apis-core (>= 0.15.0, < 2.a) + google-apis-storage_v1 (0.50.0) + google-apis-core (>= 0.15.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-env (2.2.2) + base64 (~> 0.2) + faraday (>= 1.0, < 3.a) + google-cloud-errors (1.5.0) + google-cloud-storage (1.55.0) addressable (~> 2.8) digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-core (~> 0.13) + google-apis-iamcredentials_v1 (~> 0.18) + google-apis-storage_v1 (>= 0.42) google-cloud-core (~> 1.6) - googleauth (>= 0.16.2, < 2.a) + googleauth (~> 1.9) mini_mime (~> 1.0) - googleauth (1.5.2) - faraday (>= 0.17.3, < 3.a) + google-logging-utils (0.1.0) + googleauth (1.14.0) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.2) + google-logging-utils (~> 0.1) jwt (>= 1.4, < 3.0) - memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - hashdiff (1.0.1) + hashdiff (1.1.2) hashie (5.0.0) - hiera (3.12.0) hocon (1.4.0) - httpclient (2.8.3) - i18n (1.14.1) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) concurrent-ruby (~> 1.0) + io-endpoint (0.15.2) + io-event (1.10.0) + io-stream (0.6.1) jgrep (1.5.4) jira-ruby (2.3.0) activesupport atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - json-schema (4.1.1) - addressable (>= 2.8) - jwt (2.7.1) - locale (2.1.3) - memoist (0.16.2) - metadata-json-lint (4.0.0) - json-schema (>= 2.8, < 5.0) + json (2.10.2) + json-schema (5.1.1) + addressable (~> 2.8) + bigdecimal (~> 3.1) + jwt (2.10.1) + base64 + language_server-protocol (3.17.0.4) + lint_roller (1.1.0) + locale (2.1.4) + logger (1.7.0) + metadata-json-lint (4.2.1) + json-schema (>= 2.8, < 6.0) semantic_puppet (~> 1.0) spdx-licenses (~> 1.0) - method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.19.0) + method_source (1.1.0) + metrics (0.12.2) + mini_mime (1.1.5) + minitest (5.25.5) multi_json (1.15.0) - multipart-post (2.3.0) - nio4r (2.5.8) - nokogiri (1.15.6-arm64-darwin) + multipart-post (2.4.1) + mutex_m (0.3.0) + net-http (0.6.0) + uri + nkf (0.2.0) + nokogiri (1.18.7-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.7-aarch64-linux-musl) + racc (~> 1.4) + nokogiri (1.18.7-arm-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.7-arm-linux-musl) racc (~> 1.4) - nokogiri (1.15.6-x86_64-darwin) + nokogiri (1.18.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.6-x86_64-linux) + nokogiri (1.18.7-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.18.7-x86_64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.7-x86_64-linux-musl) racc (~> 1.4) oauth (0.6.2) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (4.25.0) + octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) os (1.1.4) - parallel (1.22.1) - parser (3.1.2.0) + parallel (1.26.3) + parser (3.3.7.4) ast (~> 2.4.1) - protocol-hpack (1.4.2) - protocol-http (0.24.7) - protocol-http1 (0.15.1) + racc + prime (0.1.3) + forwardable + singleton + prism (1.4.0) + protocol-hpack (1.5.1) + protocol-http (0.49.0) + protocol-http1 (0.34.0) protocol-http (~> 0.22) - protocol-http2 (0.15.1) + protocol-http2 (0.22.1) protocol-hpack (~> 1.4) - protocol-http (~> 0.18) - pry (0.14.1) + protocol-http (~> 0.47) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.7) - puppet (7.24.0) - concurrent-ruby (~> 1.0, < 1.2.0) - deep_merge (~> 1.0) - facter (> 2.0.1, < 5) - fast_gettext (>= 1.1, < 3) - hiera (>= 3.2.1, < 4) - locale (~> 2.1) - multi_json (~> 1.10) - puppet-resource_api (~> 1.5) - scanf (~> 1.0) - semantic_puppet (~> 1.0) - puppet (7.24.0-universal-darwin) - CFPropertyList (~> 2.2) - concurrent-ruby (~> 1.0, < 1.2.0) - deep_merge (~> 1.0) - facter (> 2.0.1, < 5) - fast_gettext (>= 1.1, < 3) - hiera (>= 3.2.1, < 4) - locale (~> 2.1) - multi_json (~> 1.10) - puppet-resource_api (~> 1.5) - scanf (~> 1.0) - semantic_puppet (~> 1.0) - puppet-resource_api (1.8.14) + public_suffix (6.0.1) + puppet-resource_api (1.9.0) hocon (>= 1.0) - puppet-strings (4.0.0) + puppet-strings (4.1.3) rgen (~> 0.9) - yard (~> 0.9) - racc (1.7.3) + yard (~> 0.9, < 0.9.37) + racc (1.8.1) rainbow (3.1.1) - rake (13.0.6) - regexp_parser (2.5.0) + rake (13.2.1) + regexp_parser (2.10.0) representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.9) - rgen (0.9.1) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rexml (3.4.1) + rgen (0.10.2) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.3) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.1) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-support (3.11.0) - rubocop (1.30.0) + rspec-support (~> 3.13.0) + rspec-support (3.13.2) + rubocop (1.75.1) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.18.0, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.43.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.18.0) - parser (>= 3.1.1.0) - rubocop-i18n (3.0.0) - rubocop (~> 1.0) - rubocop-performance (1.14.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) - rubocop-rspec (2.11.1) - rubocop (~> 1.19) - ruby-progressbar (1.11.0) - ruby2_keywords (0.0.5) - rubyzip (2.3.2) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.43.0) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-capybara (2.22.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-factory_bot (2.27.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-i18n (3.2.3) + lint_roller (~> 1.1) + rubocop (>= 1.72.1) + rubocop-performance (1.24.0) + lint_roller (~> 1.1) + rubocop (>= 1.72.1, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) + rubocop-rspec (2.31.0) + rubocop (~> 1.40) + rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) + rubocop-rspec_rails (~> 2.28) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) + ruby-progressbar (1.13.0) + rubyzip (2.4.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) scanf (1.0.0) + securerandom (0.4.1) selenium-webdriver (4.0.3) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2) - semantic_puppet (1.1.0) - signet (0.17.0) + semantic_puppet (1.1.1) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) + singleton (0.3.0) snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) spdx-licenses (1.3.0) thor (1.2.2) - timers (4.3.3) - traces (0.11.1) + traces (0.15.2) trailblazer-option (0.1.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unicode-display_width (2.1.0) - version_gem (1.1.2) - webrick (1.8.2) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) + uri (1.0.3) + version_gem (1.1.6) yard (0.9.36) PLATFORMS - arm64-darwin-22 - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-linux + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + universal-darwin + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES abide_dev_utils! @@ -288,6 +372,7 @@ DEPENDENCIES gem-release github_changelog_generator pry + puppet (>= 7.0.0)! rake rspec (~> 3.10) rubocop (~> 1.8) @@ -297,4 +382,4 @@ DEPENDENCIES rubocop-rspec (~> 2.1) BUNDLED WITH - 2.4.19 + 2.5.22 diff --git a/abide_dev_utils.gemspec b/abide_dev_utils.gemspec index 138bd52..6a8bc51 100644 --- a/abide_dev_utils.gemspec +++ b/abide_dev_utils.gemspec @@ -35,7 +35,6 @@ Gem::Specification.new do |spec| # Prod dependencies spec.add_dependency 'nokogiri', '~> 1.13' spec.add_dependency 'cmdparse', '~> 3.0' - spec.add_dependency 'puppet', '>= 7.0.0' spec.add_dependency 'puppet-strings', '>= 2.7' spec.add_dependency 'jira-ruby', '~> 2.2' spec.add_dependency 'ruby-progressbar', '~> 1.11'