Skip to content

Commit

Permalink
puppet to 7, ruby to 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@rrotter
rrotter committed Sep 22, 2023
1 parent 73802e7 commit d8ff426
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5
2.7
1 change: 1 addition & 0 deletions .tool-versions
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby 2.7.8
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ruby:2.5
FROM ruby:2.7
ARG UNAME=app
ARG UID=1000
ARG GID=1000
ARG APP_HOME=/app

RUN gem install 'bundler:~>2.1.4'
RUN gem install 'bundler:~>2.4.19'
RUN groupadd -g $GID -o $UNAME
RUN useradd -m -d $APP_HOME -u $UID -g $GID -o -s /bin/bash $UNAME
RUN mkdir -p /gems && chown $UID:$GID /gems
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

minor_version = Gem::Version.new(RUBY_VERSION.dup).segments[0..1].join('.')

gem 'rake', '>= 12.3.3'
gem 'rake', '>= 13.0.6'

group :development do
gem "fast_gettext", require: false
Expand All @@ -13,10 +13,10 @@ group :development do
gem "parallel_tests"
end

gem 'puppet', '~> 6.19'
gem 'puppet', '~> 7.26'
gem 'puppet-strings'
gem 'semantic_puppet'
gem 'yard', '>= 0.9.20'
gem 'yard', '>= 0.9.34'

# Evaluate Gemfile.local and ~/.gemfile if they exist
[
Expand Down
122 changes: 63 additions & 59 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
ansi (1.5.0)
ast (2.4.2)
awesome_print (1.9.2)
bcrypt_pbkdf (1.1.0)
codecov (0.6.0)
simplecov (>= 0.15, < 0.22)
coderay (1.1.3)
concurrent-ruby (1.1.9)
concurrent-ruby (1.2.2)
deep_merge (1.2.2)
dependency_checker (0.3.0)
parallel
Expand All @@ -22,15 +22,16 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ed25519 (1.3.0)
facter (4.2.7)
facter (4.4.3)
hocon (~> 1.3)
sys-filesystem (~> 1.3)
thor (>= 1.0.1, < 2.0)
facterdb (1.13.0)
facterdb (1.21.0)
facter (< 5.0.0)
jgrep
faker (2.19.0)
i18n (>= 1.6, < 2)
faraday (1.9.3)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -46,84 +47,85 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.3)
multipart-post (>= 1.2, < 3)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fast_gettext (1.8.0)
hiera (3.8.0)
fast_gettext (2.3.0)
ffi (1.15.5)
hiera (3.12.0)
hirb (0.7.3)
hocon (1.3.1)
hocon (1.4.0)
http-accept (1.7.0)
http-cookie (1.0.4)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.9.1)
concurrent-ruby (~> 1.0)
jgrep (1.5.4)
json-schema (2.8.1)
addressable (>= 2.4)
json-schema (4.1.1)
addressable (>= 2.8)
locale (2.1.3)
metaclass (0.0.4)
metadata-json-lint (3.0.1)
json-schema (~> 2.8)
metadata-json-lint (3.0.3)
json-schema (>= 2.8, < 5.0)
spdx-licenses (~> 1.0)
method_source (1.0.0)
mime-types (3.4.1)
mime-types (3.5.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mime-types-data (3.2023.0808)
minitar (0.9)
mocha (1.1.0)
metaclass (~> 0.0.1)
multi_json (1.15.0)
multipart-post (2.1.1)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
multipart-post (2.3.0)
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-ssh (7.2.0)
net-telnet (0.1.1)
netrc (0.11.0)
parallel (1.21.0)
parallel_tests (3.7.3)
parallel
parser (3.1.0.0)
parser (3.2.2.3)
ast (~> 2.4.1)
racc
pathspec (0.2.1)
pluginator (1.5.0)
pry (0.14.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
puppet (6.26.0)
public_suffix (5.0.3)
puppet (7.26.0)
concurrent-ruby (~> 1.0)
deep_merge (~> 1.0)
facter (> 2.0.1, < 5)
fast_gettext (~> 1.1)
fast_gettext (>= 1.1, < 3)
hiera (>= 3.2.1, < 4)
httpclient (~> 2.8)
locale (~> 2.1)
multi_json (~> 1.10)
puppet-resource_api (~> 1.5)
scanf (~> 1.0)
semantic_puppet (~> 1.0)
puppet-blacksmith (6.1.1)
puppet-modulebuilder (~> 0.2)
rest-client (~> 2.0)
puppet-debugger (1.2.0)
puppet-debugger (1.3.0)
awesome_print (~> 1.7)
bundler
facterdb (>= 0.4.0)
pluginator (~> 1.5.0)
puppet (>= 5.5)
rb-readline (>= 0.5.5)
table_print (>= 1.0.0)
tty-pager (~> 0.13.0)
tty-pager (~> 0.13)
puppet-lint (2.5.2)
puppet-module-posix-default-r2.5 (1.1.1)
puppet-module-posix-dev-r2.5 (1.1.1)
puppet-module-posix-default-r2.7 (1.1.1)
puppet-module-posix-dev-r2.7 (1.1.1)
bcrypt_pbkdf (~> 1.0)
codecov (~> 0.2)
concurrent-ruby (!= 1.1.6)
Expand All @@ -133,7 +135,6 @@ GEM
metadata-json-lint (>= 2.0.2, < 4.0.0)
mocha (>= 1.0.0, < 1.2.0)
parallel_tests (~> 3.4)
pathspec (< 1.0.0)
pry (~> 0.10)
puppet-blacksmith (~> 6.0)
puppet-debugger (~> 1.0)
Expand All @@ -156,7 +157,7 @@ GEM
puppet-modulebuilder (0.3.0)
minitar (~> 0.9)
pathspec (>= 0.2.1, < 2.0.0)
puppet-resource_api (1.8.14)
puppet-resource_api (1.9.0)
hocon (>= 1.0)
puppet-strings (2.9.0)
rgen
Expand All @@ -175,17 +176,18 @@ GEM
puppet-lint (~> 2.0)
puppet-syntax (>= 2.0, < 4)
rspec-puppet (~> 2.0)
racc (1.7.1)
rainbow (2.2.2)
rake
rake (13.0.6)
rb-readline (0.5.5)
regexp_parser (2.2.1)
regexp_parser (2.8.1)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.2.5)
rexml (3.2.6)
rgen (0.9.0)
rspec (3.11.0)
rspec-core (~> 3.11.0)
Expand All @@ -204,7 +206,7 @@ GEM
rspec-support (~> 3.11.0)
rspec-puppet (2.11.1)
rspec
rspec-puppet-facts (2.0.3)
rspec-puppet-facts (2.0.5)
facter
facterdb (>= 0.5.0)
puppet
Expand All @@ -215,7 +217,7 @@ GEM
rspec
rspec-puppet
rspec-support (3.11.0)
rspec_junit_formatter (0.5.1)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (1.6.1)
parallel (~> 1.10)
Expand All @@ -226,18 +228,19 @@ GEM
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.15.2)
parser (>= 3.0.1.1)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-performance (1.9.1)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rspec (2.0.1)
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
ruby-progressbar (1.11.0)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
semantic_puppet (1.0.4)
serverspec (2.42.0)
scanf (1.0.0)
semantic_puppet (1.1.0)
serverspec (2.42.3)
multi_json
rspec (~> 3.0)
rspec-its
Expand All @@ -257,40 +260,41 @@ GEM
net-ssh (>= 2.7)
net-telnet (= 0.1.1)
sfl
strings (0.1.8)
strings-ansi (~> 0.1)
unicode-display_width (~> 1.5)
strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
sys-filesystem (1.4.4)
ffi (~> 1.1)
table_print (1.5.7)
thor (1.2.1)
tty-pager (0.13.0)
strings (~> 0.1.8)
thor (1.2.2)
tty-pager (0.14.0)
strings (~> 0.2.0)
tty-screen (~> 0.8)
tty-screen (0.8.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.8)
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
unicode_utils (1.4.0)
webrick (1.7.0)
yard (0.9.27)
webrick (~> 1.7.0)
yard (0.9.34)

PLATFORMS
ruby

DEPENDENCIES
faker
fast_gettext
puppet (~> 6.19)
puppet-module-posix-default-r2.5
puppet-module-posix-dev-r2.5
parallel_tests
puppet (~> 7.26)
puppet-module-posix-default-r2.7
puppet-module-posix-dev-r2.7
puppet-strings
rake (>= 12.3.3)
rake (>= 13.0.6)
rspec-puppet-utils
semantic_puppet
yard (>= 0.9.20)
yard (>= 0.9.34)

BUNDLED WITH
2.1.4

0 comments on commit d8ff426

Please sign in to comment.