Skip to content

Commit

Permalink
administrative updates (#101)
Browse files Browse the repository at this point in the history
* update ruby, gems

* license update

* remove travis

* stringstyle

* gemfile updates
  • Loading branch information
jdowning authored Sep 15, 2024
1 parent 9fc0ddb commit f56d207
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 87 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
15 changes: 2 additions & 13 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ require:
- rubocop-rspec
AllCops:
DisplayCopNames: true
TargetRubyVersion: '2.5'
Include:
- "**/*.rb"
Exclude:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -469,6 +456,8 @@ Style/StderrPuts:
Enabled: false
Style/StringConcatenation:
Enabled: false
Style/StringLiterals:
Enabled: false
Style/Strip:
Enabled: false
Style/SymbolProc:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.2.5
45 changes: 0 additions & 45 deletions .travis.yml

This file was deleted.

37 changes: 12 additions & 25 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
Expand All @@ -14,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 "rubocop", '= 1.6.1', require: false
gem "rubocop-performance", '= 1.9.1', require: false
gem "rubocop-rspec", '= 2.0.1', 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 "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
Expand All @@ -58,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
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit f56d207

Please sign in to comment.