diff --git a/bashly.gemspec b/bashly.gemspec index 74fb1210..72ef1da3 100644 --- a/bashly.gemspec +++ b/bashly.gemspec @@ -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' diff --git a/examples/config/src/lib/ini.sh b/examples/config/src/lib/ini.sh index 862b7341..8b2df57e 100644 --- a/examples/config/src/lib/ini.sh +++ b/examples/config/src/lib/ini.sh @@ -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" diff --git a/examples/ini/src/lib/ini.sh b/examples/ini/src/lib/ini.sh index 862b7341..8b2df57e 100644 --- a/examples/ini/src/lib/ini.sh +++ b/examples/ini/src/lib/ini.sh @@ -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" diff --git a/examples/render-mandoc/docs/download.1 b/examples/render-mandoc/docs/download.1 index b26fb422..adb73be8 100644 --- a/examples/render-mandoc/docs/download.1 +++ b/examples/render-mandoc/docs/download.1 @@ -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 diff --git a/examples/render-mandoc/docs/download.md b/examples/render-mandoc/docs/download.md index 0e746e7e..cbd1b20e 100644 --- a/examples/render-mandoc/docs/download.md +++ b/examples/render-mandoc/docs/download.md @@ -1,6 +1,6 @@ % download(1) Version 0.1.0 | Sample application % Lana Lang -% August 2024 +% September 2024 NAME ================================================== diff --git a/lib/bashly/libraries/ini/ini.sh b/lib/bashly/libraries/ini/ini.sh index 862b7341..8b2df57e 100644 --- a/lib/bashly/libraries/ini/ini.sh +++ b/lib/bashly/libraries/ini/ini.sh @@ -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" diff --git a/spec/approvals/examples/render-mandoc b/spec/approvals/examples/render-mandoc index 17464c88..95029b27 100644 --- a/spec/approvals/examples/render-mandoc +++ b/spec/approvals/examples/render-mandoc @@ -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) diff --git a/spec/approvals/libraries/render/mandoc/render-1-download.1 b/spec/approvals/libraries/render/mandoc/render-1-download.1 index 788988a0..0c87b282 100644 --- a/spec/approvals/libraries/render/mandoc/render-1-download.1 +++ b/spec/approvals/libraries/render/mandoc/render-1-download.1 @@ -27,4 +27,3 @@ EXAMPLES download example.com ./output -f -Version 0.1.0 MONTH YEAR ... APPNAME diff --git a/spec/bashly/libraries/render_mandoc_spec.rb b/spec/bashly/libraries/render_mandoc_spec.rb index fe298a9e..c4f18474 100644 --- a/spec/bashly/libraries/render_mandoc_spec.rb +++ b/spec/bashly/libraries/render_mandoc_spec.rb @@ -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 @@ -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')