ppl 1.5.3 → 1.6.0

data/lib/ppl/adapter/vcard/vpim.rb

@@ -20,7 +20,6 @@ class Ppl::Adapter::Vcard::Vpim
       encode_phone_number(contact, maker)
       encode_organization(contact, maker)
       encode_postal_address(contact, maker)
-      encode_email_addresses(contact, maker)
     end
     vcard.to_s
   end

data/lib/ppl/command/email.rb

@@ -14,6 +14,10 @@ class Ppl::Command::Email < Ppl::Application::Command
 
   def options(parser, options)
     parser.banner = "usage: ppl email <contact> [<email-address>]"
+
+    parser.on("-d", "--delete", "delete email address") do
+      options[:delete] = true
+    end
   end
 
   def execute(input, output)
@@ -29,6 +33,8 @@ class Ppl::Command::Email < Ppl::Application::Command
       :list_email_addresses
     elsif input.arguments[1].nil?
       :show_email_addresses
+    elsif input.options[:delete]
+      :delete_email_address
     else
       :set_email_address
     end
@@ -51,10 +57,19 @@ class Ppl::Command::Email < Ppl::Application::Command
     end
   end
 
-  def set_email_address(input, output)
+  def delete_email_address(input, output)
     contact = @storage.require_contact(input.arguments[0])
     email_address = input.arguments[1].dup
+    contact.email_addresses.delete(email_address) do
+      message = sprintf("%s has no such email address %s", contact.id, email_address)
+      raise Ppl::Error::IncorrectUsage, message
+    end
+    @storage.save_contact(contact)
+  end
 
+  def set_email_address(input, output)
+    contact = @storage.require_contact(input.arguments[0])
+    email_address = input.arguments[1].dup
     if contact.has_email_address?(email_address)
       message = sprintf("%s already has email address %s", contact.id, email_address)
       raise Ppl::Error::IncorrectUsage, message

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.5.3"
+  Version = "1.6.0"
 
   module Adapter
   end

data/ppl.gemspec

@@ -2,8 +2,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.5.3"
-  spec.date        = "2012-12-26"
+  spec.version     = "1.6.0"
+  spec.date        = "2012-12-27"
 
   spec.required_ruby_version = ">= 1.9.3"
 

data/spec/ppl/command/email_spec.rb

@@ -48,6 +48,27 @@ describe Ppl::Command::Email do
       @command.execute(@input, @output).should eq false
     end
 
+    it "should delete the given address to the contact if requested" do
+      @contact.email_addresses.push("jim@example.org")
+      @contact.email_addresses.push("jim@example.com")
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @storage.should_receive(:save_contact) do |contact|
+        contact.email_addresses.should eq ["jim@example.com"]
+      end
+      @input.arguments = ["jim", "jim@example.org"]
+      @input.options   = { :delete => true }
+      @command.execute(@input, @output)
+    end
+
+    it "should raise an error when deleting a non-existent email address" do
+      @contact.email_addresses.push("jim@example.org")
+      @contact.email_addresses.push("jim@example.com")
+      @storage.should_receive(:require_contact).and_return(@contact)
+      @input.arguments = ["jim", "jim@example.net"]
+      @input.options   = { :delete => true }
+      expect{@command.execute(@input, nil)}.to raise_error(Ppl::Error::IncorrectUsage)
+    end
+
     it "should add the given address to the contact if it's new" do
       @storage.should_receive(:require_contact).and_return(@contact)
       @storage.should_receive(:save_contact) do |contact|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2012-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
-  requirement: &19907800 !ruby/object:Gem::Requirement
+  requirement: &17793580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *19907800
+  version_requirements: *17793580
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &19907120 !ruby/object:Gem::Requirement
+  requirement: &17792360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.17.0.b6
   type: :runtime
   prerelease: false
-  version_requirements: *19907120
+  version_requirements: *17792360
 - !ruby/object:Gem::Dependency
   name: vpim
-  requirement: &19906320 !ruby/object:Gem::Requirement
+  requirement: &17791520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: '0.695'
   type: :runtime
   prerelease: false
-  version_requirements: *19906320
+  version_requirements: *17791520
 description: CLI Address Book
 email: henry@henrysmith.org
 executables: