howzit 2.0.22 → 2.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e00517a83b13075c8af7884b3a5afd683f62008f6ccc8b50015044e7625a6b7
-  data.tar.gz: 1918ceb4965f7a5fe127581c1dd602dfa387d8e310654f5ac7ca643ab5dd4c8d
+  metadata.gz: 29f72dd5e915f1fbec378cc4210902fb6e3b9ce376de4f4e962c08b40dc5bbca
+  data.tar.gz: bdc554ae8533b3a86360c82a41d4ea55677a5a271fab218db5b1057814aac490
 SHA512:
-  metadata.gz: 549952e3e175d9fcd5df9d85400a8abc3279ff76862e172029e974920ba85aa8ef1dfb84fcdbaff94a260a5630f49c462cd58d5a97f359735978c074b9742c2d
-  data.tar.gz: acb315d65c7cb1f9cf3e1ee6ef9044a1f7584b23f4bc1a7d58b39acda4851a62e58d55fe53fa227807c84f01093f3f07c6ad18070ceffda92ba05fe72f137573
+  metadata.gz: b49e67762ea36e7e792decb239a8d35f100f28be2992f70a2fb9b2d6ed13ba809db11aa4ea075244be6b263c1c464430b0e57db73ecf444a61f79fcdad812a91
+  data.tar.gz: 7d2d9b973f4798dc4ce0082ccdaad308748a4a39fe505f384f928cdf1fe73a23f751928907e2418a602e26f0de46bafb874d9f0917017d39a0c6feedcfb99990

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+### 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
+
+#### FIXED
+
+- --grep function regression
+
 ### 2.0.22
 
 2022-08-08 13:49

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?
@@ -691,7 +697,7 @@ module Howzit
     ##                     single topic
     ##
     def process_topic(topic, run, single: false)
-      new_topic = topic.dup
+      new_topic = topic.is_a?(String) ? find_topic(topic)[0] : topic.dup
 
       # Handle variable replacement
       new_topic.content = new_topic.content.render_arguments
@@ -793,6 +799,7 @@ module Howzit
 
       if !topic_matches.empty?
         # If we found a match
+        topic_matches.map! { |topic| topic.is_a?(String) ? find_topic(topic)[0] : topic }
         topic_matches.each { |topic_match| output.push(process_topic(topic_match, Howzit.options[:run], single: true)) }
       else
         # If there's no argument or no match found, output all

data/lib/howzit/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.0.22'
+  VERSION = '2.0.25'
 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.22
+  version: 2.0.25
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler