col 1.0.0 → 1.0.1a

data/test/col.rb

@@ -1,229 +1,241 @@
-
-# This enhancement to String is needed for testing this file.
-class String
-  require 'term/ansicolor'
-  include Term::ANSIColor
-end
-
-D "Simple formatting (single string)" do
-  D "yellow" do
-    Eq Col["string"].y.to_s,   "string".yellow
-    Eq Col["string"].fmt("y"), "string".yellow
-    Eq Col["string"].fmt(:y),  "string".yellow
-  end
-  D "red" do
-    Eq Col["string"].r.to_s,   "string".red
-    Eq Col["string"].fmt(:r),  "string".red
-    Eq Col["string"].fmt("r"), "string".red
-  end
-  D "red bold" do
-    Eq Col["string"].rb.to_s,  "string".red.bold
-    Eq Col["string"].fmt(:rb), "string".red.bold
-    Eq (Col["string"].fmt [:red, :bold]), "string".red.bold
-  end
-  D "bold" do
-    Eq Col["string"]._b.to_s,  "string".bold
-    Eq Col["string"].fmt(:_b), "string".bold
-  end
-  D "black" do
-    Eq Col["string"].B.to_s,   "string".black
-    Eq Col["string"].fmt(:B),  "string".black
-  end
-end
-
-D "General formatting (multiple strings)" do
-  D "example 1" do
-    str1 = Col("one", "two", "three", "four").fmt(:rb, :y, :cb, :m)
-    str2 = Col("one", "two", "three", "four").fmt "rb,y,cb,m"
-    expected = "one".red.bold + "two".yellow + "three".cyan.bold + "four".magenta
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "example 2" do
-    str1 = Col("one", "two", "three").fmt(:Bb, :_b, :w_)  # the _ in w_ is optional
-    str2 = Col("one", "two", "three").fmt "Bb,_b,w_"
-    expected = "one".black.bold + "two".bold + "three".white
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "example 3" do
-    str1 = Col["one","two"].fmt "y,r"
-    expected = "one".yellow + "two".red
-    Eq str1, expected
-  end
-  D "including strings where no formatting is done" do
-    name, age = "Peter", 14
-    str1 = Col["Name: ", name, "   Age: ", age].fmt(:_, :rb, :_, :gb)
-    str2 = Col["Name: ", name, "   Age: ", age].fmt "_,rb,_,gb"
-    expected = "Name: " + name.red.bold + "   Age: " + age.to_s.green.bold
-    Eq str1, expected
-    Eq str2, expected
-  end
-end
-
-D "More complex formatting (on_red, strikethrough, italic, dark, negative, ...)" do
-  D "all styles (part 1)" do
-    str1 = Col["one","two","three","four","five"].fmt(:_b, :_d, :_i, :_u, :_U)
-    str2 = Col["one","two","three","four","five"].fmt "_b,_d,_i,_u,_U"
-    expected = "one".bold + "two".dark + "three".italic + "four".underline \
-             + "five".underscore
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "all styles (part 2)" do
-    str1 = Col["one","two","three","four","five"].fmt(:_k, :_r, :_n, :_c, :_s)
-    str2 = Col["one","two","three","four","five"].fmt "_k,_r,_n,_c,_s"
-    expected = "one".blink + "two".rapid_blink + "three".negative \
-             + "four".concealed + "five".strikethrough
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "all backgrounds (part 1)" do
-    str1 = Col["one","two","three","four"].fmt(:__oB, :__or, :__og, :__oy)
-    str2 = Col["one","two","three","four"].fmt "__oB,__or,__og,__oy"
-    expected = "one".on_black + "two".on_red + "three".on_green + "four".on_yellow
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "all backgrounds (part 2)" do
-    str1 = Col["one","two","three","four"].fmt(:__ob, :__om, :__oc, :__ow)
-    str2 = Col["one","two","three","four"].fmt "__ob,__om,__oc,__ow"
-    expected = "one".on_blue + "two".on_magenta + "three".on_cyan + "four".on_white
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "mixed 1" do
-    str1 = Col["one","two","three","four"].fmt(:r_ow, :bnoy, :_d, :gs)
-    str2 = Col["one","two","three","four"].fmt "r_ow,bnoy,_d,gs"
-    expected = "one".red.on_white + "two".blue.negative.on_yellow \
-             + "three".dark + "four".green.strikethrough
-    Eq str1, expected
-    Eq str2, expected
-  end
-  D "mixed 2" do
-    str1 = Col["one","two","three","four"].fmt(:cUob, :wkoB, :m_or, :yc)
-    str2 = Col["one","two","three","four"].fmt "cUob,wkoB,m_or,yc"
-    expected = "one".cyan.underscore.on_blue + "two".white.blink.on_black \
-             + "three".magenta.on_red + "four".yellow.concealed
-    Eq str1, expected
-    Eq str2, expected
-  end
-end  # "More complex formatting..."
-
-D ":_ (do-nothing) format specifiers" do
-  Eq Col["..."].fmt(:_), "..."
-  Eq Col["..."].fmt('_'), "..."
-  Eq Col["abc","123"].fmt(:_, :_), "abc123"
-  Eq Col["abc","123"].fmt('_,_'), "abc123"
-  D "totally empty arguments" do
-    Eq Col[].fmt(), ""
-  end
-end
-
-D "Esoteric options" do
-  D "italic,strikethrough,blink" do
-    D "separate" do
-      str1 = Col["one","two","three"].fmt(:italic, :strikethrough, :blink)
-      expected = "one".italic + "two".strikethrough + "three".blink
-      Eq str1, expected
-    end
-    D "combined" do
-      # one string, several symbols
-      str1 = Col["string"].fmt([:italic, :strikethrough, :blink])
-      expected = "string".italic.strikethrough.blink
-      Eq str1, expected
-    end
-  end
-end
-
-D "Verbose specification" do
-  D "example 1" do
-    str1 = Col["one","two"].fmt( [:bold, :yellow, :on_red], [:cyan, :dark] )
-    expected = "one".bold.yellow.on_red + "two".cyan.dark
-    Eq str1, expected
-  end
-  D "example 2" do
-    str1 = Col["one","two"].fmt([:negative, :dark], [:underscore, :rapid_blink])
-    expected = "one".negative.dark + "two".underscore.rapid_blink
-  end
-end
-
-D "Col.inline" do
-  D "with correct # arguments" do
-    str1 = Col.inline(
-      "foo", :blue,
-      "bar", :rb,
-      12345, [:white, :negative],
-      "qux", :_
-    )
-    expected = "foo".blue + "bar".red.bold + "12345".white.negative + "qux"
-    Eq str1, expected
-  end
-  D "with incorrect # arguments" do
-    E(Col::Error) do
-      Col.inline( "foo", :blue, "bar", :red, "quux" )
-    end
-    Mt Attest.exception.message, /even/i
-  end
-end
-
-D "Col.uncolored(string)" do
-  str = Col["foo"].yellow.bold.on_red.to_s
-  Eq Col.uncolored(str), "foo"
-  Eq Col.plain(str), "foo"
-  str = Col["foo","bar"].fmt('rboc,_i')
-  Eq Col.uncolored(str), "foobar"
-  Eq Col.plain(str), "foobar"
-  str = "\e[1;4;37;41mfoo\e[0m"
-  Eq Col.uncolored(str), "foo"
-  Eq Col.plain(str), "foo"
-  str = "foo"
-  Eq Col.uncolored(str), "foo"
-  Eq Col.plain(str), "foo"
-end
-
-D "Object properties" do
-  D "Col[...].green.on_white is still a Col object" do
-    c = Col["..."].green
-    Ko c, Col
-    c = Col["..."].green.on_white
-    Ko c, Col
-  end
-  D "other methods, like Col[...].rb, produce a String object" do
-    str = Col["foo"].yb
-    Ko str, String
-    str = Col["foo"].fmt [:yellow, :italic, :strikethrough, :on_green]
-    Ko str, String
-    str = Col["one","two"].fmt :g_ow, :yb
-    Ko str, String
-  end
-  D "a Col object is printable (implements to_s)" do
-    c = Col["one","two","three"]
-    Eq c.to_s, "onetwothree"
-    c = Col["..."].green.on_white
-    Eq c.to_s, "...".green.on_white
-  end
-  D "the string returned after formatting has nothing mixed in" do
-    # Whilesoever Term::ANSIColor is mixed in to String, as it is at the top of
-    # this file, I can't think of a way to test this property :(
-    # I could change all the "foo".red.bold to bold(foo("red")) but that's a
-    # _lot_ of work and will make this file quite ugly.
-  end
-end
-
-D "Erroneous specifications" do
-  D "incorrect number of arguments" do
-    E(Col::Error) { Col["one","two"].fmt :b }
-    Mt Attest.exception.message, /incorrect number of arguments/i
-    E(Col::Error) { Col["one","two"].fmt(:b, :r, :g) }
-    Mt Attest.exception.message, /incorrect number of arguments/i
-    E(Col::Error) { Col["one","two"].fmt(:b, :r, :g, :cbow) }
-    Mt Attest.exception.message, /incorrect number of arguments/i
-  end
-
-  D "invalid code" do
-    E(Col::Error) { Col["one","two"].fmt(:T, :r) }
-    E(Col::Error) { Col["one","two"].fmt "T,r" }
-    Mt Attest.exception.message, /invalid color code/i
-  end
-end
+
+# This enhancement to String is needed for testing this file.
+class String
+  require 'term/ansicolor'
+  include Term::ANSIColor
+end
+
+D "Simple formatting (single string)" do
+  D "yellow" do
+    Eq Col["string"].y.to_s,   "string".yellow
+    Eq Col["string"].fmt("y"), "string".yellow
+    Eq Col["string"].fmt(:y),  "string".yellow
+  end
+  D "red" do
+    Eq Col["string"].r.to_s,   "string".red
+    Eq Col["string"].fmt(:r),  "string".red
+    Eq Col["string"].fmt("r"), "string".red
+  end
+  D "red bold" do
+    Eq Col["string"].rb.to_s,  "string".red.bold
+    Eq Col["string"].fmt(:rb), "string".red.bold
+    Eq (Col["string"].fmt [:red, :bold]), "string".red.bold
+  end
+  D "bold" do
+    Eq Col["string"]._b.to_s,  "string".bold
+    Eq Col["string"].fmt(:_b), "string".bold
+  end
+  D "black" do
+    Eq Col["string"].B.to_s,   "string".black
+    Eq Col["string"].fmt(:B),  "string".black
+  end
+end
+
+D "General formatting (multiple strings)" do
+  D "example 1" do
+    str1 = Col("one", "two", "three", "four").fmt(:rb, :y, :cb, :m)
+    str2 = Col("one", "two", "three", "four").fmt "rb,y,cb,m"
+    expected = "one".red.bold + "two".yellow + "three".cyan.bold + "four".magenta
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "example 2" do
+    str1 = Col("one", "two", "three").fmt(:Bb, :_b, :w_)  # the _ in w_ is optional
+    str2 = Col("one", "two", "three").fmt "Bb,_b,w_"
+    expected = "one".black.bold + "two".bold + "three".white
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "example 3" do
+    str1 = Col["one","two"].fmt "y,r"
+    expected = "one".yellow + "two".red
+    Eq str1, expected
+  end
+  D "including strings where no formatting is done" do
+    name, age = "Peter", 14
+    str1 = Col["Name: ", name, "   Age: ", age].fmt(:_, :rb, :_, :gb)
+    str2 = Col["Name: ", name, "   Age: ", age].fmt "_,rb,_,gb"
+    expected = "Name: " + name.red.bold + "   Age: " + age.to_s.green.bold
+    Eq str1, expected
+    Eq str2, expected
+  end
+end
+
+D "Method names, like Col('foo').red.bold" do
+  Eq Col::VERSION, "1.0.1a"
+  Ko Col('foo').red, Col
+  Ko Col('foo').red.bold, Col
+  Eq Col('foo').red.bold.to_str, "foo".red.bold
+  Eq Col['foo'].red.bold.to_str, "foo".red.bold
+end
+
+D "More complex formatting (on_red, strikethrough, italic, dark, negative, ...)" do
+  D "all styles (part 1)" do
+    str1 = Col["one","two","three","four","five"].fmt(:_b, :_d, :_i, :_u, :_U)
+    str2 = Col["one","two","three","four","five"].fmt "_b,_d,_i,_u,_U"
+    expected = "one".bold + "two".dark + "three".italic + "four".underline \
+             + "five".underscore
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "all styles (part 2)" do
+    str1 = Col["one","two","three","four","five"].fmt(:_k, :_r, :_n, :_c, :_s)
+    str2 = Col["one","two","three","four","five"].fmt "_k,_r,_n,_c,_s"
+    expected = "one".blink + "two".rapid_blink + "three".negative \
+             + "four".concealed + "five".strikethrough
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "all backgrounds (part 1)" do
+    str1 = Col["one","two","three","four"].fmt(:__oB, :__or, :__og, :__oy)
+    str2 = Col["one","two","three","four"].fmt "__oB,__or,__og,__oy"
+    expected = "one".on_black + "two".on_red + "three".on_green + "four".on_yellow
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "all backgrounds (part 2)" do
+    str1 = Col["one","two","three","four"].fmt(:__ob, :__om, :__oc, :__ow)
+    str2 = Col["one","two","three","four"].fmt "__ob,__om,__oc,__ow"
+    expected = "one".on_blue + "two".on_magenta + "three".on_cyan + "four".on_white
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "mixed 1" do
+    str1 = Col["one","two","three","four"].fmt(:r_ow, :bnoy, :_d, :gs)
+    str2 = Col["one","two","three","four"].fmt "r_ow,bnoy,_d,gs"
+    expected = "one".red.on_white + "two".blue.negative.on_yellow \
+             + "three".dark + "four".green.strikethrough
+    Eq str1, expected
+    Eq str2, expected
+  end
+  D "mixed 2" do
+    str1 = Col["one","two","three","four"].fmt(:cUob, :wkoB, :m_or, :yc)
+    str2 = Col["one","two","three","four"].fmt "cUob,wkoB,m_or,yc"
+    expected = "one".cyan.underscore.on_blue + "two".white.blink.on_black \
+             + "three".magenta.on_red + "four".yellow.concealed
+    Eq str1, expected
+    Eq str2, expected
+  end
+end  # "More complex formatting..."
+
+D ":_ (do-nothing) format specifiers" do
+  Eq Col["..."].fmt(:_), "..."
+  Eq Col["..."].fmt('_'), "..."
+  Eq Col["abc","123"].fmt(:_, :_), "abc123"
+  Eq Col["abc","123"].fmt('_,_'), "abc123"
+  D "totally empty arguments" do
+    Eq Col[].fmt(), ""
+  end
+end
+
+D "Esoteric options" do
+  D "italic,strikethrough,blink" do
+    D "separate" do
+      str1 = Col["one","two","three"].fmt(:italic, :strikethrough, :blink)
+      expected = "one".italic + "two".strikethrough + "three".blink
+      Eq str1, expected
+    end
+    D "combined" do
+      # one string, several symbols
+      str1 = Col["string"].fmt([:italic, :strikethrough, :blink])
+      expected = "string".italic.strikethrough.blink
+      Eq str1, expected
+    end
+  end
+end
+
+D "Verbose specification" do
+  D "example 1" do
+    str1 = Col["one","two"].fmt( [:bold, :yellow, :on_red], [:cyan, :dark] )
+    expected = "one".bold.yellow.on_red + "two".cyan.dark
+    Eq str1, expected
+  end
+  D "example 2" do
+    str1 = Col["one","two"].fmt([:negative, :dark], [:underscore, :rapid_blink])
+    expected = "one".negative.dark + "two".underscore.rapid_blink
+  end
+end
+
+D "Col.inline" do
+  D "with correct # arguments" do
+    str1 = Col.inline(
+      "foo", :blue,
+      "bar", :rb,
+      12345, [:white, :negative],
+      "qux", :_
+    )
+    expected = "foo".blue + "bar".red.bold + "12345".white.negative + "qux"
+    Eq str1, expected
+  end
+  D "with incorrect # arguments" do
+    E(Col::Error) do
+      Col.inline( "foo", :blue, "bar", :red, "quux" )
+    end
+    Mt Attest.exception.message, /even/i
+  end
+end
+
+D "Col.uncolored(string)" do
+  str = Col["foo"].yellow.bold.on_red.to_s
+  Eq Col.uncolored(str), "foo"
+  Eq Col.plain(str), "foo"
+  str = Col["foo","bar"].fmt('rboc,_i')
+  Eq Col.uncolored(str), "foobar"
+  Eq Col.plain(str), "foobar"
+  str = "\e[1;4;37;41mfoo\e[0m"
+  Eq Col.uncolored(str), "foo"
+  Eq Col.plain(str), "foo"
+  str = "foo"
+  Eq Col.uncolored(str), "foo"
+  Eq Col.plain(str), "foo"
+end
+
+D "Object properties" do
+  D "Col[...] and Col(...) produce a Col object" do
+    Ko Col['...'], Col
+    Ko Col('...'), Col
+  end
+  D "Col[...].green.on_white is still a Col object" do
+    c = Col["..."].green
+    Ko c, Col
+    c = Col["..."].green.on_white
+    Ko c, Col
+  end
+  D "other methods, like Col[...].rb, produce a String object" do
+    str = Col["foo"].yb
+    Ko str, String
+    str = Col["foo"].fmt [:yellow, :italic, :strikethrough, :on_green]
+    Ko str, String
+    str = Col["one","two"].fmt :g_ow, :yb
+    Ko str, String
+  end
+  D "a Col object is printable (implements to_s)" do
+    c = Col["one","two","three"]
+    Eq c.to_s, "onetwothree"
+    c = Col["..."].green.on_white
+    Eq c.to_s, "...".green.on_white
+  end
+  D "the string returned after formatting has nothing mixed in" do
+    # Whilesoever Term::ANSIColor is mixed in to String, as it is at the top of
+    # this file, I can't think of a way to test this property :(
+    # I could change all the "foo".red.bold to bold(foo("red")) but that's a
+    # _lot_ of work and will make this file quite ugly.
+  end
+end
+
+D "Erroneous specifications" do
+  D "incorrect number of arguments" do
+    E(Col::Error) { Col["one","two"].fmt :b }
+    Mt Attest.exception.message, /incorrect number of arguments/i
+    E(Col::Error) { Col["one","two"].fmt(:b, :r, :g) }
+    Mt Attest.exception.message, /incorrect number of arguments/i
+    E(Col::Error) { Col["one","two"].fmt(:b, :r, :g, :cbow) }
+    Mt Attest.exception.message, /incorrect number of arguments/i
+  end
+
+  D "invalid code" do
+    E(Col::Error) { Col["one","two"].fmt(:T, :r) }
+    E(Col::Error) { Col["one","two"].fmt "T,r" }
+    Mt Attest.exception.message, /invalid color code/i
+  end
+end

