ppl 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e392faaea1882705856f5dbe483e493ca0c427a
-  data.tar.gz: 2334459a46cc72d92aa8c3c2f0a500a15de3fb5c
+  metadata.gz: f2c1a083b23b90a24e6f81e381593c1ed37150e1
+  data.tar.gz: e8477cde9b1eec569179e8695c65da79878f5925
 SHA512:
-  metadata.gz: 6227509847307b130c84049c0ce92063ea9079320e76e9530021a0fe7b3cd75425e1276abc2fbc35dcb2e6c0bb85f0c44181cd5235362e9fca4764f167cab584
-  data.tar.gz: 0e737fbd7ec0817918693c406587efab38d7f8f3dc8eb1f11577669665cf2a0750e5fdf70c6c445716848e94e6d45aeb7d47f6d316eb2625937c120e1cff60bc
+  metadata.gz: 6526a4a9e7a9aebfb8172736570852731ec890e15c5d74be9851a89c9a4f34c3599d0c10368252a038aafa6a7e4a8b6ca127821dd3e035b16af2cbc4d12969a0
+  data.tar.gz: a8abdf21b1ef7faea30160279c1fcf0e7ebf1e71138e1c8232ffdd2ea9b893a1b1773655e773cf7b77009cd653357a28e85cbe6dbf49ff5da4f839cb84600a47

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 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`; do echo ${x} ; done )
+    local nicknames=$(for x in `ppl nick --no-color | cut -d ':' -f 1`; 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 | sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g"`)
+  contacts=(`ppl nick --no-color | cut -d ':' -f 1`)
 }
 
 local -a _1st_arguments

data/lib/ppl/command/attribute.rb

@@ -27,6 +27,9 @@ class Ppl::Command::Attribute < Ppl::Application::Command
 
   def list_attribute(input, output)
     address_book = @storage.load_address_book
+    if input.options[:no_color]
+      @list_format.disable_colors!
+    end
     output.line(@list_format.process(address_book))
     true
   end

data/lib/ppl/command/nick.rb

@@ -13,6 +13,9 @@ class Ppl::Command::Nick < Ppl::Command::Attribute
     parser.on("-d", "--delete", "delete nickname") do
       options[:delete] = true
     end
+    parser.on("--no-color", "turn off colored output") do
+      options[:no_color] = true
+    end
   end
 
 end

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

@@ -12,6 +12,9 @@ class Ppl::Format::AddressBook::Nicknames < Ppl::Format::AddressBook
     @table.to_s
   end
 
+  def disable_colors!
+    @table.disable_colors!
+  end
 
   private
 

data/lib/ppl/format/table.rb

@@ -38,6 +38,9 @@ class Ppl::Format::Table
     string.strip
   end
 
+  def disable_colors!
+    @colors = {}
+  end
 
   private
 

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "1.19.0"
+  Version = "1.20.0"
 
   module Adapter
   end

data/ppl.gemspec

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

data/spec/ppl/command/attribute_spec.rb

@@ -28,6 +28,15 @@ describe Ppl::Command::Attribute do
       @command.execute(@input, @output).should eq true
     end
 
+    it "should disable color output if :no_color is set" do
+      @input.options[:no_color] = true
+      @storage.stub(:load_address_book).and_return(@address_book)
+      @list_format.should_receive(:disable_colors!)
+      @list_format.stub(:process)
+      @output.should_receive(:line)
+      @command.execute(@input, @output).should eq true
+    end
+
     it "should show the full list of attributes for the given contact" do
       @input.arguments.push("jdoe")
       @storage.should_receive(:require_contact).and_return(@contact)

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

@@ -44,5 +44,12 @@ describe Ppl::Format::AddressBook::Nicknames do
 
   end
 
+  describe "#disable_colors!" do
+    it "should turn off the table's colors" do
+      @table.should_receive(:disable_colors!)
+      @format.disable_colors!
+    end
+  end
+
 end
 

data/spec/ppl/format/table_spec.rb

@@ -98,5 +98,22 @@ describe Ppl::Format::Table do
 
   end
 
+  describe "#disable_colors!" do
+    it "should disable colors" do
+      @table.colors = {
+        "id" => "red",
+        "name" => "yellow",
+        "email" => "blue",
+      }
+      @table.add_row({
+        :id    => 12345,
+        :name  => "John Doe",
+        :email => "jdoe@example.org",
+      })
+      @table.disable_colors!
+      @table.to_s.should eq "12345  John Doe  jdoe@example.org"
+    end
+  end
+
 end
 

metadata

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