Skip to content

Fix INI library when loading multiple files #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2024
Merged

Fix INI library when loading multiple files #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bfb1bc
- Fix INI library when loading multiple files
DannyBen Sep 3, 2024
30b7318
- Add sub dependencies to avoid Ruby 3.3.5 warnings
DannyBen Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bashly.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Gem::Specification.new do |s|
s.add_dependency 'requires', '~> 1.1.0'
s.add_dependency 'tty-markdown', '~> 0.7'

# Sub-dependenceis (Ruby 3.3.5 warnings)
s.add_dependency 'logger' # required by filewatcher
s.add_dependency 'ostruct' # required by json

# Ruby 3.0 comes with Psych 3.3.0, which does not have the `unsafe_load`
# ref: https://github.com/ruby/psych/commit/cb50aa8d3fb8be01897becff77b4922b12a0ab4c
s.add_dependency 'psych', '>= 3.3.2', '< 7'
Expand Down
1 change: 1 addition & 0 deletions examples/config/src/lib/ini.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
##
## Load an INI file and populate the associative array `ini`.
ini_load() {
unset ini
declare -gA ini

local ini_file="$1"
Expand Down
1 change: 1 addition & 0 deletions examples/ini/src/lib/ini.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
##
## Load an INI file and populate the associative array `ini`.
ini_load() {
unset ini
declare -gA ini

local ini_file="$1"
Expand Down
2 changes: 1 addition & 1 deletion examples/render-mandoc/docs/download.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.\" Automatically generated by Pandoc 3.2
.\"
.TH "download" "1" "August 2024" "Version 0.1.0" "Sample application"
.TH "download" "1" "September 2024" "Version 0.1.0" "Sample application"
.SH NAME
\f[B]download\f[R] \- Sample application
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion examples/render-mandoc/docs/download.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
% download(1) Version 0.1.0 | Sample application
% Lana Lang
% August 2024
% September 2024

NAME
==================================================
Expand Down
1 change: 1 addition & 0 deletions lib/bashly/libraries/ini/ini.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
##
## Load an INI file and populate the associative array `ini`.
ini_load() {
unset ini
declare -gA ini

local ini_file="$1"
Expand Down
2 changes: 1 addition & 1 deletion spec/approvals/examples/render-mandoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ ISSUE TRACKER
AUTHORS
Lana Lang.

Version 0.1.0 August 2024 download(1)
Version 0.1.0 September 2024 download(1)
1 change: 0 additions & 1 deletion spec/approvals/libraries/render/mandoc/render-1-download.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,3 @@ EXAMPLES

download example.com ./output -f

Version 0.1.0 MONTH YEAR ... APPNAME
4 changes: 1 addition & 3 deletions spec/bashly/libraries/render_mandoc_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,9 @@
.to match_approval('libraries/render/mandoc/render-1-download.md')
.except(/\w{3,9} 202\d/, 'MONTH YEAR')

expect(`man "#{target}/download.1" | col -bx`)
expect(`man "#{target}/download.1" | col -bx | sed '$d'`)
.to match_approval('libraries/render/mandoc/render-1-download.1')
.diff(leeway)
.except(/\w{3,9} 202\d.*/, 'MONTH YEAR ... APPNAME')
end
end

Expand All @@ -41,7 +40,6 @@
it 'saves a markdown and man files for each command' do
expect { subject.instance_eval render_script }
.to output_approval('libraries/render/mandoc/render-2')
.except(/\w{3,9} 202\d.*/, 'MONTH YEAR ... APPNAME')

expect(File.read "#{target}/cli-download.md")
.to match_approval('libraries/render/mandoc/render-2-download.md')
Expand Down