howzit 2.0.17 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa788ff480288582a4473e2bb2fa9388afc98165c9c78b2c90a1bb9b964d7919
-  data.tar.gz: e3012f8ed229832f7cefa29b1ff9a4d971858886c8c9778ec7fe6a3b74faa181
+  metadata.gz: 22f532430daee5c4c7a1d662d959aa5141848be745940e497b0f5d5d920e0739
+  data.tar.gz: 4db5982c0f1409754cf41206b747ccc39b02ceacdaf100dc12e32185d8c13602
 SHA512:
-  metadata.gz: 893cc81a4db7d7297f8a3d195f6a02bec4a0e419c56ca6a76e97bfbbe49636ef6e6162457f83f914422bb42d5906df8f38a375309d9d5a1b6844d57d488c2e55
-  data.tar.gz: e286bd61f5d4d4dd9632691c3486a9daa51701aac8c4facd3f5a62d01e871ec0cd06d7ff4ac1f19c0f9ff7d24d6ef1d3b9f812d68aa6d62877c99b5bfed7b261
+  metadata.gz: 7d57db8ee804c204c42b1b30fac02bede10a2ec1b46c31aaf33a688a3441c6338e033e568d61eecedf3ec5a0c05087106532504a4c7cfcbff6daf1ccd9efea20
+  data.tar.gz: 99d46ccfe0612d10c832e093a6b1f95fd4c48a72750e2375bc67b5bc8c1a017d15580f5806fa90fb47e8aae6db1f31c3fc931fd51d588ce1aa249bddfe875538

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+### 2.0.20
+
+2022-08-08 11:38
+
+#### NEW
+
+- --hook command for macOS to copy a link to the build note to clipboard
+
+#### FIXED
+
+- Error on --edit-config
+- Fzf preview empty
+
+### 2.0.19
+
+2022-08-08 06:18
+
+#### IMPROVED
+
+- Sort options in help output
+
+### 2.0.18
+
+2022-08-08 03:48
+
+#### NEW
+
+- Use --ask to require confirmation of all tasks when running a topic
+
 ### 2.0.17
 
 2022-08-07 06:09

data/bin/howzit

@@ -20,6 +20,10 @@ OptionParser.new do |opts|
 
   opts.separator "  Behavior:\n\n" #=================================================================== BEHAVIOR
 
+  opts.on('--ask', 'Request confirmation for all tasks when running a topic') do
+    Howzit.options[:ask] = true
+  end
+
   opts.on('--default', 'Answer all prompts with default response') do
     Howzit.options[:default] = true
   end
@@ -40,7 +44,7 @@ OptionParser.new do |opts|
 
   opts.separator "\n  Listing:\n\n" #=================================================================== LISTING
 
-  opts.on('-L', '--list-completions', 'List topics for completion') do
+  opts.on('-L', '--list-completions', 'List topics (completion-compatible)') do
     Howzit.options[:list_topics] = true
     Howzit.options[:list_topic_titles] = true
   end
@@ -94,11 +98,6 @@ OptionParser.new do |opts|
     Process.exit 0
   end
 
-  opts.on('--edit-template NAME', 'Create or edit a template') do |template|
-    Howzit.buildnote.edit_template(template)
-    Process.exit 0
-  end
-
   opts.on('--config-get [KEY]', 'Display the configuration settings or setting for a specific key') do |k|
     if k.nil?
       Howzit::Config::DEFAULTS.sort_by { |key, _| key }.each do |key, _|
@@ -132,14 +131,21 @@ OptionParser.new do |opts|
     Process.exit 0
   end
 
