ppl 2.3.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6b8cf7a49d86910e1f9ae9d0715173ddfd90c172
-  data.tar.gz: b936dfdaa46dd5f3a494d74e2caaf369c65c7dea
+SHA256:
+  metadata.gz: a028d8682930e39c6389a412dcc8d184b651b7fbcd45884e03865cf51ccedee4
+  data.tar.gz: 23e77730f17c512b5d7e59f5d6bda1f2dd54e99628d110ebb3fbd9b5efa376b6
 SHA512:
-  metadata.gz: adb3738b5599011b369a186cce6a9133b0d2e2fcfc8e7206989cc3c6d63624e0c96fd99bd596d84106b4695c51d50a23fa18820f32a75ca1ee6a43f5876dedfb
-  data.tar.gz: e5999fc187d6e5ce979cd14809f8c7f5e78138ebd963c3011831171a3234c79da6d89b45fa1980b227111e670b591901a9035914de38ace5bba21b1f36fa001f
+  metadata.gz: e2981dfd3deddc4e52938681ce6ec9278d06d93bc0719572b12706ebe9fb2fd9aabec1e3c6e54a23d70a1e4145eadd9693823951ce837044298516af9da70dd1
+  data.tar.gz: d0378f569f3f93a0df75d55da9ba62e335681fc2449c33dbe0726c367de3146be046762f790000235499bb88adb95fe726ee3ed33dd8f256b5aa054d28be1af7

data/.editorconfig

@@ -0,0 +1,4 @@
+[*.yml]
+indent_style = space
+indent_size = 2
+

data/.github/workflows/build.yml

@@ -0,0 +1,26 @@
+name: Build
+on: push
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 3.0.0
+      - uses: jwlawson/actions-setup-cmake@v1.8
+        with:
+          cmake-version: "3.16.x"
+      - name: Install dependencies
+        run: bundle install
+      - name: rspec
+        run: bundle exec rake spec
+      #- name: cucumber
+      #  run: bundle exec rake features
+      - uses: dawidd6/action-publish-gem@v1
+        continue-on-error: true
+        if: ${{ github.ref == 'refs/heads/trunk' }}
+        with:
+          api_key: ${{secrets.RUBYGEMS_API_KEY}}
+

data/Rakefile

@@ -1,8 +1,3 @@
-
-task :build    => [:build193, :build200]
-task :build193 => [:ruby193, :spec, :features]
-task :build200 => [:ruby200, :spec, :features]
-
 task :features => [:disable_config] do
   system "bundle exec cucumber"
 end
@@ -11,18 +6,6 @@ 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")

data/{CODE_OF_CONDUCT.md → code_of_conduct.md}

@@ -35,7 +35,7 @@ This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at [henry@henrysmith.org](mailto:henry@henrysmith.org). All
+reported by contacting a project maintainer at [hen@hey.com](mailto:hen@hey.com). All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an

data/lib/ppl.rb

@@ -1,7 +1,6 @@
-
 module Ppl
 
-  Version = "2.3.3"
+  Version = "3.0.1"
 
   module Adapter
   end
@@ -36,7 +35,7 @@ require "ppl/adapter/storage/disk"
 require "ppl/adapter/storage/factory"
 require "ppl/adapter/storage/git"
 require "ppl/adapter/vcard"
-require "ppl/adapter/vcard/greencard"
+require "ppl/adapter/vcard/vpim"
 
 require "ppl/application/bootstrap"
 require "ppl/application/command"

data/lib/ppl/adapter/color.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Adapter::Color
 
   def colorize(string, color)

data/lib/ppl/adapter/color/colored.rb

@@ -1,4 +1,3 @@
-
 require "colored"
 
 class Ppl::Adapter::Color::Colored

data/lib/ppl/adapter/email_scraper.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Adapter::EmailScraper
 
   def scrape_contacts(email)

data/lib/ppl/adapter/email_scraper/mail.rb

@@ -1,4 +1,3 @@
-
 require "mail"
 
 class Ppl::Adapter::EmailScraper::Mail

data/lib/ppl/adapter/storage.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Adapter::Storage
 
   def self.create_address_book(path)

data/lib/ppl/adapter/storage/disk.rb

@@ -1,4 +1,3 @@
-
 require "fileutils"
 
 class Ppl::Adapter::Storage::Disk < Ppl::Adapter::Storage

data/lib/ppl/adapter/storage/factory.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Adapter::Storage::Factory
 
   def initialize(vcard_adapter)

data/lib/ppl/adapter/storage/git.rb

@@ -24,7 +24,7 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   def load_address_book
     address_book = Ppl::Entity::AddressBook.new
 
-    head = @repository.lookup(@repository.head.target)
+    head = @repository.lookup(@repository.head.target.oid)
     head.tree.each do |file|
       extension = file[:name].slice(-4..-1)
       if extension != ".vcf"
@@ -41,7 +41,7 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   def load_contact(id)
     begin
       read_contact_from_disk id
-    rescue GreenCard::InvalidEncodingError
+    rescue Vpim::InvalidEncodingError
       raise Ppl::Error::InvalidVcard, "#{id}.vcf contains invalid data"
     end
   end
@@ -77,20 +77,23 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
     end
 
     if !head.nil?
-      parents    = [ @repository.lookup( @repository.head.target ).oid ]
+      parents    = [ @repository.lookup( @repository.head.target.oid ).oid ]
       update_ref = "HEAD"
     else
       parents    = []
       update_ref = "HEAD"
     end
 
