work around latest bug in verbosity changes.

work around bug in expanded paths with .. not being accepted on some platforms.
ThrowTheSwitch · Jan 29, 2024 · 3f0da46 · 3f0da46
1 parent 90b52d3
commit 3f0da46
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/ceedling/configurator.rb b/lib/ceedling/configurator.rb
@@ -227,7 +227,7 @@ def find_and_merge_plugins(config)
       if (plugin_config.include? :paths)
         plugin_config[:paths].update(plugin_config[:paths]) do |k,v| 
           plugin_path = plugin.match(/(.*)[\/]config[\/]\w+\.yml/)[1]
-          v.map {|vv| vv.gsub!(/\$PLUGIN_PATH/,plugin_path) }
+          v.map {|vv| File.expand_path(vv.gsub!(/\$PLUGIN_PATH/,plugin_path)) }
         end
       end
 

diff --git a/lib/ceedling/tasks_base.rake b/lib/ceedling/tasks_base.rake
@@ -3,7 +3,9 @@ require 'ceedling/file_path_utils'
 require 'ceedling/version'
 
 # Set Rake verbosity using global constant verbosity set before Rake is loaded
-verbose(PROJECT_VERBOSITY >= Verbosity::OBNOXIOUS)
+if !!defined?(PROJECT_VERBOSITY)
+  verbose(PROJECT_VERBOSITY >= Verbosity::OBNOXIOUS)
+end
 
 desc "Display build environment version info."
 task :version do

diff --git a/lib/ceedling/verbosinator.rb b/lib/ceedling/verbosinator.rb
@@ -4,7 +4,7 @@ class Verbosinator
 
   def should_output?(level)
     # Rely on global constant created at early stages of command line processing
-    return (level <= PROJECT_VERBOSITY)
+    return (!defined?(PROJECT_VERBOSITY)) || (level <= PROJECT_VERBOSITY)
   end
 
 end