ppl 3.0.0 → 4.0.3

data/spec/ppl/command/rm_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Rm do
 
   before(:each) do
@@ -14,7 +13,7 @@ describe Ppl::Command::Rm do
 
   describe "#name" do
     it "should be 'rm'" do
-      @command.name.should eq "rm"
+      expect(@command.name).to eq "rm"
     end
   end
 
@@ -26,8 +25,8 @@ describe Ppl::Command::Rm do
     end
 
     it "should delete the given contact" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @storage.should_receive(:delete_contact).with(@contact)
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@storage).to receive(:delete_contact).with(@contact)
       @command.execute(@input, @output)
     end
 

data/spec/ppl/command/scrape_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Scrape do
 
   before(:each) do
@@ -16,68 +15,68 @@ describe Ppl::Command::Scrape do
 
   describe "#name" do
     it "should be 'scrape'" do
-      @command.name.should eq "scrape"
+      expect(@command.name).to eq "scrape"
     end
   end
 
   describe "#execute" do
 
     before(:each) do
-      @input.stdin.stub(:read)
-      @input.stdin.stub(:reopen)
-      @input.stdin.stub(:eof?)
-      @email_scraper.stub(:scrape_contacts).and_return([])
-      Readline.stub(:readline).and_return("")
-      @storage.stub(:save_contact)
+      allow(@input.stdin).to receive(:read)
+      allow(@input.stdin).to receive(:reopen)
+      allow(@input.stdin).to receive(:eof?)
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([])
+      allow(Readline).to receive(:readline).and_return("")
+      allow(@storage).to receive(:save_contact)
     end
 
     it "should read input from stdin" do
       @input.options[:sender] = true
-      @input.stdin.should_receive(:read)
+      expect(@input.stdin).to receive(:read)
       @command.execute(@input, @output)
     end
 
     it "should pass input to the email scraper" do
       @input.options[:sender] = true
-      @email_scraper.should_receive(:scrape_contacts)
+      expect(@email_scraper).to receive(:scrape_contacts)
       @command.execute(@input, @output)
     end
 
     it "shouldn't do any scraping unless told which fields to scrape" do
-      @email_scraper.should_not_receive(:scrape_contacts)
+      expect(@email_scraper).not_to receive(:scrape_contacts)
       @command.execute(@input, @output)
     end
 
     it "should always save contacts if in quiet mode" do
       @input.options[:sender] = true
       @input.options[:quiet] = true
-      @email_scraper.stub(:scrape_contacts).and_return([@contact])
-      Readline.should_not_receive(:readline)
-      @storage.should_receive(:save_contact)
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([@contact])
+      expect(Readline).not_to receive(:readline)
+      expect(@storage).to receive(:save_contact)
       @command.execute(@input, @output)
     end
 
     it "should reopen stdin to prompt the user" do
       @input.options[:sender] = true
-      @input.stdin.should_receive(:eof?).and_return(true)
-      @input.stdin.should_receive(:reopen)
-      @email_scraper.stub(:scrape_contacts).and_return([@contact])
+      expect(@input.stdin).to receive(:eof?).and_return(true)
+      expect(@input.stdin).to receive(:reopen)
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([@contact])
       @command.execute(@input, @output)
     end
 
     it "should save the contact if the user approves" do
       @input.options[:sender] = true
-      @email_scraper.stub(:scrape_contacts).and_return([@contact])
-      Readline.should_receive(:readline).and_return("y")
-      @storage.should_receive(:save_contact)
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([@contact])
+      expect(Readline).to receive(:readline).and_return("y")
+      expect(@storage).to receive(:save_contact)
       @command.execute(@input, @output)
     end
 
     it "should not save the contact if the user disapproves" do
       @input.options[:sender] = true
-      @email_scraper.stub(:scrape_contacts).and_return([@contact])
-      Readline.should_receive(:readline).and_return("n")
-      @storage.should_not_receive(:save_contact)
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([@contact])
+      expect(Readline).to receive(:readline).and_return("n")
+      expect(@storage).not_to receive(:save_contact)
       @command.execute(@input, @output)
     end
 
@@ -86,8 +85,8 @@ describe Ppl::Command::Scrape do
       contact = Ppl::Entity::Contact.new
       contact.name = "Test Person"
       contact.email_addresses << "test@example.org"
-      @email_scraper.stub(:scrape_contacts).and_return([contact])
-      Readline.should_receive(:readline).with("Add \"Test Person <test@example.org>\" to your address book [Y/n]? ")
+      allow(@email_scraper).to receive(:scrape_contacts).and_return([contact])
+      expect(Readline).to receive(:readline).with("Add \"Test Person <test@example.org>\" to your address book [Y/n]? ")
       @command.execute(@input, @output)
     end
 

data/spec/ppl/command/shell_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Shell do
 
   before(:each) do
@@ -9,16 +8,16 @@ describe Ppl::Command::Shell do
 
   describe "#name" do
     it "should be 'shell'" do
-      @command.name.should eq "shell"
+      expect(@command.name).to eq "shell"
     end
   end
 
   describe "#execute" do
     it "should read a line of input from stdin" do
-      Readline.should_receive(:readline)
-      @command.stub(:welcome_user)
-      @command.stub(:terminate_gracefully)
-      @command.execute(@input, @output).should eq true
+      expect(Readline).to receive(:readline)
+      allow(@command).to receive(:welcome_user)
+      allow(@command).to receive(:terminate_gracefully)
+      expect(@command.execute(@input, @output)).to eq true
     end
   end
 
@@ -26,73 +25,73 @@ describe Ppl::Command::Shell do
 
     before(:each) do
       @input.stdin = double(IO)
-      @input.stdin.stub(:tty?) { true }
+      allow(@input.stdin).to receive(:tty?) { true }
     end
 
     it "should not show a prompt if stdin isn't a tty" do
-      @input.stdin.stub(:tty?) { false }
-      Readline.should_receive(:readline).with("", true)
-      @command.stub(:welcome_user)
+      allow(@input.stdin).to receive(:tty?) { false }
+      expect(Readline).to receive(:readline).with("", true)
+      allow(@command).to receive(:welcome_user)
       @command.execute(@input, @output)
     end
 
     it "should show a prompt if stdin is a tty" do
-      @input.stdin.stub(:tty?) { true }
-      Readline.should_receive(:readline).with("ppl> ", true)
-      @command.stub(:welcome_user)
-      @command.stub(:terminate_gracefully)
+      allow(@input.stdin).to receive(:tty?) { true }
+      expect(Readline).to receive(:readline).with("ppl> ", true)
+      allow(@command).to receive(:welcome_user)
+      allow(@command).to receive(:terminate_gracefully)
       @command.execute(@input, @output)
     end
 
     it "should make a system call with the input from stdin" do
-      Readline.should_receive(:readline).and_return("email fred")
-      Readline.should_receive(:readline).and_return(false)
-      Kernel.should_receive(:system) do |command|
-        command.should include "email fred"
+      expect(Readline).to receive(:readline).and_return("email fred")
+      expect(Readline).to receive(:readline).and_return(false)
+      expect(Kernel).to receive(:system) do |command|
+        expect(command).to include "email fred"
       end
-      @command.stub(:welcome_user)
-      @command.stub(:terminate_gracefully)
-      @command.execute(@input, @output).should eq true
+      allow(@command).to receive(:welcome_user)
+      allow(@command).to receive(:terminate_gracefully)
+      expect(@command.execute(@input, @output)).to eq true
     end
 
     it "should exit on ctrl+c" do
-      Readline.should_receive(:readline).and_raise(Interrupt)
-      @command.stub(:welcome_user)
-      @command.stub(:terminate_gracefully)
-      @command.execute(@input, @output).should eq false
+      expect(Readline).to receive(:readline).and_raise(Interrupt)
+      allow(@command).to receive(:welcome_user)
+      allow(@command).to receive(:terminate_gracefully)
+      expect(@command.execute(@input, @output)).to eq false
     end
 
     it "should print a final newline on EOF so the user's prompt looks nice" do
