ppl 1.8.0 → 1.9.0

data/lib/ppl/adapter/storage/disk.rb

@@ -33,7 +33,7 @@ class Ppl::Adapter::Storage::Disk < Ppl::Adapter::Storage
     filenames.each do |filename|
       contact_id = File.basename(filename).slice(0..-5)
       contact    = load_contact(contact_id)
-      address_book.add_contact(contact)
+      address_book.contacts.push(contact)
     end
 
     return address_book

data/lib/ppl/adapter/storage/git.rb

@@ -33,7 +33,7 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
       end
       contact_id = file[:name].slice(0..-5)
       contact    = load_contact(contact_id)
-      address_book.add_contact(contact)
+      address_book.contacts.push(contact)
     end
 
     return address_book

data/lib/ppl/application/bootstrap.rb

@@ -19,6 +19,7 @@ class Ppl::Application::Bootstrap
       Ppl::Command::Post.new,
       Ppl::Command::Shell.new,
       Ppl::Command::Url.new,
+      Ppl::Command::Version.new,
     ]
     commands.each do |command|
       command.storage = storage_adapter
@@ -52,6 +53,7 @@ class Ppl::Application::Bootstrap
 
   def router
     router = Ppl::Application::Router.new(command_suite)
+    router.aliases = configuration.aliases
     router.default = "help"
     return router
   end

data/lib/ppl/application/configuration.rb

@@ -19,14 +19,20 @@ class Ppl::Application::Configuration
   end
 
   def aliases
-    aliases = {}
-    return aliases
+    user_aliases = user_configuration["aliases"]
+    default_aliases = default_configuration["aliases"]
+    if user_aliases.nil?
+      default_aliases
+    else
+      user_aliases
+    end
   end
 
   private
 
   def default_configuration
     {
+      "aliases" => {},
       "address book" => {
         "path" => Dir.pwd
       },

data/lib/ppl/application/router.rb

@@ -1,14 +1,19 @@
 
 class Ppl::Application::Router
 
+  attr_accessor :aliases
   attr_accessor :default
 
   def initialize(command_suite)
     @command_suite = command_suite
+    @aliases = {}
   end
 
   def route(argument)
     command = @command_suite.find_command(argument)
+    if command.nil? && @aliases.has_key?(argument)
+      command = @command_suite.find_command(@aliases[argument])
+    end
     if command.nil? && !@default.nil?
       command = @command_suite.find_command(@default)
     end

data/lib/ppl/command/mutt.rb

@@ -18,7 +18,7 @@ class Ppl::Command::Mutt < Ppl::Application::Command
     query = require_query(input)
     matches = mutt_search(query)
     output.line(describe_result(matches))
-    matches.count > 0
+    matches.contacts.length > 0
   end
 
 
@@ -35,7 +35,7 @@ class Ppl::Command::Mutt < Ppl::Application::Command
     @address_book = @storage.load_address_book
     matches = Ppl::Entity::AddressBook.new
 
-    @address_book.each do |contact|
+    @address_book.contacts.each do |contact|
       next if contact.email_addresses.empty?
 
       matching_emails = contact.email_addresses.select do |email_address|
@@ -43,9 +43,9 @@ class Ppl::Command::Mutt < Ppl::Application::Command
       end
 
       if matching_emails.length > 0
-        matches.add_contact(contact)
+        matches.contacts.push(contact)
       elsif !contact.name.nil? && contact.name.include?(query)
-        matches.add_contact(contact)
+        matches.contacts.push(contact)
       end
     end
 
@@ -53,7 +53,7 @@ class Ppl::Command::Mutt < Ppl::Application::Command
   end
 
   def describe_result(matches)
-    if matches.count > 0
+    if matches.contacts.length > 0
       describe_matches(matches)
     else
       "No matches"
@@ -63,8 +63,8 @@ class Ppl::Command::Mutt < Ppl::Application::Command
   def describe_matches(matches)
     summary = sprintf(
       "Searching address book... %d entries... %d matching:",
-      @address_book.count,
-      matches.count
+      @address_book.contacts.length,
+      matches.contacts.length
     )
     results = @format.process(matches)
     [summary, results].join("\n").strip

data/lib/ppl/command/version.rb

@@ -0,0 +1,19 @@
+
+class Ppl::Command::Version < Ppl::Application::Command
+
+  name        "version"
+  description "Display ppl version information"
+
+  attr_writer :format
+
+  def options(parser, options)
+    parser.banner = "usage: ppl version"
+  end
+
+  def execute(input, output)
+    output.line("ppl version #{Ppl::Version}")
+    true
+  end
+
+end
+

data/lib/ppl/entity/address_book.rb

@@ -1,21 +1,11 @@
 
-require "enumerator"
-
 class Ppl::Entity::AddressBook
 
-  include Enumerable
+  attr_accessor :contacts
 
   def initialize
     @contacts = []
   end
 
-  def add_contact(contact)
-    @contacts.push contact
-  end
-
-  def each
-    @contacts.each { |contact| yield contact }
-  end
-
 end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::Birthdays < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::EmailAddresses < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -9,7 +9,7 @@ class Ppl::Format::AddressBook::MuttQuery < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::Names < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::OneLine < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::Organizations < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::PhoneNumbers < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::PostalAddresses < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -8,7 +8,7 @@ class Ppl::Format::AddressBook::Urls < Ppl::Format::AddressBook
   end
 
   def process(address_book)
-    address_book.each { |contact| add_row(contact) }
+    address_book.contacts.each { |contact| add_row(contact) }
     @table.to_s
   end
 

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

@@ -58,34 +58,36 @@ class Ppl::Format::Contact::Full < Ppl::Format::Contact
   end
 
   def format_email_addresses(contact)
-    if !contact.email_addresses.empty?
-      @lines.push("")
-      @lines.push("Email Addresses:")
-      contact.email_addresses.each { |email_address| @lines.push("  " + email_address) }
-    end
+    push_list("Email Addresses", contact.email_addresses)
   end
 
   def format_phone_numbers(contact)
     if !contact.phone_number.nil?
-      @lines.push("")
-      @lines.push("Phone Numbers:")
-      @lines.push("  #{contact.phone_number}")
+      push_list("Phone Numbers", contact.phone_number)
     end
   end
 
   def format_postal_addresses(contact)
     if !contact.postal_address.nil?
-      @lines.push("")
-      @lines.push("Postal Address:")
-      @lines.push("  " + @postal_address_format.process(contact.postal_address))
+      push_list(
+        "Postal Address",
+        @postal_address_format.process(contact.postal_address)
+      )
     end
   end
 
   def format_urls(contact)
-    if !contact.urls.empty?
-      @lines.push("")
-      @lines.push("URLs:")
-      contact.urls.each { |url| @lines.push("  " + url) }
+    push_list("URLs", contact.urls)
+  end
+
+  def push_list(label, list)
+    return if list.empty?
+    @lines.push("")
+    @lines.push("#{label}:")
+    if list.kind_of?(Array)
+      list.each { |item| @lines.push("  #{item}") }
+    else
+      @lines.push("  #{list}")
     end
   end
 

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

@@ -2,11 +2,7 @@
 class Ppl::Format::Contact::Urls < Ppl::Format::Contact
 
   def process(contact)
-    lines = []
-    contact.urls.each do |url|
-      lines.push url
-    end
-    lines.join("\n")
+    contact.urls.join("\n")
   end
 
 end

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.8.0"
+  Version = "1.9.0"
 
   module Adapter
   end
@@ -56,6 +56,7 @@ require "ppl/command/mutt"
 require "ppl/command/post"
 require "ppl/command/shell"
 require "ppl/command/url"
+require "ppl/command/version"
 
 require "ppl/entity/address_book"
 require "ppl/entity/contact"

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.8.0"
-  spec.date        = "2013-01-05"
+  spec.version     = "1.9.0"
+  spec.date        = "2013-01-06"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/spec/ppl/adapter/storage/disk_spec.rb

@@ -82,7 +82,7 @@ describe Ppl::Adapter::Storage::Disk do
       @adapter.should_receive(:decode).twice
 
       address_book = @storage.load_address_book
-      address_book.count.should eq 2
+      address_book.contacts.count.should eq 2
     end
 
   end

data/spec/ppl/adapter/storage/git_spec.rb

@@ -1,7 +1,7 @@
 
 require "ostruct"
 
-describe Ppl::Adapter::Storage::Git, "#initialize" do
+describe Ppl::Adapter::Storage::Git do
 
   before(:each) do
     FakeFS.activate!
@@ -65,7 +65,7 @@ describe Ppl::Adapter::Storage::Git, "#initialize" do
       @head.should_receive(:tree).and_return(@files)
 
       address_book = @git.load_address_book
-      address_book.each do |contact|
+      address_book.contacts.each do |contact|
         contact.should be_a(Ppl::Entity::Contact)
       end
     end

data/spec/ppl/application/bootstrap_spec.rb

@@ -81,6 +81,9 @@ describe Ppl::Application::Bootstrap do
     it "should contain the 'url' command" do
       @bootstrap.command_suite.find_command("url").should_not be nil
     end
+    it "should contain the 'version' command" do
+      @bootstrap.command_suite.find_command("version").should_not be nil
+    end
   end
 
   describe "#configuration" do
@@ -111,6 +114,9 @@ describe Ppl::Application::Bootstrap do
     it "should set the 'help' command as the default" do
       @bootstrap.router.default.should eq "help"
     end
+    it "should inject the user's aliases" do
+      @bootstrap.router.aliases.should be_a(Hash)
+    end
   end
 
   describe "#shell" do

data/spec/ppl/application/router_spec.rb

@@ -37,6 +37,11 @@ describe Ppl::Application::Router do
       @router.route("three").should be @cmd_one
     end
 
+    it "should apply the aliases if the argument doesn't match a command" do
+      @router.aliases = {"t" => "two"}
+      @router.route("t").should be @cmd_two
+    end
+
   end
 
 end

data/spec/ppl/command/mutt_spec.rb

@@ -27,7 +27,7 @@ describe Ppl::Command::Mutt do
 
     it "should search the address book for the query" do
       @input.arguments.push "query"
-      @command.should_receive(:mutt_search).and_return([])
+      @command.should_receive(:mutt_search).and_return(Ppl::Entity::AddressBook.new)
       @output.should_receive(:line).with("No matches")
       @command.execute(@input, @output).should eq false
     end
@@ -36,7 +36,7 @@ describe Ppl::Command::Mutt do
 
       @contact.name = "Test User"
       @contact.email_addresses.push "test@example.org"
-      @address_book.add_contact(@contact)
+      @address_book.contacts.push(@contact)
 
       @input.arguments.push "example"
 
@@ -52,7 +52,7 @@ describe Ppl::Command::Mutt do
 
       @contact.name = "Test User"
       @contact.email_addresses.push "test@example.org"
-      @address_book.add_contact(@contact)
+      @address_book.contacts.push(@contact)
 
       @input.arguments.push "User"
 

data/spec/ppl/command/version_spec.rb

@@ -0,0 +1,26 @@
+
+describe Ppl::Command::Version do
+
+  before(:each) do
+    @command = Ppl::Command::Version.new
+    @input   = Ppl::Application::Input.new
+    @output  = double(Ppl::Application::Output)
+  end
+
+  describe "#name" do
+    it "should be 'version'" do
+      @command.name.should eq "version"
+    end
+  end
+
+  describe "#execute" do
+    it "should show the version number" do
+      @output.should_receive(:line) do |line|
+        line.should include Ppl::Version
+      end
+      @command.execute(@input, @output).should eq true
+    end
+  end
+
+end
+

data/spec/ppl/entity/address_book_spec.rb

@@ -5,20 +5,9 @@ describe Ppl::Entity::AddressBook do
     @address_book = Ppl::Entity::AddressBook.new
   end
 
-  describe "#add_contact" do
-    it "should accept a contact" do
-      @address_book.add_contact(double(Ppl::Entity::Contact))
-      @address_book.count.should be 1
-    end
-  end
-
-  describe "#each" do
-    it "should yield contacts" do
-      contact = double(Ppl::Entity::Contact)
-      @address_book.add_contact(contact)
-      @address_book.each do |c|
-        c.should be contact
-      end
+  describe "#contacts" do
+    it "should be an array" do
+      @address_book.contacts.should be_an(Array)
     end
   end
 

data/spec/ppl/format/address_book/birthdays_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::Birthdays do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/email_addresses_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::EmailAddresses do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/mutt_query_spec.rb

@@ -11,7 +11,7 @@ describe Ppl::Format::AddressBook::MuttQuery do
     @contact.name = "Test Contact"
 
     @format.table = @table
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/names_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::Names do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/one_line_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::OneLine do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/organizations_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::Organizations do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/phone_numbers_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::PhoneNumbers do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/postal_addresses_spec.rb

@@ -12,7 +12,7 @@ describe Ppl::Format::AddressBook::PostalAddresses do
     @contact.postal_address = @address
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

data/spec/ppl/format/address_book/urls_spec.rb

@@ -10,7 +10,7 @@ describe Ppl::Format::AddressBook::Urls do
     @contact.id = "test"
     @format.table = @table
 
-    @address_book.add_contact(@contact)
+    @address_book.contacts.push(@contact)
   end
 
   describe "#process" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-05 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &20369960 !ruby/object:Gem::Requirement
+  requirement: &18641320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *20369960
+  version_requirements: *18641320
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &20352640 !ruby/object:Gem::Requirement
+  requirement: &18640600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *20352640
+  version_requirements: *18640600
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &20351880 !ruby/object:Gem::Requirement
+  requirement: &18640020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *20351880
+  version_requirements: *18640020
 description: CLI Address Book
 email: henry@henrysmith.org
 executables:
@@ -90,6 +90,7 @@ files:
 - lib/ppl/command/shell.rb
 - lib/ppl/command/show.rb
 - lib/ppl/command/url.rb
+- lib/ppl/command/version.rb
 - lib/ppl/entity/address_book.rb
 - lib/ppl/entity/contact.rb
 - lib/ppl/entity/postal_address.rb
@@ -148,6 +149,7 @@ files:
 - spec/ppl/command/shell_spec.rb
 - spec/ppl/command/show_spec.rb
 - spec/ppl/command/url_spec.rb
+- spec/ppl/command/version_spec.rb
 - spec/ppl/entity/address_book_spec.rb
 - spec/ppl/entity/contact_spec.rb
 - spec/ppl/entity/postal_address_spec.rb