howzit 2.1.28 → 2.1.30

data/lib/howzit/script_support.rb

@@ -0,0 +1,479 @@
+# frozen_string_literal: true
+
+require 'fileutils'
+require 'shellwords'
+
+module Howzit
+  # Script Support module
+  # Handles helper script installation and injection for run blocks
+  # rubocop:disable Metrics/ModuleLength
+  module ScriptSupport
+    SUPPORT_DIR = '~/.local/share/howzit/support'
+
+    class << self
+      ##
+      ## Get the support directory path
+      ##
+      ## @return     [String] expanded path to support directory
+      ##
+      def support_dir
+        File.expand_path(SUPPORT_DIR)
+      end
+
+      ##
+      ## Ensure support directory exists and is populated
+      ##
+      def ensure_support_dir
+        dir = support_dir
+        FileUtils.mkdir_p(dir) unless File.directory?(dir)
+        install_helper_scripts
+        dir
+      end
+
+      ##
+      ## Detect interpreter from hashbang line
+      ##
+      ## @param      script_content  [String] The script content
+      ##
+      ## @return     [Symbol, nil] Language identifier (:bash, :zsh, :fish, :ruby, :python, etc.)
+      ##
+      def detect_interpreter(script_content)
+        first_line = script_content.lines.first&.strip
+        return nil unless first_line&.start_with?('#!')
+
+        shebang = first_line.sub(/^#!/, '').strip
+
+        case shebang
+        when %r{/bin/bash}, %r{/usr/bin/env bash}
+          :bash
+        when %r{/bin/zsh}, %r{/usr/bin/env zsh}
+          :zsh
+        when %r{/bin/fish}, %r{/usr/bin/env fish}
+          :fish
+        when %r{/usr/bin/env ruby}, %r{/usr/bin/ruby}, %r{/usr/local/bin/ruby}
+          :ruby
+        when %r{/usr/bin/env python3?}, %r{/usr/bin/python3?}, %r{/usr/local/bin/python3?}
+          :python
+        when %r{/usr/bin/env perl}, %r{/usr/bin/perl}
+          :perl
+        when %r{/usr/bin/env node}, %r{/usr/bin/node}
+          :node
+        end
+      end
+
+      ##
+      ## Get the injection line for a given interpreter
+      ##
+      ## @param      interpreter  [Symbol] The interpreter type
+      ##
+      ## @return     [String, nil] The injection line to add
+      ##
+      def injection_line_for(interpreter)
+        support_path = support_dir
+        case interpreter
+        when :bash, :zsh
+          "source \"#{support_path}/howzit.sh\""
+        when :fish
+          "source \"#{support_path}/howzit.fish\""
+        when :ruby
+          "require '#{support_path}/howzit.rb'"
+        when :python
+          "import sys\nsys.path.insert(0, '#{support_path}')\nimport howzit"
+        when :perl
+          "require '#{support_path}/howzit.pl'"
+        when :node
+          "require('#{support_path}/howzit.js')"
+        end
+      end
+
+      ##
+      ## Inject helper script loading into script content
+      ##
+      ## @param      script_content  [String] The original script content
+      ##
+      ## @return     [Array] [modified_content, interpreter] Script content with injection added and interpreter
+      ##
+      def inject_helper(script_content)
+        interpreter = detect_interpreter(script_content)
+        return [script_content, nil] unless interpreter
+
+        injection = injection_line_for(interpreter)
+        return [script_content, interpreter] unless injection
+
+        lines = script_content.lines
+        injection_lines = injection.split("\n").map { |l| "#{l}\n" }
+        # Find the hashbang line
+        if lines.first&.strip&.start_with?('#!')
+          # Insert after hashbang
+          injection_lines.each_with_index do |line, idx|
+            lines.insert(1 + idx, line)
+          end
+        else
+          # No hashbang, prepend
+          lines = injection_lines + lines
+        end
+
+        [lines.join, interpreter]
+      end
+
+      ##
+      ## Get the command to execute a script based on interpreter
+      ##
+      ## @param      script_path   [String] Path to the script file
+      ## @param      interpreter   [Symbol, nil] The interpreter type
+      ##
+      ## @return     [String] Command to execute the script
+      ##
+      def execution_command_for(script_path, interpreter)
+        cmd = case interpreter
+              when :bash
+                "/bin/bash #{Shellwords.escape(script_path)}"
+              when :zsh
+                "/bin/zsh #{Shellwords.escape(script_path)}"
+              when :fish
+                "/usr/bin/env fish #{Shellwords.escape(script_path)}"
+              when :ruby
+                "/usr/bin/env ruby #{Shellwords.escape(script_path)}"
+              when :python
+                "/usr/bin/env python3 #{Shellwords.escape(script_path)}"
+              when :perl
+                "/usr/bin/env perl #{Shellwords.escape(script_path)}"
+              when :node
+                "/usr/bin/env node #{Shellwords.escape(script_path)}"
+              end
+        # Fallback to direct execution if interpreter not recognized
+        cmd || script_path
+      end
+
+      ##
+      ## Install all helper scripts
+      ##
+      def install_helper_scripts
+        dir = support_dir
+        FileUtils.mkdir_p(dir)
+
+        install_bash_helper(dir)
+        install_fish_helper(dir)
+        install_ruby_helper(dir)
+        install_python_helper(dir)
+        install_perl_helper(dir)
+        install_node_helper(dir)
+      end
+
+      private
+
+      ##
+      ## Install bash/zsh helper script
+      ##
+      def install_bash_helper(dir)
+        file = File.join(dir, 'howzit.sh')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~BASH
+          #!/bin/bash
+          # Howzit helper functions for bash/zsh
+
+          # Log functions
+          log() {
+            local level="$1"
+            shift
+            local message="$*"
+            if [ -n "$HOWZIT_COMM_FILE" ]; then
+              echo "LOG:$level:$message" >> "$HOWZIT_COMM_FILE"
+            fi
+          }
+
+          log_info() { log info "$@"; }
+          log_warn() { log warn "$@"; }
+          log_error() { log error "$@"; }
+          log_debug() { log debug "$@"; }
+
+          # Set variable function
+          set_var() {
+            local var_name="$1"
+            local var_value="$2"
+            if [ -n "$HOWZIT_COMM_FILE" ]; then
+              echo "VAR:$var_name=$var_value" >> "$HOWZIT_COMM_FILE"
+            fi
+          }
+        BASH
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Install fish helper script
+      ##
+      def install_fish_helper(dir)
+        file = File.join(dir, 'howzit.fish')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~FISH
+          #!/usr/bin/env fish
+          # Howzit helper functions for fish
+
+          function log -d "Log a message at the specified level"
+            set level $argv[1]
+            set -e argv[1]
+            set message (string join " " $argv)
+            if test -n "$HOWZIT_COMM_FILE"
+              echo "LOG:$level:$message" >> "$HOWZIT_COMM_FILE"
+            end
+          end
+
+          function log_info -d "Log an info message"
+            log info $argv
+          end
+
+          function log_warn -d "Log a warning message"
+            log warn $argv
+          end
+
+          function log_error -d "Log an error message"
+            log error $argv
+          end
+
+          function log_debug -d "Log a debug message"
+            log debug $argv
+          end
+
+          function set_var -d "Set a variable for howzit"
+            set var_name $argv[1]
+            set var_value $argv[2]
+            if test -n "$HOWZIT_COMM_FILE"
+              echo "VAR:$var_name=$var_value" >> "$HOWZIT_COMM_FILE"
+            end
+          end
+        FISH
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Install Ruby helper script
+      ##
+      def install_ruby_helper(dir)
+        file = File.join(dir, 'howzit.rb')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~'RUBY'
+          # frozen_string_literal: true
+
+          # Howzit helper module for Ruby
+          module Howzit
+            class << self
+              # Log methods
+              def logger
+                @logger ||= Logger.new
+              end
+
+              class Logger
+                def info(message)
+                  log(:info, message)
+                end
+
+                def warn(message)
+                  log(:warn, message)
+                end
+
+                def error(message)
+                  log(:error, message)
+                end
+
+                def debug(message)
+                  log(:debug, message)
+                end
+
+                private
+
+                def log(level, message)
+                  comm_file = ENV['HOWZIT_COMM_FILE']
+                  return unless comm_file
+
+                  File.open(comm_file, 'a') do |f|
+                    f.puts "LOG:#{level}:#{message}"
+                  end
+                end
+              end
+
+              # Set variable method
+              def set_var(name, value)
+                comm_file = ENV['HOWZIT_COMM_FILE']
+                return unless comm_file
+
+                File.open(comm_file, 'a') do |f|
+                  f.puts "VAR:#{name}=#{value}"
+                end
+              end
+            end
+          end
+        RUBY
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Install Python helper script
+      ##
+      def install_python_helper(dir)
+        file = File.join(dir, 'howzit.py')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~PYTHON
+          #!/usr/bin/env python3
+          # Howzit helper module for Python
+
+          import os
+
+          class _Logger:
+              def _log(self, level, message):
+                  comm_file = os.environ.get('HOWZIT_COMM_FILE')
+                  if comm_file:
+                      with open(comm_file, 'a') as f:
+                          f.write(f"LOG:{level}:{message}\\n")
+
+              def info(self, message):
+                  self._log('info', message)
+
+              def warn(self, message):
+                  self._log('warn', message)
+
+              def error(self, message):
+                  self._log('error', message)
+
+              def debug(self, message):
+                  self._log('debug', message)
+
+          class Howzit:
+              logger = _Logger()
+
+              @staticmethod
+              def set_var(name, value):
+                  comm_file = os.environ.get('HOWZIT_COMM_FILE')
+                  if comm_file:
+                      with open(comm_file, 'a') as f:
+                          f.write(f"VAR:{name}={value}\\n")
+        PYTHON
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Install Perl helper script
+      ##
+      def install_perl_helper(dir)
+        file = File.join(dir, 'howzit.pl')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~PERL
+          #!/usr/bin/env perl
+          # Howzit helper module for Perl
+
+          package Howzit;
+
+          use strict;
+          use warnings;
+
+          sub log {
+            my ($level, $message) = @_;
+            my $comm_file = $ENV{'HOWZIT_COMM_FILE'};
+            return unless $comm_file;
+
+            open(my $fh, '>>', $comm_file) or return;
+            print $fh "LOG:$level:$message\\n";
+            close($fh);
+          }
+
+          sub log_info { log('info', $_[0]); }
+          sub log_warn { log('warn', $_[0]); }
+          sub log_error { log('error', $_[0]); }
+          sub log_debug { log('debug', $_[0]); }
+
+          sub set_var {
+            my ($name, $value) = @_;
+            my $comm_file = $ENV{'HOWZIT_COMM_FILE'};
+            return unless $comm_file;
+
+            open(my $fh, '>>', $comm_file) or return;
+            print $fh "VAR:$name=$value\\n";
+            close($fh);
+          }
+
+          1;
+        PERL
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Install Node.js helper script
+      ##
+      def install_node_helper(dir)
+        file = File.join(dir, 'howzit.js')
+        return if File.exist?(file) && !file_stale?(file)
+
+        content = <<~JAVASCRIPT
+          // Howzit helper module for Node.js
+
+          const fs = require('fs');
+          const path = require('path');
+
+          class Logger {
+            _log(level, message) {
+              const commFile = process.env.HOWZIT_COMM_FILE;
+              if (commFile) {
+                fs.appendFileSync(commFile, `LOG:${level}:${message}\\n`);
+              }
+            }
+
+            info(message) {
+              this._log('info', message);
+            }
+
+            warn(message) {
+              this._log('warn', message);
+            }
+
+            error(message) {
+              this._log('error', message);
+            }
+
+            debug(message) {
+              this._log('debug', message);
+            }
+          }
+
+          class Howzit {
+            static logger = new Logger();
+
+            static setVar(name, value) {
+              const commFile = process.env.HOWZIT_COMM_FILE;
+              if (commFile) {
+                fs.appendFileSync(commFile, `VAR:${name}=${value}\\n`);
+              }
+            }
+          }
+
+          module.exports = { Howzit, Logger };
+        JAVASCRIPT
+
+        File.write(file, content)
+        File.chmod(0o644, file)
+      end
+
+      ##
+      ## Check if a file is stale and needs updating
+      ## For now, always update to ensure latest version
+      ##
+      def file_stale?(_file)
+        true
+      end
+    end
+    # rubocop:enable Metrics/ModuleLength
+  end
+end

data/lib/howzit/stringutils.rb

@@ -38,7 +38,7 @@ module Howzit
       position = 0
       in_order = 0
       chars.each do |char|
-        new_pos = self[position..-1] =~ /#{char}/i
+        new_pos = self[position..] =~ /#{char}/i
         if new_pos
           position += new_pos
           in_order += 1
@@ -72,7 +72,7 @@ module Howzit
     ##
     def distance(chars)
       distance = 0
-      max = self.length - chars.length
+      max = length - chars.length
       return max unless in_order(chars) == chars.length
 
       while distance < max
@@ -219,7 +219,7 @@ module Howzit
     def uncolor
       # force UTF-8 and remove invalid characters, then remove color codes
       # and iTerm markers
-      gsub(Howzit::Color::COLORED_REGEXP, "").gsub(/\e\]1337;SetMark/, "")
+      gsub(Howzit::Color::COLORED_REGEXP, '').gsub(/\e\]1337;SetMark/, '')
     end
 
     # Wrap text at a specified width.
@@ -371,7 +371,7 @@ module Howzit
       gsub!(/\$\{(?<name>[A-Z0-9_]+(?::.*?)?)\}/i) do
         m = Regexp.last_match
         arg, default = m['name'].split(/:/).map(&:strip)
-        if Howzit.named_arguments && Howzit.named_arguments.key?(arg) && !Howzit.named_arguments[arg].nil?
+        if Howzit.named_arguments&.key?(arg) && !Howzit.named_arguments[arg].nil?
           Howzit.named_arguments[arg]
         elsif default
           default

data/lib/howzit/task.rb

@@ -5,7 +5,7 @@ require 'English'
 module Howzit
   # Task object
   class Task
-    attr_reader :type, :title, :action, :arguments, :parent, :optional, :default, :last_status
+    attr_reader :type, :title, :action, :arguments, :parent, :optional, :default, :last_status, :log_level
 
     ##
     ## Initialize a Task object
@@ -20,16 +20,18 @@ module Howzit
     ## @option attributes :title [String] task title
     ## @option attributes :action [String] task action
     ## @option attributes :parent [String] title of nested (included) topic origin
+    ## @option attributes :log_level [String] log level for this task (debug, info, warn, error)
     def initialize(attributes, optional: false, default: true)
       @prefix = "{bw}\u{25B7}\u{25B7} {x}"
       # arrow = "{bw}\u{279F}{x}"
       @arguments = attributes[:arguments] || []
 
       @type = attributes[:type] || :run
