tact 1.2.23 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 646f2aeb31eeec006ea63f14c1e323cd8f4943c4
-  data.tar.gz: 03ae8aee41865c91c1052b986b261c6077f021b3
+  metadata.gz: 0c97568e1e4da1c76294dd69bdfc31af58cd5ded
+  data.tar.gz: 887f421efa7a7fb0a5272f798706518403a4fbb2
 SHA512:
-  metadata.gz: 22c70b517f55076452ed7580571c8d609ef11608a3cd8a9f26d192ff6eaf401b0c6d2adb0fdd6ebeb6a7f200d13bd6689748f442b4755370a1916b9f351037bb
-  data.tar.gz: 5bb758c735ccf9df330fa73efa6def114e46543843b7d79313b896022a8cf60e2bf027240935086b6144bb7d19e1c0f7417afcf246a16b02edfa6ab5b97c97d7
+  metadata.gz: d65d88384b495953b11699693eae7179b22a0af7cdfa818079768da6b26e8f7e7e72d1a6046eb1350eb0eec9e404721956a471906860dd4c7ae75400cf78adfd
+  data.tar.gz: 611fcd81f8c5d8d0b451065607195adde2380be76db5640dd0f3d908f2f4133d83b12fce69cc33a97ecee86caac9f34e594383e82463661a42e0bc4a41ee2da8

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+client_secret.json

data/README.md

@@ -11,6 +11,7 @@ A command line rolodex.
 ```     
   -v                                    Current version
   -h                                    Help
+  -s                                    Sync Google contacts
 
   <param>                               Search by name
   -p <param>                            Search by number
@@ -28,7 +29,7 @@ A command line rolodex.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ollieshmollie/tact.
+Bug reports and pull requests are welcome on GitHub at https://github.com/olishmollie/tact.
 
 
 ## License

data/Rakefile

@@ -1,2 +1,95 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'
+require 'fileutils'
+
+task :environment do
+  require 'tact'
+end
+
+namespace :generate do
+  desc "Create an empty migration in db/migrate, e.g., rake generate:migration NAME=create_tasks"
+  task :migration => :environment do
+    unless ENV.has_key?('NAME')
+      raise "Must specificy migration name, e.g., rake generate:migration NAME=create_tasks"
+    end
+
+    name     = ENV['NAME'].camelize
+    filename = "%s_%s.rb" % [Time.now.strftime('%Y%m%d%H%M%S'), ENV['NAME'].underscore]
+    path     = File.join('db', 'migrate', filename)
+
+    if File.exist?(path)
+      raise "ERROR: File '#{path}' already exists"
+    end
+
+    puts "Creating #{path}"
+    File.open(path, 'w+') do |f|
+      f.write(<<-EOF.strip_heredoc)
+        class #{name} < ActiveRecord::Migration
+          def change
+          end
+        end
+      EOF
+    end
+  end
+end
+
+task :make_tact_dir do
+  if !File.exists?("#{File.expand_path('~')}/.tact")
+    FileUtils.mkdir("#{File.expand_path('~')}/.tact")
+  end
+end
+
+namespace :db do
+  desc "Create databases"
+  task :create => [:environment, :make_tact_dir] do
+    SQLite3::Database.new(DEV_DB)
+    SQLite3::Database.new(TEST_DB)
+  end
+
+  desc "Drop databases"
+  task :drop => :environment do
+    FileUtils.rm DEV_DB
+    FileUtils.rm TEST_DB
+  end
+
+  desc "Run migrations"
+  task :migrate => :environment do
+    ActiveRecord::Migrator.migrations_paths << File.dirname(__FILE__) + 'db/migrate'
+    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+    ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
+      ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
+    end
+  end
+
+  desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
+  task :rollback => :environment do
+    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+    ActiveRecord::Migrator.rollback MIGRATIONS_DIR, step
+  end
+
+  desc "Retrieves the current schema version number"
+  task :version do
+    puts "Current version: #{ActiveRecord::Migrator.current_version}"
+  end
+end
+
+desc "Run specs in test environment"
+task :spec => :environment do
+  sh 'rspec'
+end
+
+desc "Open console with this library required"
+task :console do
+  sh 'irb -I lib -r tact.rb'
+end
+
+desc "Uninstall local version of gem"
+task :uninstall do
+  sh 'yes | gem uninstall tact'  
+  sh 'rm tact-*' unless Dir.glob('./tact-*').empty?
+end
+
+desc "Build and install local gem version"
+task :build => :uninstall do
+  sh 'gem build tact.gemspec && gem install tact'
+end
+

data/bin/tact

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 require 'tact'
 
-Tact::Tact.new(ARGV).run
+Tact::Tact.new(ARGV).run

data/db/migrate/20170515014719_create_tables.rb

@@ -0,0 +1,17 @@
+class CreateTables < ActiveRecord::Migration[4.2]
+  def change
+    create_table :contacts do |t|
+      t.string :first_name, limit: 20
+      t.string :last_name, limit: 20
+
+      t.timestamps
+    end
+    create_table :phone_numbers do |t|
+      t.string :number, limit: 15
+      t.string :type, limit: 10
+    end
+    create_table :emails do |t|
+      t.string :address, limit: 50
+    end
+  end
+end

data/db/migrate/20170515015242_add_foreign_keys.rb

@@ -0,0 +1,6 @@
+class AddForeignKeys < ActiveRecord::Migration[4.2]
+  def change
+    add_column :phone_numbers, :contact_id, :integer
+    add_column :emails, :contact_id, :integer
+  end
+end

data/db/migrate/20170515130759_change_type_on_phone_numbers.rb

@@ -0,0 +1,5 @@
+class ChangeTypeOnPhoneNumbers < ActiveRecord::Migration[4.2]
+  def change
+    rename_column :phone_numbers, :type, :kind
+  end
+end

data/lib/tact.rb

@@ -1 +1,50 @@
-require 'tact/tact'
+# require needed gems
+require 'fileutils'
+require 'active_record'
+require 'sqlite3'
+require 'colored'
+
+# require lib files
+require 'tact/authorizable'
+require 'tact/card'
+require 'tact/contact'
+require 'tact/email'
+require 'tact/google_client'
+require 'tact/phone_number'
+require 'tact/rolodex'
+require 'tact/tact'
+require 'tact/version'
+
+
+APP_ROOT ||= File.join(File.dirname(__FILE__), '../')
+DEV_DB ||= File.join(File.expand_path('~'), '.tact', 'tact.sqlite3')
+TEST_DB ||= File.join(File.expand_path('~'), '.tact', 'tact_test.sqlite3')
+MIGRATIONS_DIR ||= 'db/migrate'
+CLIENT_SECRET ||= File.join(APP_ROOT, 'client_secret.json')
+
+# tells AR what db file to use
+if ENV['GEM_ENV'] == 'test'
+  ActiveRecord::Base.establish_connection(
+    :adapter => 'sqlite3',
+    :database => TEST_DB 
+  )
+else
+  ActiveRecord::Base.establish_connection(
+    :adapter => 'sqlite3',
+    :database => DEV_DB 
+  )
+end
+
+# Make tact directory
+if !File.exists?("#{File.expand_path('~')}/.tact")
+  FileUtils.mkdir("#{File.expand_path('~')}/.tact")
+end
+
+# Create database
+SQLite3::Database.new(DEV_DB)
+SQLite3::Database.new(TEST_DB)
+
+# Run migrations
+ActiveRecord::Migrator.migrations_paths << APP_ROOT + 'db/migrate'
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths)

data/lib/tact/authorizable.rb

@@ -0,0 +1,10 @@
+module Authorizable
+  def authorize
+    system("oauth2l fetch --json #{CLIENT_SECRET} https://www.googleapis.com/auth/contacts https://www.googleapis.com/auth/contacts.readonly")
+  end
+
+  def authorized?
+    credentials = File.join(File.expand_path('~'), '.oauth2l.token')
+    File.exists?(credentials) && !File.zero?(credentials)
+  end
+end

data/lib/tact/card.rb

@@ -1,21 +1,17 @@
-require_relative 'contact'
-
 module Tact
   class Card
     attr_reader :contact
     def initialize(contact, index="*")
       @contact = contact
       @index = index
-      @phone_numbers = contact.phone_numbers
-      @emails = contact.emails
     end
 
     def to_s
       string = "=" * 40 + "\n"
       string += "[#{@index}]".red + " #{@contact.to_s}"
-      @phone_numbers.each_with_index {|number, i| string += "\s\s" + "[#{i + 1}] " + number.to_s + "\n"}
-      @emails.each_with_index {|address, i| string += "\s\s\s\s" + "[#{i + 1}] " + address.to_s + "\n"}
+      contact.phone_numbers.each_with_index {|number, i| string += "\s\s" + "[#{i + 1}] " + number.to_s + "\n"}
+      contact.emails.each_with_index {|address, i| string += "\s\s\s\s" + "[#{i + 1}] " + address.to_s + "\n"}
       string += "=" * 40 + "\n"
     end
   end
-end
+end

data/lib/tact/contact.rb

@@ -1,74 +1,12 @@
-require 'colored'
-require_relative 'phone_number'
-require_relative "email"
-
 module Tact
-  class Contact
-    attr_reader :id
-    attr_accessor :index, :first_name, :last_name
-
-    @@db = Database.new.db
-
-    def self.from_hash(hash)
-      contact = self.new(hash["first_name"], hash["last_name"], hash["id"])
-    end
-
-    def self.all
-      contact_hashes = @@db.execute("select * from contacts order by last_name asc, first_name asc;")
-      contact_hashes.each_with_index.map {|c_hash, index| self.from_hash(c_hash) }
-    end
-
-    def self.find_by_id(id)
-      contact_hashes = @@db.execute("select * from contacts where id = ?", [id])
-      self.from_hash(contact_hashes[0]) if !contact_hashes.empty?
-    end
-
-    def self.find_by_first_name(first_name)
-      results = @@db.execute("select * from contacts where upper(first_name) = upper(?);", [first_name])
-      results.map {|c_hash| self.from_hash(c_hash) }
-    end
-
-    def self.find_by_last_name(last_name)
-      results = @@db.execute("select * from contacts where upper(last_name) = upper(?);", [last_name])
-      results.map {|c_hash| self.from_hash(c_hash) }
-    end
-
-    def self.delete(id)
-      @@db.execute("delete from contacts where id = ?;", [id])
-      @@db.execute("select changes();")[0]["changes()"] == 1 ? true : false
-    end
-
-    def initialize(first_name, last_name, primary_key=nil)
-      @id = primary_key
-      @first_name = first_name.downcase.capitalize
-      @last_name = last_name.downcase.capitalize
-    end
-
-    def save
-      begin
-        if @id == nil
-          if @@db.execute("insert into contacts (first_name, last_name) values (?, ?);", [@first_name, @last_name])
-            @id = @@db.execute("select last_insert_rowid()")[0]["last_insert_rowid()"]
-            self
-          else
-            false
-          end
-        else
-          @@db.execute("update contacts set first_name = ?, last_name = ? where id = ?;", [@first_name, @last_name, @id]) ? self : false
-        end
-      rescue
-        puts "Error: Contact already exists".red 
-      end
-    end
-
-    def phone_numbers
-      number_hashes = @@db.execute("select * from phone_numbers where contact_id = ? order by type asc;", [@id])
-      number_hashes.map {|n_hash| PhoneNumber.from_hash(n_hash) }
-    end
+  class Contact < ActiveRecord::Base
+    has_many :phone_numbers, dependent: :destroy
+    has_many :emails, dependent: :destroy
+    validates :last_name, uniqueness: { scope: :first_name }
 
-    def emails
-      email_hashes = @@db.execute("select * from emails where contact_id = ?", [@id])
-      email_hashes.map {|e_hash| Email.from_hash(e_hash) }
+    before_validation do
+      first_name.upcase!
+      last_name.upcase!
     end
 
     def full_name
@@ -79,4 +17,4 @@ module Tact
       "#{full_name}\n".green.bold
     end
   end
-end
+end

data/lib/tact/email.rb

@@ -1,57 +1,10 @@
-require_relative 'database'
-
 module Tact
-  class Email
-    attr_reader :id
-    attr_accessor :address, :index
-
-    @@db = Database.new.db
-
-    def self.from_hash(hash)
-      self.new(hash["address"], hash["contact_id"], hash["id"])
-    end
-
-    def self.all
-      email_hashes = @@db.execute("select * from emails;")
-      email_hashes.map {|e_hash| Email.from_hash(e_hash) }
-    end
-
-    def self.find_by_id(id)
-      email_hashes = @@db.execute("select * from emails where id = ?", [id])
-      self.from_hash(email_hashes[0]) if !email_hashes.empty?
-    end
-
-    def self.find_by_address(address)
-      email_hashes = @@db.execute("select * from emails where address = ?", [address])
-      email_hashes.map {|e_hash| self.from_hash(e_hash) }
-    end
-
-    def self.delete(id)
-      @@db.execute("delete from emails where id = ?;", [id])
-      @@db.execute("select changes();")[0]["changes()"] == 1 ? true : false
-    end
-
-    def initialize(address, contact_id, primary_key=nil)
-      @id = primary_key
-      @address = address
-      @contact_id = contact_id
-    end
-
-    def save
-      if @id == nil
-        if @@db.execute("insert into emails (address, contact_id) values (?, ?);", [@address, @contact_id])
-          @id = @@db.execute("select last_insert_rowid();")[0]["last_insert_rowid()"]
-          self
-        else
-          false
-        end
-      else
-        @@db.execute("update emails set address = ?, contact_id = ? where id = ?;", [@address, @contact_id, @id]) ? self : false
-      end
-    end
+  class Email < ActiveRecord::Base
+    belongs_to :contact
 
     def to_s
-      "<#{@address}>"
+      "<#{address}>"
     end
+
   end
-end
+end

data/lib/tact/google_client.rb

@@ -0,0 +1,156 @@
+require 'json'
+
+module Tact
+  module GoogleContacts
+
+    class Entry
+      attr_reader :info
+
+      def self.all
+        collection
+      end
+
+      def initialize(info)
+        @info = info
+      end
+
+      def first_name
+        names[:givenName]
+      end
+
+      def last_name
+        names[:familyName]
+      end
+
+      def phone_numbers
+        if info[:phoneNumbers]
+          info[:phoneNumbers].map do |phone_number|
+            PhoneNumber.new(
+              number: phone_number[:value],
+              kind: phone_number[:type]
+            )
+          end
+        end
+      end
+
+      def emails
+        if info[:emailAddresses]
+          info[:emailAddresses].map do |email_address|
+            Email.new(address: email_address[:value])
+          end 
+        end
+      end
+
+      private
+
+        def names
+          info[:names][0]
+        end
+
+      def self.collection
+        @@collection ||= Fetcher.info_list.reduce(EntriesCollection.new) do |collection, info|
+          collection << new(info)
+        end
+      end
+      
+      private_class_method :collection
+    end
+
+
+    class EntriesCollection
+      include Enumerable
+
+      def initialize(entries=[])
+        @entries = entries
+      end
+
+      def <<(entry)
+        @entries << entry
+      end
+
+      def each
+        @entries.each { |c| yield(c) }  
+      end
+    end
+    
+
+    class Syncer
+
+      def initialize(entry)
+        @entry = entry
+        @new_numbers = []
+        @new_emails = []
+      end
+
+      def sync
+        contact = find_contact || Contact.new(
+          first_name: entry.first_name.upcase,
+          last_name: (entry.last_name || "").upcase
+        )
+        merge_properties(contact)
+        contact.save
+      end
+
+      def find_contact
+        Contact.find_by(
+          first_name: entry.first_name.upcase,
+          last_name: (entry.last_name || "").upcase
+        )
+      end
+
+      def merge_properties(contact)
+        get_new_phone_numbers(contact)
+        get_new_emails(contact)
+        add_new_phone_numbers(contact)
+        add_new_emails(contact)
+      end
+
+      def add_new_phone_numbers(contact)
+        contact.phone_numbers << new_numbers
+      end
+
+      def add_new_emails(contact)
+        contact.emails << new_emails
+      end
+
+      def get_new_phone_numbers(contact)
+        entry.phone_numbers.each do |number|
+          if !contact.phone_numbers.any? { |n| n.number == number.number }
+            new_numbers << number
+          end
+        end if entry.phone_numbers
+      end
+
+      def get_new_emails(contact)
+        entry.emails.each do |email|
+          if !contact.emails.any? { |e| e.address == email.address }
+            new_emails << email
+          end
+        end if entry.emails
+      end
+
+      private
+        attr_reader :entry, :new_numbers, :new_emails
+
+    end
+
+    
+    class Fetcher
+
+      def self.info_list
+        info = JSON.parse(json, symbolize_names: true)
+        if info[:error]
+          puts "ERROR: Please authorize your Google account.".red 
+          exit
+        end
+        info[:connections]  
+      end
+
+      def self.json
+        `curl -H "$(oauth2l header --json #{CLIENT_SECRET} https://www.googleapis.com/auth/contacts https://www.googleapis.com/auth/contacts.readonly)"\
+          https://people.googleapis.com/v1/people/me/connections?requestMask.includeField=person.names,person.phone_numbers,person.email_addresses`
+      end
+    end
+
+  end
+end

data/lib/tact/phone_number.rb

@@ -1,78 +1,21 @@
-require 'colored'
-require_relative 'database'
-
 module Tact
-  class PhoneNumber
-    attr_reader :id
-    attr_accessor :number, :index, :type
-
-    @@db = Database.new.db
-
-    def self.format_number(number)
-      n = number.gsub(/[^\d]/, "")
-      chars = n.chars
-      if chars.count == 10
-        chars.insert(3, '-')
-        chars.insert(7, '-')
-      elsif chars.count == 11
-        chars.insert(0, '+')
-        chars.insert(2, ' ')
-        chars.insert(6, '-')
-        chars.insert(10, '-')
-      elsif chars.count == 7
-        chars.insert(3, '-')
-      else
-        return n
-      end
-      return chars.join
-    end
-
-    def self.from_hash(hash)
-      self.new(hash["type"], hash["number"], hash["contact_id"], hash["id"])
-    end
-
-    def self.all
-      number_hashes = @@db.execute("select * from phone_numbers;")
-      number_hashes.map {|n_hash| self.from_hash(n_hash) }
-    end
-
-    def self.delete(id)
-      @@db.execute("delete from phone_numbers where id = ?;", [id])
-      @@db.execute("select changes();")[0]["changes()"] == 1 ? true : false
-    end
+  class PhoneNumber < ActiveRecord::Base
+    belongs_to :contact
 
-    def self.find_by_id(id)
-      number_hashes = @@db.execute("select * from phone_numbers where id = ?", [id])
-      self.from_hash(number_hashes[0]) if !number_hashes.empty?
+    after_initialize :format_number
+    before_save :format_number
+    before_save do
+      self.kind = kind ? kind.downcase.capitalize : "Cell"
     end
 
-    def self.find_by_number(number)
-      number_hashes = @@db.execute("select * from phone_numbers where number = ?", [number])
-      number_hashes.map {|n_hash| self.from_hash(n_hash) }
-    end
-    
-    def initialize(type, number, contact_id, primary_key=nil)
-      @id = primary_key
-      @type = type.downcase.capitalize
-      @number = number.gsub(/\D/, "")
-      @contact_id = contact_id
+    def to_s
+      "#{kind.yellow}: #{number.bold}"
     end
 
-    def save
-      if @id == nil
-        if @@db.execute("INSERT INTO phone_numbers (type, number, contact_id) values (?, ?, ?);", [@type, @number, @contact_id])
-          @id = @@db.execute("select last_insert_rowid();")[0]["last_insert_rowid()"]
-          self
-        else
-          false
-        end
-      else
-        @@db.execute("update phone_numbers set type = ?, number = ?, contact_id = ? where id = ?;", [@type, @number, @contact_id]) ? self : false
-      end
+    def format_number
+      n = number.gsub(/[^\d]/, "")
+      self.number = n.gsub(/\A(?:\d{1,3})?(\d{3})(\d{3})(\d{4})\z/, '(\1) \2-\3')
     end
 
-    def to_s
-      "#{type.yellow}: #{PhoneNumber.format_number(number).bold}"
-    end
   end
-end
+end

data/lib/tact/rolodex.rb

@@ -1,72 +1,76 @@
-require 'sqlite3'
-require 'colored'
-require_relative 'card'
-require_relative 'database'
-
 module Tact
   class Rolodex
     
     def initialize
       @cards = load_cards
-      @db = Database.new.db
     end
 
     def load_cards
-      cards = Contact.all.each_with_index.map do |contact, index|
+      cards = Contact.all.order(last_name: :asc, first_name: :asc).each_with_index.map do |contact, index|
         Card.new(contact, index + 1)
       end
       cards
     end
 
     def add_contact(first_name, last_name)
-      Contact.new(first_name, last_name).save
+      begin
+        Contact.create!(
+          first_name: first_name,
+          last_name: last_name
+        )
+      rescue
+        puts 'Error: Contact already exists'.red
+      end
     end
 
-    def add_phone_number(contact_index, type, number)
+    def add_phone_number(contact_index, kind, number)
       contact = find_contact(contact_index)
-      PhoneNumber.new(type, number, contact.id).save
+      PhoneNumber.create(
+        kind: kind,
+        number: number,
+        contact: contact
+      )
     end
 
     def add_email(contact_index, address)
       contact = find_contact(contact_index)
-      Email.new(address, contact.id).save
+      Email.create(
+        address: address, 
+        contact: contact
+      )
     end
 
     def delete_contact(contact_index)
-      contact = find_contact(contact_index)
-      Contact.delete(contact.id)
+      find_contact(contact_index).destroy
     end
 
     def delete_phone_number(contact_index, num_index)
-      phone_number = find_phone_number(contact_index, num_index)
-      PhoneNumber.delete(phone_number.id)
+      find_phone_number(contact_index, num_index).destroy
     end
 
     def delete_email(contact_index, email_index)
-      email = find_email(contact_index, email_index)
-      Email.delete(email.id)
+      find_email(contact_index, email_index).destroy
     end
 
     def edit_contact_name(contact_index, new_first_name, new_last_name)
       contact = find_contact(contact_index)
-      contact.first_name = new_first_name.downcase.capitalize
-      contact.last_name = new_last_name.downcase.capitalize
-      contact.save
+      contact.update_attributes(
+        first_name: new_first_name,
+        last_name: new_last_name
+      )
     end
 
     def edit_phone_number(contact_index, num_index, new_type, new_number)
-      new_type = new_type.downcase.capitalize
-      new_number = new_number.gsub(/\D/, "")
       phone_number = find_phone_number(contact_index, num_index)
-      phone_number.type = new_type
-      phone_number.number = new_number
-      phone_number.save
+      phone_number.update_attributes(
+        type: new_type,
+        number: new_number
+      )
     end
 
     def edit_email(contact_index, email_index, new_address)
       email = find_email(contact_index, email_index)
-      email.address = new_address
-      email.save
+      email.update_attributes(address: new_address)
     end
 
     def find_contact(contact_index)
@@ -98,21 +102,26 @@ module Tact
       end
     end
 
+    # TODO: Add specs for find methods
     def find_by_name(param)
