howzit 1.2.19 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8b16b06b6f594b321d2226b4985c51330b437cda97528e120b09e1bfa9d777c
-  data.tar.gz: fda79561390a39336c2bfe2aa94de7c6d81ce97b71e8721cf91066ec495d4080
+  metadata.gz: 5758dea871a182fc419de237ba35828396000307710b1680841bb774ea6994a2
+  data.tar.gz: bdf200a5a60c0acd268e37adcfae6b187807a14766e8199970fbd1d3ac1e4e3d
 SHA512:
-  metadata.gz: e20d289047b1824e0f882895b580703003514c09424dbd848a461d7ed1680b2368d5ac0f11143a0fdd21eaab80a23545c0e4ceb131964003b442c8f112654a1b
-  data.tar.gz: 4b5af891c82a9e1dcaec9177a025336d023873114e87ce906f1a0cdaa49845e02d113e60d90395fbbde2568a99b0766af3c889d4f8786e4f24e36d52a408c2a7
+  metadata.gz: c6ec5058df211c32bdf02a33f99626822221317ee95eb16161d17e4ede96ae31b744a16aee328cead7c4e3bab5ca393f0911227234709622fea27f4026a6504f
+  data.tar.gz: 7ce5c34e121fa6a3fa6fea662d21b3ccc60beba0e0fee8f0b87b0f8653e3d0e64c66f61cfdc978e0a4b1d425cb757fcf191ba4026262c1ce26225dad8b87897d

data/.travis.yml

@@ -4,4 +4,10 @@ sudo: required
 dist: trusty
 cache: bundler
 rvm:
-  - 2
+  - ruby-2.7.0
+  - ruby-3.0.1
+install:
+  - gem uninstall bundler
+  - gem install bundler --version '2.2.29'
+  - bundle install
+script: "rake"

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 2.0.2
+
+2022-08-03 18:26
+
+#### IMPROVED
+
+- If a title is provided after an @command, display it instead of the contents when viewing
+
+### 2.0.1
+
+2022-08-03 12:46
+
+#### FIXED
+
+- Failure to create new notes file when one isn't found
+
+### 2.0.0
+
+2022-08-03 12:37
+
+#### FIXED
+
+- Positional arguments not rendering in tasks
+- Fix degradation where arguments are empty
+
 ### 1.2.19
 
 2022-08-03 12:18

data/bin/howzit

@@ -95,7 +95,7 @@ OptionParser.new do |opts|
 
   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, val|
+      Howzit::Config::DEFAULTS.sort_by { |key, _| key }.each do |key, _|
         print "#{key}: "
         p Howzit.options[key]
       end

data/howzit.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(features|spec|test)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.0.1'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_development_dependency 'bundler', '~> 2.2'
   spec.add_development_dependency 'rake', '~> 11.2'

data/lib/howzit/buildnote.rb

@@ -9,6 +9,7 @@ module Howzit
 
     def initialize(file: nil, args: [])
       @topics = []
+      create_note if note_file.nil?
       @metadata = IO.read(note_file).split(/^#/)[0].strip.get_metadata
 
       read_help(file)
@@ -422,14 +423,7 @@ module Howzit
       new_topic = topic.dup
 
       # Handle variable replacement
-
-      unless Howzit.arguments.empty?
-        new_topic.content = new_topic.content.gsub(/\$(\d+)/) do |m|
-          idx = m[1].to_i - 1
-          Howzit.arguments.length > idx ? Howzit.arguments[idx] : m
-        end
-        new_topic.content = new_topic.content.gsub(/\$[@*]/, Shellwords.join(Howzit.arguments))
-      end
+      new_topic.content = new_topic.content.render_arguments
 
       output = if run
                  new_topic.run

data/lib/howzit/stringutils.rb

@@ -131,6 +131,16 @@ module Howzit
       replace render_template(vars)
     end
 
+    def render_arguments
+      return self if Howzit.arguments.nil? || Howzit.arguments.empty?
+
+      gsub!(/\$(\d+)/) do |m|
+        idx = m[1].to_i - 1
+        Howzit.arguments.length > idx ? Howzit.arguments[idx] : m
+      end
+      gsub(/\$[@*]/, Shellwords.join(Howzit.arguments))
+    end
+
     def extract_metadata
       if File.exist?(self)
         leader = IO.read(self).split(/^#/)[0].strip

data/lib/howzit/task.rb

@@ -7,7 +7,7 @@ module Howzit
     def initialize(type, title, action, parent = nil)
       @type = type
       @title = title
-      @action = action
+      @action = action.render_arguments
       @parent = parent
     end
 

data/lib/howzit/topic.rb

@@ -153,10 +153,11 @@ module Howzit
             Howzit.inclusions.push(matches[0])
           end
 
-        when /@(run|copy|open|url|include)\((.*?)\)/
+        when /@(run|copy|open|url|include)\((.*?)\)(.*?)$/
           m = Regexp.last_match
           cmd = m[1]
           obj = m[2]
+          title = m[3].nil? ? obj : m[3]
           icon = case cmd
                  when 'run'
                    "\u{25B6}"
@@ -166,7 +167,7 @@ module Howzit
                    "\u{279A}"
                  end
 
-          output.push(Color.template("{bmK}#{icon} {bwK}#{obj.gsub(/\\n/, '\​n')}{x}"))
+          output.push(Color.template("{bmK}#{icon} {bwK}#{title.gsub(/\\n/, '\​n')}{x}"))
         when /(`{3,})run *(.*?)$/i
           m = Regexp.last_match
           desc = m[2].length.positive? ? "Block: #{m[2]}" : 'Code Block'

data/lib/howzit/version.rb

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

data/spec/ruby_gem_spec.rb

@@ -43,8 +43,8 @@ describe Howzit::BuildNote do
   Howzit.options[:include_upstream] = false
   Howzit.options[:default] = true
   hz = Howzit.buildnote
-
   hz.create_note
+
   subject(:how) { hz }
 
   describe ".note_file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 2.0.2
 platform: ruby
 authors:
 - Brett Terpstra
@@ -295,7 +295,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.1
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="