everyday-cli-utils 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b519a76138a2e3d8d4906235acf55c0579a7f11f
-  data.tar.gz: c2d4e843d1be0a4c19c4b2b53b2e2b2da305724c
+  metadata.gz: 8afc8c7cdc6d4d3adffcc15723afa531d4961533
+  data.tar.gz: de9412ebd7b3965986e8fb66821ac94b3057a429
 SHA512:
-  metadata.gz: ca5221853db3b28969056198aaae0a3ba235b561c813f023e17a61a6311f63ebd04ba2327722ef8b66aaea06bbedcf8816b5c7c008395317dbab2b593c44101a
-  data.tar.gz: 76b6953166fc4afdd406905d56978f5a7776da41a71bd87e796eef676aeb583e992d72364be3495c3170668fe0ed72d8fabd4e7ac7f6a0180087d53fd3efab57
+  metadata.gz: 2ba0851f31eee49fa57b74dc5b7e5999a34ebfccd56ca9e8b3446452d8f93ae5ae8dbd1f4e2d5a4f42186df2ce44050f30da8d5d93cffb6f43e1feadd8cd6d8e
+  data.tar.gz: 656476dd69d7b17479d4aba60904a6d3685fac59461f73b9759a4929643e11fac61785a57f85c258b17a47950653b55953a0b2d775b90f6ace73519ba29d66c8

data/lib/everyday-cli-utils/format.rb

@@ -19,4 +19,8 @@ class String
     colors = 'black|red|green|yellow|blue|purple|cyan|white|none'
     (!(name =~ /format(_bold)?(_underline)?(?:_fg_(#{colors}))?(?:_bg_(#{colors}))?/).nil?) || old_respond_to?(method)
   end
+
+  def format_all
+    EverydayCliUtils::Format::format_all(self)
+  end
 end

data/lib/everyday-cli-utils/safe/format.rb

@@ -103,5 +103,19 @@ module EverydayCliUtils
     def self::boldunderline(text, fgcolor = nil, bgcolor = nil)
       self::format(text, self::build_string(true, true, fgcolor, bgcolor))
     end
+
+    def self::format_all(text)
+      colors    = 'bk|rd|gr|yw|bl|pu|cy|wh|no'
+      color_map = { 'bk' => :black, 'rd' => :red, 'gr' => :green, 'yw' => :yellow, 'bl' => :blue, 'pu' => :purple, 'cy' => :cyan, 'wh' => :white, 'no' => :none }
+      regex     = /\{(.+?)\}\((bd)?(ul)?(?:f(#{colors}))?(?:b(#{colors}))?\)/
+      text.gsub(regex) { |m|
+        txt       = $1
+        bold      = !$2.nil?
+        underline = !$3.nil?
+        fg        = $4.nil? ? nil : color_map[$4]
+        bg        = $5.nil? ? nil : color_map[$5]
+        format(txt, build_string(bold, underline, fg, bg))
+      }
+    end
   end
 end

data/lib/everyday-cli-utils/version.rb

@@ -1,3 +1,3 @@
 module EverydayCliUtils
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/everyday-cli-utils/format_spec.rb

@@ -61,4 +61,10 @@ describe EverydayCliUtils::Format do
     str.respond_to?(:hi).should be_false
     expect { str.hi }.to raise_error(NameError)
   end
+
+  it 'allows shorthand for formatting in-string' do
+    str      = 'abc {def}(bdulfywbgr) ghi {jkl}(ulfyw) mno'
+    expected = "abc #{'def'.format_bold_underline_fg_yellow_bg_green} ghi #{'jkl'.format_underline_fg_yellow} mno"
+    str.format_all.should eq expected
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everyday-cli-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Eric Henderson