Skip to content

Commit 3088a42

Browse files
authored
Merge pull request #2 from markeganfuller/remove_untainted
* Drop use of `untainted` - these taint tracking methods were finally [removed in ruby 3.3](https://bugs.ruby-lang.org/issues/16131). * Add currently supported ruby versions to GitHub workflow testing matrix.
2 parents b1d64f4 + 8b79636 commit 3088a42

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

.github/workflows/test.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,31 @@
1+
---
12
name: Run tests
2-
on: [push, pull_request]
3+
on: [push, pull_request] # yamllint disable-line rule:truthy
34
jobs:
45
test:
56
strategy:
67
fail-fast: false
78
matrix:
8-
ruby: ['2.3', '2.4', '2.5', '2.6', '2.7', '3.0', '3.1']
9+
ruby: [
10+
'2.3', '2.4', '2.5', '2.6', '2.7',
11+
'3.0', '3.1', '3.2', '3.3', '3.4'
12+
]
913
runs-on: ubuntu-latest
1014
env:
1115
BUNDLE_GEMFILE: ${{ github.workspace }}/spec/spec.gemfile
1216
steps:
13-
- uses: actions/checkout@v2
14-
- uses: ruby/setup-ruby@v1
15-
with:
16-
ruby-version: ${{ matrix.ruby }}
17-
bundler-cache: true
18-
- run: bundle exec rspec
17+
- uses: actions/checkout@v5
18+
- uses: ruby/setup-ruby@v1
19+
with:
20+
ruby-version: ${{ matrix.ruby }}
21+
bundler-cache: true
22+
- run: bundle exec rspec
1923
lint:
2024
runs-on: ubuntu-latest
2125
steps:
22-
- uses: actions/checkout@v2
23-
- uses: ruby/setup-ruby@v1
24-
with:
25-
ruby-version: 2.7
26-
bundler-cache: true
27-
- run: bundle exec rubocop
26+
- uses: actions/checkout@v5
27+
- uses: ruby/setup-ruby@v1
28+
with:
29+
ruby-version: 2.7
30+
bundler-cache: true
31+
- run: bundle exec rubocop

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source 'https://rubygems.org'
44

5-
ruby '2.7.7'
5+
ruby '2.7.8'
66

77
# Specify your gem's dependencies in resolv-hosts-dynamic.gemspec
88
gemspec

lib/resolv-hosts-dynamic.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ def add_address(host)
3535
raise "Must specify 'addr' for host" unless addr
3636
raise "Must specify 'hostname' for host" unless hostname
3737

38-
addr.untaint
39-
hostname.untaint
40-
4138
# So that aliases can be passed a string or an array of strings
4239
aliases = [aliases] if aliases.is_a? String
4340

@@ -47,7 +44,6 @@ def add_address(host)
4744
@name2addr[hostname] = [] unless @name2addr.include? hostname
4845
@name2addr[hostname] << addr
4946
aliases&.each do |n|
50-
n.untaint
5147
@name2addr[n] = [] unless @name2addr.include? n
5248
@name2addr[n] << addr
5349
end

0 commit comments

Comments
 (0)