howzit 2.1.25 → 2.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330829109ccbd73e32ce82690327d2776c1a2f4e60004165fbcde80bdb2b68d6
-  data.tar.gz: 402805ec02154f4ed0f219bc8975be8b1f24e5ca8726e2eb6040f905f32854c7
+  metadata.gz: 19fc185635709d53c4d7dcf0b437d4ec6b00cdd341d734e4655ef4e8e1dbfd3a
+  data.tar.gz: 9305e6edf7a8c4f7bf6d2d6a4a1aed14313aac73b658595a877314e929c15c8b
 SHA512:
-  metadata.gz: 6f6f3ad81b25dc520f43a4ba1ca063a093dece43129c5ba86ed4364ecc4de5d9222f86ba64dbc91220d73197586846d92ff7f7b98251739881a3d140f453c0ea
-  data.tar.gz: 7b5eef5eb1cca9c57e3f7fa7af222911d43790b15bfb30b682c1c6f521cd1c54f8995a357141f1533830c888b91d79b107f3ec295b6238360719e1a6f2bb6032
+  metadata.gz: a35475dfaf7aa381157964466046ff8c94b0a4282bd9bbb8c067b7d344527d8ba95a296934ce935375111c4c255122cd3c684829d761b4962c517ea6dfadc14b
+  data.tar.gz: 41ae72b53d9602fb9b6df8231a4d1db8d9f134b78460e2243e8afaf616528279d0e7b08d68820a330994935579186058838a5d5e5c288b809aa46d0670b71b0f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2.1.26
+
+2025-12-26 04:53
+
+#### FIXED
+
+- Bash script variables in run blocks now preserve ${VAR} syntax when the variable is not defined by howzit, allowing bash to handle them normally instead of being replaced with empty strings.
+
 ### 2.1.25
 
 2025-12-19 07:41

data/lib/howzit/stringutils.rb

@@ -337,7 +337,14 @@ module Howzit
       gsub!(/\$\{(?<name>[A-Z0-9_]+(?::.*?)?)\}/i) do
         m = Regexp.last_match
         arg, default = m['name'].split(/:/).map(&:strip)
-        Howzit.named_arguments.key?(arg) && !Howzit.named_arguments[arg].nil? ? Howzit.named_arguments[arg] : default
+        if Howzit.named_arguments && Howzit.named_arguments.key?(arg) && !Howzit.named_arguments[arg].nil?
+          Howzit.named_arguments[arg]
+        elsif default
+          default
+        else
+          # Preserve the original ${VAR} syntax if variable is not defined and no default provided
+          m[0]
+        end
       end
     end
 

data/lib/howzit/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.1.25'
+  VERSION = '2.1.26'
 end

data/spec/stringutils_spec.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'StringUtils' do
+  describe '#render_named_placeholders' do
+    before do
+      Howzit.named_arguments = {}
+    end
+
+    it 'preserves ${VAR} syntax when variable is not defined' do
+      str = 'echo ${MY_VAR}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo ${MY_VAR}')
+    end
+
+    it 'preserves ${VAR} syntax for multiple undefined variables' do
+      str = 'echo ${VAR1} and ${VAR2}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo ${VAR1} and ${VAR2}')
+    end
+
+    it 'replaces ${VAR} with value when variable is defined' do
+      Howzit.named_arguments = { 'MY_VAR' => 'hello' }
+      str = 'echo ${MY_VAR}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo hello')
+    end
+
+    it 'uses default value when variable is not defined but default is provided' do
+      str = 'echo ${MY_VAR:default_value}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo default_value')
+    end
+
+    it 'replaces variable when defined even if default is provided' do
+      Howzit.named_arguments = { 'MY_VAR' => 'actual_value' }
+      str = 'echo ${MY_VAR:default_value}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo actual_value')
+    end
+
+    it 'preserves ${VAR} in bash script blocks' do
+      script = <<~SCRIPT
+        #!/bin/bash
+        echo "The value is ${ENV_VAR}"
+        echo "Another ${OTHER_VAR}"
+      SCRIPT
+      str = script.dup
+      str.render_named_placeholders
+      expect(str).to eq(script)
+    end
+
+    it 'handles mixed defined and undefined variables' do
+      Howzit.named_arguments = { 'DEFINED_VAR' => 'value1' }
+      str = 'echo ${DEFINED_VAR} and ${UNDEFINED_VAR}'.dup
+      str.render_named_placeholders
+      expect(str).to eq('echo value1 and ${UNDEFINED_VAR}')
+    end
+
+    it 'handles nil named_arguments gracefully' do
+      Howzit.named_arguments = nil
+      str = 'echo ${MY_VAR}'.dup
+      expect { str.render_named_placeholders }.not_to raise_error
+      expect(str).to eq('echo ${MY_VAR}')
+    end
+  end
+
+  describe '#render_arguments' do
+    before do
+      Howzit.named_arguments = {}
+      Howzit.arguments = nil
+    end
+
+    it 'preserves ${VAR} syntax through render_arguments' do
+      str = 'echo ${BASH_VAR}'.dup
+      result = str.render_arguments
+      expect(result).to eq('echo ${BASH_VAR}')
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.1.25
+  version: 2.1.26
 platform: ruby
 authors:
 - Brett Terpstra
@@ -315,6 +315,7 @@ files:
 - spec/ruby_gem_spec.rb
 - spec/run_report_spec.rb
 - spec/spec_helper.rb
+- spec/stringutils_spec.rb
 - spec/task_spec.rb
 - spec/topic_spec.rb
 - spec/util_spec.rb
@@ -349,6 +350,7 @@ test_files:
 - spec/ruby_gem_spec.rb
 - spec/run_report_spec.rb
 - spec/spec_helper.rb
+- spec/stringutils_spec.rb
 - spec/task_spec.rb
 - spec/topic_spec.rb
 - spec/util_spec.rb