ark-util 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fa97d8986f4485c90256d45558ce37493efcddf
-  data.tar.gz: fddb3c760b8a073842b41057c0f7fbbe9159b26e
+  metadata.gz: c8933c9374b25a7da33cb418a60e223c5a635236
+  data.tar.gz: d3cacf8addcb2e9ff29fe08b88167f106f13f602
 SHA512:
-  metadata.gz: 561ec48a301ce15e6ccd9f02e27b22143b8e59eb34b6920a2951847846deab947511c8c348cb154f9e667c7f30dcd7c5404aae5e44c6d5e4e786a787c13476e9
-  data.tar.gz: 8bcce1c7c3494f02d81c0c54d0751590e3da52e1597258b116aaea38a81a4fc31d84010556a3c1b02f593f0ca860d0fbfa5556d728b94ebe60e383889f59902b
+  metadata.gz: c1f5f4e7903c52e6fdd087ce4a75fa461b0cd5bf2a55b155e80c25c4389eccbcfdb40b1433438686d4ba5cffcfeb80e5b25c20cd6e388d62ddc7a828e2912c3f
+  data.tar.gz: 186c8fb12845ef661c68b2ec67b52fa243baa647d56a73114d260c021fdc171101741fab8fd2815734101efbcec40984daeef72b7ee8cff7bcb41d7cae285d9e

data/lib/ark/utility.rb

@@ -90,15 +90,42 @@ module Ark
 
   # Methods for manipulating text
   module Text
+    
+    def self.wrap_segments(segments, width: 78, indent: 0, indent_after: false)
+      segments = segments.flatten.map(&:to_s)
+      lines = []
+      line = ''
+      current_indent = indent
+      segments.each do |seg|
+        if lines.empty? && indent_after
+          current_indent = 0
+        else
+          current_indent = indent
+        end
+        if line.size + seg.size >= width
+          lines << line
+          line = (' ' * indent) + seg
+        elsif line.empty?
+          line = (' ' * current_indent) + seg
+        else
+          line << ' ' << seg
+        end
+      end
+      lines << line if line
+      return lines.join("\n")
+    end
+
     # Wrap a string to a given width, with an optional indent. Indented text
     # will fall within the specified width.
     # [+text+] The text to be wrapped
     # [+width+] The number of columns to wrap within
     # [+indent+] Indent each wrapped line of +text+ by this number of columns
-    def self.wrap(text, width: 78, indent: 0)
-      width -= indent
-      text = text.gsub(/\s+/, " ").gsub(/(.{1,#{width}})( |\Z)/, "\\1\n")
-      text.gsub(/^/, ' ' * indent)
+    def self.wrap(text, width: 78, indent: 0, indent_after: false)
+      if text.is_a?(Array)
+        text = text.flatten.join(' ')
+      end
+      text = text.split(' ')
+      self.wrap_segments(text, width: width, indent: indent, indent_after: indent_after)
     end
   end
 
@@ -127,9 +154,12 @@ module Ark
 
     # Wrap the current line to +width+, with an optional +indent+. After
     # wrapping, the current line will be the last line wrapped.
-    def wrap(width: 78, indent: 0)
-      text = @lines[@line].join(' ')
-      text = Text.wrap(text, width: width, indent: indent)
+    def wrap(width: 78, indent: 0, indent_after: false, segments: false)
+      if segments
+        text = Text.wrap_segments(@lines[@line], width: width, indent: indent, indent_after: indent_after)
+      else
+        text = Text.wrap(@lines[@line], width: width, indent: indent, indent_after: indent_after)
+      end
       @lines.delete_at(@line)
       @line -= 1
       text.split("\n").each {|line| self.next(line) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ark-util
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Macquarie Sharpless
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies: []
 description: Utility library for ark-* gems
 email: