ppl 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e7227e67ddcd57d56016f63b0d40b51c2989d62f9f0d42b764535c1176a436
-  data.tar.gz: 9444983ccb14e1ee6d73626fed21a5aaf7c6aba89013dff4d706b088bb57e654
+  metadata.gz: 4cc246db0a4e91b85f3f04c9c7961ff4e564c9ce91ba87631d4efdabe6c0aec0
+  data.tar.gz: cc829862f67814f88a44a8f50367b7a453d2deee549d2f73af9b4f7c47855b4f
 SHA512:
-  metadata.gz: f3efe966f2e4d2d0f19b87392a2643e457b8cb71c49916000ca5ec0c2060f8238d41110b59203b1eb4dda48703f2c7bee52880e7486235647eb1e345d9b93d83
-  data.tar.gz: a2b65af534bc75927673e93387ac35056b376337a31ad28e175ba5606b1717d5b31bea46cb2661b7539ff9d0aba1e8276a3b71d04ed75c7a3b8c111edf4bf472
+  metadata.gz: e32285452876a1a7312a4a683b18bbdca0ff2e45bea87034def7bd794a0044bbd8c5e6a8b2067da36a12a070345afeb46ff03b8e698ae8dda1003c3bc491f7a4
+  data.tar.gz: aab66b67e9def63ef307be8ea85619d7346f4a77897fbe1dd29bc3db847d1dbe496dfe69007e515da2c282a7f128f516c870d24d069710c6f703888262822cd8

data/.github/workflows/build.yml

@@ -29,4 +29,5 @@ jobs:
         if: ${{ github.ref == 'refs/heads/trunk' }}
         with:
           api_key: ${{secrets.RUBYGEMS_API_KEY}}
+          github_token: ${{secrets.GITHUB_TOKEN}}
 

data/features/step_definitions/ppl_steps.rb

@@ -11,11 +11,11 @@ When /^I run "ppl ([^"]+)"$/ do |command|
 end
 
 Then /^it should succeed$/ do
-  $?.exitstatus.should eq 0
+  expect($?.exitstatus).to eq 0
 end
 
 Then /^it should fail$/ do
-  $?.exitstatus.should_not eq 0
+  expect($?.exitstatus).not_to eq 0
 end
 
 Then /^there should be (\d+) contacts?$/ do |n|
@@ -28,7 +28,7 @@ end
 
 Then /^(bob) should have (\d+) email addresse?s?$/ do |name, number|
   @email_addresses = ppl("email #{name}").split("\n")
-  @email_addresses.length.should eq number.to_i
+  expect(@email_addresses.length).to eq number.to_i
 end
 
 Then /^(bob) should have (\d+) nicknames?$/ do |name, number|

data/ppl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |spec|
 
   spec.name = "ppl"
-  spec.version = "4.0.1"
+  spec.version = "4.0.2"
   spec.date = "2021-04-02"
 
   spec.required_ruby_version = ">= 3.0.0"

data/spec/ppl/adapter/color/colored_spec.rb

@@ -8,13 +8,13 @@ describe Ppl::Adapter::Color::Colored do
 
     it "should colorize the string using the monkeypatched String method" do
       string = "example"
-      string.should_receive(:red).and_return("red example")
-      @adapter.colorize(string, "red").should eq "red example"
+      expect(string).to receive(:red).and_return("red example")
+      expect(@adapter.colorize(string, "red")).to eq "red example"
     end
 
     it "should only attempt to colorize the string if the color exists" do
       string = "example"
-      @adapter.colorize(string, "neon").should eq "example"
+      expect(@adapter.colorize(string, "neon")).to eq "example"
     end
 
   end

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

@@ -11,7 +11,7 @@ describe Ppl::Adapter::EmailScraper::Mail do
   describe "#scrape_contacts" do
 
     it "should return an array" do