-      @input.stdin.stub(:tty?) { true }
-      @output.should_receive(:line).with("")
-      Readline.should_receive(:readline).and_return(false)
-      @command.stub(:welcome_user)
+      allow(@input.stdin).to receive(:tty?) { true }
+      expect(@output).to receive(:line).with("")
+      expect(Readline).to receive(:readline).and_return(false)
+      allow(@command).to receive(:welcome_user)
       @command.execute(@input, @output)
     end
 
     it "should print a final newline on error so the user's prompt looks nice" do
-      @input.stdin.stub(:tty?) { true }
-      @output.should_receive(:line).with("")
-      @command.stub(:shell).and_raise(Interrupt)
+      allow(@input.stdin).to receive(:tty?) { true }
+      expect(@output).to receive(:line).with("")
+      allow(@command).to receive(:shell).and_raise(Interrupt)
       @command.execute(@input, @output)
     end
 
     it "should not print a final newline on EOF if stdin isn't a tty" do
-      @input.stdin.stub(:tty?) { false }
-      @output.should_not_receive(:line).with("")
-      Readline.should_receive(:readline).and_return(false)
-      @command.stub(:welcome_user)
+      allow(@input.stdin).to receive(:tty?) { false }
+      expect(@output).not_to receive(:line).with("")
+      expect(Readline).to receive(:readline).and_return(false)
+      allow(@command).to receive(:welcome_user)
       @command.execute(@input, @output)
     end
 
     it "should print a welcome message on the tty" do
-      @input.stdin.stub(:tty?) { true }
-      @output.should_receive(:line) do |line|
-        line.should include "ppl"
-        line.should include Ppl::Version
+      allow(@input.stdin).to receive(:tty?) { true }
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include "ppl"
+        expect(line).to include Ppl::Version
       end
-      Readline.should_receive(:readline).and_return(false)
-      @command.stub(:terminate_gracefully)
+      expect(Readline).to receive(:readline).and_return(false)
+      allow(@command).to receive(:terminate_gracefully)
       @command.execute(@input, @output)
     end
 

data/spec/ppl/command/show_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Show do
 
   before(:each) do
@@ -15,7 +14,7 @@ describe Ppl::Command::Show do
 
   describe "#name" do
     it "should be 'show'" do
-      @command.name.should eq "show"
+      expect(@command.name).to eq "show"
     end
   end
 
@@ -27,12 +26,12 @@ describe Ppl::Command::Show do
     end
 
     it "should show the contact's name" do
-      @storage.should_receive(:require_contact).and_return(@contact)
-      @format.should_receive(:process).and_return("John Doe")
+      expect(@storage).to receive(:require_contact).and_return(@contact)
+      expect(@format).to receive(:process).and_return("John Doe")
 
       @input.arguments = ["john"]
 
-      @output.should_receive(:line).with("John Doe")
+      expect(@output).to receive(:line).with("John Doe")
       @command.execute(@input, @output)
     end
   end

data/spec/ppl/command/url_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Url do
 
   before(:each) do
@@ -7,7 +6,7 @@ describe Ppl::Command::Url do
 
   describe "#name" do
     it "should be 'url'" do
-      @command.name.should eq "url"
+      expect(@command.name).to eq "url"
     end
   end
 

data/spec/ppl/command/version_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Command::Version do
 
   before(:each) do
@@ -9,16 +8,16 @@ describe Ppl::Command::Version do
 
   describe "#name" do
     it "should be 'version'" do
-      @command.name.should eq "version"
+      expect(@command.name).to eq "version"
     end
   end
 
   describe "#execute" do
     it "should show the version number" do
-      @output.should_receive(:line) do |line|
-        line.should include Ppl::Version
+      expect(@output).to receive(:line) do |line|
+        expect(line).to include Ppl::Version
       end
-      @command.execute(@input, @output).should eq true
+      expect(@command.execute(@input, @output)).to eq true
     end
   end
 

data/spec/ppl/entity/address_book_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::AddressBook do
 
   before(:each) do
@@ -7,7 +6,7 @@ describe Ppl::Entity::AddressBook do
 
   describe "#contacts" do
     it "should be an array" do
-      @address_book.contacts.should be_an(Array)
+      expect(@address_book.contacts).to be_an(Array)
     end
   end
 

data/spec/ppl/entity/contact_spec.rb

@@ -1,4 +1,3 @@
-
 describe Ppl::Entity::Contact do
 
   before(:each) do
@@ -7,72 +6,72 @@ describe Ppl::Entity::Contact do
 
   describe "#id" do
     it "should return a value" do
-      @contact.id.should be nil
+      expect(@contact.id).to be nil
     end
   end
 
   describe "#id=" do
     it "should accept a value" do
       @contact.id = "john"
-      @contact.id.should eq "john"
+      expect(@contact.id).to eq "john"
     end
   end
 
   describe "#email_addresses" do
     it "should return an array" do
-      @contact.email_addresses.should be_a(Array)
+      expect(@contact.email_addresses).to be_a(Array)
     end
   end
 
   describe "#postal_addresses" do
     it "should return an array" do
-      @contact.postal_addresses.should be_a(Array)
+      expect(@contact.postal_addresses).to be_a(Array)
     end
   end
 
   describe "#birthday" do
     it "should return a value" do
-      @contact.birthday.should eq nil
+      expect(@contact.birthday).to eq nil
     end
   end
 
   describe "#postal_address" do
     it "should return a value" do
-      @contact.postal_address.should eq nil
+      expect(@contact.postal_address).to eq nil
     end
   end
 
   describe "#urls" do
     it "should return an array" do
-      @contact.urls.should be_a(Array)
+      expect(@contact.urls).to be_a(Array)
     end
   end
 
   describe "#nicknames" do
     it "should return an array" do
-      @contact.nicknames.should be_a(Array)
+      expect(@contact.nicknames).to be_a(Array)
     end
   end
 
   describe "#organizations" do
     it "should return an array" do
-      @contact.organizations.should be_a(Array)
+      expect(@contact.organizations).to be_a(Array)
     end
   end
 
   describe "#phone_numbers" do
     it "should return an array" do
-      @contact.phone_numbers.should be_a(Array)
+      expect(@contact.phone_numbers).to be_a(Array)
     end
   end
 
   describe "#age" do
     it "should return nil if the date of birth is unknown" do
-      @contact.age(Date.today).should eq nil
+      expect(@contact.age(Date.today)).to eq nil
     end
     it "should return the contact's age" do
       @contact.birthday = Date.parse("1970-01-01")
-      @contact.age(Date.parse("1980-01-02")).should eq 10
+      expect(@contact.age(Date.parse("1980-01-02"))).to eq 10
     end
   end
 
@@ -83,12 +82,12 @@ describe Ppl::Entity::Contact do
     end
 
     it "returns nil if there's no preferred address" do
-      @contact.preferred_email_address.should eq nil
+      expect(@contact.preferred_email_address).to eq nil
     end
 
     it "returns the preferred email address" do
       @contact.email_addresses[0].preferred = true
-      @contact.preferred_email_address.should be_a(Ppl::Entity::EmailAddress)
+      expect(@contact.preferred_email_address).to be_a(Ppl::Entity::EmailAddress)
     end
 
   end
@@ -100,12 +99,12 @@ describe Ppl::Entity::Contact do
     end
 
     it "returns nil if there's no preferred number" do
-      @contact.preferred_phone_number.should eq nil
+      expect(@contact.preferred_phone_number).to eq nil
     end
 
     it "returns the preferred phone number" do
       @contact.phone_numbers[0].preferred = true
-      @contact.preferred_phone_number.should be_a(Ppl::Entity::PhoneNumber)
+      expect(@contact.preferred_phone_number).to be_a(Ppl::Entity::PhoneNumber)
     end
 
   end