Skip to content

Commit 794a6e7

Browse files
authored
Merge pull request #29 from github/jhongturney/bump-ruby-test
Ruby 2.7.8, bundle updates to resolve vulns
2 parents 93eb991 + f2bc6be commit 794a6e7

File tree

76 files changed

+65
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+65
-56
lines changed

.github/workflows/lint-and-test.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ jobs:
77
- uses: actions/checkout@v4
88
- name: Setup Ruby
99
uses: ruby/setup-ruby@v1
10-
with:
11-
ruby-version: 2.6
1210
- name: Install dependencies
1311
run: |
1412
bundle install --jobs 4 --retry 3
@@ -20,8 +18,6 @@ jobs:
2018
steps:
2119
- uses: actions/checkout@v4
2220
- uses: ruby/setup-ruby@v1
23-
with:
24-
node-version: 2.1
2521
- name: Install dependencies
2622
run: |
2723
bundle install --jobs 4 --retry 3

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inherit_gem:
55
AllCops:
66
NewCops: enable
77
DisplayCopNames: true
8-
TargetRubyVersion: 2.6
8+
TargetRubyVersion: 2.7
99

1010
Style/HashSyntax:
1111
Exclude:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.4
1+
2.7.8

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ script: "script/cibuild"
66

77
matrix:
88
include:
9+
- rvm: 2.7
910
- rvm: 2.4
1011
- rvm: 2.3.2
1112
- rvm: 2.2.3

Gemfile.lock

Lines changed: 60 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -11,59 +11,69 @@ PATH
1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
activesupport (6.1.7.6)
14+
activesupport (7.1.3.2)
15+
base64
16+
bigdecimal
1517
concurrent-ruby (~> 1.0, >= 1.0.2)
18+
connection_pool (>= 2.2.5)
19+
drb
1620
i18n (>= 1.6, < 2)
1721
minitest (>= 5.1)
22+
mutex_m
1823
tzinfo (~> 2.0)
19-
zeitwerk (~> 2.3)
20-
addressable (2.8.5)
24+
addressable (2.8.6)
2125
public_suffix (>= 2.0.2, < 6.0)
2226
ast (2.4.2)
2327
base64 (0.2.0)
28+
bigdecimal (3.1.7)
2429
coderay (1.1.3)
25-
concurrent-ruby (1.2.2)
30+
concurrent-ruby (1.2.3)
31+
connection_pool (2.4.1)
2632
deep_merge (1.2.2)
27-
diff-lcs (1.5.0)
33+
diff-lcs (1.5.1)
2834
diffy (3.4.2)
29-
docile (1.1.5)
30-
facter (4.5.2)
35+
docile (1.4.0)
36+
drb (2.2.1)
37+
facter (4.6.1)
3138
hocon (~> 1.3)
3239
thor (>= 1.0.1, < 2.0)
33-
faraday (2.7.12)
40+
faraday (2.8.1)
3441
base64
3542
faraday-net_http (>= 2.0, < 3.1)
3643
ruby2_keywords (>= 0.0.4)
3744
faraday-net_http (3.0.2)
3845
fast_gettext (1.8.0)
39-
hashdiff (1.0.1)
46+
hashdiff (1.1.0)
4047
hiera (3.12.0)
4148
hocon (1.4.0)
4249
httparty (0.21.0)
4350
mini_mime (>= 1.0.0)
4451
multi_xml (>= 0.5.2)
4552
httpclient (2.8.3)
46-
i18n (1.14.1)
53+
i18n (1.14.4)
4754
concurrent-ruby (~> 1.0)
48-
json (2.6.1)
49-
locale (2.1.3)
55+
json (2.7.1)
56+
language_server-protocol (3.17.0.3)
57+
locale (2.1.4)
5058
method_source (1.0.0)
5159
mini_mime (1.1.5)
52-
minitest (5.20.0)
60+
minitest (5.22.3)
5361
multi_json (1.15.0)
5462
multi_xml (0.6.0)
55-
net-ssh (7.2.0)
63+
mutex_m (0.2.0)
64+
net-ssh (7.2.1)
5665
octocatalog-diff (2.1.0)
5766
diffy (>= 3.1.0)
5867
hashdiff (>= 0.3.0)
5968
httparty (>= 0.11.0)
6069
parallel (>= 1.12.0)
6170
rugged (>= 0.25.0b2)
62-
octokit (4.25.1)
71+
octokit (8.1.0)
72+
base64
6373
faraday (>= 1, < 3)
6474
sawyer (~> 0.9)
6575
parallel (1.12.0)
66-
parser (3.2.2.4)
76+
parser (3.3.0.5)
6777
ast (~> 2.4.1)
6878
racc
6979
pry (0.14.2)
@@ -84,69 +94,71 @@ GEM
8494
puppet-resource_api (1.9.0)
8595
hocon (>= 1.0)
8696
racc (1.7.3)
87-
rack (3.0.8)
97+
rack (3.0.10)
8898
rainbow (3.1.1)
8999
rake (12.3.3)
90-
regexp_parser (2.8.3)
100+
regexp_parser (2.9.0)
91101
rexml (3.2.6)
92-
rspec (3.12.0)
93-
rspec-core (~> 3.12.0)
94-
rspec-expectations (~> 3.12.0)
95-
rspec-mocks (~> 3.12.0)
96-
rspec-core (3.12.2)
97-
rspec-support (~> 3.12.0)
98-
rspec-expectations (3.12.3)
102+
rspec (3.13.0)
103+
rspec-core (~> 3.13.0)
104+
rspec-expectations (~> 3.13.0)
105+
rspec-mocks (~> 3.13.0)
106+
rspec-core (3.13.0)
107+
rspec-support (~> 3.13.0)
108+
rspec-expectations (3.13.0)
99109
diff-lcs (>= 1.2.0, < 2.0)
100-
rspec-support (~> 3.12.0)
101-
rspec-mocks (3.12.6)
110+
rspec-support (~> 3.13.0)
111+
rspec-mocks (3.13.0)
102112
diff-lcs (>= 1.2.0, < 2.0)
103-
rspec-support (~> 3.12.0)
113+
rspec-support (~> 3.13.0)
104114
rspec-puppet (2.6.15)
105115
rspec
106-
rspec-support (3.12.1)
107-
rubocop (1.50.2)
116+
rspec-support (3.13.1)
117+
rubocop (1.62.1)
108118
json (~> 2.3)
119+
language_server-protocol (>= 3.17.0)
109120
parallel (~> 1.10)
110-
parser (>= 3.2.0.0)
121+
parser (>= 3.3.0.2)
111122
rainbow (>= 2.2.2, < 4.0)
112123
regexp_parser (>= 1.8, < 3.0)
113124
rexml (>= 3.2.5, < 4.0)
114-
rubocop-ast (>= 1.28.0, < 2.0)
125+
rubocop-ast (>= 1.31.1, < 2.0)
115126
ruby-progressbar (~> 1.7)
116127
unicode-display_width (>= 2.4.0, < 3.0)
117-
rubocop-ast (1.30.0)
118-
parser (>= 3.2.1.0)
128+
rubocop-ast (1.31.2)
129+
parser (>= 3.3.0.4)
119130
rubocop-github (0.20.0)
120131
rubocop (>= 1.37)
121132
rubocop-performance (>= 1.15)
122133
rubocop-rails (>= 2.17)
123-
rubocop-performance (1.17.1)
124-
rubocop (>= 1.7.0, < 2.0)
125-
rubocop-ast (>= 0.4.0)
126-
rubocop-rails (2.19.1)
134+
rubocop-performance (1.20.2)
135+
rubocop (>= 1.48.1, < 2.0)
136+
rubocop-ast (>= 1.30.0, < 2.0)
137+
rubocop-rails (2.24.0)
127138
activesupport (>= 4.2.0)
128139
rack (>= 1.1)
129140
rubocop (>= 1.33.0, < 2.0)
141+
rubocop-ast (>= 1.31.1, < 2.0)
130142
ruby-progressbar (1.13.0)
131143
ruby2_keywords (0.0.5)
132-
rugged (1.7.1)
144+
rugged (1.7.2)
133145
sawyer (0.9.2)
134146
addressable (>= 2.3.5)
135147
faraday (>= 0.17.3, < 3)
136-
semantic_puppet (1.0.4)
137-
simplecov (0.14.1)
138-
docile (~> 1.1.0)
139-
json (>= 1.8, < 3)
140-
simplecov-html (~> 0.10.0)
141-
simplecov-html (0.10.2)
148+
semantic_puppet (1.1.0)
149+
simplecov (0.22.0)
150+
docile (~> 1.1)
151+
simplecov-html (~> 0.11)
152+
simplecov_json_formatter (~> 0.1)
153+
simplecov-html (0.12.3)
142154
simplecov-json (0.2.3)
143155
json
144156
simplecov
145-
thor (1.3.0)
157+
simplecov_json_formatter (0.1.4)
158+
thor (1.3.1)
146159
tzinfo (2.0.6)
147160
concurrent-ruby (~> 1.0)
148161
unicode-display_width (2.5.0)
149-
zeitwerk (2.6.12)
150162

151163
PLATFORMS
152164
ruby
@@ -164,4 +176,4 @@ DEPENDENCIES
164176
simplecov-json (~> 0.2)
165177

166178
BUNDLED WITH
167-
1.17.2
179+
2.1.4

rake/gem.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def self.push
8585
def self.tag
8686
# Make sure we have not released this version before
8787
exec_command("git fetch -t origin")
88-
tags = exec_command("git tag -l").split(/\n/)
88+
tags = exec_command("git tag -l").split("\n")
8989
raise "There is already a #{version} tag" if tags.include?(version)
9090

9191
# Tag it

script/cibuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
rspec_puppet_versions="2.3.2 2.4.0 2.5.0 2.6.4"
3+
rspec_puppet_versions="2.3.2 2.4.0 2.5.0 2.6.4 2.7.8"
44
puppet_versions="4.10.4"
55

66
set -e
-216 KB
Binary file not shown.
252 KB
Binary file not shown.

vendor/cache/addressable-2.8.5.gem

-104 KB
Binary file not shown.

0 commit comments

Comments
 (0)