col 1.0.1 → 1.0.2

data/History.txt

@@ -1,4 +1,8 @@
-=== 1.0.1 / 2012-01-01
+=== 1.0.2 / 2012-01-02
+
+* Code is now compatible with Ruby 1.8.6.
+
+=== 1.0.1 / 2012-01-02
 
 * 1 minor enhancement:
 

data/col.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "term-ansicolor", ">= 1.0"
 
-  #s.add_development_dependency "T"
   s.add_development_dependency "bundler"
+  s.add_development_dependency "whitestone"
 
-  s.required_ruby_version = '>= 1.8.6'    # Not sure about this.
+  s.required_ruby_version = '>= 1.8.6'    # Tested.
 end

data/doc/col.markdown

@@ -324,8 +324,11 @@ environment has been tested!
 
 ### History
 
-January 1 2012: Version 1.0.1 released (minor bug fix for 1.9.3)
-July 25 2010: Version 1.0 released.
+* 2 JAN 2012: Version 1.0.2 released (1.8.6 compatibility)
+* 2 JAN 2012: Version 1.0.1 released (minor bug fix for 1.9.3)
+* 25 JUL 25 2010: Version 1.0 released.
+
+See History.txt for more details.
 
 ### Credits
 

data/lib/col.rb

@@ -5,7 +5,6 @@ require 'col/version'
 
 class Col
 
-
   # args: array of strings (to_s is called on each)
   def initialize(*args)
     @strings = args.map { |a| a.to_s }
@@ -34,14 +33,14 @@ class Col
   end
 
   def Col.inline(*args)
-    unless args.size.even?
+    unless args.size % 2 == 0    # even? breaks 1.8.6
       raise Col::Error, "Col.inline requires an even number of arguments"
     end
-    String.new.tap { |result|
-      args.each_slice(2) do |string, format|
-        result << Col(string.to_s).fmt(format)
-      end
-    }
+    result = String.new
+    Col::Utils.each_pair(args) do |string, format|
+      result << Col(string.to_s).fmt(format)
+    end
+    result
   end
 
   # e.g.
@@ -98,12 +97,12 @@ class Col::Formatter
     unless @strings.size == @format_spec.size
       raise Col::Error, "mismatching strings and specs"
     end
-    String.new.tap { |str|
-      @strings.zip(@format_spec).each do |string, spec|
-        d = decorated_string(string, spec)
-        str << d
-      end
-    }
+    result = String.new
+    @strings.zip(@format_spec).each do |string, spec|
+      d = decorated_string(string, spec)
+      result << d
+    end
+    result
   end
 
   # e.g.
@@ -347,3 +346,23 @@ class Col::DB
   end
 
 end  # Col::DB
+
+# --------------------------------------------------------------------------- #
+
+# Utility methods to enable Col to work on 1.8.6.
+class Col::Utils
+  if RUBY_VERSION < "1.8.7"
+    def self.each_pair(array)
+      a = array.dup
+      loop do
+        pair = a.slice!(0,2)
+        break if pair.empty?
+        yield pair
+      end
+    end
+  else
+    def self.each_pair(array, &block)
+      array.each_slice(2, &block)
+    end
+  end
+end

data/lib/col/version.rb

@@ -1,3 +1,3 @@
 class Col
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/col.rb

@@ -62,7 +62,6 @@ D "General formatting (multiple strings)" do
 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
@@ -171,7 +170,7 @@ D "Col.inline" do
     E(Col::Error) do
       Col.inline( "foo", :blue, "bar", :red, "quux" )
     end
-    Mt Attest.exception.message, /even/i
+    Mt Whitestone.exception.message, /even/i
   end
 end
 
@@ -226,16 +225,16 @@ 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
+    Mt Whitestone.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
+    Mt Whitestone.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
+    Mt Whitestone.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
+    Mt Whitestone.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
+      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"
+      T Col::DB.method?("yellow")
+      T Col::DB.method?("blink")
+      T Col::DB.method?("on_cyan")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: col
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-01 00:00:00.000000000 Z
+date: 2012-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2155928480 !ruby/object:Gem::Requirement
+  requirement: &2157711260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155928480
+  version_requirements: *2157711260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155927760 !ruby/object:Gem::Requirement
+  requirement: &2157710800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155927760
+  version_requirements: *2157710800
+- !ruby/object:Gem::Dependency
+  name: whitestone
+  requirement: &2157710240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157710240
 description: ! "    Console color formatting library with abbreviations (e.g. 'rb'
   for\n    red and bold), and the ability to format several strings easily.\n    No
   methods are added to core classes.\n"
@@ -78,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: High-level console color formatting