freyia 0.5.3 → 0.6.0

data/lib/freyia/shell/basic.rb

@@ -80,14 +80,13 @@ module Freyia
       #
       #   ask "Where should the file be saved?", path: true
       #
-      def ask(statement, *args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
+      def ask(statement, *args, **options)
         color = args.first
 
         if options[:limited_to]
-          ask_filtered(statement, color, options)
+          ask_filtered(statement, color, **options)
         else
-          ask_simply(statement, color, options)
+          ask_simply(statement, color, **options)
         end
       end
 
@@ -181,8 +180,8 @@ module Freyia
       # colwidth<Integer>:: Force the first column to colwidth spaces wide.
       # borders<Boolean>:: Adds ascii borders.
       #
-      def print_table(array, options = {})
-        printer = TablePrinter.new(stdout, options)
+      def print_table(array, **)
+        printer = TablePrinter.new(stdout, **)
         printer.print(array)
       end
 
@@ -195,7 +194,7 @@ module Freyia
       # ==== Options
       # indent<Integer>:: Indent each line of the printed paragraph by indent value.
       #
-      def print_wrapped(message, options = {})
+      def print_wrapped(message, **options)
         printer = WrappedPrinter.new(stdout, options)
         printer.print(message)
       end
@@ -260,7 +259,7 @@ module Freyia
       # Apply color to the given string with optional bold. Disabled in the
       # Freyia::Shell::Basic class.
       #
-      def set_color(string, *) #:nodoc:
+      def set_color(string, *)
         string
       end
 
@@ -289,7 +288,7 @@ module Freyia
         $stderr
       end
 
-      def is?(value) #:nodoc: # rubocop:disable Naming/PredicateMethod
+      def is?(value) # rubocop:disable Naming/PredicateMethod
         value = value.to_s
 
         if value.size == 1
@@ -299,7 +298,7 @@ module Freyia
         end
       end
 
-      def file_collision_help(block_given) #:nodoc:
+      def file_collision_help(block_given)
         help = <<-HELP
         Y - yes, overwrite
         n - no, do not overwrite
@@ -316,7 +315,7 @@ module Freyia
         help
       end
 
-      def show_diff(destination, content) #:nodoc:
+      def show_diff(destination, content)
         require "tempfile"
         Tempfile.open(File.basename(destination), File.dirname(destination),
                       binmode: true) do |temp|
@@ -326,7 +325,7 @@ module Freyia
         end
       end
 
-      def quiet? #:nodoc:
+      def quiet?
         mute? || (base && base.options[:quiet])
       end
 
@@ -372,7 +371,7 @@ module Freyia
         end
       end
 
-      def merge(destination, content) #:nodoc:
+      def merge(destination, content)
         require "tempfile"
         Tempfile.open([File.basename(destination), File.extname(destination)],
                       File.dirname(destination)) do |temp|
@@ -382,14 +381,14 @@ module Freyia
         end
       end
 
-      def merge_tool #:nodoc:
+      def merge_tool
         @merge_tool ||= begin
           require "shellwords"
           Shellwords.split(ENV["FREYIA_MERGE"] || "git difftool --no-index")
         end
       end
 
-      def diff_tool #:nodoc:
+      def diff_tool
         @diff_cmd ||= begin
           require "shellwords"
           Shellwords.split(ENV["FREYIA_DIFF"] || ENV["RAILS_DIFF"] || "diff -u")

data/lib/freyia/shell/color.rb

@@ -11,6 +11,12 @@ module Freyia
     class Color < Basic
       include LCSDiff
 
+      ANSI_ESCAPE = format("%c", 27)
+
+      # NOTE: the following is tweaked from Bridgetown Foundation's regex because we need to
+      # be able to count the number within the escape sequence
+      ANSI_MATCH = %r!#{ANSI_ESCAPE}\[([0-9;]*)(j|k|m|s|u|A|B|G)|\e\(B\e\[m!ix
+
       # Embed in a String to clear all previous ANSI sequences.
       CLEAR      = "\e[0m"
       # The start of an ANSI bold sequence.
@@ -99,6 +105,11 @@ module Freyia
         end
       end
 
+      # Strip ANSI from the current string.  It also strips cursor stuff,
+      # well some of it, and it also strips some other stuff that a lot of
+      # the other ANSI strippers don't.
+      def self.strip_ansi(str) = str.gsub(ANSI_MATCH, "")
+
       protected
 
       def can_display_colors?

data/lib/freyia/shell/column_printer.rb

@@ -7,7 +7,7 @@ module Freyia
     class ColumnPrinter
       attr_reader :stdout, :options
 
-      def initialize(stdout, options = {})
+      def initialize(stdout, **options)
         @stdout = stdout
         @options = options
         @indent = options[:indent].to_i

data/lib/freyia/shell/lcs_diff.rb

@@ -5,7 +5,7 @@ module LCSDiff
 
   # Overwrite show_diff to show diff with colors if Diff::LCS is
   # available.
-  def show_diff(destination, content) #:nodoc:
+  def show_diff(destination, content)
     if diff_lcs_loaded? && ENV["FREYIA_DIFF"].nil? && ENV["RAILS_DIFF"].nil?
       actual  = File.binread(destination).to_s.split("\n")
       content = content.to_s.split("\n")
@@ -20,7 +20,7 @@ module LCSDiff
 
   private
 
-  def output_diff_line(diff) #:nodoc:
+  def output_diff_line(diff)
     case diff.action
     when "-"
       say "- #{diff.old_element.chomp}", :red, true
@@ -36,7 +36,7 @@ module LCSDiff
 
   # Check if Diff::LCS is loaded. If it is, use it to create pretty output
   # for diff.
-  def diff_lcs_loaded? #:nodoc:
+  def diff_lcs_loaded?
     return true if defined?(Diff::LCS)
     return @diff_lcs_loaded unless @diff_lcs_loaded.nil?
 

data/lib/freyia/shell/table_printer.rb

@@ -5,15 +5,23 @@ require_relative "terminal"
 
 module Freyia
   module Shell
-    class TablePrinter < ColumnPrinter
+    class TablePrinter
       BORDER_SEPARATOR = :separator
 
-      def initialize(stdout, options = {})
-        super
+      # @return [IO]
+      attr_reader :stdout
+
+      # @return [Boolean]
+      attr_reader :borders
+
+      def initialize(stdout, indent: 0, colwidth: nil, truncate: false, borders: false) # rubocop:disable Metrics/ParameterLists
+        @stdout = stdout
+        @indent = indent.to_i
         @formats = []
         @maximas = []
-        @colwidth = options[:colwidth]
-        @truncate = options[:truncate] == true ? Terminal.terminal_width : options[:truncate]
+        @colwidth = colwidth
+        @truncate = truncate == true ? Terminal.terminal_width : truncate
+        @borders = borders
         @padding = 1
       end
 
@@ -22,10 +30,10 @@ module Freyia
 
         prepare(array)
 
-        print_border_separator if options[:borders]
+        print_border_separator if borders
 
         array.each do |row|
-          if options[:borders] && row == BORDER_SEPARATOR
+          if borders && row == BORDER_SEPARATOR
             print_border_separator
             next
           end
@@ -37,10 +45,10 @@ module Freyia
           end
 
           sentence = truncate(sentence)
-          sentence << "|" if options[:borders]
+          sentence << "|" if borders
           stdout.puts indentation + sentence
         end
-        print_border_separator if options[:borders]
+        print_border_separator if borders
       end
 
       private
@@ -54,10 +62,12 @@ module Freyia
         colcount = array.max_by(&:size).size
 
         start.upto(colcount - 1) do |index|
-          maxima = array.map { |row| row[index] ? row[index].to_s.size : 0 }.max
+          maxima = array.map do |row|
+            row[index] ? Shell::Color.strip_ansi(row[index].to_s).size : 0
+          end.max
 
           @maximas << maxima
-          @formats << if options[:borders]
+          @formats << if borders
                         "%-#{maxima}s"
                       elsif index == colcount - 1
                         # Don't output 2 trailing spaces when printing the last column
@@ -74,7 +84,7 @@ module Freyia
         maxima = @maximas[index]
 
         f = if column.is_a?(Numeric)
-              if options[:borders]
+              if borders
                 # With borders we handle padding separately
                 "%#{maxima}s"
               elsif index == row_size - 1 # rubocop:disable Lint/DuplicateBranch
@@ -84,13 +94,13 @@ module Freyia
                 "%#{maxima}s  "
               end
             else
-              @formats[index]
+              adjust_for_ansi_codes @formats[index], column
             end
 
         cell = +""
-        cell << "|#{" " * @padding}" if options[:borders]
+        cell << "|#{" " * @padding}" if borders
         cell << (f % column.to_s)
-        cell << (" " * @padding) if options[:borders]
+        cell << (" " * @padding) if borders
         cell
       end
 
@@ -115,6 +125,20 @@ module Freyia
       def indentation
         " " * @indent
       end
+
+      def adjust_for_ansi_codes(format, column)
+        column_string = column.to_s
+        if column_string =~ Shell::Color::ANSI_MATCH
+          codes_count = column_string.scan(Shell::Color::ANSI_MATCH).sum do |match|
+            match[0].length + 3
+          end
+          format.gsub(%r!(\d+)s!) do
+            "#{Regexp.last_match[1].to_i + codes_count}s"
+          end
+        else
+          format
+        end
+      end
     end
   end
 end

data/lib/freyia/shell.rb

@@ -13,8 +13,8 @@ module Freyia
     # Common methods that are delegated to the shell.
     SHELL_DELEGATED_METHODS.each do |method|
       module_eval <<-METHOD, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
-        def #{method}(*args,&block)
-          shell.#{method}(*args,&block)
+        def #{method}(*args, **kwargs, &block)
+          shell.#{method}(*args, **kwargs, &block)
         end
       METHOD
     end

data/lib/freyia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Freyia
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

data/lib/freyia.rb

@@ -4,7 +4,6 @@ require_relative "freyia/version"
 
 module Freyia
   class Error < StandardError; end
-  # Your code goes here...
 
   TEMPLATE_EXTNAME = ".tmpl"
 end
@@ -30,6 +29,15 @@ module Freyia::Setup
                    Freyia::Shell::Color
                  end
     end
+
+    # Set or return the `template` type for the Freyia base. Defaults to `:erb`
+    #
+    # @param type [Symbol] either `:erb` or `:serbea`
+    # @return [Symbol] if called without an argument, returns the template type
+    def template_type(type = nil)
+      @template_type ||= :erb
+      type ? @template_type = type : @template_type
+    end
   end
 
   def self.included(klass)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: freyia
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Jared White
 bindir: bin
 cert_chain: []
-date: 2025-11-21 00:00:00.000000000 Z
+date: 2025-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Define and execute automated tasks like the party girl you are.
 email: