howzit 2.1.32 → 2.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 816754b14a92ca32bab9ae753a03926d0163e2af860164032b7d1fdfff58f716
-  data.tar.gz: 32fb6fee068779ba312051bd2613c8d47e24777760ecce28da796f2c35899fdd
+  metadata.gz: '08e8aa05598a4c02e555d78a4a12b9f7a0b767fe5fcb41c585f31d3db46ef5b1'
+  data.tar.gz: aabd6174f5693146e9995b28b86638a0992e541ad8bad7c943d1f72379bdc775
 SHA512:
-  metadata.gz: 2741d38466727329dc19755f910acc88a67068b66c1665256365fecffd31ed64a9d0040b97f26140444676a74bec53b1e33c96048dd9b7044b8aecafa0e3a845
-  data.tar.gz: fbe6e5aa03de0eadbc3d4af7a34d67b0a1628d0926dbf0d908ab9ae8f49b31236b5b6d89d5433ef88785e0d78a9066a969ad7a757b5c81e33f7ada0a923bbc24
+  metadata.gz: f9effb24928673466f2cadb59f93f2cac8b3df0154a982f754159b3537a4c92d995914429dd34f1831dc5e9a33d98a33af83518ace340f5b3b223a04f5c740de
+  data.tar.gz: 40aa8c9f70d76d7668fa211b9ca0fa3a694cd63ad56324d11eff5129ed0e746d777fad30b92c0dfa276f2bdf41281dbefb79d51f0cf616a4e2b3fc3571848918

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 2.1.33
+
+2026-01-06 08:08
+
+#### IMPROVED
+
+- Variables set via set_var in run blocks are now properly substituted in all task types: fenced code blocks, @run directive actions, @copy directive actions, and @after block content, enabling dynamic script execution and messaging based on variables set in earlier tasks
+- Directive#to_task now merges parent named_args with existing named_arguments instead of overwriting, preserving variables set by scripts via set_var helper functions across sequential task execution
+
+#### FIXED
+
+- Fix variables set via set_var in run blocks not being substituted in subsequent fenced code block (```run) actions by moving variable substitution to execution time instead of task creation time
+- Fix @after blocks only displaying first two lines by wrapping each line individually to preserve multiline structure including empty lines and numbered lists
+- Fix @after blocks not displaying when no tasks are executed in sequential processing mode by ensuring they display regardless of task execution results
+
 ### 2.1.32
 
 2026-01-06 05:21

data/lib/howzit/directive.rb

@@ -85,18 +85,30 @@ module Howzit
       task_data[:log_level] = current_log_level if current_log_level && !task_data[:log_level]
 
       # Set named_arguments before processing titles for variable substitution
-      Howzit.named_arguments = parent.named_args
+      # Merge with existing named_arguments to preserve variables set by scripts
+      Howzit.named_arguments ||= {}
+      Howzit.named_arguments.merge!(parent.named_args) if parent.named_args
 
       case task_type
       when :block
-        # Block tasks are already properly formatted
+        # Block tasks need title rendering
+        # Note: Action substitution happens at execution time in Task#run_block
+        # so variables from previous run blocks are available
+        title = task_data[:title]
+        title = title.render_arguments if title && !title.empty?
+        task_data[:title] = title
+        # Don't substitute variables in action here - do it at execution time
         task_data[:parent] = parent
         Howzit::Task.new(task_data, optional: @optional, default: @default)
       when :run
-        # Run tasks need title rendering (similar to define_task_args)
+        # Run tasks need title and action rendering (similar to define_task_args)
         title = task_data[:title]
         title = title.render_arguments if title && !title.empty?
         task_data[:title] = title
+        # Apply variable substitution to action
+        action = task_data[:action]
+        action = action.render_arguments if action && !action.empty?
+        task_data[:action] = action
         task_data[:parent] = parent
         Howzit::Task.new(task_data, optional: @optional, default: @default)
       when :copy
@@ -104,7 +116,10 @@ module Howzit
         title = task_data[:title]
         title = title.render_arguments if title && !title.empty?
         task_data[:title] = title
-        task_data[:action] = Shellwords.escape(task_data[:action])
+        # Apply variable substitution to action before escaping
+        action = task_data[:action]
+        action = action.render_arguments if action && !action.empty?
+        task_data[:action] = Shellwords.escape(action)
         task_data[:parent] = parent
         Howzit::Task.new(task_data, optional: @optional, default: @default)
       when :open

data/lib/howzit/script_support.rb

@@ -34,7 +34,7 @@ module Howzit
       def ensure_support_dir
         dir = support_dir
         legacy_dir = File.expand_path(LEGACY_SUPPORT_DIR)
-        new_root  = File.expand_path(File.join(SUPPORT_DIR, '..'))
+        File.expand_path(File.join(SUPPORT_DIR, '..'))
 
         # If legacy files exist, always offer to migrate them before proceeding.
         # Use early_init=false here since config is already loaded by the time we reach this point
@@ -71,15 +71,14 @@ module Howzit
       ##
       def migrate_legacy_support(early_init: false)
         legacy_dir = File.expand_path(LEGACY_SUPPORT_DIR)
-        new_root  = File.expand_path(File.join(SUPPORT_DIR, '..'))
+        new_root = File.expand_path(File.join(SUPPORT_DIR, '..'))
 
         unless File.directory?(legacy_dir)
-          if early_init
-            return
-          else
-            Howzit.console.info "No legacy Howzit directory found at #{legacy_dir}; nothing to migrate."
-            return
-          end
+          return if early_init
+
+          Howzit.console.info "No legacy Howzit directory found at #{legacy_dir}; nothing to migrate."
+          return
+
         end
 
         prompt = "Migrate Howzit files from #{legacy_dir} to #{new_root}? This will overwrite files in the new location with legacy versions, " \
@@ -87,7 +86,7 @@ module Howzit
 
         if early_init
           unless simple_yn_prompt(prompt, default: true)
-            $stderr.puts 'Migration cancelled; no changes made.'
+            warn 'Migration cancelled; no changes made.'
             return
           end
         else
@@ -117,7 +116,7 @@ module Howzit
 
         FileUtils.rm_rf(legacy_dir)
         if early_init
-          $stderr.puts "Migrated Howzit files from #{legacy_dir} to #{new_root}."
+          warn "Migrated Howzit files from #{legacy_dir} to #{new_root}."
         else
           Howzit.console.info "Migrated Howzit files from #{legacy_dir} to #{new_root}."
         end

data/lib/howzit/task.rb

@@ -62,6 +62,9 @@ module Howzit
     def run_block
       Howzit.console.info "#{@prefix}{bg}Running block {bw}#{@title}{x}".c if Howzit.options[:log_level] < 2
       block = @action
+      # Apply variable substitution to block content at execution time
+      # (variables from previous run blocks are now available)
+      block = block.render_arguments if block && !block.empty?
       script = Tempfile.new('howzit_script')
       comm_file = ScriptComm.setup
       old_log_level = apply_log_level

data/lib/howzit/topic.rb

@@ -141,7 +141,10 @@ module Howzit
 
       unless @postreqs.empty?
         begin
-          puts TTY::Box.frame("{bw}#{@postreqs.join("\n\n").wrap(cols - 4)}{x}".c, width: cols)
+          # Apply variable substitution to postreqs content, then wrap each line individually to preserve structure
+          postreqs_content = @postreqs.join("\n\n").render_arguments
+          wrapped_content = postreqs_content.split(/\n/).map { |line| line.wrap(cols - 4) }.join("\n")
+          puts TTY::Box.frame("{bw}#{wrapped_content}{x}".c, width: cols)
         rescue Errno::EPIPE
           # Pipe closed, ignore
         end
@@ -859,21 +862,25 @@ module Howzit
         re_evaluate_conditionals(conditional_state, directive_index - 1, context)
       end
 
-      total = "{bw}#{@results[:total]}{by} #{@results[:total] == 1 ? 'task' : 'tasks'}".c
-      errors = "{bw}#{@results[:errors]}{by} #{@results[:errors] == 1 ? 'error' : 'errors'}".c
-      @results[:message] += if @results[:errors].zero?
-                              "{bg}\u{2713} {by}Ran #{total}{x}".c
-                            elsif Howzit.options[:force]
-                              "{br}\u{2715} {by}Completed #{total} with #{errors}{x}".c
-                            else
-                              "{br}\u{2715} {by}Ran #{total}, terminated due to error{x}".c
-                            end
-
-      output.push(@results[:message]) if Howzit.options[:log_level] < 2 && !nested && !Howzit.options[:run]
+      if @results[:total].positive?
+        total = "{bw}#{@results[:total]}{by} #{@results[:total] == 1 ? 'task' : 'tasks'}".c
+        errors = "{bw}#{@results[:errors]}{by} #{@results[:errors] == 1 ? 'error' : 'errors'}".c
+        @results[:message] += if @results[:errors].zero?
+                                "{bg}\u{2713} {by}Ran #{total}{x}".c
+                              elsif Howzit.options[:force]
+                                "{br}\u{2715} {by}Completed #{total} with #{errors}{x}".c
+                              else
+                                "{br}\u{2715} {by}Ran #{total}, terminated due to error{x}".c
+                              end
+        output.push(@results[:message]) if Howzit.options[:log_level] < 2 && !nested && !Howzit.options[:run]
+      end
 
       unless @postreqs.empty?
         begin
-          puts TTY::Box.frame("{bw}#{@postreqs.join("\n\n").wrap(cols - 4)}{x}".c, width: cols)
+          # Apply variable substitution to postreqs content, then wrap each line individually to preserve structure
+          postreqs_content = @postreqs.join("\n\n").render_arguments
+          wrapped_content = postreqs_content.split(/\n/).map { |line| line.wrap(cols - 4) }.join("\n")
+          puts TTY::Box.frame("{bw}#{wrapped_content}{x}".c, width: cols)
         rescue Errno::EPIPE
           # Pipe closed, ignore
         end

data/lib/howzit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.1.32
+  version: 2.1.33
 platform: ruby
 authors:
 - Brett Terpstra