ppl 1.14.1 → 1.15.0

data/lib/ppl/format/address_book/email_addresses.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::EmailAddresses < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:contact_id, :email_addresses])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :email_addresses], colors)
   end
 
   def process(address_book)
@@ -17,7 +17,7 @@ class Ppl::Format::AddressBook::EmailAddresses < Ppl::Format::AddressBook
 
   def add_row(contact)
     @table.add_row({
-      :contact_id      => sprintf("%s:", contact.id),
+      :id              => sprintf("%s:", contact.id),
       :email_addresses => contact.email_addresses.join(", "),
     })
   end

data/lib/ppl/format/address_book/names.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::Names < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :name])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :name], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/nicknames.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::Nicknames < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :nicknames])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :nicknames], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/one_line.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::OneLine < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :name, :email])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :name, :email], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/organizations.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::Organizations < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :organizations])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :organizations], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/phone_numbers.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::PhoneNumbers < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :phone_numbers])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :phone_numbers], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/postal_addresses.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::PostalAddresses < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :postal_address])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :postal_address], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/address_book/urls.rb

@@ -3,8 +3,8 @@ class Ppl::Format::AddressBook::Urls < Ppl::Format::AddressBook
 
   attr_writer :table
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :urls])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :urls], colors)
   end
 
   def process(address_book)

data/lib/ppl/format/contact/age.rb

@@ -1,8 +1,20 @@
 
 class Ppl::Format::Contact::Age < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
-    contact.age(Date.today).to_s
+    age = contact.age(Date.today).to_s
+    if @colors["age"]
+      age = @color_adapter.colorize(age, @colors["age"])
+    end
+    age
   end
 
 end

data/lib/ppl/format/contact/birthday.rb

@@ -1,11 +1,22 @@
 
 class Ppl::Format::Contact::Birthday < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
     output = ""
     if !contact.birthday.nil?
       output += contact.birthday.strftime("%Y-%m-%d")
     end
+    if @colors["birthday"]
+      output = @color_adapter.colorize(output, @colors["birthday"])
+    end
     return output
   end
 

data/lib/ppl/format/contact/email_addresses.rb

@@ -1,12 +1,30 @@
 
 class Ppl::Format::Contact::EmailAddresses < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
     lines = []
     contact.email_addresses.each do |email_address|
       lines.push email_address
     end
