bitsa 0.20 → 0.30

data/spec/lib/bitsa/settings_spec.rb

@@ -0,0 +1,50 @@
+require "helper"
+
+require "bitsa/config_file"
+require "bitsa/settings"
+
+describe Bitsa::Settings do
+  context "login specified in config file"
+  it "should read a value from config file if it wasn't passed in options" do
+    settings = load_settings({})
+    expect(settings.login).to eq "test@gmail.com"
+    expect(settings.password).to eq "myPassword"
+  end
+
+  it "should use values passed in options to override those in the config file" do
+    settings = load_settings({:login => "somebody@example.com"})
+    expect(settings.login).to eq "somebody@example.com"
+  end
+
+  it "should still use values in config file when other options passed" do
+    settings = load_settings({:login => "somebody@example.com"})
+    expect(settings.password).to eq "myPassword"
+  end
+
+  context "default value" do
+    let(:settings) { empty_settings }
+
+    context :auto_check do
+      specify { expect(settings.auto_check).to eq 1}
+    end
+
+    context :cache_file_path do
+      specify { expect(settings.cache_file_path).to eq "~/.bitsa_cache.yml" }
+    end
+  end
+
+  private
+
+  def load_settings(options)
+    settings = Bitsa::Settings.new
+    settings.load(Bitsa::ConfigFile.new("spec/data/config.yml"), options)
+    settings
+  end
+
+  def empty_settings()
+    settings = Bitsa::Settings.new
+    settings.load(Bitsa::ConfigFile.new("/tmp/non-existent"), {})
+    settings
+  end
+
+end

data/spec/lib/bitsa_spec.rb

@@ -0,0 +1,2 @@
+require "helper"
+require "bitsa"

data/tasks/spec.rake

@@ -2,8 +2,8 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) {}
 
-desc  "Run all specs with rcov"
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.rcov = true
-  t.rcov_opts = %w{--exclude spec\/,gems\/}
-end
+# desc  "Run all specs with rcov"
+# RSpec::Core::RakeTask.new(:rcov) do |t|
+#   t.rcov = true
+#   t.rcov_opts = %w{--exclude spec\/,gems\/}
+# end

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: bitsa
 version: !ruby/object:Gem::Version
-  version: '0.20'
-  prerelease: 
+  version: '0.30'
 platform: ruby
 authors:
 - Colin Noel Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &7267640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7267640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gdata_19
-  requirement: &7266240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *7266240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &7257200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *7257200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7255600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *7255600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &7253680 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *7253680
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &7252900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7252900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7251600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7251600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows you to lookup GMail contacts and cache contacts locally from the
   command line.
 email:
@@ -118,19 +138,22 @@ files:
 - lib/bitsa/gmail_contacts_loader.rb
 - lib/bitsa/settings.rb
 - lib/bitsa/version.rb
-- spec/args_processor_spec.rb
-- spec/confg_file_spec.rb
-- spec/contacts_cache_spec.rb
+- rvmrc
 - spec/data/bitsa_cache.yml
 - spec/data/config.yml
-- spec/gmail_contacts_loader_spec.rb
 - spec/helper.rb
-- spec/settings_spec.rb
+- spec/lib/bitsa/args_processor_spec.rb
+- spec/lib/bitsa/confg_file_spec.rb
+- spec/lib/bitsa/contacts_cache_spec.rb
+- spec/lib/bitsa/gmail_contacts_loader_spec.rb
+- spec/lib/bitsa/settings_spec.rb
+- spec/lib/bitsa_spec.rb
 - tasks/create_tags.rake
 - tasks/retrieve_one_page.rake
 - tasks/spec.rake
 homepage: https://github.com/colbell/bitsa
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -138,24 +161,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3627828178775541145
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Command line GMail Contacts lookup tool.
 test_files: []

data/spec/args_processor_spec.rb

@@ -1,66 +0,0 @@
-require "helper"
-require "bitsa/args_processor"
-
-describe Bitsa::ArgsProcessor do
-  context "when created" do
-    before(:all) { @ap = Bitsa::ArgsProcessor.new }
-
-    it "should recognise the 'update' command" do
-      @ap.parse(["update"])
-    end
-
-    it "should throw raise SystemExit if an invalid command passed" do
-      lambda {@ap.parse(['unknown'])}.should raise_error(SystemExit)
-    end
-
-    it "should throw raise SystemExit if nothing passed" do
-      lambda {@ap.parse([])}.should raise_error(SystemExit)
-    end
-
-    context "and being passed valid commands" do
-      [["reload"], ["search", "data"], ["update"]].each do |ar|
-        cmd = ar[0]
-        it "should recognise the #{cmd} command" do
-          @ap.parse(ar)
-          @ap.cmd.should == cmd
-        end
-      end
-    end
-
-    it "should recognise valid long arguments" do
-      args = []
-      args << "--config-file"
-      args << "somefile"
-      args << "--login"
-      args << "someone"
-      args << "--password"
-      args << "mypassword"
-      args << "update"
-
-      @ap.parse(args)
-
-      @ap.global_opts[:config_file].should == "somefile"
-      @ap.global_opts[:login].should == "someone"
-      @ap.global_opts[:password].should == "mypassword"
-    end
-
-    it "should recognise valid short arguments" do
-      args = []
-      args << "-c"
-      args << "somefile"
-      args << "-l"
-      args << "someone"
-      args << "-p"
-      args << "mypassword"
-      args << "update"
-
-      @ap.parse(args)
-
-      @ap.global_opts[:config_file].should == "somefile"
-      @ap.global_opts[:login].should == "someone"
-      @ap.global_opts[:password].should == "mypassword"
-    end
-
-  end
-
-end

data/spec/confg_file_spec.rb

@@ -1,32 +0,0 @@
-require "helper"
-require "bitsa/config_file"
-
-describe Bitsa::ConfigFile do
-  context "An existing configuration file" do
-    before(:all) { @config = Bitsa::ConfigFile.new("spec/data/config.yml") }
-     it "should read values from config file" do
-       @config.data[:login].should == "test@gmail.com"
-       @config.data[:password].should == "myPassword"
-     end
-  end
-
-  context "An non-existent configuration file" do
-    before(:all) { @config = Bitsa::ConfigFile.new("/tmp/i-dont-exist") }
-    it "should have no values" do
-      @config.data.should == {}
-    end
-  end
-
-  context "An existing configuration file that I have no read rights to" do
-    before(:all) do
-      @tmp_file = Tempfile.open("cache")
-      FileUtils.cp("spec/data/config.yml", @tmp_file.path)
-      FileUtils.chmod(0222, @tmp_file.path)
-    end
-
-    it "should throw an exception when I try to read from it" do
-      lambda { Bitsa::ConfigFile.new(@tmp_file.path) }.should raise_error(Errno::EACCES)
-    end
-  end
-
-end

data/spec/contacts_cache_spec.rb

@@ -1,294 +0,0 @@
-require "fileutils"
-require "tempfile"
-
-require "helper"
-
-require "bitsa/contacts_cache"
-
-describe Bitsa::ContactsCache do
-  context "cache" do
-    it "should build successfully if cache file empty" do
-      tmp_file = create_empty_temp_file
-      cache = Bitsa::ContactsCache.new(tmp_file.path, 1)
-      should_be_an_empty_cache cache
-    end
-
-    it "should build successfully if cache file does not exist" do
-      cache = Bitsa::ContactsCache.new("/tmp/idonotexististhatoky", 1)
-      should_be_an_empty_cache cache
-    end
-
-    it "should fail with exception if user not authorised to read cache file" do
-      tmp_file = create_empty_temp_file
-      FileUtils.chmod(0222, tmp_file.path)
-      lambda { Bitsa::ContactsCache.new(tmp_file.path, 1).should raise_error(Errno::EACCES) }
-    end
-
-    it "should not be stale if last updated today" do
-      create_cache(DateTime.now, 1)
-      @cache.stale?.should_not be_true
-    end
-
-    it "should be stale if last updated yesterday and lifespan is 1 day" do
-      create_cache(DateTime.now-1, 1)
-      @cache.stale?.should be_true
-    end
-
-    it "should not be stale if last updated yesterday and lifespan is 2 days" do
-      create_cache(DateTime.now-1, 2)
-      @cache.stale?.should_not be_true
-    end
-  end
-
-  context "clearing the cache" do
-    before(:each) do
-      create_cache
-      @cache.should have_at_least(1).entries
-      @cache.empty?.should be_false
-    end
-
-    it "should leave the cache empty" do
-      @cache.clear!
-      @cache.size.should == 0
-      @cache.empty?.should be_true
-    end
-  end
-
-  context "searching the test data" do
-    # 4 contacts with 5 email addresses
-    before(:all) { create_cache }
-
-    it "should have read the correct number of contacts" do
-      @cache.size.should == 4
-    end
-
-    it "should return all entries if blank searched for" do
-      results = @cache.search('')
-      results.size.should == 5
-      results.flatten(0).sort.should == read_test_data
-    end
-
-    it "should return all entries if a nill string searched for" do
-      results = @cache.search(nil)
-      results.size.should == 5
-      results.flatten(0).sort.should == read_test_data
-    end
-
-    it "should find correctly when searching by start of email address" do
-      results = @cache.search('test1')
-       results.should =~ [["test1@example.com", "My Tester"]]
-
-       results = @cache.search('jo')
-       expected = [["john_smith@here.org", ""], ["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-       results.should =~ expected
-     end
-
-    it "should find correctly when searching by end of email address" do
-      results = @cache.search('org')
-      expected = [["john_smith@here.org", ""]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by middle of email address" do
-      results = @cache.search('n_s')
-      expected = [["john_smith@here.org", ""]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by email address irrespective of case" do
-      results = @cache.search('N_sMI')
-      expected = [["john_smith@here.org", ""]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by start of name" do
-      results = @cache.search('Joan Blo')
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by end of name" do
-      results = @cache.search('ggshere')
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by middle of name" do
-      results = @cache.search('n Bl')
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-    end
-
-    it "should find correctly when searching by name irrespective of case" do
-      results = @cache.search('N BL')
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-    end
-
-    it "should find no results if nothing to find" do
-      results = @cache.search('nothing is here')
-      results.size.should == 0
-    end
-
-    it "should return all email addresses on a contact with multiple email addresses when matching on name" do
-      results = @cache.search('multip')
-      expected = [["email2@somewhere.com", "Mr Multiple"], ["email1@somewhere.com", "Mr Multiple"]]
-      results.should =~ expected
-    end
-
-    it "should return only the matched email address on a contact with multiple email addresses" do
-      results = @cache.search('email1')
-      expected = [["email1@somewhere.com", "Mr Multiple"]]
-      results.should =~ expected
-     end
-
-    it "should find by ID correctly" do
-      id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/685e301a549c176e"
-      results = @cache.get(id)
-      expected = [["email1@somewhere.com", "Mr Multiple"],
-                  ["email2@somewhere.com", "Mr Multiple"]]
-      results.should =~ expected
-    end
-
-    it "should return nil if finding by a non-existent ID" do
-      id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/4783783783"
-      @cache.get(id).should be_nil
-    end
-  end
-
-  context "updating the test data" do
-    # 4 contacts with 5 email addresses
-    before(:each) { create_cache }
-
-    it "should handle update with a single email address correctly" do
-      id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/637e301a549c176e"
-      results = @cache.get(id)
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-
-      @cache.update(id, "Tammy Smith", ["tammy5@example.com"])
-      results = @cache.get(id)
-      expected = [["tammy5@example.com", "Tammy Smith"]]
-      results.should =~ expected
-    end
-
-    it "should handle update with two email addresses correctly" do
-      id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/637e301a549c176e"
-      results = @cache.get(id)
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-
-      @cache.update(id, "Tammy Smith", ["tammy5@example.com", "smithtammy@exampel.org"])
-      results = @cache.get(id)
-      expected = [["smithtammy@exampel.org", "Tammy Smith"], ["tammy5@example.com", "Tammy Smith"]]
-      results.should =~ expected
-    end
-  end
-
-  context "deleting a non-existent entry" do
-    before(:each) { create_cache }
-
-    it "should no longer contain the deleted entry" do
-      @cache.delete("NONEXISTENT")
-      @cache.get("NONEXISTENT").should be_nil
-    end
-
-    it "should not change the number of entries in the cache" do
-      lambda {
-        @cache.delete("NONEXISTENT")
-      }.should_not change(@cache, :size)
-    end
-
-    it "should return nil" do
-      @cache.delete("NONEXISTENT").should be_nil
-    end
-  end
-
-  context "deleting an existing entry" do
-    before(:each) do
-      create_cache
-      @id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/637e301a549c176e"
-    end
-
-    it "should_change the number of entries by -1" do
-      lambda {
-        @cache.delete(@id)
-      }.should change(@cache, :size).by(-1)
-    end
-
-    it "should return the deleted entry" do
-      results = @cache.delete(@id)
-      expected = [["Joan.bloggs@somewhere.com.au", "Joan Bloggshere"]]
-      results.should =~ expected
-    end
-
-    it "should no longer contain the deleted entry" do
-      @cache.delete(@id)
-      @cache.get(@id).should be_nil
-    end
-  end
-
-  context "saving the test data" do
-    before(:each) { create_cache }
-    it "should save changes to existing contacts" do
-      id = "http://www.google.com/m8/feeds/contacts/person%40example.org/base/637e301a549c176e"
-      @cache.update(id, "The Changed Name", ["change1@somewhere.org"])
-      @cache.save
-      new_cache = Bitsa::ContactsCache.new(@tmp_file.path, 1)
-      expected = [["change1@somewhere.org", "The Changed Name"]]
-      new_cache.get(id).should =~ expected
-    end
-
-    it "should save newly added entries" do
-      id = "NONEXISTENT"
-      @cache.update(id, "The Changed Name", ["change1@somewhere.org"])
-      @cache.save
-      new_cache = Bitsa::ContactsCache.new(@tmp_file.path, 1)
-      expected = [["change1@somewhere.org", "The Changed Name"]]
-      new_cache.get(id).should =~ expected
-    end
-
-    context "to a file that I have no write rights to" do
-      before(:each) { FileUtils.chmod(0444, @tmp_file.path) }
-
-      it "should throw an exception when I try to write to it" do
-        lambda {@cache.save}.should raise_error(Errno::EACCES)
-      end
-
-    end
-  end
-
-  private
-
-  def create_cache(last_modified = nil, lifespan_days = 1)
-    source_last_modified, addresses = YAML::load_file("spec/data/bitsa_cache.yml")
-    source_last_modified = last_modified.to_s if last_modified
-
-    @tmp_file = Tempfile.open("cache")
-    File.open(@tmp_file.path, "w") do |f|
-      f.write(YAML::dump([source_last_modified, addresses]))
-    end
-    @cache = Bitsa::ContactsCache.new(@tmp_file.path, lifespan_days)
-  end
-
-  def create_empty_temp_file
-    tmp_file = Tempfile.open("cache")
-    File.open(tmp_file.path, "w") do |f|
-      f.write('')
-    end
-    tmp_file
-  end
-
-   def should_be_an_empty_cache cache
-     cache.should_not be_nil
-     cache.size.should == 0
-     cache.source_last_modified.should be_nil
-     cache.stale?.should be_true
-   end
-
-   def read_test_data
-     source_last_modified, addresses = YAML::load_file(@tmp_file.path)
-     addresses.values.flatten(1).sort
-   end
-
- end