howzit 2.0.23 → 2.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef13e763de59e83d14808c8778e5941c43b1b68669d09a9047dd53aaff60b38
-  data.tar.gz: 0f4052f07e44bbe1b9679a021abd147bc0830941351221baa61cb09f6bfe25c6
+  metadata.gz: 4d5ddc7a4ec5cda133517d27dfef17d80299c17a68de2469e9dab66e81dffa33
+  data.tar.gz: 78fed9d51d054f4c39d3bb6b9daed3709e6a7f7644e5a6368bb924bb0b042665
 SHA512:
-  metadata.gz: 69231c5b96a7c011710787d6f47ef628286a5b7237489c6220f1bc25a9aab2d76d70f438b9d1872e2531710f100b3d09f715acabb138c7a8cfc6967d6dde9f70
-  data.tar.gz: 49c1e9266d4401d8ca863a9f107ab4e2c2722db719ab253b03db1b1c8983aeb83e3c715971d15be5ebe42d074f79b4ee521a9062a216422023c9884123555646
+  metadata.gz: 5427a3f6754462ae1311194407a3c6dfc71b084bb639afa29d961fad758ed554ce40ccdb21ec7b9175289343866da6d1ddb0f9db5fccb12f8224d206f9d53b98
+  data.tar.gz: 6222c4a34783c842fc342a27b2167588578afefa3f45a2fc16637b5d3f266d99d11bbefada5dd4a586902f914566a86efcef4262396133e573cf520923cd468a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 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

@@ -32,7 +32,7 @@ module Howzit
     ## @return     description
     ##
     def inspect
-      puts "#<Howzit::BuildNote @topics=[#{@topics.count}]>"
+      "#<Howzit::BuildNote @topics=[#{@topics.count}]>"
     end
 
     ##
@@ -205,14 +205,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 +298,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,
@@ -532,7 +532,6 @@ module Howzit
     ##
     def read_upstream
       buildnotes = glob_upstream
-
       topics_dict = []
       buildnotes.each do |path|
         topics_dict.concat(read_help_file(path))
@@ -627,12 +626,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/version.rb

@@ -3,5 +3,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '2.0.23'
+  VERSION = '2.0.24'
 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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.0.24
 platform: ruby
 authors:
 - Brett Terpstra