-    lines.join("\n")
+    colorize_output(lines.join("\n"))
+  end
+
+  private
+
+  def colorize_output(string)
+    if @colors["email_addresses"]
+      @color_adapter.colorize(string, @colors["email_addresses"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/contact/name.rb

@@ -1,14 +1,30 @@
 
 class Ppl::Format::Contact::Name < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
     output = ""
-
     if !contact.name.nil?
       output += contact.name
     end
+    colorize_output(output)
+  end
+
+  private
 
-    return output
+  def colorize_output(string)
+    if @colors["name"]
+      @color_adapter.colorize(string, @colors["name"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/contact/nicknames.rb

@@ -1,8 +1,26 @@
 
 class Ppl::Format::Contact::Nicknames < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
-    contact.nicknames.join("\n")
+    colorize_output(contact.nicknames.join("\n"))
+  end
+
+  private
+
+  def colorize_output(string)
+    if @colors["nicknames"]
+      @color_adapter.colorize(string, @colors["nicknames"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/contact/organization.rb

@@ -1,8 +1,26 @@
 
 class Ppl::Format::Contact::Organization < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
-    contact.organizations.join("\n")
+    colorize_output(contact.organizations.join("\n"))
+  end
+
+  private
+
+  def colorize_output(string)
+    if @colors["organizations"]
+      @color_adapter.colorize(string, @colors["organizations"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/contact/phone_number.rb

@@ -1,8 +1,26 @@
 
 class Ppl::Format::Contact::PhoneNumber < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
-    contact.phone_numbers.join("\n")
+    colorize_output(contact.phone_numbers.join("\n"))
+  end
+
+  private
+
+  def colorize_output(string)
+    if @colors["phone_numbers"]
+      @color_adapter.colorize(string, @colors["phone_numbers"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/contact/urls.rb

@@ -1,8 +1,26 @@
 
 class Ppl::Format::Contact::Urls < Ppl::Format::Contact
 
+  attr_writer :color_adapter
+  attr_writer :colors
+
+  def initialize(colors={})
+    @colors = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
+  end
+
   def process(contact)
-    contact.urls.join("\n")
+    colorize_output(contact.urls.join("\n"))
+  end
+
+  private
+
+  def colorize_output(string)
+    if @colors["urls"]
+      @color_adapter.colorize(string, @colors["urls"])
+    else
+      string
+    end
   end
 
 end

data/lib/ppl/format/table.rb

@@ -1,4 +1,6 @@
 
+require "colored"
+
 class Ppl::Format::Table
 
   SEPARATOR_SPACES = 0
@@ -7,12 +9,14 @@ class Ppl::Format::Table
   attr_accessor :columns
   attr_accessor :rows
   attr_accessor :separator
+  attr_accessor :colors
 
-  def initialize(columns=[])
+  def initialize(columns=[], colors={})
     @columns   = columns
     @rows      = []
     @separator = SEPARATOR_SPACES
-
+    @colors    = colors
+    @color_adapter = Ppl::Adapter::Color::Colored.new
     @column_widths = {}
     @columns.each { |c| @column_widths[c] = 0 }
   end
@@ -44,13 +48,18 @@ class Ppl::Format::Table
   end
 
   def format_cell(row, column)
-    width  = @column_widths[column]
+    width = @column_widths[column]
+    string = row[column].to_s
     if @separator == SEPARATOR_SPACES
-      string = sprintf("%-#{width}s  ", row[column])
+      string = sprintf("%-#{width}s  ", string)
     else
-      string = sprintf("%s\t", row[column])
+      string = sprintf("%s\t", string)
     end
-    return string
+    colorize_string(string, column)
+  end
+
+  def colorize_string(string, column)
+    @color_adapter.colorize(string, @colors[column.to_s])
   end
 
 end

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.14.1"
+  Version = "1.15.0"
 
   module Adapter
   end
@@ -24,6 +24,8 @@ module Ppl
 end
 
 
+require "ppl/adapter/color"
+require "ppl/adapter/color/colored"
 require "ppl/adapter/storage"
 require "ppl/adapter/storage/disk"
 require "ppl/adapter/storage/factory"

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.14.1"
-  spec.date        = "2013-02-17"
+  spec.version     = "1.15.0"
+  spec.date        = "2013-03-16"
 
   spec.required_ruby_version = ">= 1.9.3"
 
@@ -11,7 +11,9 @@ Gem::Specification.new do |spec|
   spec.description = "CLI Address Book"
   spec.license     = "GPL-2"
 
+  spec.add_dependency("colored", "1.2")
   spec.add_dependency("inifile", "2.0.2")
+  spec.add_dependency("morphine", "0.1.1")
   spec.add_dependency("rugged", "0.17.0.b6")
   spec.add_dependency("vpim", "0.695")
 

data/spec/ppl/adapter/color/colored_spec.rb

@@ -0,0 +1,24 @@
+
+describe Ppl::Adapter::Color::Colored do
+
+  before(:each) do
+    @adapter = Ppl::Adapter::Color::Colored.new
+  end
+
+  describe "#colorize" do
+
+    it "should colorize the string using the monkeypatched String method" do
+      string = "example"
+      string.should_receive(:red).and_return("red example")
+      @adapter.colorize(string, "red").should eq "red example"
+    end
+
+    it "should only attempt to colorize the string if the color exists" do
+      string = "example"
+      @adapter.colorize(string, "neon").should eq "example"
+    end
+
+  end
+
+end
+

data/spec/ppl/adapter/color_spec.rb

@@ -0,0 +1,15 @@
+
+describe Ppl::Adapter::Color do
+
+  before(:each) do
+    @adapter = Ppl::Adapter::Color.new
+  end
+
+  describe "#colorize" do
+    it "should raise not implemented error" do
+      expect{@adapter.colorize(nil, nil)}.to raise_error(NotImplementedError)
+    end
+  end
+
+end
+