imap-backup 1.0.5 → 1.0.6

data/spec/unit/configuration/asker_spec.rb

@@ -1,114 +1,88 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Imap::Backup::Configuration::Asker do
-  context '.email' do
-    it 'should ask for an email' do
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/email/)
+module Imap::Backup::Configuration
+  describe Asker do
+    let(:highline) { double }
 
-      Imap::Backup::Configuration::Asker.email
+    subject { Asker.new(highline) }
+
+    context '#initialize' do
+      its(:highline) { should eq(highline) }
     end
 
-    it 'should validate the address' do
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/email/) do |&block|
-        q = stub('HighLine::Question', :default=  => nil,
-                                       :readline= => nil,
-                                       :responses => {})
-        q.should_receive(:validate=).with(instance_of(Regexp))
+    context '#email' do
+      let(:email) { 'email@example.com' }
 
-        block.call q
+      before do
+        allow(highline).to receive(:ask).and_return(email)
+        @result = subject.email
       end
 
-      Imap::Backup::Configuration::Asker.email
-    end
-
-    it 'should return the address' do
-      Imap::Backup::Configuration::Setup.highline.stub!(:ask).with(/email/).and_return('new@example.com')
-
-      Imap::Backup::Configuration::Asker.email.should == 'new@example.com'
-    end
-  end
+      it 'asks for an email'  do
+        expect(highline).to have_received(:ask).with(/email/)
+      end
 
-  context '.password' do
-    before :each do
-      Imap::Backup::Configuration::Setup.highline.stub!(:ask).with(/^password/).and_return('secret')
-      Imap::Backup::Configuration::Setup.highline.stub!(:ask).with(/^repeat password/).and_return('secret')
+      it 'returns the address' do
+        expect(@result).to eq(email)
+      end
     end
 
-    it 'should ask for a password and confirmation' do
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/^password/).and_return('secret')
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/^repeat password/).and_return('secret')
+    context '#password' do
+      let(:password1) { 'password' }
+      let(:password2) { 'password' }
+      let(:answers) { [answer1, answer2] }
+      let(:answer1) { true }
+      let(:answer2) { false }
+
+      before do
+        @i = 0
+        allow(highline).to receive(:ask).with('password: ').and_return(password1)
+        allow(highline).to receive(:ask).with('repeat password: ').and_return(password2)
+        allow(highline).to receive(:agree) do
+          answer = answers[@i]
+          @i += 1
+          answer
+        end
+        @result = subject.password
+      end
 
-      Imap::Backup::Configuration::Asker.password
-    end
+      it 'asks for a password' do
+        expect(highline).to have_received(:ask).with('password: ')
+      end
 
-    it 'should return the password' do
-      Imap::Backup::Configuration::Asker.password.should == 'secret'
-    end
+      it 'asks for confirmation' do
+        expect(highline).to have_received(:ask).with('repeat password: ')
+      end
 
-    it "should ask again if the passwords don't match" do
-      state = :password1
-      Imap::Backup::Configuration::Setup.highline.stub!(:ask) do
-        case state
-        when :password1
-          state = :confirmation1
-          'secret'
-        when :confirmation1
-          state = :retry?
-          'wrong!!!'
-        when :retry?
-          state = :password2
-          'y'
-        when :password2
-          state = :confirmation2
-          'secret'
-        when :confirmation2
-          'secret'
-        end
+      it 'returns the password' do
+        expect(@result).to eq(password1)
       end
 
-      Imap::Backup::Configuration::Asker.password
-    end
+      context 'different answers' do
+        let(:password2) { 'secret' }
 
-    it 'should return nil if the user cancels' do
-      state = :password1
-      Imap::Backup::Configuration::Setup.highline.stub!(:ask) do
-        case state
-        when :password1
-          state = :confirmation1
-          'secret'
-        when :confirmation1
-          state = :retry?
-          'wrong!!!'
-        when :retry?
-          state = :password2
-          'n'
+        it 'asks to continue' do
+          expect(highline).to have_received(:agree).at_least(1).times.with(/Continue\?/)
         end
       end
-
-      Imap::Backup::Configuration::Asker.password.should be_nil
     end
-  end
 
