howzit 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311a04719d7aa7de00e54224eda363bc249dd6f8e3fdd31ad5d2a625eaa8bff8
-  data.tar.gz: 87f632ce5ac4855880b5d7ddade20983c42b252fa51bbf7fd0b654cf389970ff
+  metadata.gz: fba37c5c428aeab92ed337697a52323d5b98d5f9398776187e000043e3a5173b
+  data.tar.gz: 6f3a3ebfe50f50476837c2d702cd1c9854d49ff4960c51a06641e79d88abb410
 SHA512:
-  metadata.gz: 3ef0f06a0d408c652ae516e92d78dbb7d6bd6bf48260cb21dd66e63f4ecf27c38eed30eae42b79c53f87a824e8622b93416aef7e29feae25d2003ed00827332d
-  data.tar.gz: 16025164eb7fb5550058e361fd478b7b37e4e560cbb1b06965c79a9f091df2862d0387cd908cdfcc11456a7b358f3f507ee876036f95190971acdaa610aa979a
+  metadata.gz: 015bc504dca39d5b7a32b6d81a4df037abf61467f58b392e88389557f38a2abfb078fd3dc5ced7411b5d1654479d5a79b94da843f8384d4cf77216e9efa1c24c
+  data.tar.gz: c0b2003e8c1b24efa1e193520a66e01813fab6e9d8e21318a7d0c82718540fa8ef1c99b075d40dc07254c678015ca3fe687b64a2be6f8ce541c22e786ac63c9a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 1.2.10
+
+2022-08-01 07:45
+
+#### FIXED
+
+- Headline formatting when iTerm markers are inserted
+
 ### 1.2.9
 
 2022-08-01 07:09

data/lib/howzit/buildnotes.rb

@@ -132,8 +132,12 @@ module Howzit
       end
     end
 
+    def should_mark_iterm?
+      ENV['TERM_PROGRAM'] =~ /^iTerm/ && !@options[:run] && !@options[:paginate]
+    end
+
     def iterm_marker
-      "\e]1337;SetMark\a\n" if ENV['TERM_PROGRAM'] =~ /^iTerm/ && !@options[:run] && !@options[:paginate]
+      "\e]1337;SetMark\a" if should_mark_iterm?
     end
 
     def color_single_options(choices = %w[y n])
@@ -226,16 +230,23 @@ module Howzit
       options = {
         hr: "\u{254C}",
         color: '1;32',
-        border: '0'
+        border: '0',
+        mark: false
       }
 
       options.merge!(opts)
 
       cols = TTY::Screen.columns
+
       cols = @options[:wrap] if (@options[:wrap]).positive? && cols > @options[:wrap]
-      title = "\e[#{options[:border]}m#{options[:hr]}#{options[:hr]}( \e[#{options[:color]}m#{title}\e[#{options[:border]}m )"
-      tail = options[:hr] * (cols - title.uncolor.length)
-      options[:hr] =~ /╌/ ? "#{iterm_marker}#{title}#{tail}\e[0m" : "#{title}#{tail}\e[0m"
+      title = "\e[#{options[:border]}m#{options[:hr] * 2}( \e[#{options[:color]}m#{title}\e[#{options[:border]}m )"
+
+      tail = if should_mark_iterm?
+               "#{options[:hr] * (cols - title.uncolor.length - 15)}#{options[:mark] ? iterm_marker : ''}"
+             else
+               options[:hr] * (cols - title.uncolor.length)
+             end
+      "#{title}#{tail}\e[0m"
     end
 
     def os_open(command)
@@ -344,7 +355,7 @@ module Howzit
 
       output = []
       if opt[:header]
-        output.push(format_header(key))
+        output.push(format_header(key, { mark: should_mark_iterm? }))
         output.push('')
       end
       topic = topics[key].strip

data/lib/howzit/version.rb

@@ -2,5 +2,5 @@
 # Primary module for this gem.
 module Howzit
   # Current Howzit version.
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.2.10'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Brett Terpstra