data/test/col_db.rb

@@ -1,14 +1,14 @@
-D "Col::DB" do
-  D "method?" do
-    D "given symbol" do
-      T Col::DB.method? :yellow
-      T Col::DB.method? :blink
-      T Col::DB.method? :on_cyan
-    end
-    D "given string" do
-      T Col::DB.method? "yellow"
-      T Col::DB.method? "blink"
-      T Col::DB.method? "on_cyan"
-    end
-  end
-end
+D "Col::DB" do
+  D "method?" do
+    D "given symbol" do
+      T Col::DB.method? :yellow
+      T Col::DB.method? :blink
+      T Col::DB.method? :on_cyan
+    end
+    D "given string" do
+      T Col::DB.method? "yellow"
+      T Col::DB.method? "blink"
+      T Col::DB.method? "on_cyan"
+    end
+  end
+end

metadata

@@ -1,90 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: col
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.0.1a
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Gavin Sinclair
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-07-25 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: term-ansicolor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164543120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-description: "    Console color formatting library with abbreviations (e.g. 'rb' for\n    red and bold), and the ability to format several strings easily.\n"
+  prerelease: false
+  version_requirements: *2164543120
+description: ! "    Console color formatting library with abbreviations (e.g. 'rb'
+  for\n    red and bold), and the ability to format several strings easily.\n"
 email: gsinclair@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/col.rb
 - LICENCE
 - README
+- test/_setup.rb
 - test/col.rb
 - test/col_db.rb
-- test/_setup.rb
-has_rdoc: true
 homepage: http://gsinclair.github.com/col.html
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: high-level console color formatting
-test_files: 
+test_files:
+- test/_setup.rb
 - test/col.rb
 - test/col_db.rb
-- test/_setup.rb
+has_rdoc: true