-  context '.backup_path' do
-    it 'should ask for a directory' do
-      validator = /validator/
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/directory/) do |&block|
-        q = stub('HighLine::Question', :responses => {}, :readline= => nil)
-        q.should_receive(:default=).with('default path')
-        q.should_receive(:validate=).with(validator)
+    context '#backup_path' do
+      let(:path) { '/path' }
 
-        block.call q
+      before do
+        allow(highline).to receive(:ask).and_return(path)
+        @result = subject.backup_path('', //)
       end
 
-      Imap::Backup::Configuration::Asker.backup_path('default path', validator)
-    end
-
-    it 'should return the choice' do
-      Imap::Backup::Configuration::Setup.highline.should_receive(:ask).with(/directory/).and_return('/path')
+      it 'asks for a directory' do
+        expect(highline).to have_received(:ask).with(/directory/)
+      end
 
-      Imap::Backup::Configuration::Asker.backup_path('default path', //).should == '/path'
+      it 'returns the path' do
+        expect(@result).to eq(path)
+      end
     end
   end
 end
-

data/spec/unit/configuration/connection_tester_spec.rb

@@ -3,41 +3,51 @@ require 'spec_helper'
 
 describe Imap::Backup::Configuration::ConnectionTester do
   context '.test' do
-    it 'should try to connect' do
-      Imap::Backup::Account::Connection.should_receive(:new).with('foo')
+    let(:connection) { double('Imap::Backup::Account::Connection', :imap => nil) }
 
-      Imap::Backup::Configuration::ConnectionTester.test('foo')
+    before do
+      allow(Imap::Backup::Account::Connection).to receive(:new).and_return(connection)
     end
 
-    it 'should return success if the connection works' do
-      Imap::Backup::Account::Connection.stub!(:new).
-                                        with('foo')
+    context 'call' do
+      before { @result = subject.test('foo') }
 
-      result = Imap::Backup::Configuration::ConnectionTester.test('foo')
-
-      result.should =~ /successful/
+      it 'tries to connect' do
+        expect(connection).to have_received(:imap)
+      end
     end
 
-    it 'should handle no response' do
-      e = Net::IMAP::NoResponseError.new(stub('o', :data => stub('foo', :text => 'bar')))
-      Imap::Backup::Account::Connection.stub!(:new).
-                                        with('foo').
-                                        and_raise(e)
-
-      result = Imap::Backup::Configuration::ConnectionTester.test('foo')
+    context 'success' do
+      before { @result = subject.test('foo') }
 
-      result.should =~ /no response/i
+      it 'returns success' do
+        expect(@result).to match(/successful/)
+      end
     end
 
-    it 'should handle other errors' do
-      Imap::Backup::Account::Connection.stub!(:new).
-                                        with('foo').
-                                        and_raise('error')
-
-      result = Imap::Backup::Configuration::ConnectionTester.test('foo')
-
-      result.should =~ /unexpected error/i
+    context 'failure' do
+      before do
+        allow(connection).to receive(:imap).and_raise(error)
+        @result = subject.test('foo')
+      end
+
+      context 'no connection' do
+        let(:error) do
+          data = double('foo', :text => 'bar')
+          Net::IMAP::NoResponseError.new(double('o', :data => data))
+        end
+
+        it 'returns success' do
+          expect(@result).to match(/no response/i)
+        end
+      end
+
+      context 'other' do
+        let(:error) { 'Error' }
+        it 'returns success' do
+          expect(@result).to match(/unexpected error/i)
+        end
+      end
     end
   end
 end
-

data/spec/unit/configuration/folder_chooser_spec.rb

@@ -8,9 +8,7 @@ describe Imap::Backup::Configuration::FolderChooser do
 
   context '#run' do
     let(:connection) do
-      stub(
-        'Imap::Backup::Account::Connection'
-      )
+      stub('Imap::Backup::Account::Connection')
     end
     let(:existing_account) do
       {
@@ -124,7 +122,7 @@ describe Imap::Backup::Configuration::FolderChooser do
         subject.run
 
         @output.string.should =~ /\d+\. \+ another_folder/
-        account[:folders].should include( { :name => 'another_folder' } )
+        account[:folders].should include({:name => 'another_folder'})
       end
 
       it 'should remove folders' do
@@ -142,9 +140,8 @@ describe Imap::Backup::Configuration::FolderChooser do
         subject.run
 
         @output.string.should =~ /\d+\. \- my_folder/
-        account[:folders].should_not include( { :name => 'my_folder' } )
+        account[:folders].should_not include({:name => 'my_folder'})
       end
     end
   end
 end
-

data/spec/unit/configuration/list_spec.rb

@@ -74,4 +74,3 @@ describe Imap::Backup::Configuration::List do
     end
   end
 end
-

data/spec/unit/configuration/setup_spec.rb

@@ -5,10 +5,10 @@ describe Imap::Backup::Configuration::Setup do
   include HighLineTestHelpers
 
   context '#initialize' do
-    it 'should not require the config file to exist' do
-      Imap::Backup::Configuration::Store.should_receive(:new)
-
-      Imap::Backup::Configuration::Setup.new
+    context 'without a config file' do
+      it 'works' do
+        Imap::Backup::Configuration::Setup.new
+      end
     end
   end
 
@@ -20,8 +20,8 @@ describe Imap::Backup::Configuration::Setup do
     end
 
     def prepare_store
-      @account1 = { :username => 'account@example.com' }
-      @data     = { :accounts => [ @account1 ] }
+      @account1 = {:username => 'account@example.com'}
+      @data     = {:accounts => [@account1]}
       @store    = stub('Imap::Backup::Configuration::Store', :data => @data, :path => '/base/path')
       Imap::Backup::Configuration::Store.stub!(:new).and_return(@store)
     end
@@ -65,7 +65,7 @@ describe Imap::Backup::Configuration::Setup do
       end
 
       @account = stub('Imap::Backup::Configuration::Account')
-      Imap::Backup::Configuration::Account.should_receive(:new).with(@store, @account1).and_return(@account)
+      allow(Imap::Backup::Configuration::Account).to receive(:new).with(@store, @account1, anything).and_return(@account)
       @account.should_receive(:run).with()
 
       subject.run
@@ -86,7 +86,7 @@ describe Imap::Backup::Configuration::Setup do
       blank_account = {:username=>"new@example.com", :password=>"", :local_path=>"/base/path/new_example.com", :folders=>[]}
       Imap::Backup::Configuration::Asker.should_receive(:email).with().and_return('new@example.com')
       @account = stub('Imap::Backup::Configuration::Account')
-      Imap::Backup::Configuration::Account.should_receive(:new).with(@store, blank_account).and_return(@account)
+      allow(Imap::Backup::Configuration::Account).to receive(:new).with(@store, blank_account, anything).and_return(@account)
       @account.should_receive(:run).once
 
       subject.run
@@ -114,4 +114,3 @@ describe Imap::Backup::Configuration::Setup do
     end
   end
 end
-

data/spec/unit/configuration/store_spec.rb

@@ -146,9 +146,7 @@ describe Imap::Backup::Configuration::Store do
       end
 
       it 'should create a path for folders with slashes' do
-        folders = [
-          { :name => 'folder/path' },
-        ]
+        folders = [{:name => 'folder/path'}]
         JSON.stub!(:parse).with('xxx', :symbolize_names => true).and_return(configuration(folders))
 
         File.should_receive(:directory?).with('/my/backup/path/folder').and_return(true)
@@ -161,4 +159,3 @@ describe Imap::Backup::Configuration::Store do
     end
   end
 end
-

data/spec/unit/downloader_spec.rb

@@ -84,4 +84,3 @@ describe Imap::Backup::Downloader do
     end
   end
 end
-

data/spec/unit/email/mboxrd/message_spec.rb

@@ -48,4 +48,3 @@ describe Email::Mboxrd::Message do
     end
   end
 end
-

data/spec/unit/serializer/base_spec.rb

@@ -16,4 +16,3 @@ describe Imap::Backup::Serializer::Base do
     end
   end
 end
-

data/spec/unit/serializer/directory_spec.rb

@@ -76,4 +76,3 @@ describe Imap::Backup::Serializer::Directory do
     end
   end
 end
-

data/spec/unit/serializer/mbox_spec.rb

@@ -110,4 +110,3 @@ describe Imap::Backup::Serializer::Mbox do
     end
   end
 end
-

data/spec/unit/utils_spec.rb

@@ -66,4 +66,3 @@ describe Imap::Backup::Utils do
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imap-backup
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake