ppl 1.14.1 → 1.15.0

data/Gemfile

@@ -1,7 +1,8 @@
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "inifile", "2.0.2"
+gem "morphine", "0.1.1"
 gem "rugged", "0.17.0.b6"
 gem "vpim", "12.1.12", :git => "git://github.com/sam-github/vpim.git"
 

data/Gemfile.lock

@@ -5,11 +5,12 @@ GIT
     vpim (12.1.12)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     diff-lcs (1.1.3)
     fakefs (0.4.1)
     inifile (2.0.2)
+    morphine (0.1.1)
     rake (10.0.1)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -27,6 +28,7 @@ PLATFORMS
 DEPENDENCIES
   fakefs
   inifile (= 2.0.2)
+  morphine (= 0.1.1)
   rake
   rspec
   rugged (= 0.17.0.b6)

data/lib/ppl/adapter/color/colored.rb

@@ -0,0 +1,15 @@
+
+require "colored"
+
+class Ppl::Adapter::Color::Colored
+
+  def colorize(string, color)
+    if Colored::COLORS[color].nil?
+      string
+    else
+      string.send(color)
+    end
+  end
+
+end
+

data/lib/ppl/adapter/color.rb

@@ -0,0 +1,9 @@
+
+class Ppl::Adapter::Color
+
+  def colorize(string, color)
+    raise NotImplementedError
+  end
+
+end
+

data/lib/ppl/application/bootstrap.rb

@@ -1,101 +1,349 @@
 
+require "morphine"
+
 class Ppl::Application::Bootstrap
 
-  def commands
-    commands = [
-      Ppl::Command::Add.new,
-      Ppl::Command::Age.new,
-      Ppl::Command::Bday.new,
-      Ppl::Command::Email.new,
-      Ppl::Command::Help.new,
-      Ppl::Command::Init.new,
-      Ppl::Command::Ls.new,
-      Ppl::Command::Mutt.new,
-      Ppl::Command::Mv.new,
-      Ppl::Command::Name.new,
-      Ppl::Command::Nick.new,
-      Ppl::Command::Org.new,
-      Ppl::Command::Phone.new,
-      Ppl::Command::Post.new,
-      Ppl::Command::Rm.new,
-      Ppl::Command::Shell.new,
-      Ppl::Command::Show.new,
-      Ppl::Command::Url.new,
-      Ppl::Command::Version.new,
-    ]
-    commands += git_commands
-    commands.each do |command|
-      command.storage = storage_adapter
-    end
-    return commands
-  end
-
-  def command_suite
+  include Morphine
+
+  register :command_add do
+    add = Ppl::Command::Add.new
+    add.storage = storage_adapter
+    add
+  end
+
+  register :command_age do
+    age = Ppl::Command::Age.new
+    age.storage = storage_adapter
+    age.list_format = format_address_book_ages
+    age.show_format = format_contact_age
+    age
+  end
+
+  register :command_bday do
+    bday = Ppl::Command::Bday.new
+    bday.storage = storage_adapter
+    bday.list_format = format_address_book_birthdays
+    bday.show_format = format_contact_birthday
+    bday
+  end
+
+  register :command_email do
+    email = Ppl::Command::Email.new
+    email.storage = storage_adapter
+    email.list_format = format_address_book_email_addresses
+    email.show_format = format_contact_email_addresses
+    email
+  end
+
+  register :command_help do
+    help = Ppl::Command::Help.new
+    help.storage = storage_adapter
+    help
+  end
+
+  register :command_init do
+    init = Ppl::Command::Init.new
+    init.storage = storage_adapter
+    init
+  end
+
+  register :command_ls do
+    ls = Ppl::Command::Ls.new
+    ls.storage = storage_adapter
+    ls.format = format_address_book_one_line
+    ls
+  end
+
+  register :command_mutt do
+    mutt = Ppl::Command::Mutt.new
+    mutt.storage = storage_adapter
+    mutt.format = format_address_book_mutt_query
+    mutt
+  end
+
+  register :command_mv do
+    mv = Ppl::Command::Mv.new
+    mv.storage = storage_adapter
+    mv
+  end
+
+  register :command_name do
+    name = Ppl::Command::Name.new
+    name.storage = storage_adapter
+    name.list_format = format_address_book_names
+    name.show_format = format_contact_name
+    name
+  end
+
+  register :command_nick do
+    nick = Ppl::Command::Nick.new
+    nick.storage = storage_adapter
+    nick.list_format = format_address_book_nicknames
+    nick.show_format = format_contact_nicknames
+    nick
+  end
+
+  register :command_org do
+    org = Ppl::Command::Org.new
+    org.list_format = format_address_book_organizations
+    org.show_format = format_contact_organizations
+    org.storage = storage_adapter
+    org
+  end
+
+  register :command_phone do
+    phone = Ppl::Command::Phone.new
+    phone.storage = storage_adapter
+    phone.list_format = format_address_book_phone_numbers
+    phone.show_format = format_contact_phone_numbers
+    phone
+  end
+
+  register :command_post do
+    post = Ppl::Command::Post.new
+    post.storage = storage_adapter
+    post.list_format = format_address_book_postal_addresses
+    post.show_format = format_contact_postal_addresses
+    post
+  end
+
+  register :command_pull do
+    pull = Ppl::Command::Execute.new("pull", "git pull", "Execute 'git pull' in the address book directory")
+    pull.storage = storage_adapter
+    pull
+  end
+
+  register :command_push do
+    push = Ppl::Command::Execute.new("push", "git push", "Execute 'git push' in the address book directory")
+    push.storage = storage_adapter
+    push
+  end
+
+  register :command_remote do
+    remote = Ppl::Command::Execute.new("remote", "git remote", "Execute 'git remote' in the address book directory")
+    remote.storage = storage_adapter
+    remote
+  end
+
+  register :command_rm do
+    rm = Ppl::Command::Rm.new
+    rm.storage = storage_adapter
+    rm
+  end
+
+  register :command_shell do
+    shell = Ppl::Command::Shell.new
+    shell.storage = storage_adapter
+    shell
+  end
+
+  register :command_show do
+    show = Ppl::Command::Show.new
+    show.storage = storage_adapter
+    show
+  end
+
+  register :command_url do
+    url = Ppl::Command::Url.new
+    url.storage = storage_adapter
+    url.list_format = format_address_book_urls
+    url.show_format = format_contact_urls
+    url
+  end
+
+  register :command_version do
+    version = Ppl::Command::Version.new
+    version.storage = storage_adapter
+    version
+  end
+
+  register :command_suite do
     suite = Ppl::Application::CommandSuite.new
-    commands.each do |command|
-      suite.add_command(command)
-    end
+    suite.add_command command_add
+    suite.add_command command_age
+    suite.add_command command_bday
+    suite.add_command command_email
+    suite.add_command command_help
+    suite.add_command command_init
+    suite.add_command command_ls
+    suite.add_command command_mutt
+    suite.add_command command_mv
+    suite.add_command command_name
+    suite.add_command command_nick
+    suite.add_command command_org
+    suite.add_command command_phone
+    suite.add_command command_post
+    suite.add_command command_pull
+    suite.add_command command_push
+    suite.add_command command_remote
+    suite.add_command command_rm
+    suite.add_command command_shell
+    suite.add_command command_show
+    suite.add_command command_url
+    suite.add_command command_version
     suite.find_command("help").command_suite = suite
-    return suite
+    suite
   end
 
-  def configuration
-    config = Ppl::Application::Configuration.new
-    return config
+  register :configuration do
+    Ppl::Application::Configuration.new
   end
 
-  def execute_command
+  register :execute_command do
     command = Ppl::Command::Execute.new(nil, nil, nil)
     command.storage = storage_adapter
     command
   end
 
-  def git_commands
-    [
-      Ppl::Command::Execute.new("pull", "git pull", "Execute 'git pull' in the address book directory"),
-      Ppl::Command::Execute.new("push", "git push", "Execute 'git push' in the address book directory"),
-      Ppl::Command::Execute.new("remote", "git remote", "Execute 'git remote' in the address book directory"),
-    ]
+  register :format_address_book_ages do
+    config = configuration
+    colors = config.color_enabled("age") ? config.command_colors("age") : {}
+    Ppl::Format::AddressBook::Ages.new(colors)
+  end
+
+  register :format_address_book_birthdays do
+    config = configuration
+    colors = config.color_enabled("bday") ? config.command_colors("bday") : {}
+    Ppl::Format::AddressBook::Birthdays.new(colors)
+  end
+
+  register :format_address_book_email_addresses do
+    config = configuration
+    colors = config.color_enabled("email") ? config.command_colors("email") : {}
+    Ppl::Format::AddressBook::EmailAddresses.new(colors)
+  end
+
+  register :format_address_book_mutt_query do
+    Ppl::Format::AddressBook::MuttQuery.new
+  end
+
+  register :format_address_book_names do
+    config = configuration
+    colors = config.color_enabled("name") ? config.command_colors("name") : {}
+    Ppl::Format::AddressBook::Names.new(colors)
+  end
+
+  register :format_address_book_nicknames do
+    config = configuration
+    colors = config.color_enabled("nick") ? config.command_colors("nick") : {}
+    Ppl::Format::AddressBook::Nicknames.new(colors)
+  end
+
+  register :format_address_book_one_line do
+    config = configuration
+    colors = config.color_enabled("ls") ? config.command_colors("ls") : {}
+    Ppl::Format::AddressBook::OneLine.new(colors)
+  end
+
+  register :format_address_book_organizations do
+    config = configuration
+    colors = config.color_enabled("org") ? config.command_colors("org") : {}
+    Ppl::Format::AddressBook::Organizations.new(colors)
+  end
+
+  register :format_address_book_phone_numbers do
+    config = configuration
+    colors = config.color_enabled("phone") ? config.command_colors("phone") : {}
+    Ppl::Format::AddressBook::PhoneNumbers.new(colors)
+  end
+
+  register :format_address_book_postal_addresses do
+    config = configuration
+    colors = config.color_enabled("post") ? config.command_colors("post") : {}
+    Ppl::Format::AddressBook::PostalAddresses.new(colors)
+  end
+
+  register :format_address_book_urls do
+    config = configuration
+    colors = config.color_enabled("url") ? config.command_colors("url") : {}
+    Ppl::Format::AddressBook::Urls.new(colors)
+  end
+
+  register :format_contact_age do
+    config = configuration
+    colors = config.color_enabled("age") ? config.command_colors("age") : {}
+    Ppl::Format::Contact::Age.new(colors)
+  end
+
+  register :format_contact_birthday do
+    config = configuration
+    colors = config.color_enabled("bday") ? config.command_colors("bday") : {}
+    Ppl::Format::Contact::Birthday.new(colors)
+  end
+
+  register :format_contact_email_addresses do
+    config = configuration
+    colors = config.color_enabled("email") ? config.command_colors("email") : {}
+    Ppl::Format::Contact::EmailAddresses.new(colors)
+  end
+
+  register :format_contact_name do
+    config = configuration
+    colors = config.color_enabled("name") ? config.command_colors("name") : {}
+    Ppl::Format::Contact::Name.new(colors)
+  end
+
+  register :format_contact_nicknames do
+    config = configuration
+    colors = config.color_enabled("nick") ? config.command_colors("nick") : {}
+    Ppl::Format::Contact::Nicknames.new(colors)
   end
 
