Skip to content

Commit

Permalink
Add support for Ruby 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
hasghari committed Dec 26, 2021
1 parent 7f98b4d commit c8fccd9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- '2.6'
- '2.7'
- '3.0'
- '3.1'

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.0.0
ruby 3.1.0
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ GEM
climate_control (1.0.0)
diff-lcs (1.4.4)
docile (1.3.5)
parallel (1.20.1)
parser (3.0.1.0)
parallel (1.21.0)
parser (3.0.3.2)
ast (~> 2.4.1)
rainbow (3.0.0)
rake (13.0.3)
regexp_parser (2.1.1)
regexp_parser (2.2.0)
rexml (3.2.5)
rspec (3.10.0)
rspec-core (~> 3.10.0)
Expand All @@ -30,17 +30,17 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
rubocop (1.13.0)
rubocop (1.24.0)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.2.0, < 2.0)
rubocop-ast (>= 1.15.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
rubocop-ast (1.15.0)
parser (>= 3.0.1.1)
rubocop-rspec (2.3.0)
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
Expand All @@ -51,7 +51,7 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.2)
unicode-display_width (2.0.0)
unicode-display_width (2.1.0)

PLATFORMS
x86_64-darwin-19
Expand All @@ -68,4 +68,4 @@ DEPENDENCIES
simplecov

BUNDLED WITH
2.2.13
2.3.3
2 changes: 1 addition & 1 deletion lib/conifer/file.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def [](key)
def parsed
@parsed ||= case format
when :yml, :yaml
YAML.safe_load(ERB.new(::File.read(path)).result, allowed_classes)
YAML.safe_load(ERB.new(::File.read(path)).result, permitted_classes: allowed_classes)
when :json
JSON.parse(ERB.new(::File.read(path)).result)
else
Expand Down

0 comments on commit c8fccd9

Please sign in to comment.