ppl 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b49a2cceb54b4ee3b05d5d4c27ee3cbda36ebfbc
-  data.tar.gz: 6f0aa6699ffa9da4890b9526e8f166158e78d77a
+  metadata.gz: 54bd898c01b4596d0141c54a64caa74db1e2e00f
+  data.tar.gz: ed04641beeb4b1b57c2f65c652288e649a29d17d
 SHA512:
-  metadata.gz: dea1764de2c16aa7630309ecbde9ef05c46d0ff0914a11beb9a29031e5013694c848bf9f8efd460ff4defa39eb261b6912caa157bdc4c3ce1a95fbceb64ca94d
-  data.tar.gz: db473dff006d114dee4b99ca9bd20f9c9c3b748e29beb0eeef940c22ae3df14fadabf5359b37850396d7582147b2c1cd1275b3dc9e837c639623cac433fef28f
+  metadata.gz: 3f685cebc610e4a67c852d565533bfe28631959514884ec808deef38bb0444f4fe32efddcca8b1e87023a1e924ba7f87fe78e1871fb12ddb356fb21707dc2818
+  data.tar.gz: 96a9cef98cbf2344b281341b3fafe64b0c211e0f5923c91ee7e6376f891fcfe9ab9e62674c591818153ec9205a24b223aa2b7523ee7b5219be5e6fb7407a3270

data/.travis.yml

@@ -1,8 +1,10 @@
-
 language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+sudo: false
+before_install:
+  - gem install bundler
 script:
   - bundle exec rspec spec
   - bundle exec cucumber

data/lib/ppl.rb

@@ -1,7 +1,7 @@
 
 module Ppl
 
-  Version = "2.4.0"
+  Version = "2.4.1"
 
   module Adapter
   end
@@ -126,4 +126,3 @@ require "ppl/service/postal_address"
 class String
   alias_method :each, :each_line
 end
-

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"
@@ -77,7 +77,7 @@ 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    = []
@@ -118,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/ppl.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
 
   spec.name        = "ppl"
-  spec.version     = "2.4.0"
-  spec.date        = "2016-01-12"
+  spec.version     = "2.4.1"
+  spec.date        = "2017-05-01"
 
   spec.required_ruby_version = ">= 1.9.3"
 
@@ -14,10 +14,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency("inifile", "2.0.2")
   spec.add_dependency("mail", "2.5.3")
   spec.add_dependency("morphine", "0.1.1")
-  spec.add_dependency("rugged", "0.17.0.b6")
+  spec.add_dependency("rugged", "~> 0.24.0")
   spec.add_dependency("greencard", "0.0.5")
 
-  spec.add_development_dependency("coveralls")
   spec.add_development_dependency("cucumber")
   spec.add_development_dependency("rspec")
   spec.add_development_dependency("rake")
@@ -33,4 +32,3 @@ Gem::Specification.new do |spec|
   spec.homepage     = "http://ppladdressbook.org"
 
 end
-

data/spec/ppl/adapter/email_scraper/mail_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 describe Ppl::Adapter::EmailScraper::Mail do
 

data/spec/ppl/adapter/storage/git_spec.rb

@@ -12,6 +12,7 @@ describe Ppl::Adapter::Storage::Git do
     @repo    = double(Rugged::Repository)
     @commit  = double(Rugged::Commit)
     @vcard   = double(Ppl::Adapter::Vcard)
+    @target  = double(Rugged::Commit)
 
     Rugged::Repository.stub(:new).and_return(@repo)
 
@@ -50,7 +51,8 @@ describe Ppl::Adapter::Storage::Git do
 
       @files = [{:name => "test.vcf"}]
 
-      @commit.should_receive(:target)
+      @commit.should_receive(:target).and_return(@target)
+      @target.should_receive(:oid)
       @repo.should_receive(:lookup).and_return(@head)
       @repo.should_receive(:head).and_return(@commit)
 
@@ -82,11 +84,16 @@ describe Ppl::Adapter::Storage::Git do
   describe "#load_contact" do
 
     it "should return a contact" do
+      target      = OpenStruct.new
+      target.oid  = "asdfg"
       head        = OpenStruct.new
-      head.target = "asdfg"
+      head.target = target
+
+      blob         = OpenStruct.new
+      blob.content = 'vcard contents'
 
       @repo.should_receive(:head).and_return(head)
-      @repo.should_receive(:file_at).and_return("vcard contents")
+      @repo.should_receive(:blob_at).and_return(blob)
       @vcard.should_receive(:decode).and_return(@contact)
       @contact.should_receive(:id=).with("test")
 
@@ -94,11 +101,16 @@ describe Ppl::Adapter::Storage::Git do
     end
 
     it "handles encoding errors gracefully" do
+      target      = OpenStruct.new
+      target.oid  = "asdfg"
       head        = OpenStruct.new
-      head.target = "asdfg"
+      head.target = target
+
+      blob         = OpenStruct.new
+      blob.content = 'vcard contents'
 
       @repo.should_receive(:head).and_return(head)
-      @repo.should_receive(:file_at).and_return("vcard contents")
+      @repo.should_receive(:blob_at).and_return(blob)
       @vcard.should_receive(:decode).and_raise(GreenCard::InvalidEncodingError)
       expect{ @git.load_contact("test") }.to raise_error(Ppl::Error::InvalidVcard)
     end

data/spec/spec_helper.rb

@@ -1,14 +1,7 @@
-
 require "fakefs/safe"
 require "pathname"
 
 bin_file = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
-if ENV['CI']
-  require "coveralls"
-  Coveralls.wear!
-end
-
 require "ppl"
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ppl
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Henry Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2017-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -70,16 +70,16 @@ dependencies:
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0.b6
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0.b6
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: greencard
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -397,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The command line address book