-  def input
-    input = Ppl::Application::Input.new(ARGV.dup)
-    return input
+  register :format_contact_organizations do
+    config = configuration
+    colors = config.color_enabled("org") ? config.command_colors("org") : {}
+    Ppl::Format::Contact::Organization.new(colors)
+  end
+
+  register :format_contact_phone_numbers do
+    config = configuration
+    colors = config.color_enabled("phone") ? config.command_colors("phone") : {}
+    Ppl::Format::Contact::PhoneNumber.new(colors)
   end
 
-  def output
-    output = Ppl::Application::Output.new($stdout, $stderr)
-    return output
+  register :format_contact_postal_addresses do
+    Ppl::Format::Contact::PostalAddress.new
+  end
+
+  register :format_contact_urls do
+    config = configuration
+    colors = config.color_enabled("url") ? config.command_colors("url") : {}
+    Ppl::Format::Contact::Urls.new(colors)
   end
 
-  def router
+  register :input do
+    Ppl::Application::Input.new(ARGV.dup)
+  end
+
+  register :output do
+    Ppl::Application::Output.new($stdout, $stderr)
+  end
+
+  register :router do
     router = Ppl::Application::Router.new(command_suite)
     router.aliases = configuration.aliases
     router.default = "help"
     router.execute_command = execute_command
-    return router
+    router
   end
 
-  def shell
+  register :shell do
     shell = Ppl::Application::Shell.new
     shell.router = router
-    return shell
+    shell
   end
 
-  def storage_adapter
+  register :storage_adapter do
     config = configuration
-
     directory = Dir.new(config.address_book_path)
     factory   = Ppl::Adapter::Storage::Factory.new(vcard_adapter)
     storage   = factory.load_adapter(directory)
-
     storage.vcard_adapter = vcard_adapter
-    return storage
+    storage
   end
 
-  def vcard_adapter
-    vcard = Ppl::Adapter::Vcard::Vpim.new
-    return vcard
+  register :vcard_adapter do
+    Ppl::Adapter::Vcard::Vpim.new
   end
 
 end

data/lib/ppl/application/configuration.rb

@@ -28,6 +28,21 @@ class Ppl::Application::Configuration
     end
   end
 
+  def color_enabled(command_name)
+    config = user_configuration
+    if !config["color"].nil? && config["color"][command_name] == "true"
+      true
+    else
+      false
+    end
+  end
+
+  def command_colors(command_name)
+    config = user_configuration
+    search = "color \"#{command_name}\""
+    result = config[search]
+  end
+
   private
 
   def default_configuration

data/lib/ppl/command/age.rb

@@ -7,11 +7,6 @@ class Ppl::Command::Age < Ppl::Application::Command
   attr_writer :list_format
   attr_writer :show_format
 
-  def initialize
-    @list_format = Ppl::Format::AddressBook::Ages.new
-    @show_format = Ppl::Format::Contact::Age.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl age"
   end

data/lib/ppl/command/bday.rb

@@ -7,11 +7,6 @@ class Ppl::Command::Bday < Ppl::Application::Command
   attr_writer :list_format
   attr_writer :show_format
 
-  def initialize
-    @list_format = Ppl::Format::AddressBook::Birthdays.new
-    @show_format = Ppl::Format::Contact::Birthday.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl birthday <contact> [<date>]"
   end

data/lib/ppl/command/email.rb

@@ -5,9 +5,7 @@ class Ppl::Command::Email < Ppl::Command::Attribute
   description "Show or change a contact's email address"
 
   def initialize
-    @attribute   = :email_addresses
-    @show_format = Ppl::Format::Contact::EmailAddresses.new
-    @list_format = Ppl::Format::AddressBook::EmailAddresses.new
+    @attribute = :email_addresses
   end
 
   def options(parser, options)

data/lib/ppl/command/ls.rb

@@ -6,10 +6,6 @@ class Ppl::Command::Ls < Ppl::Application::Command
 
   attr_writer :format
 
-  def initialize
-    @format = Ppl::Format::AddressBook::OneLine.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl ls"
   end
@@ -17,7 +13,6 @@ class Ppl::Command::Ls < Ppl::Application::Command
   def execute(input, output)
     address_book = @storage.load_address_book
     formatted    = @format.process(address_book)
-
     output.line(formatted)
     return true
   end

data/lib/ppl/command/mutt.rb

@@ -6,10 +6,6 @@ class Ppl::Command::Mutt < Ppl::Application::Command
 
   attr_writer :format
 
-  def initialize
-    @format = Ppl::Format::AddressBook::MuttQuery.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl mutt <query>"
   end

data/lib/ppl/command/name.rb

@@ -7,11 +7,6 @@ class Ppl::Command::Name < Ppl::Application::Command
   attr_writer :show_format
   attr_writer :list_format
 
-  def initialize
-    @show_format = Ppl::Format::Contact::Name.new
-    @list_format = Ppl::Format::AddressBook::Names.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl name <contact> [<name>]"
   end

data/lib/ppl/command/nick.rb

@@ -5,9 +5,7 @@ class Ppl::Command::Nick < Ppl::Command::Attribute
   description "List, show or change nicknames"
 
   def initialize
-    @attribute   = :nicknames
-    @show_format = Ppl::Format::Contact::Nicknames.new
-    @list_format = Ppl::Format::AddressBook::Nicknames.new
+    @attribute = :nicknames
   end
 
   def options(parser, options)

data/lib/ppl/command/org.rb

@@ -5,9 +5,7 @@ class Ppl::Command::Org < Ppl::Command::Attribute
   description "List, show or change organizations"
 
   def initialize
-    @attribute   = :organizations
-    @show_format = Ppl::Format::Contact::Organization.new
-    @list_format = Ppl::Format::AddressBook::Organizations.new
+    @attribute = :organizations
   end
 
   def options(parser, options)

data/lib/ppl/command/phone.rb

@@ -5,9 +5,7 @@ class Ppl::Command::Phone < Ppl::Command::Attribute
   description "List, show or change phone numbers"
 
   def initialize
-    @attribute   = :phone_numbers
-    @show_format = Ppl::Format::Contact::PhoneNumber.new
-    @list_format = Ppl::Format::AddressBook::PhoneNumbers.new
+    @attribute = :phone_numbers
   end
 
   def options(parser, options)

data/lib/ppl/command/post.rb

@@ -7,11 +7,6 @@ class Ppl::Command::Post < Ppl::Application::Command
   attr_writer :show_format
   attr_writer :list_format
 
-  def initialize
-    @show_format = Ppl::Format::Contact::PostalAddress.new
-    @list_format = Ppl::Format::AddressBook::PostalAddresses.new
-  end
-
   def options(parser, options)
     parser.banner = "usage: ppl post <contact> [address]"
 

data/lib/ppl/command/url.rb

@@ -5,9 +5,7 @@ class Ppl::Command::Url < Ppl::Command::Attribute
   description "List, show or change URLs"
 
   def initialize
-    @attribute   = :urls
-    @show_format = Ppl::Format::Contact::Urls.new
-    @list_format = Ppl::Format::AddressBook::Urls.new
+    @attribute = :urls
   end
 
   def options(parser, options)

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

@@ -4,8 +4,8 @@ class Ppl::Format::AddressBook::Ages < Ppl::Format::AddressBook
   attr_writer :table
   attr_writer :date
 
-  def initialize
-    @table = Ppl::Format::Table.new([:id, :age])
+  def initialize(colors={})
+    @table = Ppl::Format::Table.new([:id, :age], colors)
     @date  = Date.today
   end
 
@@ -14,7 +14,6 @@ class Ppl::Format::AddressBook::Ages < Ppl::Format::AddressBook
     @table.to_s
   end
 
-
   private
 
   def add_row(contact)
@@ -24,6 +23,5 @@ class Ppl::Format::AddressBook::Ages < Ppl::Format::AddressBook
     })
   end
 
-
 end
 

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

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