ppl 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534e964077775b5213a6a424cbd7e7fafdd3bdc1
-  data.tar.gz: 591219daa582fb9f4f0ce4513407a11aca5c340e
+  metadata.gz: ecd0486206406d56c76fb117e670366c7a9397d6
+  data.tar.gz: 28772223134972c6b129ad759dcfbcf02d030d7f
 SHA512:
-  metadata.gz: a163c7310507391c86a9605dec4c07154ad9b7e91304948d09ba77dc72a4f92488ef7a679da6fc0b31d95e18260e98783ade8492491fa9f273018d05658cad6c
-  data.tar.gz: 5c23014db12338370ab46ee21098bbcb15ee9e2ef6cb3b4917ed8dcef59a7df6e58ac28b1611862ce8b1a0f4bdbaa2429b06657a1f18277a82a8d4f9d455ac03
+  metadata.gz: 1887503ef58bbcd1df760d0fc07e61ae2799e83e29994f7097b690b3a043bf65b1abc5be315a4bbceb84cffd616769f01e16c861bb231f533af53d69a61e736e
+  data.tar.gz: 45268a4da3b16be35c6cb572f48427a7c9d9f5dd07a820c7d317469e080554f6d2f077e4fcab932f13df863b0cf2e5d02f801b2a412139d4cb3690fd82f2e044

data/completions/bash

@@ -15,7 +15,7 @@ _ppl()
   # Complete nicknames
   nick_cmds=([age]="" [bday]="" [email]="" [mv]="" [name]="" [nick]="" [org]="" [phone]="" [post]="" [rm]="" [show]="" [url]="")
   if [[ $nick_cmds[${prev}] ]]; then
-    local nicknames=$(for x in `ppl nick | cut -d ':' -f 1`; do echo ${x} ; done )
+    local nicknames=$(for x in `ppl nick | cut -d ':' -f 1 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`; do echo ${x} ; done )
     COMPREPLY=( $(compgen -W "${nicknames}" -- ${cur}) )
     return 0
   fi

data/completions/zsh

@@ -2,7 +2,7 @@
 #autoload
 
 _ppl_contacts() {
-  contacts=(`ppl nick | cut -d ':' -f 1`)
+  contacts=(`ppl nick | cut -d ':' -f 1 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`)
 }
 
 local -a _1st_arguments

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.17.0"
+  Version = "1.17.1"
 
   module Adapter
   end

data/lib/ppl/application/output.rb

@@ -10,13 +10,19 @@ class Ppl::Application::Output
   end
 
   def error(string)
-    @stderr.puts string
+    @stderr.puts sanitise(string)
   end
 
   def line(string)
-    @stdout.puts string
+    @stdout.puts sanitise(string)
     true
   end
 
+  private
+
+  def sanitise(string)
+    string.delete "\r"
+  end
+
 end
 

data/lib/ppl/application/shell.rb

@@ -7,9 +7,19 @@ class Ppl::Application::Shell
 
   def run(input, output)
     outcome = false
+    begin
       command = select_command(input)
       prepare_command(command, input)
       outcome = execute_command(command, input, output)
+    rescue Ppl::Error::ContactNotFound
+      output.error("ppl: Contact '#{$!}' not found")
+    rescue OptionParser::InvalidOption, OptionParser::MissingArgument, Ppl::Error::IncorrectUsage
+      output.error($!)
+      output.error(@optparse.to_s)
+    rescue
+      output.error("ppl: " + $!.message)
+      outcome = false
+    end
     return outcome
   end
 

data/lib/ppl/command/mutt.rb

@@ -39,6 +39,7 @@ class Ppl::Command::Mutt < Ppl::Application::Command
   def select_matching_contacts(address_book, query)
     matches = Ppl::Entity::AddressBook.new
     address_book.contacts.each do |contact|
+      contact = contact.dup
       if contact.email_addresses.empty?
         next
       elsif match_by_name(contact, query)
@@ -82,9 +83,9 @@ class Ppl::Command::Mutt < Ppl::Application::Command
 
   def describe_matches(matches)
     summary = sprintf(
-      "Searching address book... %d entries... %d matching:",
-      @address_book.contacts.length,
-      matches.contacts.length
+      "Searching address book... %d email addresses... %d matching:",
+      @address_book.contacts.inject(0) { |total, c| total += c.email_addresses.length },
+      matches.contacts.inject(0) { |total, c| total += c.email_addresses.length }
     )
     results = @format.process(matches)
     [summary, results].join("\n").strip

data/ppl.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "1.17.0"
+  spec.version     = "1.17.1"
   spec.date        = "2013-04-14"
 
   spec.required_ruby_version = ">= 1.9.3"

data/spec/ppl/adapter/output_spec.rb

@@ -37,6 +37,18 @@ describe Ppl::Application::Output do
       @stdout.should_receive(:puts).with(string)
       @output.line(string)
     end
+
+    it "should not send carriage returns to stdout" do
+      string = "The quick brown fox
+      @stdout.should_receive(:puts).with("The quick brown fox")
+      @output.line(string)
+    end
+
+    it "should not send carriage returns to stderr" do
+      string = "The quick brown fox
+      @stderr.should_receive(:puts).with("The quick brown fox")
+      @output.error(string)
+    end
   end
 
 end

data/spec/ppl/adapter/vcard/greencard_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 describe Ppl::Adapter::Vcard::GreenCard, "#encode" do
 

data/spec/ppl/command/mutt_spec.rb

@@ -45,7 +45,7 @@ describe Ppl::Command::Mutt do
       @storage.should_receive(:load_address_book).and_return(@address_book)
       @format.should_receive(:process).and_return("test@example.org\tTest User")
       @output.should_receive(:line) do |line|
-        line.should include "Searching address book... 1 entries... 1 matching:"
+        line.should include "Searching address book... 1 email addresses... 1 matching:"
         line.should include "test@example.org\tTest User"
       end
       @command.execute(@input, @output).should eq true
@@ -78,12 +78,30 @@ describe Ppl::Command::Mutt do
       @storage.should_receive(:load_address_book).and_return(@address_book)
       @format.should_receive(:process).and_return("test@example.org\tTest User")
       @output.should_receive(:line) do |line|
-        line.should include "Searching address book... 1 entries... 1 matching:"
+        line.should include "Searching address book... 1 email addresses... 1 matching:"
         line.should include "test@example.org\tTest User"
       end
       @command.execute(@input, @output).should eq true
     end
 
+
+    it "should count up email addresses in the status line" do
+      @input.arguments.push "org"
+
+      @contact.name = "Test User"
+      @contact.email_addresses.push "test@test.org"
+      @contact.email_addresses.push "prova@prova.org"
+      @address_book.contacts << @contact
+
+      @storage.stub(:load_address_book).and_return(@address_book)
+      @format.stub(:process)
+      @output.stub(:line)
+      @output.should_receive(:line) do |line|
+        line.should include "Searching address book... 2 email addresses... 2 matching:"
+      end
+      @command.execute(@input, @output)
+    end
+
   end
 
   describe "#execute (case-insensitive)" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Henry Smith