-      @title = attributes[:title].nil? ? nil : attributes[:title].to_s
+      @title = attributes[:title]&.to_s
       @parent = attributes[:parent] || nil
 
       @action = attributes[:action].render_arguments || nil
+      @log_level = attributes[:log_level]
 
       @optional = optional
       @default = default
@@ -61,14 +63,34 @@ module Howzit
       Howzit.console.info "#{@prefix}{bg}Running block {bw}#{@title}{x}".c if Howzit.options[:log_level] < 2
       block = @action
       script = Tempfile.new('howzit_script')
+      comm_file = ScriptComm.setup
+      old_log_level = apply_log_level
       begin
-        script.write(block)
+        # Ensure support directory exists and install helpers
+        ScriptSupport.ensure_support_dir
+        ENV['HOWZIT_SUPPORT_DIR'] = ScriptSupport.support_dir
+
+        # Inject helper script loading
+        modified_block, interpreter = ScriptSupport.inject_helper(block)
+
+        script.write(modified_block)
         script.close
-        File.chmod(0o777, script.path)
-        res = system(%(/bin/sh -c "#{script.path}"))
+        File.chmod(0o755, script.path)
+
+        # Use appropriate interpreter command
+        cmd = ScriptSupport.execution_command_for(script.path, interpreter)
+        # If interpreter is nil, execute directly (will respect hashbang)
+        res = if interpreter.nil?
+                system(script.path)
+              else
+                system(cmd)
+              end
       ensure
+        restore_log_level(old_log_level) if old_log_level
         script.close
         script.unlink
+        # Process script communication
+        ScriptComm.apply(comm_file) if comm_file
       end
 
       update_last_status(res ? 0 : 1)
@@ -94,6 +116,38 @@ module Howzit
       [output, matches[0].tasks.count]
     end
 
+    ##
+    ## Apply log level for this task
+    ##
+    def apply_log_level
+      return unless @log_level
+
+      level_map = {
+        'debug' => 0,
+        'info' => 1,
+        'warn' => 2,
+        'warning' => 2,
+        'error' => 3
+      }
+      level_value = level_map[@log_level.downcase] || @log_level.to_i
+      old_level = Howzit.options[:log_level]
+      Howzit.options[:log_level] = level_value
+      Howzit.console.log_level = level_value
+      ENV['HOWZIT_LOG_LEVEL'] = @log_level.downcase
+      old_level
+    end
+
+    ##
+    ## Restore log level after task execution
+    ##
+    def restore_log_level(old_level)
+      return unless @log_level
+
+      Howzit.options[:log_level] = old_level
+      Howzit.console.log_level = old_level
+      ENV.delete('HOWZIT_LOG_LEVEL')
+    end
+
     ##
     ## Execute a run task
     ##
@@ -112,7 +166,15 @@ module Howzit
                       end
       Howzit.console.info("#{@prefix}{bg}Running {bw}#{display_title}{x}".c)
       ENV['HOWZIT_SCRIPTS'] = File.expand_path('~/.config/howzit/scripts')
-      res = system(@action)
+      comm_file = ScriptComm.setup
+      old_log_level = apply_log_level
+      begin
+        res = system(@action)
+      ensure
+        restore_log_level(old_log_level) if old_log_level
+        # Process script communication
+        ScriptComm.apply(comm_file) if comm_file
+      end
       update_last_status(res ? 0 : 1)
       res
     end