-      param = param.split(" ").map {|name| name.capitalize }.join(" ")
+      param = param.split(" ").map {|name| name.upcase }.join(" ")
       search_results = []
       @cards.each {|card| search_results.push(card) if card.contact.full_name.include?(param)}
       search_results
     end
 
     def find_by_number(param)
-      contact_ids = @db.execute("select distinct contact_id from phone_numbers where number like '%#{param}%';")
-      contact_ids.map {|hash| convert_to_card(hash["contact_id"]) } 
+      phone_numbers = PhoneNumber.includes(:contact).where('number LIKE ?', "%#{param}%")
+      phone_numbers.map do |phone_number|
+        convert_to_card(phone_number.contact.id)
+      end
     end
 
     def find_by_email(param)
-      contact_ids = @db.execute("select distinct contact_id from emails where address like '%#{param}%';")
-      contact_ids.map {|hash| convert_to_card(hash["contact_id"]) }
+      emails = Email.includes(:contact).where('address LIKE ?', "%#{param}%")
+      emails.map do |email|
+        convert_to_card(email.contact.id)
+      end
     end
 
     def convert_to_card(contact_id)
@@ -120,6 +129,10 @@ module Tact
       results[0]
     end
 
+    def length
+      @cards.count
+    end
+
     def to_s
       string = ""
       @cards.each {|card| string += card.to_s}

data/lib/tact/tact.rb

@@ -1,10 +1,10 @@
-require_relative "rolodex.rb"
 require 'optparse'
-require 'tact/version'
-require 'colored'
+require_relative 'authorizable.rb'
 
 module Tact
   class Tact
+    include Authorizable
+
     def initialize(args)
       @dex = Rolodex.new
       @options = {}
@@ -20,12 +20,15 @@ module Tact
           opt.on('-d', '--delete', 'Delete entry') do
             @options[:delete] = true
           end
-          opt.on('-p', '--phone', 'Edit phone number') do
+          opt.on('-p', '--phone', 'Phone number') do
             @options[:number] = true
           end
-          opt.on('-e', '--email', 'Edit email') do
+          opt.on('-e', '--email', 'Email') do
             @options[:email] = true
           end
+          opt.on('-s', '--sync', 'Sync Google contacts') do
+            @options[:sync] = true
+          end
           opt.on("-v", "--version", "Version") do 
             @options[:version] = true
           end
@@ -41,23 +44,24 @@ module Tact
     end
 
     def help_message
-      <<~EOF
-  
-        -v                                    Current version
-        -h                                    Help
+      <<-EOF
+
+-v                                    Current version
+-h                                    Help
+-s                                    Sync with Google Contacts
 
-        <param>                               Search by name
-        -p <param>                            Search by number
-        -e <param>                            Search by email
-        -n <first> <last>                     Adds new name
-        -np <index> <type> <num>              Adds contact number
-        -ne <index> <address>                 Adds contact email
-        -d <index>                            Deletes contact
-        -dp <index> <num_index>               Deletes contact number
-        -de <index> <e_index>                 Deletes contact email
-        -u <index> <first> <last>             Edits contact name
-        -up <index> <num_index> <type> <num>  Edits contact number
-        -ue <index> <e_index> <address>       Edits contact email
+<param>                               Search by name
+-p <param>                            Search by number
+-e <param>                            Search by email
+-n <first> <last>                     Adds new name
+-np <index> <type> <num>              Adds contact number
+-ne <index> <address>                 Adds contact email
+-d <index>                            Deletes contact
+-dp <index> <num_index>               Deletes contact number
+-de <index> <e_index>                 Deletes contact email
+-u <index> <first> <last>             Edits contact name
+-up <index> <num_index> <type> <num>  Edits contact number
+-ue <index> <e_index> <address>       Edits contact email
 
       EOF
     end
@@ -117,7 +121,15 @@ module Tact
           new_address = @args[2]
           @dex.edit_email(contact_index, email_index, new_address)
         end
