From bc8d4c599e5871beb1fdef56e9aca59ce5c4f5c4 Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Sun, 15 Sep 2024 14:39:06 -0700 Subject: [PATCH 1/5] update ruby, gems --- .github/workflows/spec.yml | 5 ++++- .rubocop.yml | 13 ------------- .ruby-version | 2 +- Gemfile | 7 ++++--- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index dbe998a..1eb749d 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -8,6 +8,9 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.8 + ruby-version: 3.2.5 - run: bundle install + - run: bundle exec rake check:symlinks check:git_ignore check:dot_underscore check:test_file + - run: bundle exec rake rubocop + - run: bundle exec rake syntax lint metadata_lint - run: bundle exec rake spec diff --git a/.rubocop.yml b/.rubocop.yml index 31e8248..9bb08fb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,7 +4,6 @@ require: - rubocop-rspec AllCops: DisplayCopNames: true - TargetRubyVersion: '2.5' Include: - "**/*.rb" Exclude: @@ -287,12 +286,6 @@ Performance/UriDefaultParser: Enabled: false RSpec/Be: Enabled: false -RSpec/Capybara/CurrentPathExpectation: - Enabled: false -RSpec/Capybara/FeatureMethods: - Enabled: false -RSpec/Capybara/VisibilityMatcher: - Enabled: false RSpec/ContextMethod: Enabled: false RSpec/ContextWording: @@ -315,12 +308,6 @@ RSpec/ExpectChange: Enabled: false RSpec/ExpectInHook: Enabled: false -RSpec/FactoryBot/AttributeDefinedStatically: - Enabled: false -RSpec/FactoryBot/CreateList: - Enabled: false -RSpec/FactoryBot/FactoryClassName: - Enabled: false RSpec/HooksBeforeExamples: Enabled: false RSpec/ImplicitBlockExpectation: diff --git a/.ruby-version b/.ruby-version index 6a81b4c..5ae69bd 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.2.5 diff --git a/Gemfile b/Gemfile index 4eaa0c3..b5b4233 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' +ruby file: ".ruby-version" def location_for(place_or_version, fake_version = nil) git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} @@ -30,9 +31,9 @@ group :development do gem "pry", '~> 0.10', require: false gem "simplecov-console", '~> 0.5', require: false gem "puppet-debugger", '~> 1.0', require: false - gem "rubocop", '= 1.6.1', require: false - gem "rubocop-performance", '= 1.9.1', require: false - gem "rubocop-rspec", '= 2.0.1', require: false + gem "rubocop", require: false + gem "rubocop-performance", require: false + gem "rubocop-rspec", require: false gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] end group :system_tests do From 3c5c45f9ec519a8b6581cb32af94b859e36ace08 Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Sun, 15 Sep 2024 14:45:31 -0700 Subject: [PATCH 2/5] license update --- LICENSE | 2 +- metadata.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index f7bafa0..814f3df 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013-2014 Justin Downing +Copyright (c) 2013-2024 Justin Downing Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/metadata.json b/metadata.json index e201b29..8fe0648 100644 --- a/metadata.json +++ b/metadata.json @@ -3,7 +3,7 @@ "version": "3.0.0", "author": "Justin Downing", "summary": "Setup rbenv ruby manager for systemwide use", - "license": "Apache-2.0", + "license": "MIT", "source": "https://github.com/jdowning/puppet-rbenv.git", "project_page": "https://github.com/jdowning/puppet-rbenv", "issues_url": "https://github.com/jdowning/puppet-rbenv/issues", From 474ba0723a341ef003a8a85b3735de62c5b09b37 Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Sun, 15 Sep 2024 14:46:52 -0700 Subject: [PATCH 3/5] remove travis --- .travis.yml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ed27d4d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -dist: xenial -language: ruby -cache: bundler -before_install: - - bundle -v - - rm -f Gemfile.lock - - gem update --system $RUBYGEMS_VERSION - - gem --version - - bundle -v -script: - - 'bundle exec rake $CHECK' -bundler_args: --without system_tests -rvm: - - 2.5.3 -stages: - - static - - spec - - acceptance - - - if: tag =~ ^v\d - name: deploy -matrix: - fast_finish: true - include: - - - env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" - stage: static - - - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec - rvm: 2.4.5 - stage: spec - - - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec - rvm: 2.5.3 - stage: spec - - - env: DEPLOY_TO_FORGE=yes - stage: deploy -branches: - only: - - master - - /^v\d/ -notifications: - email: false From 553b52717ef4144c8830340473af95e20c35a866 Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Sun, 15 Sep 2024 15:14:07 -0700 Subject: [PATCH 4/5] stringstyle --- .rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 9bb08fb..b08944d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -456,6 +456,8 @@ Style/StderrPuts: Enabled: false Style/StringConcatenation: Enabled: false +Style/StringLiterals: + Enabled: false Style/Strip: Enabled: false Style/SymbolProc: From 130b52f95ba9b0bbe58b8d6aa77adbcdd9af81ec Mon Sep 17 00:00:00 2001 From: Justin Downing Date: Sun, 15 Sep 2024 15:21:36 -0700 Subject: [PATCH 5/5] gemfile updates --- Gemfile | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/Gemfile b/Gemfile index b5b4233..b865601 100644 --- a/Gemfile +++ b/Gemfile @@ -15,27 +15,24 @@ def location_for(place_or_version, fake_version = nil) end group :development do - gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) - gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false - gem "facterdb", '~> 1.18', require: false - gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false - gem "puppetlabs_spec_helper", '~> 5.0', require: false - gem "rspec-puppet-facts", '~> 2.0', require: false gem "codecov", '~> 0.2', require: false gem "dependency_checker", '~> 0.2', require: false + gem "facterdb", '~> 1.18', require: false + gem "json", require: false + gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false gem "parallel_tests", '= 3.12.1', require: false gem "pry", '~> 0.10', require: false - gem "simplecov-console", '~> 0.5', require: false gem "puppet-debugger", '~> 1.0', require: false + gem "puppetlabs_spec_helper", '~> 5.0', require: false + gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "rspec-puppet-facts", '~> 2.0', require: false gem "rubocop", require: false gem "rubocop-performance", require: false gem "rubocop-rspec", require: false - gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw] + gem "simplecov-console", '~> 0.5', require: false + gem "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false end + group :system_tests do gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw] gem "serverspec", '~> 2.41', require: false @@ -59,15 +56,4 @@ gems.each do |gem_name, gem_params| gem gem_name, *gem_params end -# Evaluate Gemfile.local and ~/.gemfile if they exist -extra_gemfiles = [ - "#{__FILE__}.local", - File.join(Dir.home, '.gemfile'), -] - -extra_gemfiles.each do |gemfile| - if File.file?(gemfile) && File.readable?(gemfile) - eval(File.read(gemfile), binding) - end -end # vim: syntax=ruby