-    name = ENV['USER']
-    host = Socket.gethostname
+    begin
+      git_config = Rugged::Config.open_global.to_hash
+    rescue Rugged::OSError
+      git_config = {}
+    end
 
     author = {
-      :email => name + "@" + host,
+      :email => git_config.fetch('user.email', "#{ENV['USER']}@#{Socket.gethostname}"),
       :time  => Time.now,
-      :name  => name,
+      :name  => git_config.fetch('user.name', ENV['USER']),
     }
 
     data = {
@@ -115,7 +118,8 @@ class Ppl::Adapter::Storage::Git < Ppl::Adapter::Storage
   def read_contact_from_disk(id)
     filename = id + ".vcf"
     target   = @repository.head.target
-    vcard    = @repository.file_at(target, filename)
+    blob     = @repository.blob_at(target.oid, filename)
+    vcard    = blob.nil? ? nil : blob.content
     contact  = nil
 
     if !vcard.nil?

data/lib/ppl/adapter/vcard.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Adapter::Vcard
 
   def encode(contact)

data/lib/ppl/adapter/vcard/{greencard.rb → vpim.rb}

@@ -1,8 +1,7 @@
-
-require "greencard/vcard"
+require "vpim/vcard"
 require "digest/sha1"
 
-class Ppl::Adapter::Vcard::GreenCard
+class Ppl::Adapter::Vcard::Vpim
 
   @@postal_address_property_map = {
     :street     => :street,
@@ -15,7 +14,7 @@ class Ppl::Adapter::Vcard::GreenCard
   }
 
   def encode(contact)
-    vcard = GreenCard::Vcard::Maker.make2 do |maker|
+    vcard = Vpim::Vcard::Maker.make2 do |maker|
       encode_birthday(contact, maker)
       encode_name(contact, maker)
       encode_email_addresses(contact, maker)
@@ -29,7 +28,7 @@ class Ppl::Adapter::Vcard::GreenCard
   end
 
   def decode(string)
-    vcard   = GreenCard::Vcard.decode(string).first
+    vcard   = Vpim::Vcard.decode(string).first
     contact = Ppl::Entity::Contact.new
     decode_birthday(vcard, contact)
     decode_email_addresses(vcard, contact)
@@ -119,6 +118,11 @@ class Ppl::Adapter::Vcard::GreenCard
     contact.name = Ppl::Entity::Name.new
     if !vcard.name.nil?
       contact.name.full = vcard.name.fullname
+      contact.name.given  = vcard.name.given      unless vcard.name.given.nil?
+      contact.name.family = vcard.name.family     unless vcard.name.family.nil?
+      contact.name.middle = vcard.name.additional unless vcard.name.additional.nil?
+      contact.name.prefix = vcard.name.prefix     unless vcard.name.prefix.nil?
+      contact.name.suffix = vcard.name.suffix     unless vcard.name.suffix.nil?
     end
   end
 

data/lib/ppl/application/bootstrap.rb

@@ -1,4 +1,3 @@
-
 require "morphine"
 
 class Ppl::Application::Bootstrap
@@ -373,7 +372,7 @@ class Ppl::Application::Bootstrap
   end
 
   register :vcard_adapter do
-    Ppl::Adapter::Vcard::GreenCard.new
+    Ppl::Adapter::Vcard::Vpim.new
   end
 
   register :email_scraper do

data/lib/ppl/application/command.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Application::Command
 
   @@property_values = {}

data/lib/ppl/application/command_suite.rb

@@ -1,4 +1,3 @@
-
 require "enumerator"
 
 class Ppl::Application::CommandSuite

data/lib/ppl/application/configuration.rb

@@ -1,4 +1,3 @@
-
 require "inifile"
 
 class Ppl::Application::Configuration

data/lib/ppl/application/input.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Application::Input
 
   attr_accessor :arguments

data/lib/ppl/application/output.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Application::Output
 
   attr_accessor :stdout

data/lib/ppl/application/router.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Application::Router
 
   attr_accessor :aliases

data/lib/ppl/application/shell.rb

@@ -1,4 +1,3 @@
-
 require "optparse"
 
 class Ppl::Application::Shell

data/lib/ppl/command/add.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Add < Ppl::Application::Command
 
   attr_writer :name_service

data/lib/ppl/command/age.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Age < Ppl::Application::Command
 
   name        "age"

data/lib/ppl/command/attribute.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Attribute < Ppl::Application::Command
 
   attr_writer :attribute

data/lib/ppl/command/bday.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Bday < Ppl::Application::Command
 
   name        "bday"

data/lib/ppl/command/completion.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Completion < Ppl::Application::Command
 
   name        "completion"

data/lib/ppl/command/email.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Email < Ppl::Application::Command
 
   name        "email"

data/lib/ppl/command/external.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::External < Ppl::Application::Command
 
   attr_accessor :command

data/lib/ppl/command/help.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Help < Ppl::Application::Command
 
   name        "help"

data/lib/ppl/command/init.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Init < Ppl::Application::Command
 
   name        "init"

data/lib/ppl/command/ls.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Ls < Ppl::Application::Command
 
   name        "ls"

data/lib/ppl/command/mutt.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Mutt < Ppl::Application::Command
 
   name        "mutt"

data/lib/ppl/command/mv.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Mv < Ppl::Application::Command
 
   name        "mv"

data/lib/ppl/command/name.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Name < Ppl::Application::Command
 
   name        "name"

data/lib/ppl/command/nick.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Nick < Ppl::Command::Attribute
 
   name        "nick"

data/lib/ppl/command/org.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Org < Ppl::Command::Attribute
 
   name        "org"

data/lib/ppl/command/phone.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Phone < Ppl::Application::Command
 
   name        "phone"

data/lib/ppl/command/post.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Post < Ppl::Application::Command
 
   name        "post"

data/lib/ppl/command/rm.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Rm < Ppl::Application::Command
 
   name        "rm"

data/lib/ppl/command/scrape.rb

@@ -1,4 +1,3 @@
-
 require "readline"
 
 class Ppl::Command::Scrape < Ppl::Application::Command

data/lib/ppl/command/shell.rb

@@ -1,4 +1,3 @@
-
 require "readline"
 
 class Ppl::Command::Shell < Ppl::Application::Command

data/lib/ppl/command/show.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Show < Ppl::Application::Command
 
   name        "show"

data/lib/ppl/command/url.rb

@@ -1,4 +1,3 @@
-
 class Ppl::Command::Url < Ppl::Command::Attribute
 
   name        "url"