-      @adapter.scrape_contacts("").should eq []
+      expect(@adapter.scrape_contacts("")).to eq []
     end
 
     it "should scrape the sender's name" do
@@ -26,9 +26,9 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
-      @storage.should_receive(:load_contact).and_return(nil)
+      expect(@storage).to receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.name.full.should eq "Test User"
+      expect(contacts.first.name.full).to eq "Test User"
     end
 
     it "should scrape the sender's email address" do
@@ -43,9 +43,9 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
-      @storage.should_receive(:load_contact).and_return(nil)
+      expect(@storage).to receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.email_addresses.first.address.should eq "test@example.org"
+      expect(contacts.first.email_addresses.first.address).to eq "test@example.org"
     end
 
     it "should generate an ID for the sender based on their name" do
@@ -60,9 +60,9 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
-      @storage.should_receive(:load_contact).and_return(nil)
+      expect(@storage).to receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.id.should eq "test_user"
+      expect(contacts.first.id).to eq "test_user"
     end
 
     it "should generate a sender ID based on email address if there's no name" do
@@ -78,7 +78,7 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "Bye!",
       ].join("\n")
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.id.should eq "test@example.org"
+      expect(contacts.first.id).to eq "test@example.org"
     end
 
     it "avoids overwriting an existing contact ID" do
@@ -93,10 +93,10 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "This is a test email.",
         "Bye!",
       ].join("\n")
-      @storage.should_receive(:load_contact).with("test_user").and_return(Ppl::Entity::Contact.new)
-      @storage.should_receive(:load_contact).with("test_user_1").and_return(nil)
+      expect(@storage).to receive(:load_contact).with("test_user").and_return(Ppl::Entity::Contact.new)
+      expect(@storage).to receive(:load_contact).with("test_user_1").and_return(nil)
       contacts = @adapter.scrape_contacts(email)
-      contacts.first.id.should eq "test_user_1"
+      expect(contacts.first.id).to eq "test_user_1"
     end
 
     it "allows non-ASCII sender names" do
@@ -112,10 +112,10 @@ describe Ppl::Adapter::EmailScraper::Mail do
         "Bye!",
       ].join("\n")
 
-      @storage.should_receive(:load_contact).and_return(nil)
+      expect(@storage).to receive(:load_contact).and_return(nil)
       contacts = @adapter.scrape_contacts(email)
 
-      contacts.first.name.full.should eq "Александр"
+      expect(contacts.first.name.full).to eq "Александр"
     end
 
   end

data/spec/ppl/adapter/output_spec.rb

@@ -3,13 +3,13 @@ describe Ppl::Application::Output, "#initialize" do
   it "should accept stdout" do
     stdout = Object.new
     @output = Ppl::Application::Output.new(stdout, nil)
-    @output.stdout.should be stdout
+    expect(@output.stdout).to be stdout
   end
 
   it "should accept stderr" do
     stderr = Object.new
     @output = Ppl::Application::Output.new(nil, stderr)
-    @output.stderr.should be stderr
+    expect(@output.stderr).to be stderr
   end
 
 end
@@ -25,7 +25,7 @@ describe Ppl::Application::Output do
   describe "#error" do
     it "should delegate to stderr's puts method" do
       string = "COMPUTER OVER. VIRUS = VERY YES"
-      @stderr.should_receive(:puts).with(string)
+      expect(@stderr).to receive(:puts).with(string)
       @output.error(string)
     end
   end
@@ -33,25 +33,25 @@ describe Ppl::Application::Output do
   describe "#line" do
     it "should delegate to stdout's puts method" do
       string = "The quick brown fox"
-      @stdout.should_receive(:puts).with(string)
+      expect(@stdout).to 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")
+      expect(@stdout).to 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")
+      expect(@stderr).to receive(:puts).with("The quick brown fox")
       @output.error(string)
     end
 
     it "should not sanitise output if nil" do
       string = nil
-      @stdout.should_receive(:puts).with(nil)
+      expect(@stdout).to receive(:puts).with(nil)
       @output.line(string)
     end
   end

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

@@ -11,13 +11,13 @@ describe Ppl::Adapter::Storage::Disk, "#create_address_book" do
   describe "#create_address_book" do
     it "should create the directory if it doesn't exist yet" do
       Ppl::Adapter::Storage::Disk.create_address_book("/contacts")
-      Dir.exists?("/contacts").should eq true
+      expect(Dir.exists?("/contacts")).to eq true
       FileUtils.rm_rf("/contacts")
     end
     it "should return a Ppl::Adapter::Storage::Disk" do
       disk = Ppl::Adapter::Storage::Disk.create_address_book("/contacts")
       FileUtils.rm_rf("/contacts")
-      disk.should be_a(Ppl::Adapter::Storage::Disk)
+      expect(disk).to be_a(Ppl::Adapter::Storage::Disk)
     end
   end
 
@@ -28,7 +28,7 @@ describe Ppl::Adapter::Storage::Disk, "#initialize" do
   it "should accept a Dir object" do
     directory = Dir.new("/tmp")
     @storage = Ppl::Adapter::Storage::Disk.new(directory)
-    @storage.directory.should be directory
+    expect(@storage.directory).to be directory
   end
 
 end
@@ -43,7 +43,7 @@ describe Ppl::Adapter::Storage::Disk do
     it "should accept a vcard adapter" do
       adapter = double(Ppl::Adapter::Vcard)
       @storage.vcard_adapter = adapter
-      @storage.vcard_adapter.should be adapter
+      expect(@storage.vcard_adapter).to be adapter
     end
   end
 
@@ -70,24 +70,24 @@ describe Ppl::Adapter::Storage::Disk do
 
   describe "#path" do
     it "should return the path of the directory" do
-      @storage.path.should eq "/contacts"
+      expect(@storage.path).to eq "/contacts"
     end
   end
 
   describe "#load_address_book" do
 
     it "should return a Ppl::Entity::AddressBook" do
-      @storage.load_address_book.should be_a(Ppl::Entity::AddressBook)
+      expect(@storage.load_address_book).to be_a(Ppl::Entity::AddressBook)
     end
 
     it "should fill the address book with the contacts in the directory" do
       FileUtils.touch "/contacts/one.vcf"
       FileUtils.touch "/contacts/two.vcf"
 
-      @adapter.should_receive(:decode).twice
+      expect(@adapter).to receive(:decode).twice
 
       address_book = @storage.load_address_book
-      address_book.contacts.count.should eq 2
+      expect(address_book.contacts.count).to eq 2
     end
 
   end
@@ -95,19 +95,19 @@ describe Ppl::Adapter::Storage::Disk do
   describe "#load_contact" do
 
     it "should return nil if the given contact doesn't exist" do
-      @storage.load_contact("xyz").should be nil
+      expect(@storage.load_contact("xyz")).to be nil
     end
 
     it "should return a Ppl::Entity::Contact" do
       FileUtils.touch "/contacts/one.vcf"
-      @adapter.should_receive(:decode).once.and_return(@contact)
-      @storage.load_contact("one").should be_a(Ppl::Entity::Contact)
+      expect(@adapter).to receive(:decode).once.and_return(@contact)
+      expect(@storage.load_contact("one")).to be_a(Ppl::Entity::Contact)
     end
 
     it "should populate the contact's id" do
       FileUtils.touch "/contacts/one.vcf"
-      @adapter.should_receive(:decode).once.and_return(@contact)
-      @storage.load_contact("one").id.should eq "one"
+      expect(@adapter).to receive(:decode).once.and_return(@contact)
+      expect(@storage.load_contact("one").id).to eq "one"
     end
 
   end
@@ -115,12 +115,12 @@ describe Ppl::Adapter::Storage::Disk do
   describe "#save_contact" do
 
     it "should write the contact to disk" do
-      @adapter.should_receive(:encode).with(@contact).and_return("asdfg")
+      expect(@adapter).to receive(:encode).with(@contact).and_return("asdfg")
 
       @contact.id = "test"
       @storage.save_contact(@contact)
 
-      File.read("/contacts/test.vcf").should eq "asdfg"
+      expect(File.read("/contacts/test.vcf")).to eq "asdfg"
     end
 
   end
@@ -130,20 +130,20 @@ describe Ppl::Adapter::Storage::Disk do
       FileUtils.touch "/contacts/test.vcf"
       @contact.id = "test"
       @storage.delete_contact(@contact)
-      File.exists?("/contacts/test.vcf").should eq false
+      expect(File.exists?("/contacts/test.vcf")).to eq false
     end
   end
 
   describe "#filename_for_contact" do
     it "should base the filename on the contact's id" do
       @contact.id = "test"
-      @storage.filename_for_contact(@contact).should eq "/contacts/test.vcf"
+      expect(@storage.filename_for_contact(@contact)).to eq "/contacts/test.vcf"
     end
   end
 
   describe "#filename_for_contact_id" do
     it "should base the filename on the directory path" do
-      @storage.filename_for_contact_id("test").should eq "/contacts/test.vcf"
+      expect(@storage.filename_for_contact_id("test")).to eq "/contacts/test.vcf"
     end
   end
 

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

@@ -8,7 +8,7 @@ describe Ppl::Adapter::Storage::Factory do
     @directory = Dir.new("/contacts")
     @repo      = double(Rugged::Repository)
 
-    Rugged::Repository.stub(:new).and_return(@repo)
+    allow(Rugged::Repository).to receive(:new).and_return(@repo)
   end
 
   after(:each) do
@@ -19,12 +19,12 @@ describe Ppl::Adapter::Storage::Factory do
   describe "#load_adapter" do
 
     it "should return a disk adapter by default" do
-      @factory.load_adapter(@directory).should be_a(Ppl::Adapter::Storage::Disk)
+      expect(@factory.load_adapter(@directory)).to be_a(Ppl::Adapter::Storage::Disk)
     end
 
     it "should return a git adapter if the directory is a git repository" do
       Dir.mkdir "/contacts/.git"
-      @factory.load_adapter(@directory).should be_a(Ppl::Adapter::Storage::Git)
+      expect(@factory.load_adapter(@directory)).to be_a(Ppl::Adapter::Storage::Git)
     end
 
   end

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

@@ -13,11 +13,11 @@ describe Ppl::Adapter::Storage::Git do
     @vcard   = double(Ppl::Adapter::Vcard)
     @target  = double(Rugged::Commit)
 
-    Rugged::Repository.stub(:new).and_return(@repo)
+    allow(Rugged::Repository).to receive(:new).and_return(@repo)
 
-    @disk.stub(:directory).and_return(Dir.new("/contacts"))
-    @disk.stub(:path).and_return("/contacts")
-    @contact.stub(:id).and_return("test")
+    allow(@disk).to receive(:directory).and_return(Dir.new("/contacts"))
+    allow(@disk).to receive(:path).and_return("/contacts")
+    allow(@contact).to receive(:id).and_return("test")
 
     @git = Ppl::Adapter::Storage::Git.new(@disk)
     @git.vcard_adapter = @vcard
@@ -30,16 +30,16 @@ describe Ppl::Adapter::Storage::Git do
 
   describe "#path" do
     it "should return the path of the repository" do
-      @git.path.should eq "/contacts"
+      expect(@git.path).to eq "/contacts"
     end
   end
 
   describe "#initialize" do
     it "should accept a disk storage adapter" do
-      @git.disk.should be @disk
+      expect(@git.disk).to be @disk
     end
     it "should instantiate rugged" do
-      @git.repository.should be @repo
+      expect(@git.repository).to be @repo
     end
   end
 
@@ -50,12 +50,12 @@ describe Ppl::Adapter::Storage::Git do
 
       @files = [{:name => "test.vcf"}]
 
-      @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)
+      expect(@commit).to receive(:target).and_return(@target)
+      expect(@target).to receive(:oid)
+      expect(@repo).to receive(:lookup).and_return(@head)
+      expect(@repo).to receive(:head).and_return(@commit)
 
-      @git.stub(:load_contact) do |id|
+      allow(@git).to receive(:load_contact) do |id|
         contact    = Ppl::Entity::Contact.new
         contact.id = id
         contact
@@ -64,17 +64,17 @@ describe Ppl::Adapter::Storage::Git do
     end
 
     it "should return an address book" do
-      @head.should_receive(:tree).and_return(@files)
-      @git.load_address_book.should be_a(Ppl::Entity::AddressBook)
+      expect(@head).to receive(:tree).and_return(@files)
+      expect(@git.load_address_book).to be_a(Ppl::Entity::AddressBook)
     end
 
     it "should not put anything except contacts in the address book" do
       @files = [{:name => "poop.vcf"}, {:name => ".ppl"}]
-      @head.should_receive(:tree).and_return(@files)
+      expect(@head).to receive(:tree).and_return(@files)
 
       address_book = @git.load_address_book
       address_book.contacts.each do |contact|
-        contact.should be_a(Ppl::Entity::Contact)
+        expect(contact).to be_a(Ppl::Entity::Contact)
       end
     end
 
@@ -91,10 +91,10 @@ describe Ppl::Adapter::Storage::Git do
       blob         = OpenStruct.new
       blob.content = 'vcard contents'
 
-      @repo.should_receive(:head).and_return(head)
-      @repo.should_receive(:blob_at).and_return(blob)
-      @vcard.should_receive(:decode).and_return(@contact)
-      @contact.should_receive(:id=).with("test")
+      expect(@repo).to receive(:head).and_return(head)
+      expect(@repo).to receive(:blob_at).and_return(blob)
+      expect(@vcard).to receive(:decode).and_return(@contact)
+      expect(@contact).to receive(:id=).with("test")
 
       contact = @git.load_contact("test")
     end
@@ -108,9 +108,9 @@ describe Ppl::Adapter::Storage::Git do
       blob         = OpenStruct.new
       blob.content = 'vcard contents'
 
-      @repo.should_receive(:head).and_return(head)
-      @repo.should_receive(:blob_at).and_return(blob)
-      @vcard.should_receive(:decode).and_raise(Vpim::InvalidEncodingError)
+      expect(@repo).to receive(:head).and_return(head)
+      expect(@repo).to receive(:blob_at).and_return(blob)
+      expect(@vcard).to receive(:decode).and_raise(Vpim::InvalidEncodingError)
       expect{ @git.load_contact("test") }.to raise_error(Ppl::Error::InvalidVcard)
     end
 
@@ -119,19 +119,19 @@ describe Ppl::Adapter::Storage::Git do
   describe "#save_contact" do
 
     it "should save the contact to disk" do
-      @disk.should_receive(:save_contact).with(@contact)
-      @git.stub(:add)
-      @git.stub(:commit)
+      expect(@disk).to receive(:save_contact).with(@contact)
+      allow(@git).to receive(:add)
+      allow(@git).to receive(:commit)
       @git.save_contact(@contact)
     end
 
     it "should commit the changes" do
-      @disk.should_receive(:save_contact)
-      @git.stub(:add) do |file|
-        file.should eq "test.vcf"
+      expect(@disk).to receive(:save_contact)
+      allow(@git).to receive(:add) do |file|
+        expect(file).to eq "test.vcf"
       end
-      @git.stub(:commit) do |message|
-        message.should eq "save_contact(test)"
+      allow(@git).to receive(:commit) do |message|
+        expect(message).to eq "save_contact(test)"
       end
       @git.save_contact(@contact)
     end