howzit 2.1.5 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1299678fe342467585d3ced3e03840c89964312c17e865beb77bbeb10fd84d5c
-  data.tar.gz: 247e0c2819675d4da66c07e7d80af7cfdcb3a1be461a1fea4df901ca0b924bbc
+  metadata.gz: 4b0f59c8e5d03f4b8b3fab87cddfe014db34369fc74063e59de098f8abcc38b0
+  data.tar.gz: 0c8806ab4ef01df61c6559ca40d07c810637cdaa9712f0c4c44f11629fb609a9
 SHA512:
-  metadata.gz: 676fc60b51f92daa8fa61c10ca1d3029e1ac310da7c9dfb9563e40cf090572ccb97cef1384fc2fd7a7e6ef93bd113f6a677d4d61f60ddebf706a9983a0cebafc
-  data.tar.gz: 3c2e3820b771428413019e68510e50eb7ee3423af04c5540974825c0f18a07844af4eb72a1b3a83818195ce0085b5135b6f21cb6b44621da244afb54e2f98843
+  metadata.gz: 655eab2823e223e939d43c25191890a1297a63b37f7132dd869ff819e53e763c14915df8bc670af5066dee2ea88cd1da99a6350830a563058092b058777a8285
+  data.tar.gz: 69775ac58ea7d2c387fd3316c0c31b5d368de6a783ccad65d5124eee2c704fd85c4532c7e5a7046c2ce188c4d3df9b59cb7e4aedb27d98f92768a35ecf81e51c

data/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [ttscoff]
+custom: ['https://brettterpstra.com/support/', 'https://brettterpstra.com/donate/']

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 2.1.7
+
+2023-05-29 12:59
+
+#### FIXED
+
+- Handle variable replacements on lines containing colons outside of variable
+
+### 2.1.6
+
+2023-05-29 12:42
+
+#### FIXED
+
+- Remove empty undefined variables with no default
+
 ### 2.1.5
 
 2023-04-12 15:13

data/lib/howzit/config.rb

@@ -212,7 +212,7 @@ module Howzit
     end
 
     ##
-    ## Create a new config file (and directory if needed)
+    ## Create a new theme file (and directory if needed)
     ##
     ## @param      default     [Hash] default configuration to write
     ##

data/lib/howzit/stringutils.rb

@@ -223,7 +223,11 @@ module Howzit
         gsub!(/\[%#{k}(:.*?)?\]/, v)
       end
 
-      gsub(/\[%(.*?):(.*?)\]/, '\2')
+      # Replace empty variables with default
+      gsub!(/\[%([^\]]+?):(.*?)\]/, '\2')
+
+      # Remove remaining empty variables
+      gsub(/\[%.*?\]/, '')
     end
 
     ##

data/lib/howzit/version.rb

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

data/spec/spec_helper.rb

@@ -28,6 +28,8 @@ end
 
 def save_buildnote
   note = <<~EONOTE
+    defined: this is defined
+
     # Howzit Test
 
     ## Topic Balogna
@@ -39,6 +41,11 @@ def save_buildnote
     @run(ls -1 &> /dev/null) Null Output
     @include(Topic Tropic)
 
+    ```run
+    #!/usr/bin/env ruby
+    title = "[%undefined]".empty? ? "[%defined]" : "[%undefined]"
+    ```
+
     @after
     This should be a postrequisite.
     @end
@@ -49,6 +56,8 @@ def save_buildnote
 
     - It has a list in it
     - That's pretty fun, right?
+    - Defined: '[%defined]'
+    - Undefined: '[%undefined]'
 
     ## Topic Tropic
 

data/spec/topic_spec.rb

@@ -30,8 +30,8 @@ describe Howzit::Topic do
   end
 
   describe '.tasks' do
-    it 'has 2 tasks' do
-      expect(topic.tasks.count).to eq 2
+    it 'has 3 tasks' do
+      expect(topic.tasks.count).to eq 3
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: howzit
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -291,6 +291,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".editorconfig"
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".howzit.taskpaper.bak"
 - ".rspec"