-        
+
+      elsif @options[:sync]
+        authorize unless authorized?
+        puts "Syncing Google contacts..." 
+        GoogleContacts::Entry.all.each do |entry|
+          syncer = GoogleContacts::Syncer.new(entry)
+          syncer.sync
+        end
+
       elsif @options[:help]
         puts help_message
       elsif @options[:version]
@@ -202,4 +214,4 @@ module Tact
       end
     end
   end
-end
+end

data/lib/tact/version.rb

@@ -1,3 +1,3 @@
 module Tact
-  VERSION = "1.2.23"
+  VERSION = "2.0.17"
 end

data/tact.gemspec

@@ -16,12 +16,21 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+  spec.files << 'client_secret.json'
+
   spec.executables   = ["tact"]
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sqlite3", "~> 1.3"
   spec.add_runtime_dependency "colored", "~> 1.2"
+  spec.add_runtime_dependency "activerecord", "~> 5.0"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.6"
+  spec.add_development_dependency "database_cleaner", "~> 1.4"
+
+  spec.requirements << "oauth2l"
+
+  spec.post_install_message = "Thanks for installing tact! Run `tact -h` for help. Note: If you would like to sync your contacts with Google, please install oauth2l: 'https://github.com/google/oauth2l'"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tact
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 2.0.17
 platform: ruby
 authors:
 - ollieshmollie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: 
 email:
 - oliverduncan@icloud.com
@@ -82,11 +124,16 @@ files:
 - bin/console
 - bin/setup
 - bin/tact
+- client_secret.json
+- db/migrate/20170515014719_create_tables.rb
+- db/migrate/20170515015242_add_foreign_keys.rb
+- db/migrate/20170515130759_change_type_on_phone_numbers.rb
 - lib/tact.rb
+- lib/tact/authorizable.rb
 - lib/tact/card.rb
 - lib/tact/contact.rb
-- lib/tact/database.rb
 - lib/tact/email.rb
+- lib/tact/google_client.rb
 - lib/tact/phone_number.rb
 - lib/tact/rolodex.rb
 - lib/tact/tact.rb
@@ -96,7 +143,8 @@ homepage: https://www.github.com/ollieshmollie/tact
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: 'Thanks for installing tact! Run `tact -h` for help. Note: If
+  you would like to sync your contacts with Google, please install oauth2l: ''https://github.com/google/oauth2l'''
 rdoc_options: []
 require_paths:
 - lib
@@ -110,9 +158,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- oauth2l
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A command line rolodex.

data/lib/tact/database.rb

@@ -1,47 +0,0 @@
-require 'sqlite3'
-
-module Tact
-  class Database
-    attr_reader :db
-
-    def initialize
-      home_dir = File.expand_path("~")
-      Dir.mkdir("#{home_dir}/.tact") unless File.exists?("#{home_dir}/.tact")
-      @db = SQLite3::Database.new("#{File.expand_path("~")}/.tact/tact.sqlite3")
-      @db.results_as_hash = true
-      @db.execute("pragma foreign_keys = on")
-      create_tables
-    end
-
-    def create_tables
-      contact_table = <<~eof
-        CREATE TABLE IF NOT EXISTS contacts(
-          id integer primary key,
-          first_name varchar(255) not null,
-          last_name varchar(255) not null,
-          constraint name_unique unique (first_name, last_name)
-        );
-        eof
-      phone_numbers_table = <<~eof
-        CREATE TABLE IF NOT EXISTS phone_numbers(
-          id integer primary key,
-          type varchar(255),
-          number varchar(255),
-          contact_id int,
-          foreign key (contact_id) references contacts(id) on delete cascade
-        );
-        eof
-      emails_table = <<~eof
-        CREATE TABLE IF NOT EXISTS emails(
-          id integer primary key,
-          address varchar(255),
-          contact_id,
-          foreign key (contact_id) references contacts(id) on delete cascade
-        );
-        eof
-      @db.execute(contact_table)
-      @db.execute(phone_numbers_table)
-      @db.execute(emails_table)
-    end
-  end
-end