ppl 0.0.4 → 0.0.5

data/README.md

@@ -15,6 +15,12 @@ like "people". You might be interested in ppl if:
 Usage
 -----
 
+### Add a contact
+
+```bash
+$ ppl add adam "Adam Brown"
+```
+
 ### List all contacts
 
 ```bash
@@ -44,16 +50,17 @@ dave      Dave Jones 1980-01-02  100 days
 joe       Joe Bloggs 1980-01-03  101 days
 ```
 
+### Delete a contact
+
+```bash
+$ ppl rm workadam
+```
+
 Roadmap
 -------
 
 Support for the following commands is planned.
 
-### Add a contact
-```bash
-$ ppl add adam --email=adam.brown@example.org --birthday=1980-01-04
-```
-
 ### Update a contact
 ```bash
 $ ppl set adam --email=adam.brown@example.com
@@ -64,11 +71,6 @@ $ ppl set adam --email=adam.brown@example.com
 $ ppl mv adam workadam
 ```
 
-### Delete a contact
-```bash
-$ ppl rm workadam
-```
-
 In a highly optimistic version of the future, I plan to integrate Git.
 Any commands that modify the address book will also commit their changes.
 Then this will be posisble:

data/bin/ppl

@@ -11,5 +11,6 @@ class String
     alias_method :each, :each_line
 end
 
-Ppl::CLI.start *ARGV
+cli = Ppl::CLI.new
+cli.run ARGV
 

data/lib/ppl/address_book.rb

@@ -12,9 +12,13 @@ class Ppl::Address_Book
 
   def contact(id)
     filename = File.join @path, id + ".vcard"
-    vcard    = IO.read filename
-    vcard    = Vpim::Vcard.decode(vcard).first
-    contact  = Ppl::Contact.new(id, vcard)
+    if !File.exists? filename
+      return nil
+    end
+
+    vcard   = IO.read filename
+    vcard   = Vpim::Vcard.decode(vcard).first
+    contact = Ppl::Contact.new(id, vcard)
   end
 
   def contacts
@@ -38,5 +42,33 @@ class Ppl::Address_Book
     self.find_all { |contact| contact.birthday.nil? == false }
   end
 
+  def create_contact(id, full_name)
+
+    vcard = Vpim::Vcard::Maker.make2 do |maker|
+      maker.add_name do |name|
+        name.given = full_name
+      end
+    end
+
+    contact = Ppl::Contact.new(id, vcard)
+    self.save_contact contact
+    contact
+  end
+
+  def delete_contact(id)
+    filename = File.join @path, id + ".vcard"
+    if !File.exists? filename
+      return false
+    end
+    File.delete filename
+  end
+
+  def save_contact(contact)
+    filename = File.join @path, contact.id + ".vcard"
+    File.open(filename, "w") do |file|
+      file.write contact.to_s
+    end
+  end
+
 end
 

data/lib/ppl/cli.rb

@@ -1,22 +1,49 @@
 
 require "ppl"
-require "ppl/command"
+require "optparse"
 
 class Ppl::CLI
 
-  def self.start(*args)
+  def initialize
+    @address_book = Ppl::Address_Book.new("/home/h2s/doc/contacts")
+    @commands     = commands
 
-    command = args.shift
-    if command
-      command = command.strip
-    else
-      command = "help"
+    find_command("help").commands = @commands
+  end
+
+  def run(argv)
+    command_name = argv.shift
+    command      = find_command command_name
+
+    if command.nil?
+      command = find_command "help"
+    end
+
+    command.run argv
+  end
+
+
+  private
+
+  def commands
+    @commands = []
+    Ppl::Command.constants.each do |name|
+      constant = Ppl::Command.const_get(name)
+      @commands.push constant.new
     end
+    @commands.sort! { |a,b| a.name <=> b.name }
 
-    Ppl::Command.load
-    Ppl::Command.run(command, args)
+    @commands.each do |command|
+      command.address_book  = @address_book
+      command.commands      = @commands
+    end
+  end
 
+  def find_command(name)
+    matches = @commands.select { |command| command.name == name }
+    matches.first
   end
 
+
 end
 

data/lib/ppl/command/add.rb

@@ -0,0 +1,40 @@
+
+class Ppl::Command::Add < Ppl::Command
+
+  def name
+    "add"
+  end
+
+  def summary
+    "Add a new contact"
+  end
+
+  def banner
+    "Usage: ppl add <contact> <name>"
+  end
+
+  def options(parser)
+  end
+
+  def execute(argv, options)
+
+    contact_id = argv.shift
+    name       = argv.shift
+
+    if contact_id.nil? || name.nil?
+      $stderr.puts @option_parser
+      return false
+    end
+
+    contact = @address_book.contact contact_id
+    if !contact.nil?
+      raise "contact '#{contact_id}' already exists"
+    end
+
+    contact = @address_book.create_contact contact_id, name
+    puts contact
+
+  end
+
+end
+

data/lib/ppl/command/birthdays.rb

@@ -1,5 +1,5 @@
 
-class Ppl::Command::Birthdays < Ppl::Command::Base
+class Ppl::Command::Birthdays < Ppl::Command
 
   def name
     "birthdays"
@@ -9,7 +9,14 @@ class Ppl::Command::Birthdays < Ppl::Command::Base
     "Show a list of upcoming birthdays"
   end
 
-  def index
+  def banner
+    "Usage: ppl birthdays"
+  end
+
+  def options(parser)
+  end
+
+  def execute(argv, options)
     today = Date.today
 
     @address_book.with_birthday.each do |contact|

data/lib/ppl/command/help.rb

@@ -1,5 +1,5 @@
 
-class Ppl::Command::Help < Ppl::Command::Base
+class Ppl::Command::Help < Ppl::Command
 
   def name
     "help"
@@ -9,20 +9,23 @@ class Ppl::Command::Help < Ppl::Command::Base
     "Show a list of available commands"
   end
 
-  def index
+  def banner
+    "Usage: ppl <command> [options]"
+  end
+
+  def options(parser)
+  end
 
+  def execute(argv, options)
+    puts @option_parser
     puts
-    Ppl::Command.constants.each do |constant|
-      if constant.to_s != "Base"
-        command = Ppl::Command.const_get(constant).new(@arguments, @options)
-        puts(
-          sprintf(" %-10s", command.name) +
-          sprintf("%s", command.summary)
-        )
-      end
+    @commands.each do |command|
+      puts(
+        sprintf(" %-10s", command.name) +
+        sprintf("%s", command.summary)
+      )
     end
     puts
-
   end
 
 end

data/lib/ppl/command/list.rb

@@ -1,5 +1,5 @@
 
-class Ppl::Command::List < Ppl::Command::Base
+class Ppl::Command::List < Ppl::Command
 
   def name
     "list"
@@ -9,14 +9,22 @@ class Ppl::Command::List < Ppl::Command::Base
     "Show a list of all contacts"
   end
 
-  def index
+  def banner
+    "Usage: ppl list"
+  end
+
+  def options(parser)
+  end
+
+  def execute(argv, options)
     @address_book.each do |contact|
       puts(
-        sprintf("%-20s", contact.id).red +
-        sprintf("%-20s", contact.name).yellow +
-        sprintf("%-20s", contact.email).blue
+        sprintf("%-10s", contact.id + ":") +
+        sprintf("%s ", contact.name)   +
+        sprintf("%-20s", "<" + contact.email + ">")
       )
     end
+    return true
   end
 
 end

data/lib/ppl/command/rm.rb

@@ -0,0 +1,38 @@
+
+class Ppl::Command::Rm < Ppl::Command
+
+  def name
+    "rm"
+  end
+
+  def summary
+    "Delete a contact"
+  end
+
+  def banner
+    "Usage: ppl rm <contact>"
+  end
+
+  def options(parser)
+  end
+
+  def execute(argv, options)
+
+    contact_id = argv.first
+
+    if contact_id.nil?
+      $stderr.puts @option_parser
+      return false
+    end
+
+    contact = @address_book.contact contact_id
+    if contact.nil?
+      raise "contact '#{contact_id}' not found"
+    end
+
+    @address_book.delete_contact contact_id
+
+  end
+
+end
+

data/lib/ppl/command/set.rb

@@ -0,0 +1,49 @@
+
+class Ppl::Command::Set < Ppl::Command
+
+  def name
+    "set"
+  end
+
+  def summary
+    "Change the details of a contact"
+  end
+
+  def banner
+    "Usage: ppl set <contact> [options]"
+  end
+
+  def options(parser)
+    parser.on("-e", "--email <email>", "Email address") do |email|
+      @options[:email] = email
+    end
+  end
+
+  def execute(argv, options)
+
+    contact_id = argv.first
+
+    if contact_id.nil?
+      $stderr.puts @option_parser
+      return false
+    end
+
+    contact = @address_book.contact contact_id
+    if contact.nil?
+      raise "contact '#{contact_id}' not found"
+    end
+
+    contact.vcard.make do |maker|
+      maker.name do |name|
+        name.fullname = 's'
+      end
+      puts maker
+    end
+
+    if !options[:email].nil?
+      #contact.vcard.add_email options[:email]
+    end
+  end
+
+end
+

data/lib/ppl/command/show.rb

@@ -1,7 +1,5 @@
 
-require "ppl/command/base"
-
-class Ppl::Command::Show < Ppl::Command::Base
+class Ppl::Command::Show < Ppl::Command
 
   def name
     "show"
@@ -11,14 +9,34 @@ class Ppl::Command::Show < Ppl::Command::Base
     "Show full details of a single contact"
   end
 
-  def index
-    contact = @address_book.contact @arguments.first
+  def banner
+    "Usage: ppl show <contact>"
+  end
+
+  def options(parser)
+  end
+
+  def execute(argv, options)
+
+    contact_id = argv.first
+
+    if contact_id.nil?
+      $stderr.puts @option_parser
+      return false
+    end
+
+    contact = @address_book.contact contact_id
+    if contact.nil?
+      raise "contact '#{contact_id}' not found"
+    end
+
 
-    puts contact.name.yellow
+    puts contact.name
     contact.emails.each do |email|
-      puts email.blue
+      puts email
     end
 
+    return true
   end
 
 end

data/lib/ppl/command.rb

@@ -1,26 +1,55 @@
 
-module Ppl
-  module Command
+class Ppl::Command
 
-    def self.load
-      Dir[File.join(File.dirname(__FILE__), "command", "*.rb")].each do |file|
-        require file
-      end
+  attr_accessor :address_book
+  attr_accessor :commands
+
+  def initialize
+    @option_parser = OptionParser.new do |parser|
+      parser.banner = self.banner
+      self.options parser
     end
+  end
 
-    def self.run(command, arguments=[])
+  def name
+    raise NotImplementedError
+  end
 
-      options = {
-        :path => "/home/h2s/doc/contacts"
-      }
+  def summary
+    raise NotImplementedError
+  end
 
-      klass = command.capitalize
+  def banner
+    raise NotImplementedError
+  end
+
+  def options(parser)
+    raise NotImplementedError
+  end
 
-      command = Ppl::Command::List.new(arguments, options)
-      command = Ppl::Command.const_get(klass).new(arguments, options)
-      command.send("index")
+  def run(argv)
+
+    @options = {}
+    begin
+      @option_parser.parse! ARGV
+    rescue OptionParser::ParseError
+      $stderr.puts $!
+      $stderr.puts @option_parser
+      return false
+    end
+
+    begin
+      status = self.execute argv, @options
+    rescue RuntimeError
+      $stderr.puts "ppl: " + $!.to_s
     end
 
+    return status
   end
+
+  def execute(argv, options)
+    raise NotImplementedError
+  end
+
 end
 

data/lib/ppl/contact.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext/time/calculations.rb"
 class Ppl::Contact
 
   attr_reader :id
+  attr_reader :vcard
 
   def initialize(id, vcard)
     @id    = id
@@ -34,5 +35,9 @@ class Ppl::Contact
     @vcard.name.fullname
   end
 
+  def to_s
+    @vcard.to_s
+  end
+
 end
 

data/lib/ppl.rb

@@ -4,4 +4,13 @@ end
 
 require "ppl/address_book"
 require "ppl/contact"
+require "ppl/cli"
+require "ppl/command"
+require "ppl/command/add"
+require "ppl/command/birthdays"
+require "ppl/command/help"
+require "ppl/command/list"
+require "ppl/command/rm"
+require "ppl/command/set"
+require "ppl/command/show"
 

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "0.0.4"
-  spec.date        = "2012-11-11"
+  spec.version     = "0.0.5"
+  spec.date        = "2012-11-13"
 
   spec.summary     = "CLI Address Book"
   spec.description = "Command-line driven address book"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies: []
 description: Command-line driven address book
 email: henry@henrysmith.org
@@ -27,13 +27,14 @@ files:
 - lib/ppl/address_book.rb
 - lib/ppl/cli.rb
 - lib/ppl/command.rb
-- lib/ppl/command/base.rb
+- lib/ppl/command/add.rb
 - lib/ppl/command/birthdays.rb
 - lib/ppl/command/help.rb
 - lib/ppl/command/list.rb
+- lib/ppl/command/rm.rb
+- lib/ppl/command/set.rb
 - lib/ppl/command/show.rb
 - lib/ppl/contact.rb
-- lib/ppl/ppl.rb
 - ppl.gemspec
 homepage: https://github.com/h2s/ppl
 licenses:

data/lib/ppl/command/base.rb

@@ -1,29 +0,0 @@
-
-require "vpim/vcard"
-require "colored"
-
-
-class Ppl::Command::Base
-
-
-  attr_reader :arguments
-  attr_reader :options
-
-
-  def initialize(arguments=[], options={})
-    @arguments = arguments
-    @options   = options
-
-    @address_book = Ppl::Address_Book.new(@options[:path])
-  end
-
-
-  def name
-  end
-
-
-  def summary
-  end
-
-end
-

data/lib/ppl/ppl.rb

@@ -1,15 +0,0 @@
-
-
-module Ppl
-
-  class App
-
-    def run
-      puts ARGV
-      cmd = Ppl::Commands::List.new
-    end
-
-  end
-
-end
-