howzit 2.0.16 → 2.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df621f3d6e973282799aa664b3042f22f641754d979cf711848146b04c89cd92
-  data.tar.gz: 134041be4b4eaecc4cb31793dbe57dfdefed601b56ef8d1b17b399615831c0ad
+  metadata.gz: 7c08d6ceea211cc4e603a59c5e2f1ac7c2db806d55a8eaa1f260e1f0994bdf45
+  data.tar.gz: c5b6c284c725a8f1edabc07723a18d0e9d9c56204be0b7fb50e0d3bb1b5efccf
 SHA512:
-  metadata.gz: c896a32bef2ea983ef78082e685ac0f89e93a2e48b751c9dc5a3f744eb2687cf3005ffdcd5ea09284a3710ea56cc001746193855a195986290f9a98242598317
-  data.tar.gz: 05ccc75166128a3e2aefa7f143cd6076bef60dba024bb7c508aabc5865334f2e95bafaedeb151850704c6ac6fcc888101560f74e75b4b4cfc1afabe8ddaacaae
+  metadata.gz: 8c456e2c7f820777d6e07a26fcc677bfa8ac09a12bd409e870c37dbaa431f186ac551575b6eead585d446a02b533b5c729eba4dfac40b2caa876ff9f63400c9b
+  data.tar.gz: 03717f2b209cf812b31e5da66ab57000e7e54cd52efa08b8bc7e4c2840e30581509af401e76e8ccef9e5cd0b232d04601eb6d5723b49cc1e6ae3bb7e760bff29

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+### 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
+
 ### 2.0.16
 
 2022-08-07 06:05

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,19 @@ OptionParser.new do |opts|
     Process.exit 0
   end
 
-  opts.on('--edit-config', "Edit configuration file using editor (#{Howzit.options[:editor]})") do
+  desc = %(Edit buildnotes file in current working directory using editor (#{File.basename(Howzit.options[:config_editor])}))
+  opts.on('-e', '--edit', desc) do
+    Howzit.buildnote.edit
+    Process.exit 0
+  end
+
+  opts.on('--edit-config', "Edit configuration file using editor (#{File.basename(Howzit.options[: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
 

data/lib/howzit/config.rb

@@ -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/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.16'
+  VERSION = '2.0.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.19
 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