ppl 1.0.6 → 1.1.0

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.0.6"
+  Version = "1.1.0"
 
   module Adapter
   end
@@ -52,6 +52,7 @@ require "ppl/command/name"
 require "ppl/command/email"
 require "ppl/command/org"
 require "ppl/command/phone"
+require "ppl/command/mutt"
 
 require "ppl/entity/address_book"
 require "ppl/entity/contact"
@@ -62,6 +63,7 @@ require "ppl/error/incorrect_usage"
 require "ppl/format/address_book"
 require "ppl/format/address_book/birthdays"
 require "ppl/format/address_book/email_addresses"
+require "ppl/format/address_book/mutt_query"
 require "ppl/format/address_book/names"
 require "ppl/format/address_book/one_line"
 require "ppl/format/address_book/organizations"

data/lib/ppl/application/bootstrap.rb

@@ -9,6 +9,7 @@ class Ppl::Application::Bootstrap
       Ppl::Command::Add.new,
       Ppl::Command::Rm.new,
       Ppl::Command::Ls.new,
+      Ppl::Command::Mutt.new,
       Ppl::Command::Mv.new,
       Ppl::Command::Show.new,
       Ppl::Command::Name.new,

data/lib/ppl/command/mutt.rb

@@ -0,0 +1,68 @@
+
+class Ppl::Command::Mutt < Ppl::Application::Command
+
+  attr_writer :format
+
+  def initialize
+    @name        = "mutt"
+    @description = "Integration with mutt's query_command"
+
+    @format = Ppl::Format::AddressBook::MuttQuery.new
+  end
+
+  def options(parser, options)
+    parser.banner = "usage: ppl mutt <query>"
+  end
+
+  def execute(input, output)
+    query = input.arguments.shift
+    if query.nil?
+      raise Ppl::Error::IncorrectUsage, "You must provide a query"
+    end
+
+    address_book = @storage.load_address_book
+
+    matches = mutt_search(address_book, query)
+
+    if matches.count > 0
+
+      line = sprintf(
+        "Searching database... %d entries... %d matching:",
+        address_book.count,
+        matches.count
+      )
+
+      results = @format.process(matches)
+
+      output.line(line)
+      output.line(results) unless results == ""
+      true
+
+    else
+      output.line("No matches")
+      false
+    end
+
+  end
+
+
+  private
+
+  def mutt_search(address_book, query)
+    matches = Ppl::Entity::AddressBook.new
+
+    address_book.each do |contact|
+      next if contact.email_address.nil?
+
+      if contact.email_address.include?(query)
+        matches.add_contact(contact)
+      elsif !contact.name.nil? && contact.name.include?(query)
+        matches.add_contact(contact)
+      end
+    end
+
+    matches
+  end
+
+end
+

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

@@ -0,0 +1,33 @@
+
+class Ppl::Format::AddressBook::MuttQuery < Ppl::Format::AddressBook
+
+  attr_writer :table
+
+  def initialize
+    @table = Ppl::Format::Table.new([:email, :name])
+    @table.separator = Ppl::Format::Table::SEPARATOR_TABS
+  end
+
+  def process(address_book)
+    address_book.each { |contact| add_row(contact) }
+    @table.to_s
+  end
+
+
+  private
+
+  def add_row(contact)
+    name = nil
+    if !contact.name.nil?
+      name = contact.name
+    end
+
+    @table.add_row({
+      :email => contact.email_address,
+      :name  => name,
+    })
+  end
+
+
+end
+

data/lib/ppl/format/table.rb

@@ -1,12 +1,17 @@
 
 class Ppl::Format::Table
 
+  SEPARATOR_SPACES = 0
+  SEPARATOR_TABS   = 1
+
   attr_accessor :columns
   attr_accessor :rows
+  attr_accessor :separator
 
   def initialize(columns=[])
-    @columns = columns
-    @rows    = []
+    @columns   = columns
+    @rows      = []
+    @separator = SEPARATOR_SPACES
 
     @column_widths = {}
     @columns.each { |c| @column_widths[c] = 0 }
@@ -40,7 +45,11 @@ class Ppl::Format::Table
 
   def format_cell(row, column)
     width  = @column_widths[column]
-    string = sprintf("%-#{width}s  ", row[column])
+    if @separator == SEPARATOR_SPACES
+      string = sprintf("%-#{width}s  ", row[column])
+    else
+      string = sprintf("%s\t", row[column])
+    end
     return string
   end
 

data/ppl.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.0.6"
+  spec.version     = "1.1.0"
   spec.date        = "2012-12-20"
 
   spec.required_ruby_version = ">= 1.9.3"

data/spec/ppl/application/bootstrap_spec.rb

@@ -48,6 +48,9 @@ describe Ppl::Application::Bootstrap do
     it "should contain the 'ls' command" do
       @bootstrap.command_suite.find_command("ls").should_not be nil
     end
+    it "should contain the 'mutt' command" do
+      @bootstrap.command_suite.find_command("mutt").should_not be nil
+    end
     it "should contain the 'mv' command" do
       @bootstrap.command_suite.find_command("mv").should_not be nil
     end

data/spec/ppl/command/mutt_spec.rb

@@ -0,0 +1,68 @@
+
+describe Ppl::Command::Mutt do
+
+  before(:each) do
+    @command = Ppl::Command::Mutt.new
+    @input   = Ppl::Application::Input.new
+    @output  = double(Ppl::Application::Output)
+    @storage = double(Ppl::Adapter::Storage)
+
+    @address_book = Ppl::Entity::AddressBook.new
+    @contact      = Ppl::Entity::Contact.new
+
+    @command.storage = @storage
+  end
+
+  describe "#name" do
+    it "should be 'mutt'" do
+      @command.name.should eq "mutt"
+    end
+  end
+
+  describe "#execute" do
+
+    it "should raise an error if no query is given" do
+      expect{@command.execute(@input, @output)}.to raise_error(Ppl::Error::IncorrectUsage)
+    end
+
+    it "should search the address book for the query" do
+      @storage.should_receive(:load_address_book).and_return(@address_book)
+      @input.arguments.push "query"
+      @command.stub(:mutt_search) { |ab| [] }
+      @output.should_receive(:line).with("No matches")
+      @command.execute(@input, @output).should eq false
+    end
+
+    it "should return email address matches" do
+
+      @contact.name = "Test User"
+      @contact.email_address = "test@example.org"
+      @address_book.add_contact(@contact)
+
+      @input.arguments.push "example"
+
+      @storage.should_receive(:load_address_book).and_return(@address_book)
+      @output.should_receive(:line).with("Searching database... 1 entries... 1 matching:")
+      @output.should_receive(:line).with("test@example.org\tTest User")
+      @command.execute(@input, @output).should eq true
+    end
+
+    it "should return name matches" do
+
+      @contact.name = "Test User"
+      @contact.email_address = "test@example.org"
+      @address_book.add_contact(@contact)
+
+      @input.arguments.push "User"
+
+      @storage.should_receive(:load_address_book).and_return(@address_book)
+      @output.should_receive(:line).with("Searching database... 1 entries... 1 matching:")
+      @output.should_receive(:line).with("test@example.org\tTest User")
+      @command.execute(@input, @output).should eq true
+    end
+
+
+  end
+
+end
+

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

@@ -0,0 +1,30 @@
+
+describe Ppl::Format::AddressBook::MuttQuery do
+
+  before(:each) do
+    @format       = Ppl::Format::AddressBook::MuttQuery.new
+    @address_book = Ppl::Entity::AddressBook.new
+    @contact      = Ppl::Entity::Contact.new
+    @table        = double(Ppl::Format::Table)
+
+    @contact.email_address = "test@example.org"
+    @contact.name          = "Test Contact"
+
+    @format.table = @table
+    @address_book.add_contact(@contact)
+  end
+
+  describe "#process" do
+
+    it "should list the given contacts" do
+      @table.should_receive(:add_row).with({
+        :email => "test@example.org",
+        :name  => "Test Contact",
+      })
+      @format.process(@address_book)
+    end
+
+  end
+
+end
+

data/spec/ppl/format/table_spec.rb

@@ -50,6 +50,16 @@ describe Ppl::Format::Table do
       @table.to_s.should eq "12345  John Doe  jdoe@example.org"
     end
 
+    it "should use tabs if requested" do
+      @table.add_row({
+        :id    => 12345,
+        :name  => "John Doe",
+        :email => "jdoe@example.org",
+      })
+      @table.separator = Ppl::Format::Table::SEPARATOR_TABS
+      @table.to_s.should eq "12345\tJohn Doe\tjdoe@example.org"
+    end
+
     it "should align multiple rows into neat columns" do
       @table.add_row({
         :id    => 12345,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &16103420 !ruby/object:Gem::Requirement
+  requirement: &15938960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *16103420
+  version_requirements: *15938960
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &16091980 !ruby/object:Gem::Requirement
+  requirement: &15936860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *16091980
+  version_requirements: *15936860
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &16091260 !ruby/object:Gem::Requirement
+  requirement: &15936120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *16091260
+  version_requirements: *15936120
 description: CLI Address Book
 email: henry@henrysmith.org
 executables:
@@ -80,6 +80,7 @@ files:
 - lib/ppl/command/help.rb
 - lib/ppl/command/init.rb
 - lib/ppl/command/ls.rb
+- lib/ppl/command/mutt.rb
 - lib/ppl/command/mv.rb
 - lib/ppl/command/name.rb
 - lib/ppl/command/org.rb
@@ -93,6 +94,7 @@ files:
 - lib/ppl/format/address_book.rb
 - lib/ppl/format/address_book/birthdays.rb
 - lib/ppl/format/address_book/email_addresses.rb
+- lib/ppl/format/address_book/mutt_query.rb
 - lib/ppl/format/address_book/names.rb
 - lib/ppl/format/address_book/one_line.rb
 - lib/ppl/format/address_book/organizations.rb
@@ -126,6 +128,7 @@ files:
 - spec/ppl/command/help_spec.rb
 - spec/ppl/command/init_spec.rb
 - spec/ppl/command/ls_spec.rb
+- spec/ppl/command/mutt_spec.rb
 - spec/ppl/command/mv_spec.rb
 - spec/ppl/command/name_spec.rb
 - spec/ppl/command/org_spec.rb
@@ -136,6 +139,7 @@ files:
 - spec/ppl/entity/contact_spec.rb
 - spec/ppl/format/address_book/birthdays_spec.rb
 - spec/ppl/format/address_book/email_addresses_spec.rb
+- spec/ppl/format/address_book/mutt_query_spec.rb
 - spec/ppl/format/address_book/names_spec.rb
 - spec/ppl/format/address_book/one_line_spec.rb
 - spec/ppl/format/address_book/organizations_spec.rb