howzit 1.2.13 → 1.2.16

data/lib/howzit/buildnotes.rb

@@ -124,7 +124,7 @@ module Howzit
         pipes = "|#{hl}" if hl
       end
 
-      output = `echo #{Shellwords.escape(string.strip)}#{pipes}`
+      output = `echo #{Shellwords.escape(string.strip)}#{pipes}`.strip
 
       if @options[:paginate]
         page(output)
@@ -247,17 +247,22 @@ module Howzit
 
       options.merge!(opts)
 
-      cols = TTY::Screen.columns
+      case @options[:header_format]
+      when :block
+        Color.template("#{options[:color]}\u{258C}#{title}#{should_mark_iterm? && options[:mark] ? iterm_marker : ''}{x}")
+      else
+        cols = TTY::Screen.columns
 
-      cols = @options[:wrap] if (@options[:wrap]).positive? && cols > @options[:wrap]
-      title = Color.template("#{options[:border]}#{options[:hr] * 2}( #{options[:color]}#{title}#{options[:border]} )")
+        cols = @options[:wrap] if (@options[:wrap]).positive? && cols > @options[:wrap]
+        title = Color.template("#{options[:border]}#{options[:hr] * 2}( #{options[:color]}#{title}#{options[:border]} )")
 
-      tail = if should_mark_iterm?
-               "#{options[:hr] * (cols - title.uncolor.length - 15)}#{options[:mark] ? iterm_marker : ''}"
-             else
-               options[:hr] * (cols - title.uncolor.length)
-             end
-      Color.template("#{title}#{tail}{x}")
+        tail = if should_mark_iterm?
+                 "#{options[:hr] * (cols - title.uncolor.length - 15)}#{options[:mark] ? iterm_marker : ''}"
+               else
+                 options[:hr] * (cols - title.uncolor.length)
+               end
+        Color.template("#{title}#{tail}{x}")
+      end
     end
 
     def os_open(command)
@@ -356,7 +361,9 @@ module Howzit
       end
       output.push("Ran #{tasks} #{tasks == 1 ? 'task' : 'tasks'}") if @options[:log_level] < 2
 
-      puts postreqs.join("\n\n")
+      puts postreqs.join("\n\n") unless postreqs.empty?
+
+      output
     end
 
     # Output a topic with fancy title and bright white text.
@@ -382,12 +389,12 @@ module Howzit
           unless matches.empty?
             if opt[:single]
               title = "From #{matches[0]}:"
-              color = '{yK}'
-              rule = '{kK}'
+              color = '{Kyd}'
+              rule = '{kKd}'
             else
               title = "Include #{matches[0]}"
-              color = '{yK}'
-              rule = '{x}'
+              color = '{Kyd}'
+              rule = '{kKd}'
             end
             output.push(format_header("#{'> ' * @nest_level}#{title}", { color: color, hr: '.', border: rule })) unless @included.include?(matches[0])
 
@@ -666,7 +673,6 @@ module Howzit
       topics
     end
 
-
     def match_topic(search)
       matches = []
 
@@ -700,7 +706,8 @@ module Howzit
         choose: false,
         quiet: false,
         verbose: false,
-        default: false
+        default: false,
+        grep: nil
       }
 
       defaults = {
@@ -715,7 +722,8 @@ module Howzit
         show_all_on_error: false,
         include_upstream: false,
         show_all_code: false,
-        grep: nil,
+        multiple_matches: 'choose',
+        header_format: 'border',
         log_level: 1 # 0: debug, 1: info, 2: warn, 3: error
       }
 
@@ -767,6 +775,11 @@ module Howzit
           @options[:matching] = c
         end
 
+        opts.on('--multiple TYPE', MULTIPLE_OPTIONS,
+                'Multiple result handling', "(#{MULTIPLE_OPTIONS.join(', ')}, default choose)") do |c|
+          @options[:multiple_matches] = c.to_sym
+        end
+
         opts.on('-R', '--list-runnable', 'List topics containing @ directives (verbose)') do
           @options[:list_runnable] = true
         end
@@ -808,6 +821,39 @@ module Howzit
           @options[:wrap] = w.to_i
         end
 
+        opts.on('--config-get [KEY]', 'Display the configuration settings or setting for a specific key') do |k|
+
+          if k.nil?
+            config.sort_by { |key, _| key }.each do |key, val|
+              print "#{key}: "
+              p val
+            end
+          else
+            k.sub!(/^:/, '')
+            if config.key?(k.to_sym)
+              puts config[k.to_sym]
+            else
+              puts "Key #{k} not found"
+            end
+          end
+          Process.exit 0
+        end
+
+        opts.on('--config-set KEY=VALUE', 'Set a config value (must be a valid key)') do |key|
+          raise 'Argument must be KEY=VALUE' unless key =~ /\S=\S/
+
+          k, v = key.split(/=/)
+          k.sub!(/^:/, '')
+
+          if config.key?(k.to_sym)
+            config[k.to_sym] = v.to_config_value(config[k.to_sym])
+          else
+            puts "Key #{k} not found"
+          end
+          write_config(config)
+          Process.exit 0
+        end
+
         opts.on('--edit-config', "Edit configuration file using default $EDITOR") do
           edit_config(defaults)
           Process.exit 0
@@ -841,6 +887,11 @@ module Howzit
           Process.exit 0
         end
 
+        opts.on('--header-format TYPE', HEADER_FORMAT_OPTIONS,
+                "Formatting style for topic titles (#{HEADER_FORMAT_OPTIONS.join(', ')})") do |t|
+          @options[:header_format] = t
+        end
+
         opts.on('--[no-]color', 'Colorize output (default on)') do |c|
           @options[:color] = c
           @options[:highlight] = false unless c
@@ -869,6 +920,9 @@ module Howzit
         end
       end.parse!(args)
 
+      @options[:multiple_matches] = @options[:multiple_matches].to_sym
+      @options[:header_format] = @options[:header_format].to_sym
+
       @cli_args = args
     end
 
@@ -1001,12 +1055,20 @@ module Howzit
 
     def choose(matches)
       if command_exist?('fzf')
-        res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf -0 -1 --height #{matches.count + 2} --prompt 'Select a section > '`.strip
+        settings = [
+          '-0',
+          '-1',
+          '-m',
+          "--height=#{matches.count + 2}",
+          '--header="Use tab to mark multiple selections, enter to display/run"',
+          '--prompt="Select a section > "'
+        ]
+        res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf #{settings.join(' ')}`.strip
         if res.nil? || res.empty?
           warn 'Cancelled'
           Process.exit 0
         end
-        return res
+        return res.split(/\n/)
       end
 
       res = matches[0..9]
@@ -1107,7 +1169,7 @@ module Howzit
         out = get_note_title(20)
         $stdout.print(out.strip)
         Process.exit(0)
-      elsif @options[:output_title]
+      elsif @options[:output_title] && !@options[:run]
         title = get_note_title
         if title && !title.empty?
           header = format_header(title, { hr: "\u{2550}", color: '{bwK}' })
@@ -1136,33 +1198,49 @@ module Howzit
         Process.exit(0)
       end
 
-      topic_match = nil
+      topic_matches = []
       if @options[:grep]
-        topic_match = choose(grep_topics(@options[:grep]))
+        matches = grep_topics(@options[:grep])
+        case @options[:multiple_matches]
+        when :all
+          topic_matches.concat(matches.sort)
+        else
+          topic_matches.concat(choose(matches))
+        end
       elsif @options[:choose]
-        topic_match = choose(topics.keys)
+        topic_matches.concat(choose(topics.keys))
       # If there are arguments use those to search for a matching topic
       elsif !@cli_args.empty?
+        search = @cli_args.join(' ').strip.downcase.split(/ *, */).map(&:strip)
 
-        search = @cli_args.join(' ').strip.downcase
-        matches = match_topic(search)
+        search.each do |s|
+          matches = match_topic(s)
 
-        if matches.empty?
-          output.push(Color.template(%({bR}ERROR:{xr} No topic match found for {bw}#{search}{x}\n)))
-          unless @options[:show_all_on_error]
-            show(output.join("\n"), { color: true, highlight: false, paginate: false, wrap: 0 })
-            Process.exit 1
+          if matches.empty?
+            output.push(Color.template(%({bR}ERROR:{xr} No topic match found for {bw}#{s}{x}\n)))
+          else
+            case @options[:multiple_matches]
+            when :first
+              topic_matches.push(matches[0])
+            when :best
+              topic_matches.push(matches.sort.min_by(&:length))
+            when :all
+              topic_matches.concat(matches)
+            else
+              topic_matches.concat(choose(matches))
+            end
           end
-        elsif matches.length == 1
-          topic_match = matches[0]
-        else
-          topic_match = choose(matches)
+        end
+
+        if topic_matches.empty? && !@options[:show_all_on_error]
+          show(output.join("\n"), { color: true, highlight: false, paginate: false, wrap: 0 })
+          Process.exit 1
         end
       end
 
-      if topic_match
+      if !topic_matches.empty?
         # If we found a match
-        output.push(process_topic(topic_match, @options[:run], true))
+        topic_matches.each { |topic_match| output.push(process_topic(topic_match, @options[:run], true)) }
       else
         # If there's no argument or no match found, output all
         topics.each_key { |k| output.push(process_topic(k, false, false)) }

data/lib/howzit/colors.rb

@@ -223,8 +223,8 @@ module Howzit
       ##
       def template(input)
         input = input.join(' ') if input.is_a? Array
-        input.gsub!(/%/, '%%')
-        fmt = input.gsub(/\{(\w+)\}/) do
+        fmt = input.gsub(/%/, '%%')
+        fmt = fmt.gsub(/\{(\w+)\}/) do
           Regexp.last_match(1).split('').map { |c| "%<#{c}>s" }.join('')
         end
 
@@ -232,7 +232,7 @@ module Howzit
                    y: yellow, c: cyan, m: magenta, r: red,
                    W: bgwhite, K: bgblack, G: bggreen, L: bgblue,
                    Y: bgyellow, C: bgcyan, M: bgmagenta, R: bgred,
-                   b: bold, u: underline, i: italic, x: reset }
+                   d: dark, b: bold, u: underline, i: italic, x: reset }
 
         format(fmt, colors)
       end

data/lib/howzit/config.rb

@@ -0,0 +1,128 @@
+module Howzit
+  # Config Class
+  class Config
+    attr_reader :options
+
+    DEFAULTS = {
+      color: true,
+      config_editor: ENV['EDITOR'] || nil,
+      editor: ENV['EDITOR'] || nil,
+      header_format: 'border',
+      highlight: true,
+      highlighter: 'auto',
+      include_upstream: false,
+      log_level: 1, # 0: debug, 1: info, 2: warn, 3: error
+      matching: 'partial', # exact, partial, fuzzy, beginswith
+      multiple_matches: 'choose',
+      output_title: false,
+      pager: 'auto',
+      paginate: true,
+      show_all_code: false,
+      show_all_on_error: false,
+      wrap: 0
+    }.deep_freeze
+
+    def initialize
+      load_options
+    end
+
+    def write_config(config)
+      File.open(config_file, 'w') { |f| f.puts config.to_yaml }
+    end
+
+    def should_ignore(filename)
+      return false unless File.exist?(ignore_file)
+
+      @ignore_patterns ||= YAML.safe_load(IO.read(ignore_file))
+
+      ignore = false
+
+      @ignore_patterns.each do |pat|
+        if filename =~ /#{pat}/
+          ignore = true
+          break
+        end
+      end
+
+      ignore
+    end
+
+    def template_folder
+      File.join(config_dir, 'templates')
+    end
+
+    def editor
+      edit_config(DEFAULTS)
+    end
+
+    private
+
+    def load_options
+      Color.coloring = $stdout.isatty
+      flags = {
+        choose: false,
+        default: false,
+        grep: nil,
+        list_runnable: false,
+        list_runnable_titles: false,
+        list_topic_titles: false,
+        list_topics: false,
+        quiet: false,
+        run: false,
+        title_only: false,
+        verbose: false
+      }
+
+      config = load_config
+      @options = flags.merge(config)
+    end
+
+    def config_dir
+      File.expand_path(CONFIG_DIR)
+    end
+
+    def config_file
+      File.join(config_dir, CONFIG_FILE)
+    end
+
+    def ignore_file
+      File.join(config_dir, IGNORE_FILE)
+    end
+
+    def create_config(d)
+      unless File.directory?(config_dir)
+        warn "Creating config directory at #{config_dir}"
+        FileUtils.mkdir_p(config_dir)
+      end
+
+      unless File.exist?(config_file)
+        warn "Writing fresh config file to #{config_file}"
+        write_config(d)
+      end
+      config_file
+    end
+
+    def load_config
+      file = create_config(DEFAULTS)
+      config = YAML.load(IO.read(file))
+      newconfig = config ? DEFAULTS.merge(config) : DEFAULTS
+      write_config(newconfig)
+      newconfig.dup
+    end
+
+    def edit_config(d)
+      editor = Howzit.options.fetch(:config_editor, ENV['EDITOR'])
+
+      raise 'No config_editor defined' if editor.nil?
+
+      # raise "Invalid editor (#{editor})" unless Util.valid_command?(editor)
+
+      load_config
+      if Util.valid_command?(editor.split(/ /).first)
+        system %(#{editor} "#{config_file}")
+      else
+        `open -a "#{editor}" "#{config_file}"`
+      end
+    end
+  end
+end

data/lib/howzit/hash.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Hash helpers
+class ::Hash
+  ##
+  ## Freeze all values in a hash
+  ##
+  ## @return     Hash with all values frozen
+  ##
+  def deep_freeze
+    chilled = {}
+    each do |k, v|
+      chilled[k] = v.is_a?(Hash) ? v.deep_freeze : v.freeze
+    end
+
+    chilled.freeze
+  end
+
+  def deep_freeze!
+    replace deep_thaw.deep_freeze
+  end
+
+  def deep_thaw
+    chilled = {}
+    each do |k, v|
+      chilled[k] = v.is_a?(Hash) ? v.deep_thaw : v.dup
+    end
+
+    chilled.dup
+  end
+
+  def deep_thaw!
+    replace deep_thaw
+  end
+end

data/lib/howzit/prompt.rb

@@ -3,17 +3,90 @@
 module Howzit
   # Command line prompt utils
   module Prompt
-  	def yn(prompt, default = true)
-      return default if !$stdout.isatty
-
-    	system 'stty cbreak'
-    	yn = color_single_options(default ? %w[Y n] : %w[y N])
-    	$stdout.syswrite "\e[1;37m#{prompt} #{yn}\e[1;37m? \e[0m"
-    	res = $stdin.sysread 1
-    	res.chomp!
-    	puts
-    	system 'stty cooked'
-    	res =~ /y/i
+    class << self
+    	def yn(prompt, default = true)
+        return default if !$stdout.isatty
+
+      	system 'stty cbreak'
+      	yn = color_single_options(default ? %w[Y n] : %w[y N])
+      	$stdout.syswrite "\e[1;37m#{prompt} #{yn}\e[1;37m? \e[0m"
+      	res = $stdin.sysread 1
+      	res.chomp!
+      	puts
+      	system 'stty cooked'
+      	res =~ /y/i
+      end
+
+      def color_single_options(choices = %w[y n])
+        out = []
+        choices.each do |choice|
+          case choice
+          when /[A-Z]/
+            out.push(Color.template("{bg}#{choice}{xg}"))
+          else
+            out.push(Color.template("{w}#{choice}"))
+          end
+        end
+        Color.template("{g}[#{out.join('/')}{g}]{x}")
+      end
+
+      def options_list(matches)
+        counter = 1
+        puts
+        matches.each do |match|
+          printf("%<counter>2d ) %<option>s\n", counter: counter, option: match)
+          counter += 1
+        end
+        puts
+      end
+
+      def choose(matches)
+        if Util.command_exist?('fzf')
+          settings = [
+            '-0',
+            '-1',
+            '-m',
+            "--height=#{matches.count + 2}",
+            '--header="Use tab to mark multiple selections, enter to display/run"',
+            '--prompt="Select a section > "'
+          ]
+          res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf #{settings.join(' ')}`.strip
+          if res.nil? || res.empty?
+            warn 'Cancelled'
+            Process.exit 0
+          end
+          return res.split(/\n/)
+        end
+
+        res = matches[0..9]
+        stty_save = `stty -g`.chomp
+
+        trap('INT') do
+          system('stty', stty_save)
+          exit
+        end
+
+        options_list(matches)
+
+        begin
+          printf("Type 'q' to cancel, enter for first item", res.length)
+          while (line = Readline.readline(': ', true))
+            if line =~ /^[a-z]/i
+              system('stty', stty_save) # Restore
+              exit
+            end
+            line = line == '' ? 1 : line.to_i
+
+            return matches[line - 1] if line.positive? && line <= matches.length
+
+            puts 'Out of range'
+            options_list(matches)
+          end
+        rescue Interrupt
+          system('stty', stty_save)
+          exit
+        end
+      end
     end
   end
 end

data/lib/howzit/stringutils.rb

@@ -3,6 +3,44 @@
 module Howzit
   # String Extensions
   module StringUtils
+    # Convert a string to a valid YAML value
+    def to_config_value(orig_value = nil)
+      if orig_value
+        case orig_value.class.to_s
+        when /Integer/
+          to_i
+        when /(True|False)Class/
+          self =~ /^(t(rue)?|y(es)?|1)$/i ? true : false
+        else
+          self
+        end
+      else
+        case self
+        when /^[0-9]+$/
+          to_i
+        when /^(t(rue)?|y(es)?)$/i
+          true
+        when /^(f(alse)?|n(o)?)$/i
+          false
+        else
+          self
+        end
+      end
+    end
+
+    def to_rx
+      case Howzit.options[:matching]
+      when 'exact'
+        /^#{self}$/i
+      when 'beginswith'
+        /^#{self}/i
+      when 'fuzzy'
+        /#{split(//).join('.*?')}/i
+      else
+        /#{self}/i
+      end
+    end
+
     # Just strip out color codes when requested
     def uncolor
       gsub(/\e\[[\d;]+m/, '').gsub(/\e\]1337;SetMark/,'')
@@ -78,20 +116,15 @@ module Howzit
     end
 
     def available?
-      if File.exist?(File.expand_path(self))
-        File.executable?(File.expand_path(self))
-      else
-        system "which #{self}", out: File::NULL
-      end
+      Util.valid_command?(self)
     end
 
     def render_template(vars)
-      content = dup
       vars.each do |k, v|
-        content.gsub!(/\[%#{k}(:.*?)?\]/, v)
+        gsub!(/\[%#{k}(:.*?)?\]/, v)
       end
 
-      content.gsub(/\[%(.*?):(.*?)\]/, '\2')
+      gsub(/\[%(.*?):(.*?)\]/, '\2')
     end
 
     def render_template!(vars)
@@ -129,6 +162,44 @@ module Howzit
       end
       data
     end
+
+    def should_mark_iterm?
+      ENV['TERM_PROGRAM'] =~ /^iTerm/ && !Howzit.options[:run] && !Howzit.options[:paginate]
+    end
+
+    def iterm_marker
+      "\e]1337;SetMark\a" if should_mark_iterm?
+    end
+
+    # Make a fancy title line for the topic
+    def format_header(opts = {})
+      title = dup
+      options = {
+        hr: "\u{254C}",
+        color: '{bg}',
+        border: '{x}',
+        mark: should_mark_iterm?
+      }
+
+      options.merge!(opts)
+
+      case Howzit.options[:header_format]
+      when :block
+        Color.template("#{options[:color]}\u{258C}#{title}#{should_mark_iterm? && options[:mark] ? iterm_marker : ''}{x}")
+      else
+        cols = TTY::Screen.columns
+
+        cols = Howzit.options[:wrap] if (Howzit.options[:wrap]).positive? && cols > Howzit.options[:wrap]
+        title = Color.template("#{options[:border]}#{options[:hr] * 2}( #{options[:color]}#{title}#{options[:border]} )")
+
+        tail = if should_mark_iterm?
+                 "#{options[:hr] * (cols - title.uncolor.length - 15)}#{options[:mark] ? iterm_marker : ''}"
+               else
+                 options[:hr] * (cols - title.uncolor.length)
+               end
+        Color.template("#{title}#{tail}{x}")
+      end
+    end
   end
 end
 

data/lib/howzit/task.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Howzit
+  class Task
+    attr_reader :type, :title, :action, :parent
+
+    def initialize(type, title, action, parent = nil)
+      @type = type
+      @title = title
+      @action = action
+      @parent = parent
+    end
+
+    def to_s
+      @title
+    end
+
+    def to_list
+      "    * #{@type}: #{@title}"
+    end
+  end
+end