cli-dispatcher 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1601becbe908448760f6f02f45ce374db04a7b6926304cb381d5193748121a76
-  data.tar.gz: b51470fabe4535e155f8d1d7b82de56b5a5c50471aca95db3aec278fc0abd588
+  metadata.gz: 3f480b01f8af6a9af5c131e3e25081edd7e69fff4caf3daa22ea10efbc49b4f4
+  data.tar.gz: 2eea3e4b6791f4babe182b56c15607b7fa5eb532106c00505fb26b8b0ee0f0d9
 SHA512:
-  metadata.gz: 0a7b5ad86d5decfd5486f26b0c618e5f6301399493da66731eeb745340f423194e01923261c1ae8766d0bae4ae0494195f82af301e8d769c98dffe937fc49c75
-  data.tar.gz: 7f565106772b1d79b7839bdedf48181eb654a2d440c83b0bbdd474feade662529dbee2615824316fc950e914ccf929a30f7c43506f9082005d080995bb536fc1
+  metadata.gz: b4ea432b818502f65c048a0911aef575b42ed17d2cff7e42f97382f5b3f6ce77e8cf52964f9ca43eb85b467c4f3a67bcc957a14d51b82b5fe37ff120524f03a9
+  data.tar.gz: 9e5dbff959cc60f44ebadf445cb3257fea82403c2db4f053a7f241deb0f7a290cc5b5f02e3810e8ca48ba5ea16893765cfbe8e73c8b7f73b12c7462004b56ef7

data/lib/structured.rb

@@ -561,7 +561,7 @@ module Structured
     #   returned, and processing should also stop.
     #
     def process_nil_val(val, data)
-      return [ val, false ] if val
+      return [ val, false ] unless val.nil?
       unless data[:optional]
         input_err("Required element is missing (or was deleted by a preproc)")
       end
@@ -779,7 +779,7 @@ module Structured
     # @param indent The indent string before new lines.
     # @param sp Spacing after the colon, if any.
     def template_type(type, indent, sp = ' ')
-      res = ''
+      res = String.new('')
       case type
       when :boolean
         res << " true/false\n"

data/lib/texttools.rb

@@ -11,17 +11,41 @@ module TextTools
   def line_break(
     text, len: 80, prefix: '', first_prefix: nil, preserve_lines: false
   )
-    res = ''
+    res = String.new('')
+
+    #
+    # Remove single paragraph breaks (unless preserve_lines is on). After this,
+    # every paragraph break should be preserved. Also remove trailing
+    # whitespace, which causes problems.
+    #
     text = text.split(/\s*\n\s*\n\s*/).map { |para|
       preserve_lines ? para : para.gsub(/\s*\n\s*/, " ")
-    }.join("\n\n")
+    }.join("\n\n").rstrip
 
     cur_prefix = first_prefix || prefix
+
+    # Process each individual line separately.
+    while (line_match = /\s*\n\s*/.match(text))
+      res << one_line_break(line_match.pre_match, len, cur_prefix, prefix)
+      res << line_match[0].gsub(/[^\n]/, '')
+      cur_prefix = prefix
+      text = line_match.post_match
+    end
+    res << one_line_break(text, len, cur_prefix, prefix)
+    return res
+
+  end
+
+  #
+  # Line break a text that is guaranteed not to have any line breaks within it.
+  #
+  def one_line_break(text, len, first_prefix, prefix)
+    res = String.new('')
+    cur_prefix = first_prefix
     strlen = len - cur_prefix.length
     while text.length > strlen
-      if (m = /\A([^\n]{0,#{strlen}})(\s+)/.match(text))
-        res << cur_prefix + m[1]
-        res << (m[2].include?("\n") ? m[2].gsub(/[^\n]/, '') : "\n")
+      if (m = /\A(.{0,#{strlen}})(\s+)/.match(text))
+        res << cur_prefix + m[1] + "\n"
         text = m.post_match
       else
         res << cur_prefix + text[0, strlen] + "\n"
@@ -31,8 +55,6 @@ module TextTools
       strlen = len - cur_prefix.length
     end
 
-    # If there's no text left, then there were trailing spaces and the final \n
-    # is superfluous.
     if text.length > 0
       res << cur_prefix + text
     else

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cli-dispatcher
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Charles Duan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-22 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   Library for creating command-line programs that accept commands. Also
@@ -29,7 +28,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/charlesduan/cli-dispatcher
   documentation_uri: https://rubydoc.info/gems/cli-dispatcher/
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -44,8 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Command-line command dispatcher
 test_files: []