howzit 2.0.23 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef13e763de59e83d14808c8778e5941c43b1b68669d09a9047dd53aaff60b38
-  data.tar.gz: 0f4052f07e44bbe1b9679a021abd147bc0830941351221baa61cb09f6bfe25c6
+  metadata.gz: 0ef20bf69eaecc6f2d2df7ac9621dfbd227af13148ce2e0465d466b6206d8a59
+  data.tar.gz: 5923dbabfc6ec5d6bc1783ebb21b1a231fbfdaaa2ecd3887582b014a9642d8ab
 SHA512:
-  metadata.gz: 69231c5b96a7c011710787d6f47ef628286a5b7237489c6220f1bc25a9aab2d76d70f438b9d1872e2531710f100b3d09f715acabb138c7a8cfc6967d6dde9f70
-  data.tar.gz: 49c1e9266d4401d8ca863a9f107ab4e2c2722db719ab253b03db1b1c8983aeb83e3c715971d15be5ebe42d074f79b4ee521a9062a216422023c9884123555646
+  metadata.gz: b5e8c29926fa85e6b52e4d8463504a474f4d0e35765a8bf85294ab46f84e11c10d9f77f002d85ed2ea0db4657edd23a9faabe03f5c7ba0796aa38407d00e1180
+  data.tar.gz: 9340eff4ab693b1e82e11b201d63da704a4dc4d647bd5443b7b2bdfa8b5f1af98dc61cf4b42f76247c2ba4adbf2651ab82ea082136f68bdf0c5ebc0c904898d5

data/.travis.yml

@@ -14,3 +14,4 @@ script: "bundle exec rspec spec --exclude-pattern 'cli*'"
 branches:
   only:
   - main
+  - develop

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 2.0.26
+
+2022-08-23 11:36
+
+#### IMPROVED
+
+- Add ctrl-a/d bindings to fzf menu for select/deselect all
+
+### 2.0.25
+
+2022-08-09 12:46
+
+#### FIXED
+
+- Template metadata inheritence
+
+### 2.0.24
+
+2022-08-09 09:04
+
+#### FIXED
+
+- Avoid reading upstream files multiple times
+
 ### 2.0.23
 
 2022-08-09 05:51

data/lib/howzit/buildnote.rb

@@ -12,7 +12,7 @@ module Howzit
     ##
     ## @param      file  [String] The path to the build note file
     ##
-    def initialize(file: nil)
+    def initialize(file: nil, meta: nil)
       file ||= note_file
 
       @topics = []
@@ -21,7 +21,9 @@ module Howzit
       content = Util.read_file(file)
       raise "{br}No content found in build note (#{file}){x}".c if content.nil? || content.empty?
 
-      @metadata = content.split(/^#/)[0].strip.get_metadata
+      this_meta = content.split(/^#/)[0].strip.get_metadata
+
+      @metadata = meta.nil? ? this_meta : meta.merge(this_meta)
 
       read_help(file)
     end
@@ -32,7 +34,7 @@ module Howzit
     ## @return     description
     ##
     def inspect
-      puts "#<Howzit::BuildNote @topics=[#{@topics.count}]>"
+      "#<Howzit::BuildNote @topics=[#{@topics.count}]>"
     end
 
     ##
@@ -205,14 +207,14 @@ module Howzit
       if File.exist?(file) && !default
         file = "{by}#{file}".c
         unless Prompt.yn("Are you sure you want to overwrite #{file}", default: false)
-          puts 'Cancelled'
+          Howzit.console.info('Cancelled')
           Process.exit 0
         end
       end
 
       File.open(file, 'w') do |f|
         f.puts note
-        puts "{by}Template {bw}#{title}{by} written to {bw}#{file}{x}".c
+        Howzit.console.info("{by}Template {bw}#{title}{by} written to {bw}#{file}{x}".c)
       end
 
       if File.exist?(file) && !default && Prompt.yn("{bg}Do you want to open {bw}#{file} {bg}for editing?{x}".c,
@@ -298,14 +300,14 @@ module Howzit
       if File.exist?(fname) && !default
         file = "{by}#{fname}".c
         unless Prompt.yn("Are you absolutely sure you want to overwrite #{file}", default: false)
-          puts 'Canceled'
+          Howzit.console.info('Canceled')
           Process.exit 0
         end
       end
 
       File.open(fname, 'w') do |f|
         f.puts note
-        puts "{by}Build notes for {bw}#{title}{by} written to {bw}#{fname}{x}".c
+        Howzit.console.info("{by}Build notes for {bw}#{title}{by} written to {bw}#{fname}{x}".c)
       end
 
       if File.exist?(fname) && !default && Prompt.yn("{bg}Do you want to open {bw}#{fname} {bg}for editing?{x}".c,
@@ -451,11 +453,12 @@ module Howzit
     ## @return     [Array] extracted topics
     ##
     def read_template(template, file, subtopics = nil)
-      note = BuildNote.new(file: file)
+      note = BuildNote.new(file: file, meta: @metadata)
 
       template_topics = subtopics.nil? ? note.topics : extract_subtopics(note, subtopics)
       template_topics.map do |topic|
         topic.parent = template
+        topic.content = topic.content.render_template(@metadata)
         topic
       end
     end
@@ -532,7 +535,6 @@ module Howzit
     ##
     def read_upstream
       buildnotes = glob_upstream
-
       topics_dict = []
       buildnotes.each do |path|
         topics_dict.concat(read_help_file(path))
@@ -608,6 +610,7 @@ module Howzit
           end
           title = "#{short_path}:#{title}"
         end
+
         topic = Topic.new(title, prefix + lines.join("\n").strip.render_template(@metadata))
 
         topics.push(topic)
@@ -627,12 +630,15 @@ module Howzit
     ##
     def read_help(path = nil)
       @topics = read_help_file(path)
-      return unless path.nil? && Howzit.options[:include_upstream]
+      return unless Howzit.options[:include_upstream]
 
-      upstream_topics = read_upstream
+      unless Howzit.has_read_upstream
+        upstream_topics = read_upstream
 
-      upstream_topics.each do |topic|
-        @topics.push(topic) unless find_topic(title.sub(/^.+:/, '')).count.positive?
+        upstream_topics.each do |topic|
+          @topics.push(topic) unless find_topic(topic.title.sub(/^.+:/, '')).count.positive?
+        end
+        Howzit.has_read_upstream = true
       end
 
       if note_file && @topics.empty?

data/lib/howzit/prompt.rb

@@ -98,8 +98,9 @@ module Howzit
             '-1',
             '-m',
             "--height=#{height}",
-            '--header="Use tab to mark multiple selections, enter to display/run"',
-            '--prompt="Select a section > "',
+            '--header="Tab: add selection, ctrl-a/d: (de)select all, return: display/run"',
+            '--bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all',
+            '--prompt="Select a topic > "',
             %(--preview="howzit --no-pager --header-format block --no-color --default --multiple first {}")
           ]
           res = `echo #{Shellwords.escape(matches.join("\n"))} | fzf #{settings.join(' ')}`.strip

data/lib/howzit/version.rb

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

data/lib/howzit.rb

@@ -82,5 +82,13 @@ module Howzit
     def console
       @console ||= Howzit::ConsoleLogger.new(options[:log_level])
     end
+
+    def has_read_upstream
+      @has_read_upstream ||= false
+    end
+
+    def has_read_upstream=(has_read)
+      @has_read_upstream = has_read
+    end
   end
 end

metadata

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