ppl 1.22.2 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc9a9a697a887b27f8b6861bd558f92d14d0e7db
-  data.tar.gz: 76354097c49287e8c92a804bfbc9cf397eafa5fe
+  metadata.gz: 6c8a86000f8071b266624cd2cb96c4ea0da0294a
+  data.tar.gz: f0a2f09b185c73029847e11b010cc81f5fe97d7d
 SHA512:
-  metadata.gz: bd847a67287e56e12ea07d0b1cf1d0b902dcddd585bb4e7b5b09a8cb3168de0c10916651dd7f7ec126249a64f4b58b8fc5ff106936564c7d7f9cdd570ae42e74
-  data.tar.gz: 23c4c152e84c421afb380bc687c45db332c326f5c96ec4c91723de998aa299eda024ce773bcfbe5b11c8a1f3483222c53458091b1fcfdc37bcedcbcabecd8632
+  metadata.gz: eb44a9bf6207db1a1073b47f2e7fe22787b4f05e9d04987faabc473de6372ee35db3ae04c3b5bffa85817b4bd5fe8b5c060ce071faa231dbba14dc7752dae5f1
+  data.tar.gz: 487f408c4610193bbb135d0016cee82555ab0445b64645da7c072eb351d1ea32084173886eaecf44e41a9563f4276865f843348fe4ecce614a082daa619a29a8

data/Rakefile

@@ -0,0 +1,42 @@
+
+task :build    => [:build193, :build200]
+task :build193 => [:ruby193, :spec, :features]
+task :build200 => [:ruby200, :spec, :features]
+
+task :features => [:disable_config] do
+  system "bundle exec cucumber"
+end
+
+task :spec do
+  system "bundle exec rspec"
+end
+
+task :ruby193 do
+  system "bash -lc 'rvm use 1.9.3'"
+  Rake::Task["spec"].reenable
+  Rake::Task["features"].reenable
+end
+
+task :ruby200 do
+  system "bash -lc 'rvm use 2.0.0'"
+  Rake::Task["spec"].reenable
+  Rake::Task["features"].reenable
+end
+
+task :disable_config do
+  pplconfig = File.expand_path("~/.pplconfig")
+  bkpconfig = File.expand_path("~/.pplconfig.bkp")
+  if File.exists? pplconfig
+    FileUtils.mv pplconfig, bkpconfig
+  end
+  at_exit { Rake::Task["enable_config"].invoke }
+end
+
+task :enable_config do
+  pplconfig = File.expand_path("~/.pplconfig")
+  bkpconfig = File.expand_path("~/.pplconfig.bkp")
+  if File.exists? bkpconfig
+    FileUtils.mv bkpconfig, pplconfig
+  end
+end
+

data/completions/bash

@@ -1,25 +1,248 @@
-_ppl()
+__ppl()
 {
-  local cur prev opts nick_cmds base
-  COMPREPLY=()
-  cur="${COMP_WORDS[COMP_CWORD]}"
-  prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-  # Complete options
-  opts="add age bday completion email init ls mutt mv name nick org phone post pull push remote rm scrape shell show url version"
-  if [[ ${prev} == "ppl" ]]; then
-    COMPREPLY=($(compgen -W "${opts}" -- ${cur}))
+  if __ppl_needs_command_name; then
+    COMPREPLY=($(__ppl_suggest_command_name))
     return 0
   fi
 
-  # 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 --no-color | cut -d ':' -f 1`; do echo ${x} ; done )
-    COMPREPLY=( $(compgen -W "${nicknames}" -- ${cur}) )
+  if __ppl_needs_contact_id; then
+    COMPREPLY=($(__ppl_suggest_contact_id))
     return 0
   fi
+
+  if __ppl_needs_contact_email_address; then
+    COMPREPLY=($(__ppl_suggest_contact_email_address))
+    return 0
+  fi
+
+  if __ppl_needs_contact_nickname; then
+    COMPREPLY=($(__ppl_suggest_contact_nickname))
+    return 0
+  fi
+
+  if __ppl_needs_contact_organization; then
+    COMPREPLY=($(__ppl_suggest_contact_organization))
+    return 0
+  fi
+
+  if __ppl_needs_contact_phone_numher; then
+    COMPREPLY=($(__ppl_suggest_contact_phone_numher))
+    return 0
+  fi
+
+  if __ppl_needs_contact_url; then
+    COMPREPLY=($(__ppl_suggest_contact_url))
+    return 0
+  fi
+
+  if __ppl_needs_git_remote; then
+    COMPREPLY=($(__ppl_suggest_git_remote))
+    return 0
+  fi
+
+}
+
+__ppl_needs_command_name()
+{
+  if [[ $COMP_CWORD == 1 ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_id()
+{
+  command_list=$(__ppl_commands_needing_contact_ids)
+  command_name=${COMP_WORDS[1]}
+  if [[ $command_list =~ $command_name ]] && [[ $COMP_CWORD -eq 2 ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_git_remote()
+{
+  command_list=$(__ppl_commands_needing_git_remotes)
+  command_name=${COMP_WORDS[1]}
+  if [[ $command_list =~ $command_name ]] && [[ $COMP_CWORD -eq 2 ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_email_address()
+{
+  if [ "${COMP_WORDS[1]}" == "email" ] && [ "$COMP_CWORD" == 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_nickname()
+{
+  if [ "${COMP_WORDS[1]}" == "nick" ] && [ "$COMP_CWORD" == 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_organization()
+{
+  if [ "${COMP_WORDS[1]}" == "org" ] && [ "$COMP_CWORD" == 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_phone_numher()
+{
+  if [ "${COMP_WORDS[1]}" == "phone" ] && [ "$COMP_CWORD" == 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_needs_contact_url()
+{
+  if [ "${COMP_WORDS[1]}" == "url" ] && [ "$COMP_CWORD" == 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+__ppl_suggest_command_name()
+{
+  compgen -W "$(__ppl_commands)" -- ${COMP_WORDS[COMP_CWORD]}
+}
+
+__ppl_suggest_contact_id()
+{
+  compgen -W "$(__ppl_contact_ids)" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_git_remote()
+{
+  compgen -W "$(__ppl_git_remotes)" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_contact_email_address()
+{
+  contact_id=${COMP_WORDS[2]}
+  compgen -W "$(__ppl_contact_email_addresses $contact_id)" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_contact_nickname()
+{
+  compgen -W "$(__ppl_contact_nicknames ${COMP_WORDS[2]})" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_contact_organization()
+{
+  compgen -W "$(__ppl_contact_organizations ${COMP_WORDS[2]})" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_contact_phone_numher()
+{
+  compgen -W "$(__ppl_contact_phone_numbers ${COMP_WORDS[2]})" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_suggest_contact_url()
+{
+  compgen -W "$(__ppl_contact_urls ${COMP_WORDS[2]})" -- ${COMP_WORDS[$COMP_CWORD]}
+}
+
+__ppl_commands_needing_contact_ids()
+{
+  echo "age"
+  echo "bday"
+  echo "email"
+  echo "mv"
+  echo "name"
+  echo "nick"
+  echo "org"
+  echo "phone"
+  echo "post"
+  echo "rm"
+  echo "show"
+  echo "url"
+}
+
+__ppl_commands_needing_git_remotes()
+{
+  echo "pull"
+  echo "push"
+}
+
+__ppl_commands()
+{
+  echo "add"
+  echo "age"
+  echo "bday"
+  echo "completion"
+  echo "email"
+  echo "init"
+  echo "ls"
+  echo "mutt"
+  echo "mv"
+  echo "name"
+  echo "nick"
+  echo "org"
+  echo "phone"
+  echo "post"
+  echo "pull"
+  echo "push"
+  echo "remote"
+  echo "rm"
+  echo "scrape"
+  echo "shell"
+  echo "show"
+  echo "url"
+  echo "version"
+}
+
+__ppl_contact_ids()
+{
+  ppl nick --no-color | cut -d ':' -f 1
+}
+
+__ppl_contact_email_addresses()
+{
+  ppl email $1
+}
+
+__ppl_contact_nicknames()
+{
+  ppl nick $1
+}
+
+__ppl_contact_organizations()
+{
+  ppl org $1
+}
+
+__ppl_contact_phone_numbers()
+{
+  ppl phone $1
+}
+
+__ppl_contact_urls()
+{
+  ppl url $1
+}
+
+__ppl_git_remotes()
+{
+  ppl remote
 }
 
-complete -F _ppl ppl
+complete -F __ppl ppl
 

data/features/add.feature

@@ -4,6 +4,7 @@ Feature: ppl add
   Scenario: Add a new contact
     Given I am in an empty address book
     And I run "ppl add alice 'Alice Adams'"
-    Then there should be 1 contact
+    Then it should succeed
+    And there should be 1 contact
     And its name should be "Alice Adams"
 

data/features/bday.feature

@@ -0,0 +1,8 @@
+
+Feature: ppl bday
+
+  Scenario: Set a contact's birthday
+    Given I am in an address book with a blank contact called bob
+    And I run "ppl bday bob 2000-01-02"
+    Then it should succeed
+    And bob's birthday should be "2000-01-02"

data/features/email.feature

@@ -4,6 +4,13 @@ Feature: ppl email
   Scenario: Add an email address to a contact
     Given I am in an address book with a blank contact called bob
     And I run "ppl email bob bob@example.org"
-    Then bob should have 1 email address
+    Then it should succeed
+    And bob should have 1 email address
     And the 1st email address should be "bob@example.org"
 
+  Scenario: Remove an email address from a contact
+    Given I am in the same address book as before
+    And I run "ppl email bob --delete bob@example.org"
+    Then it should succeed
+    And bob should have 0 email addresses
+

data/features/init.feature

@@ -4,7 +4,8 @@ Feature: ppl init
   Scenario: Create a new address book
     Given I am in an empty directory
     When I run "ppl init ./contacts"
-    Then "./contacts" should be a ppl address book
+    Then it should succeed
+    And "./contacts" should be a ppl address book
 
   Scenario: Incorrect usage
     Given I am in an empty directory

data/features/ls.feature

@@ -0,0 +1,10 @@
+
+Feature: ppl ls
+
+  Scenario: List contacts' names and email addresses
+    Given I am in an address book with a blank contact called bob
+    And bob's name is "Robert Testing"
+    And bob's email address is "bob@example.org"
+    Then running "ppl ls" should output 1 line
+    And the 1st line should be "bob:  Robert Testing  <bob@example.org>"
+

data/features/mutt.feature

@@ -0,0 +1,22 @@
+
+Feature: ppl mutt
+
+  Scenario: Find contacts whose name matches the given string
+    Given I am in an address book with a blank contact called bob
+    And bob's name is "Robert Testing"
+    And bob's email address is "bob@example.org"
+    Then running "ppl mutt Rob" should output 2 lines
+    And the 1st line should be "Searching address book... 1 email addresses... 1 matching:"
+    And the 2nd line should be "bob@example.org	Robert Testing"
+
+  Scenario: Fail to match a name because the case is wrong
+    Given I am in the same address book as before
+    Then running "ppl mutt rob" should output 1 line
+    And the 1st line should be "No matches"
+
+  Scenario: Case-insensitive search
+    Given I am in the same address book as before
+    Then running "ppl mutt -i rob" should output 2 lines
+    And the 1st line should be "Searching address book... 1 email addresses... 1 matching:"
+    And the 2nd line should be "bob@example.org	Robert Testing"
+

data/features/mv.feature

@@ -0,0 +1,15 @@
+
+Feature: ppl mv
+
+  Scenario: Change a contact's ID
+    Given I am in an address book with a blank contact called bob
+    And I run "ppl mv bob rob"
+    Then it should succeed
+    And there should be 1 contact
+    And its ID should be "rob"
+
+  Scenario: Fail when the given contact ID doesn't exist
+    Given I am in the same address book as before
+    And I run "ppl mv bob rob 2> /dev/null"
+    Then it should fail
+

data/features/nick.feature

@@ -0,0 +1,16 @@
+
+Feature: ppl nick
+
+  Scenario: Add a nickname to a contact
+    Given I am in an address book with a blank contact called bob
+    And I run "ppl nick bob Bob"
+    Then it should succeed
+    And bob should have 1 nickname
+    And the 1st nickname should be "Bob"
+
+  Scenario: Remove a nickname address from a contact
+    Given I am in the same address book as before
+    And I run "ppl nick bob --delete Bob"
+    Then it should succeed
+    And bob should have 0 nicknames
+

data/features/org.feature

@@ -4,6 +4,13 @@ Feature: ppl org
   Scenario: Add an organization to a contact
     Given I am in an address book with a blank contact called bob
     And I run "ppl org bob 'Red Hat'"
-    Then bob should have 1 organization
+    Then it should succeed
+    And bob should have 1 organization
     And the 1st organization should be "Red Hat"
 
+  Scenario: Remove an organization from a contact
+    Given I am in the same address book as before
+    And I run "ppl org bob --delete 'Red Hat'"
+    Then it should succeed
+    And bob should have 0 organizations
+

data/features/phone.feature

@@ -4,11 +4,27 @@ Feature: ppl phone
   Scenario: Add a phone number to a contact
     Given I am in an address book with a blank contact called bob
     And I run "ppl phone bob 01234567890"
-    Then bob should have 1 phone number
+    Then it should succeed
+    And bob should have 1 phone number
+    And the 1st phone number should be "01234567890"
+
+  Scenario: Update a phone number's type
+    Given I am in the same address book as before
+    And I run "ppl phone bob 01234567890 --type cell"
+    Then it should succeed
+    And bob should have 1 phone number
+    And the 1st phone number should be "01234567890  (cell)"
+
+  Scenario: Remove a phone number's type
+    Given I am in the same address book as before
+    And I run "ppl phone bob 01234567890 --type ''"
+    Then it should succeed
+    And bob should have 1 phone number
     And the 1st phone number should be "01234567890"
 
   Scenario: Remove a phone number from a contact
     Given I am in the same address book as before
     And I run "ppl phone bob --delete 01234567890"
-    Then bob should have 0 phone numbers
+    Then it should succeed
+    And bob should have 0 phone numbers
 

data/features/rm.feature

@@ -0,0 +1,13 @@
+
+Feature: ppl rm
+
+  Scenario: Remove a contact from the address book
+    Given I am in an address book with a blank contact called bob
+    And I run "ppl rm bob"
+    Then there should be 0 contacts
+
+  Scenario: Fail when asked to remove a non-existent contact
+    Given I am in the same address book as before
+    And I run "ppl rm bob 2> /dev/null"
+    Then it should fail
+

data/features/step_definitions/ppl_steps.rb

@@ -10,14 +10,20 @@ When /^I run "ppl ([^"]+)"$/ do |command|
   ppl command
 end
 
+Then /^it should succeed$/ do
+  $?.exitstatus.should eq 0
+end
+
 Then /^it should fail$/ do
   $?.exitstatus.should_not eq 0
 end
 
-Then /^there should be 1 contact$/ do
+Then /^there should be (\d+) contacts?$/ do |n|
   contact_list = ppl("ls").strip.split("\n")
-  contact_list.length.should eq 1
-  @contact_id = contact_list[0].split(":").first
+  contact_list.length.should eq n.to_i
+  if contact_list[0]
+    @contact_id = contact_list[0].split(":").first
+  end
 end
 
 Then /^(bob) should have (\d+) email addresse?s?$/ do |name, number|
@@ -25,6 +31,11 @@ Then /^(bob) should have (\d+) email addresse?s?$/ do |name, number|
   @email_addresses.length.should eq number.to_i
 end
 
+Then /^(bob) should have (\d+) nicknames?$/ do |name, number|
+  @nicknames = ppl("nick #{name}").split("\n")
+  @nicknames.length.should eq number.to_i
+end
+
 Then /^(bob) should have (\d+) organizations?$/ do |name, number|
   @organizations = ppl("org #{name}").split("\n")
   @organizations.length.should eq number.to_i
@@ -35,6 +46,15 @@ Then /^(bob) should have (\d+) phone numbers?$/ do |name, number|
   @phone_numbers.length.should eq number.to_i
 end
 
+Then /^(bob) should have (\d+) URLs?$/ do |name, number|
+  @urls = ppl("url #{name}").split("\n")
+  @urls.length.should eq number.to_i
+end
+
+And /^its ID should be "([^"]+)"$/ do |id|
+  @contact_id.should eq id
+end
+
 And /^its name should be "([^"]+)"$/ do |name|
   ppl("name #{@contact_id}").should eq name
 end
@@ -43,6 +63,19 @@ Then(/^the (\d+).. email address should be "([^"]+)"$/) do |nth, address|
   @email_addresses[nth.to_i - 1].should eq address
 end
 
+Then /^running "ppl ([^"]+)" should output (\d+) lines?$/ do |command, lines|
+  @output = ppl(command).split("\n")
+  @output.length.should eq lines.to_i
+end
+
+And /^the (\d+).. line should be "([^"]+)"$/ do |nth, line|
+  @output[nth.to_i - 1].should eq line
+end
+
+Then(/^the (\d+).. nickname should be "([^"]+)"$/) do |nth, nickname|
+  @nicknames[nth.to_i - 1].should eq nickname
+end
+
 Then(/^the (\d+).. organization should be "([^"]+)"$/) do |nth, organization|
   @organizations[nth.to_i - 1].should eq organization
 end
@@ -51,4 +84,19 @@ Then(/^the (\d+).. phone number should be "([^"]+)"$/) do |nth, phone_number|
   @phone_numbers[nth.to_i - 1].should eq phone_number
 end
 
+Then(/^the (\d+).. URL should be "([^"]+)"$/) do |nth, url|
+  @urls[nth.to_i - 1].should eq url
+end
+
+Then /^(bob)'s birthday should be "([^"]+)"$/ do |id, birthday|
+  ppl("bday #{id}").should eq birthday
+end
+
+And /^(bob)'s name is "([^"]+)"$/ do |id, name|
+  ppl("name #{id} \"#{name}\"")
+end
+
+And /^(bob)'s email address is "([^"]+)"$/ do |id, email_address|
+  ppl("email #{id} \"#{email_address}\"")
+end
 

data/features/url.feature

@@ -0,0 +1,16 @@
+
+Feature: ppl url
+
+  Scenario: Add a URL to a contact
+    Given I am in an address book with a blank contact called bob
+    And I run "ppl url bob http://example.org/~bob"
+    Then it should succeed
+    And bob should have 1 URL
+    And the 1st URL should be "http://example.org/~bob"
+
+  Scenario: Remove a URL from a contact
+    Given I am in the same address book as before
+    And I run "ppl url bob --delete http://example.org/~bob"
+    Then it should succeed
+    And bob should have 0 URLs
+

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.22.2"
+  Version = "1.23.0"
 
   module Adapter
   end

data/ppl.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 1.22.2
+  version: 1.23.0
 platform: ruby
 authors:
 - Henry Smith
@@ -163,17 +163,25 @@ files:
 - COPYING
 - Gemfile
 - README.md
+- Rakefile
 - bin/ppl
 - completions/bash
 - completions/zsh
 - features/add.feature
+- features/bday.feature
 - features/email.feature
 - features/init.feature
+- features/ls.feature
+- features/mutt.feature
+- features/mv.feature
+- features/nick.feature
 - features/org.feature
 - features/phone.feature
+- features/rm.feature
 - features/step_definitions/address_book_steps.rb
 - features/step_definitions/cwd_steps.rb
 - features/step_definitions/ppl_steps.rb
+- features/url.feature
 - lib/ppl.rb
 - lib/ppl/adapter/color.rb
 - lib/ppl/adapter/color/colored.rb