-  opts.on('--edit-config', "Edit configuration file using editor (#{Howzit.options[:editor]})") do
+  editor = File.basename(Howzit.options[:editor])
+  desc = %(Edit buildnotes file in current working directory using editor (#{editor}))
+  opts.on('-e', '--edit', desc) do
+    Howzit.buildnote.edit
+    Process.exit 0
+  end
+
+  config_editor = File.basename(Howzit.options[:config_editor])
+  opts.on('--edit-config', "Edit configuration file using editor (#{config_editor})") do
     Howzit.config.editor
     Process.exit 0
   end
 
-  desc = %(Edit buildnotes file in current working directory using editor (#{Howzit.options[:config_editor]}))
-  opts.on('-e', '--edit', desc) do
-    Howzit.buildnote.edit
+  opts.on('--edit-template NAME', 'Create or edit a template') do |template|
+    Howzit.buildnote.edit_template(template)
     Process.exit 0
   end
 
@@ -147,6 +153,13 @@ OptionParser.new do |opts|
     Howzit.options[:grep] = pat
   end
 
+  if RbConfig::CONFIG['target_os'] =~ /darwin.*/i
+    opts.on('--hook', 'Copy a link to the build note file, ready for pasting into Hook.app or other notes') do
+      Howzit.buildnote.hook
+      Process.exit 0
+    end
+  end
+
   opts.on('-r', '--run', 'Execute @run, @open, and/or @copy commands for given topic') do
     Howzit.options[:run] = true
   end

data/lib/howzit/buildnote.rb

@@ -72,6 +72,17 @@ module Howzit
       end
     end
 
+    ##
+    ## Copy a link to the main build note file to clipboard (macOS only)
+    ##
+    def hook
+      title = Util.read_file(note_file).note_title(note_file, 20)
+      title = "#{title} build notes"
+      url = "[#{title}](file://#{note_file})"
+      `echo #{Shellwords.escape(url)}'\\c'|pbcopy`
+      Howzit.console.info('Link copied to clipboard.')
+    end
+
     ##
     ## Call grep on all topics, filtering out those that don't match
     ##

data/lib/howzit/config.rb

@@ -74,7 +74,7 @@ module Howzit
     ## Initiate the editor for the config
     ##
     def editor
-      edit_config(DEFAULTS)
+      edit_config
     end
 
     private
@@ -87,6 +87,7 @@ module Howzit
     def load_options
       Color.coloring = $stdout.isatty
       flags = {
+        ask: false,
         choose: false,
         default: false,
         for_topic: nil,

data/lib/howzit/prompt.rb

@@ -100,7 +100,7 @@ module Howzit
             "--height=#{height}",
             '--header="Use tab to mark multiple selections, enter to display/run"',
             '--prompt="Select a section > "',
-            '--preview="howzit {}"'
+            %(--preview="howzit --no-pager --header-format block --no-color --default --multiple first {}")
           ]
           res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf #{settings.join(' ')}`.strip
           if res.nil? || res.empty?

data/lib/howzit/task.rb

@@ -73,9 +73,9 @@ module Howzit
       matches = Howzit.buildnote.find_topic(@action)
       raise "Topic not found: #{@action}" if matches.empty?
 
-      $stderr.puts "{by}Running tasks from {bw}#{matches[0].title}{x}".c if Howzit.options[:log_level] < 2
+      Howzit.console.info("{by}Running tasks from {bw}#{matches[0].title}{x}".c)
       output.concat(matches[0].run(nested: true))
-      $stderr.puts "{by}End include: #{matches[0].tasks.count} tasks{x}".c if Howzit.options[:log_level] < 2
+      Howzit.console.info("{by}End include: #{matches[0].tasks.count} tasks{x}".c)
       [output, matches[0].tasks.count]
     end
 
@@ -84,7 +84,7 @@ module Howzit
     ##
     def run_run
       title = Howzit.options[:show_all_code] ? @action : @title
-      $stderr.puts "{bg}Running {bw}#{title}{x}".c if Howzit.options[:log_level] < 2
+      Howzit.console.info("{bg}Running {bw}#{title}{x}".c)
       system(@action)
     end
 
@@ -93,7 +93,7 @@ module Howzit
     ##
     def run_copy
       title = Howzit.options[:show_all_code] ? @action : @title
-      $stderr.puts "{bg}Copied {bw}#{title}{bg} to clipboard{x}".c if Howzit.options[:log_level] < 2
+      Howzit.console.info("{bg}Copied {bw}#{title}{bg} to clipboard{x}".c)
       os_copy(@action)
     end
 
@@ -107,21 +107,21 @@ module Howzit
       out = "{bg}Copying {bw}#{string}".c
       case os
       when /darwin.*/i
-        $stderr.puts "#{out} (macOS){x}".c if Howzit.options[:log_level].zero?
+        Howzit.console.debug("#{out} (macOS){x}".c)
         `echo #{Shellwords.escape(string)}'\\c'|pbcopy`
       when /mingw|mswin/i
-        $stderr.puts "#{out} (Windows){x}".c if Howzit.options[:log_level].zero?
+        Howzit.console.debug("#{out} (Windows){x}".c)
         `echo #{Shellwords.escape(string)} | clip`
       else
         if 'xsel'.available?
-          $stderr.puts "#{out} (Linux, xsel){x}".c if Howzit.options[:log_level].zero?
+          Howzit.console.debug("#{out} (Linux, xsel){x}".c)
           `echo #{Shellwords.escape(string)}'\\c'|xsel -i`
         elsif 'xclip'.available?
-          $stderr.puts "#{out} (Linux, xclip){x}".c if Howzit.options[:log_level].zero?
+          Howzit.console.debug("#{out} (Linux, xclip){x}".c)
           `echo #{Shellwords.escape(string)}'\\c'|xclip -i`
         else
-          $stderr.puts out if Howzit.options[:log_level].zero?
-          $stderr.puts 'Unable to determine executable for clipboard.'
+          Howzit.console.debug(out)
+          Howzit.console.warn('Unable to determine executable for clipboard.')
         end
       end
     end

data/lib/howzit/topic.rb

@@ -51,7 +51,7 @@ module Howzit
         end
 
         @tasks.each do |task|
-          if task.optional
+          if task.optional || Howzit.options[:ask]
             note = if task.type == :include
                      task_count = Howzit.buildnote.find_topic(task.action)[0].tasks.count
                      " (#{task_count} tasks)"

data/lib/howzit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.17
+  version: 2.0.20
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-07 00:00:00.000000000 Z
+date: 2022-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler