tomatoharvest 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f508e0466cc97b1f3b0d619bdfacbd2344b8cb8f
-  data.tar.gz: 3284680bde183e758259ec764f3ed84209931501
+  metadata.gz: 6f52afcccd4a11b6c0c6cda0692079bebcf3a96f
+  data.tar.gz: 32a18edb8874add209ba439cb094906c603d5d88
 SHA512:
-  metadata.gz: 5544110fda87a0bb5b50d50f3a4e3d6e2da532088317ba286c6f4571950f33811d7ff03455a9ed2b2fc2668ca8d65a4eec134e70a39c0dd3e9f1a49e7295d418
-  data.tar.gz: 7786c551b13055b700232d439cfe52f5c890199579e5b60f7e6aac41bdb0732b73c2116e11a74d9d30f060e651dc04346d3f93bf20ac5ac0047d0d16293c9beb
+  metadata.gz: 8945effcbc9b58c7eb8669447893a22d1bbad71eb19799ce268332ec1c9da69e2a93a9a4f50570846b0c8856d1a867c3a4f805b6aa5646a82429ca0756b93ec2
+  data.tar.gz: e5c24caf89932bb39c25fd0e912dce5bad88a123ee0363f522b979fe0677f24f0f115aa8533067455fc9043f5ebe95186aab0ee339f5222e180126adf2c8e2a5

data/.gitignore

@@ -19,4 +19,5 @@ tmp
 *.so
 *.o
 *.a
+*.swp
 mkmf.log

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in po.gemspec
 gemspec

data/README.md

@@ -1,6 +1,8 @@
 # TomatoHarvest
 Command line pomodoro timer that logs to Harvest.
 
+[![Code Climate](https://codeclimate.com/github/samuelreh/tomatoharvest.png)](https://codeclimate.com/github/samuelreh/tomatoharvest)
+
 ## Installation
 
     $ gem install tomatoharvest

data/TODO

@@ -1,4 +1,2 @@
 * Test Tmux
-* Fix 0 hr bug
-* Refactor
 * Count down?

data/lib/tomatoharvest/cli.rb

@@ -6,30 +6,34 @@ module TomatoHarvest
 
     desc "add", "add a task"
     def add(name)
+      list = ListLoader.from_file
       task = Task.new(name)
-      List.add(task)
+      list.add(task)
+      list.save!
       say "#{task.name} added with id #{task.id}"
     end
 
     desc "list", "list all tasks"
     def list
-      list = List.all.map do |task|
+      list  = ListLoader.from_file
+      table = list.map do |task|
         [task.id, task.name]
       end
-      list.unshift(['id', 'name'])
+      table.unshift(['id', 'name'])
 
       shell = Thor::Base.shell.new
-      shell.print_table(list)
+      shell.print_table(table)
     end
 
     desc "start", "start a task"
     def start(id, minutes = DEFAULT_MINUTES)
-      task    = List.find(id)
+      list    = ListLoader.from_file
+      task    = list.find(id)
       config  = Config.load.merge("name" => task.name)
       entry   = TimeEntry.build_and_test(config)
 
       say "Timer started for #{task.name}"
-      Timer.start(task.id, minutes: minutes, time_entry: entry)
+      Timer.start(list, task.id, minutes: minutes, time_entry: entry)
     end
 
     desc "stop", "stop current timer"
@@ -41,6 +45,12 @@ module TomatoHarvest
       end
     end
 
+    desc "remove", "remove a task"
+    def remove(id)
+      list = ListLoader.from_file
+      task = list.remove(id)
+      say "#{id} removed"
+    end
 
   end
 end

data/lib/tomatoharvest/config.rb

@@ -1,21 +1,38 @@
 module TomatoHarvest
   class Config
-    CONFIG_PATH = File.expand_path("#{ENV['$HOME']}/.tomaconfig")
-    LOCAL_CONFIG_PATH = File.join(Dir.pwd, '.tomaconfig')
+    DIR_NAME = '.toma'
 
-    def self.load(options = {})
-      if !(File.exists? CONFIG_PATH)
-        File.open(CONFIG_PATH, 'w') do |file|
-          YAML.dump({}, file)
+    HOME_DIR   = ENV['HOME']
+    GLOBAL_DIR = File.join(HOME_DIR, DIR_NAME)
+    LOCAL_DIR  = File.join(Dir.pwd, DIR_NAME)
+
+    def self.load
+      old_config    = merge_config(old_config_path)
+
+      global_path = config_path(GLOBAL_DIR)
+      global_config = merge_config(global_path, old_config)
+
+      local_path = config_path(LOCAL_DIR)
+      merge_config(local_path, global_config)
+    end
+
+    def self.merge_config(path, base = {})
+      mergable =
+        if File.exists?(path) 
+          YAML.load_file(path)
+        else
+          {}
         end
-      end
 
-      hash = YAML.load_file(CONFIG_PATH)
-      if File.exists? LOCAL_CONFIG_PATH
-        hash.merge!(YAML.load_file(LOCAL_CONFIG_PATH))
-      end
+      base.merge(mergable)
+    end
+
+    def self.config_path(directory)
+      File.join(directory, 'config.yaml')
+    end
 
-      hash
+    def self.old_config_path
+      File.join(HOME_DIR, '.tomaconfig')
     end
   end
 end

data/lib/tomatoharvest/list.rb

@@ -1,48 +1,47 @@
 require 'yaml'
+require 'forwardable'
 
 module TomatoHarvest
   class List
-    PATH = File.expand_path("#{ENV['$HOME']}/.toma")
+    extend ::Forwardable
 
     attr_reader :items
 
-    alias :all :items
+    def_delegators :items, :count, :map
 
-    def self.add(item)
-      new.tap do |list|
-        list.add(item)
-        list.save
-      end
-    end
-
-    def self.all
-      new.all
+    def self.init_and_load(*args)
+      new(*args).load!
     end
 
-    def self.find(id)
-      new.find(id)
+    def initialize(path, items = nil)
+      @path  = path
+      @items = items || []
     end
 
-    def initialize
-      if File.exists?(PATH)
-        @items = load_list
-      else
-        @items = []
+    def load!
+      if File.exists?(@path) && items = YAML.load_file(@path)
+        @items = items
       end
+      
+      self
     end
 
     def find(id)
-      # TODO speed this up with an algo
-      all.find do |item|
+      @items.find do |item|
         item.id == id.to_i
       end
     end
 
-    def save
-      yaml = YAML::dump(@items)
-      File.open(PATH, "w+") do |f|
+    def save!
+      dir = File.dirname(@path)
+      FileUtils.mkdir_p(dir) unless File.directory?(dir)
+
+      yaml = YAML.dump(@items)
+      File.open(@path, "w+") do |f|
         f.write(yaml)
       end
+
+      self
     end
 
     def add(item)
@@ -56,21 +55,11 @@ module TomatoHarvest
       @items << item
     end
 
-    private
-
-    def load_list
-      string = ""
-
-      # better way to do this?
-      File.open(PATH, "r") do |f|
-        while line = f.gets
-          string += line
-        end
+    def remove(id)
+      @items.delete_if do |item|
+        item.id == id.to_i
       end
-
-      YAML::load(string)
     end
 
   end
 end
-

data/lib/tomatoharvest/list_loader.rb

@@ -0,0 +1,45 @@
+module TomatoHarvest
+
+  class ListLoader
+
+    FILENAME = 'list.yaml'
+
+    class << self
+
+      def from_file
+        local_path  = list_path(TomatoHarvest::Config::LOCAL_DIR)
+
+        if File.exists? local_path
+          List.init_and_load(local_path)
+        else
+          load_old_list || List.init_and_load(global_path)
+        end
+      end
+
+      def load_old_list
+        old_path = File.join(TomatoHarvest::Config::HOME_DIR, '.toma')
+
+        if exists_as_file(old_path)
+          old_list = List.init_and_load(old_path)
+          File.delete old_path
+          List.new(global_path, old_list.items).save!
+        end
+      end
+
+      def exists_as_file(path)
+        File.exists?(path) && !File.directory?(path)
+      end
+
+      def global_path
+        list_path(TomatoHarvest::Config::GLOBAL_DIR)
+      end
+
+      def list_path(dir)
+        File.join(dir, FILENAME)
+      end
+
+    end
+
+  end
+
+end

data/lib/tomatoharvest/time_entry.rb

@@ -33,6 +33,7 @@ module TomatoHarvest
 
     def log(seconds)
       hours = seconds_to_hours(seconds)
+      return if hours == 0
       options = {
         notes: notes,
         hours: hours,

data/lib/tomatoharvest/timer.rb

@@ -2,32 +2,32 @@ require 'daemons'
 
 module TomatoHarvest
   class Timer
-    PID_DIR = '~'
-    PID_NAME = '.toma'
+    SLEEP_LENGTH = 1
+    PID_NAME = 'pid'
 
-    def self.start(task_id, options = {})
-      new(task_id, options).start
+    def self.start(*args)
+      new(*args).start
     end
 
     def self.stop
-      if monitor = Daemons::Monitor.find(File.expand_path(DIR), APP_NAME)
+      if monitor = Daemons::Monitor.find(pid_dir, PID_NAME)
         monitor.stop
         true
       end
     end
 
-    def initialize(task_id, options = {})
+    def initialize(list, task_id, options = {})
       @minutes    = options[:minutes]
       @time_entry = options[:time_entry]
       @notifier   = Notifier.new
-      @list       = List.new
+      @list       = list
       @task       = @list.find(task_id)
       @timer      = 0
       @tmux       = Tmux.new
     end
 
     def start
-      if Daemons.daemonize(app_name: PID_NAME, dir: PID_DIR, dir_mode: :normal)
+      if Daemons.daemonize(app_name: PID_NAME, dir: self.class.pid_dir, dir_mode: :normal)
         at_exit { save_and_log }
         run_timer
       else
@@ -36,13 +36,17 @@ module TomatoHarvest
       end
     end
 
+    def self.pid_dir
+      TomatoHarvest::Config::GLOBAL_DIR
+    end
+
     private
 
     def run_timer
       @notifier.notify "Pomodoro started for #{@minutes} minutes", :subtitle => @task.name
 
       (@minutes * 60).times do |i|
-        sleep 1
+        sleep SLEEP_LENGTH
         @timer += 1
         @tmux.update(@timer)
       end
@@ -50,7 +54,7 @@ module TomatoHarvest
 
     def save_and_log
       @task.log_pomodoro(@timer)
-      @list.save
+      @list.save!
       @time_entry.log(@timer) if @time_entry
       @notifier.notify "Pomodoro finished", :subtitle => "Pomodoro finished!"
       @tmux.update(0)

data/lib/tomatoharvest/tmux.rb

@@ -15,7 +15,7 @@ module TomatoHarvest
     end
 
     def write_tmux_time(time)
-      path = File.join(ENV['HOME'],'.tomatmux')
+      path = File.join(TomatoHarvest::Config::GLOBAL_DIR, 'tmux')
       File.open(path, 'w') do |file|
         file.write tmux_time(time)
       end

data/lib/tomatoharvest/version.rb

@@ -1,3 +1,3 @@
 module TomatoHarvest
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/tomatoharvest.rb

@@ -1,5 +1,6 @@
 require 'tomatoharvest/version'
 require 'tomatoharvest/list'
+require 'tomatoharvest/list_loader'
 require 'tomatoharvest/task'
 require 'tomatoharvest/timer'
 require 'tomatoharvest/cli'

data/spec/helper.rb

@@ -5,47 +5,29 @@ require 'tomatoharvest'
 require 'webmock/rspec'
 require 'minitest/unit'
 
+require 'support/file_helpers'
+require 'support/harvest_helpers'
+
 WebMock.disable_net_connect!(allow_localhost: true)
 
 RSpec.configure do |c|
   c.include MiniTest::Assertions
+  c.include FileHelpers
+  c.include HarvestHelpers
 
   #
   # Speed up the timer
   #
-  c.before :all do
-    class TomatoHarvest::Timer
-      def sleep(time)
-        super(time/100000)
-      end
-    end
+  c.before :each do
+    const = 'TomatoHarvest::Timer::SLEEP_LENGTH'
+    stub_const(const, 1/100000)
   end
 
   #
   # Stub HTTP requests
   #
   c.before do
-    body = {
-      projects: [ {
-        name: 'Pomdoro',
-        id: 1,
-        tasks: [
-          {
-            name: 'Ruby Development',
-            id: 1
-          }
-        ]
-      } ],
-      day_entries: []
-    }
-
-    stub_request(:get, /https:\/\/user:password@domain.harvestapp.com\/daily\/.*/).
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json; charset=utf-8', 'User-Agent'=>'Harvestable/2.0.0'}).
-      to_return(:status => 200, :body => body.to_json, :headers => {})
-
-    stub_request(:post, "https://user:password@domain.harvestapp.com/daily/add").
-      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json; charset=utf-8', 'User-Agent'=>'Harvestable/2.0.0'}).
-      to_return(:status => 200, :body => "", :headers => {})
+    stub_harvest
   end
 
   #
@@ -53,29 +35,31 @@ RSpec.configure do |c|
   # Dont notify the terminal
   #
   c.before do
-    Daemons.stub(daemonize: false)
-    TerminalNotifier.stub(notify: true)
-    TomatoHarvest::Tmux.any_instance.stub(update: true)
+    allow(Daemons).to receive(:daemonize) { false }
+    allow(TerminalNotifier).to receive(:notify) { true }
+    allow_any_instance_of(TomatoHarvest::Tmux).to receive(:update) { true }
+  end
+
+  # Stub Home dir 
+  c.before(:each) do
+    stub_const('TomatoHarvest::Config::HOME_DIR', 'spec/')
   end
 
   #
-  # Cleanup .toma and .tomaconfig
+  # Cleanup .toma/
   #
 
   [
-    ["TomatoHarvest::Config::CONFIG_PATH",       File.expand_path('spec/.tomaconfig')],
-    ["TomatoHarvest::Config::LOCAL_CONFIG_PATH", File.expand_path('.tomaconfig')],
-    ["TomatoHarvest::List::PATH",                File.expand_path('spec/.toma')]
-  ].each do |tuple|
-    path = tuple[1]
-
+    ["TomatoHarvest::Config::GLOBAL_DIR", File.expand_path('spec/.toma/')],
+    ["TomatoHarvest::Config::LOCAL_DIR",  File.expand_path('.toma/')]
+  ].each do |const, path|
     c.before :each do
-      stub_const(tuple[0], path)
-      File.delete(path) if File.exists?(path)
+      stub_const(const, path)
+      FileUtils.rm_rf(path) if File.directory?(path)
     end
 
     c.after :each do
-      File.delete(path) if File.exists?(path)
+      FileUtils.rm_rf(path) if File.directory?(path)
     end
   end
 end

data/spec/lib/tomatoharvest/cli_spec.rb

@@ -22,6 +22,18 @@ describe TomatoHarvest::CLI do
 
   end
 
+  describe 'remove' do
+    before do
+      TomatoHarvest::CLI.start ['add', 'foo']
+    end
+
+    it 'removes task from the list' do
+      out = capture_io { TomatoHarvest::CLI.start ['remove', 1] }.join ''
+      expect(out).to match(/1 removed/)
+    end
+
+  end
+
   describe 'start' do
     before do
       TomatoHarvest::CLI.start ['add', 'foo']
@@ -48,10 +60,8 @@ describe TomatoHarvest::CLI do
           password: 'password'
         }
 
-        path = TomatoHarvest::Config::CONFIG_PATH
-        File.open(path, 'w') do |file|
-          YAML::dump(options, file)
-        end
+        path = TomatoHarvest::Config.config_path(TomatoHarvest::Config::GLOBAL_DIR)
+        create_yaml_file(path, options)
       end
 
       it 'starts the timer with specified length' do
@@ -63,4 +73,13 @@ describe TomatoHarvest::CLI do
 
   end
 
+  describe 'stop' do
+
+    it 'warns when timer isnt running' do
+      out = capture_io { TomatoHarvest::CLI.start ['stop'] }.join ''
+      expect(out).to match(/Timer not running/)
+    end
+
+  end
+
 end

data/spec/lib/tomatoharvest/config_spec.rb

@@ -1,8 +1,10 @@
+require 'fileutils'
 require 'helper'
 
 describe TomatoHarvest::Config do
 
   describe '.load' do
+
     let(:global_options) do
       {
         project: 'Project',
@@ -11,9 +13,8 @@ describe TomatoHarvest::Config do
     end
 
     before do
-      File.open(TomatoHarvest::Config::CONFIG_PATH, 'w') do |file|
-        YAML::dump(global_options, file)
-      end
+      path = TomatoHarvest::Config.config_path(TomatoHarvest::Config::GLOBAL_DIR)
+      create_yaml_file(path, global_options)
     end
 
     it 'loads from the yaml config file' do
@@ -26,15 +27,34 @@ describe TomatoHarvest::Config do
         options = {
           type:    'JS Development',
         }
-        local_config = File.join(Dir.pwd, '.tomaconfig')
 
-        File.open(local_config, 'w') do |file|
-          YAML::dump(options, file)
-        end
+        path = TomatoHarvest::Config.config_path(TomatoHarvest::Config::LOCAL_DIR)
+        create_yaml_file(path, options)
+
+        expected = global_options.merge(options)
+
+        expect(TomatoHarvest::Config.load).to eql(expected)
+      end
+
+    end
+
+    context 'when there is an old config file' do
+
+      let(:old_config) do
+        {
+          domain: 'fake.domain.name'
+        }
+      end
+
+      it 'loads it' do
+        old_config_path = File.join(TomatoHarvest::Config::HOME_DIR, '.tomaconfig')
+        expanded_path = File.expand_path(old_config_path)
+        create_yaml_file(expanded_path, old_config)
 
-        result = global_options.merge(options)
+        expected = old_config.merge(global_options)
+        expect(TomatoHarvest::Config.load).to eql(expected)
 
-        expect(TomatoHarvest::Config.load).to eql(result)
+        File.delete(old_config_path)
       end
 
     end

data/spec/lib/tomatoharvest/list_loader_spec.rb

@@ -0,0 +1,69 @@
+require 'helper'
+
+describe TomatoHarvest::ListLoader do
+
+  describe '.from_file' do
+
+    let(:filename) { TomatoHarvest::ListLoader::FILENAME }
+
+    it 'returns a list' do
+      list = described_class.from_file
+      expect(list).to be_an_instance_of(TomatoHarvest::List)
+    end
+
+    context 'when there is an old list' do
+
+      let(:items) { ['item'] }
+      let(:path) { File.join(TomatoHarvest::Config::HOME_DIR, '.toma') }
+
+      before do
+        create_yaml_file(path, items)
+      end
+
+      it 'moves it to the global location' do
+        list = described_class.from_file
+        expect(list.count).to eql(1)
+      end
+
+      it 'persists the list' do
+        described_class.from_file
+        list = described_class.from_file
+        expect(list.count).to eql(1)
+      end
+
+    end
+
+    context 'when there is a global list' do
+
+      let(:items) { ['item'] }
+
+      before do
+        path = File.join(TomatoHarvest::Config::GLOBAL_DIR, filename)
+        create_yaml_file(path, items)
+      end
+
+      it 'returns the global list' do
+        list = described_class.from_file
+        expect(list.items).to eql(items)
+      end
+
+      context 'when there is a local list' do
+        let(:local_items) { ['local_item'] }
+
+        before do
+          path = File.join(TomatoHarvest::Config::LOCAL_DIR, filename)
+          create_yaml_file(path, local_items)
+        end
+
+        it 'returns the local list' do
+          list = described_class.from_file
+          expect(list.items).to eql(local_items)
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/tomatoharvest/list_spec.rb

@@ -2,26 +2,35 @@ require 'helper'
 
 describe TomatoHarvest::List do
 
+  let(:path) { TomatoHarvest::ListLoader.global_path }
+  let(:list) { TomatoHarvest::List.new(path) }
+
   def add_task(name)
     task = TomatoHarvest::Task.new(name)
-    TomatoHarvest::List.add(task)
+    list.add(task)
   end
 
-  describe '.add' do
+  describe 'load!' do
 
-    it 'adds to the list' do
-      add_task('foo')
-      expect(described_class.all.first).to be_an_instance_of(TomatoHarvest::Task)
+    it 'doesnt load if file is empty' do
+      create_file(path, "")
+      list.load!
+      expect(list.items).to eql([])
     end
 
   end
 
-  describe '.list' do
+  describe '.add' do
+
+    it 'adds to the list' do
+      add_task('foo')
+      expect(list.items.first).to be_an_instance_of(TomatoHarvest::Task)
+    end
 
     it 'should have two items' do
       add_task('foo')
       add_task('bar')
-      expect(described_class.all.count).to eql(2)
+      expect(list.count).to eql(2)
     end
 
   end
@@ -31,8 +40,8 @@ describe TomatoHarvest::List do
     it 'returns the task with the corresponding id' do
       add_task('foo')
       add_task('bar')
-      expect(described_class.find(1).name).to eql('foo')
-      expect(described_class.find(2).name).to eql('bar')
+      expect(list.find(1).name).to eql('foo')
+      expect(list.find(2).name).to eql('bar')
     end
 
   end
@@ -41,11 +50,20 @@ describe TomatoHarvest::List do
 
     it 'adds the task to the items array' do
       task = TomatoHarvest::Task.new('foo')
-      list = described_class.new
       list.add(task)
       expect(list.items.first.id).to eql(1)
     end
 
   end
 
+  describe '.remove' do
+
+    it 'removes the task from the item array' do
+      add_task('foo')
+      list.remove(1)
+      expect(list.count).to eql(0)
+    end
+
+  end
+
 end

data/spec/lib/tomatoharvest/time_entry_spec.rb

@@ -6,59 +6,64 @@ describe TomatoHarvest::TimeEntry do
 
     let(:entry) do
       described_class.new.tap do |entry|
-        entry.stub(project: double, task: double)
+        allow(entry).to receive(:project) { double }
+        allow(entry).to receive(:task)    { double }
       end
     end
 
     it "raises an error if project can't be found" do
-      entry.stub(project: nil)
+      allow(entry).to receive(:project) { nil }
       expect{ entry.test }.to raise_error("Couldn't find project")
     end
 
     it "raises an error if task can't be found" do
-      entry.stub(task: nil)
+      allow(entry).to receive(:task) { nil }
       expect{ entry.test }.to raise_error("Couldn't find task type")
     end
 
   end
 
   describe '#log' do
+    let(:options) do
+      {
+        'domain' => 'domain',
+        'username' => 'user',
+        'password' => 'password',
+        'project' => 'Pomodoro',
+        'task' => 'Ruby Development',
+        'name' => 'Template Refactoring'
+      }
+    end
 
-    context 'task is already logged today' do
-      let(:options) do
-        {
-          'domain' => 'domain',
-          'username' => 'user',
-          'password' => 'password',
-          'project' => 'Pomodoro',
-          'task' => 'Ruby Development',
-          'name' => 'Template Refactoring'
-        }
-      end
-
-      before do
-        body = {
-          projects: [ {
-            name: 'Pomodoro',
-            id: 1,
-            tasks: [
-              {
-                name: 'Ruby Development',
-                id: 1
-              }
-            ]
-          } ],
-
-          day_entries: [ {
-            notes: 'Template Refactoring',
-            project_id: 1,
-            task_id: 1,
-            hours: 1
-          } ]
-        }
+    let(:entries) { [] }
+
+    before do
+      body = {
+        projects: [ {
+          name: 'Pomodoro',
+          id: 1,
+          tasks: [
+            {
+              name: 'Ruby Development',
+              id: 1
+            }
+          ]
+        } ],
+        day_entries: entries
+      }
+
+      stub_request(:get, /https:\/\/user:password@domain.harvestapp.com\/daily\/.*/).
+        to_return(:status => 200, :body => body.to_json, :headers => {})
+    end
 
-        stub_request(:get, /https:\/\/user:password@domain.harvestapp.com\/daily\/.*/).
-          to_return(:status => 200, :body => body.to_json, :headers => {})
+    context 'task is already logged today' do
+      let(:entries) do
+        [ {
+          notes: 'Template Refactoring',
+          project_id: 1,
+          task_id: 1,
+          hours: 1
+        } ]
       end
 
       it 'updates exisiting entry' do
@@ -75,7 +80,21 @@ describe TomatoHarvest::TimeEntry do
         entry = TomatoHarvest::TimeEntry.new(options)
         entry.log(60 * 30)
 
-        stub.should have_been_requested
+        expect(stub).to have_been_requested
+      end
+
+    end
+
+    context 'seconds are rounded to 0.00 hours' do
+
+      it 'should not log' do
+        update_url = "https://user:password@domain.harvestapp.com/daily/add"
+        stub = stub_request(:post, update_url)
+
+        entry = TomatoHarvest::TimeEntry.new(options)
+        entry.log(0)
+
+        expect(stub).not_to have_been_requested
       end
 
     end

data/spec/lib/tomatoharvest/timer_spec.rb

@@ -6,10 +6,14 @@ describe TomatoHarvest::Timer do
 
     let(:task) { TomatoHarvest::Task.new('foo') }
 
+    let(:list) do
+      path = TomatoHarvest::ListLoader.global_path
+      TomatoHarvest::List.new(path)
+    end
+
     before do
-      list = TomatoHarvest::List.new
       list.add(task)
-      list.save
+      list.save!
     end
 
     def stub_notifier(minutes)
@@ -23,23 +27,23 @@ describe TomatoHarvest::Timer do
     end
 
     it 'can run for a custom length' do
-      TomatoHarvest::Timer.start(task.id, minutes: 15)
+      TomatoHarvest::Timer.start(list, task.id, minutes: 15)
 
-      reloaded_task = TomatoHarvest::List.find(task.id)
+      reloaded_task = list.find(task.id)
       expect(reloaded_task.logged_minutes).to eql(15.0)
     end
 
     it 'can be run twice' do
-      TomatoHarvest::Timer.start(task.id, minutes: 20)
-      TomatoHarvest::Timer.start(task.id, minutes: 20)
-      reloaded_task = TomatoHarvest::List.find(task.id)
+      TomatoHarvest::Timer.start(list, task.id, minutes: 20)
+      TomatoHarvest::Timer.start(list, task.id, minutes: 20)
+      reloaded_task = list.find(task.id)
       expect(reloaded_task.logged_minutes).to eql(40.0)
     end
 
     it 'logs a time entry if passed in' do
       entry = double
-      entry.should_receive(:log)
-      TomatoHarvest::Timer.start(task.id, time_entry: entry, minutes: 25)
+      expect(entry).to receive(:log)
+      TomatoHarvest::Timer.start(list, task.id, time_entry: entry, minutes: 25)
     end
 
   end

data/spec/support/file_helpers.rb

@@ -0,0 +1,18 @@
+module FileHelpers
+
+  # Creates a YAML config file at the specified path.
+  def create_yaml_file(path, options)
+    create_file(path, YAML::dump(options))
+  end
+
+  def create_file(path, contents)
+    dir = File.dirname(path)
+
+    FileUtils.mkdir_p(dir) unless File.directory?(dir)
+
+    File.open(path, 'w') do |file|
+      file.write(contents)
+    end
+  end
+
+end

data/spec/support/harvest_helpers.rb

@@ -0,0 +1,25 @@
+module HarvestHelpers
+  def stub_harvest
+    body = {
+      projects: [ {
+        name: 'Pomdoro',
+        id: 1,
+        tasks: [
+          {
+            name: 'Ruby Development',
+            id: 1
+          }
+        ]
+      } ],
+      day_entries: []
+    }
+
+    stub_request(:get, /https:\/\/user:password@domain.harvestapp.com\/daily\/.*/).
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json; charset=utf-8', 'User-Agent'=>'Harvestable/2.0.0'}).
+      to_return(:status => 200, :body => body.to_json, :headers => {})
+
+    stub_request(:post, "https://user:password@domain.harvestapp.com/daily/add").
+      with(:headers => {'Accept'=>'application/json', 'Content-Type'=>'application/json; charset=utf-8', 'User-Agent'=>'Harvestable/2.0.0'}).
+      to_return(:status => 200, :body => "", :headers => {})
+  end
+end

data/tomatoharvest.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "rake",    "~> 10.3"
+  spec.add_development_dependency "rspec",   "~> 3.0"
+  spec.add_development_dependency "webmock", "~> 1.18"
 
-  spec.add_dependency('thor', '~> 0.19')
-  spec.add_dependency('harvested')
-  spec.add_dependency('daemons')
-  spec.add_dependency('terminal-notifier', '~> 1.4') if TomatoHarvest::OS.mac?
+  spec.add_dependency 'thor',              '~> 0.19'
+  spec.add_dependency 'harvested',         '~> 2.0'
+  spec.add_dependency 'daemons',           '~> 1.1'
+  spec.add_dependency 'terminal-notifier', '~> 1.4' if TomatoHarvest::OS.mac?
 end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: tomatoharvest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Sam Reh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: harvested
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 description: Command line pomodoro timer that logs to Harvest.
@@ -130,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -141,6 +141,7 @@ files:
 - lib/tomatoharvest/cli.rb
 - lib/tomatoharvest/config.rb
 - lib/tomatoharvest/list.rb
+- lib/tomatoharvest/list_loader.rb
 - lib/tomatoharvest/notifier.rb
 - lib/tomatoharvest/notifier/notification_center.rb
 - lib/tomatoharvest/os.rb
@@ -153,9 +154,12 @@ files:
 - spec/helper.rb
 - spec/lib/tomatoharvest/cli_spec.rb
 - spec/lib/tomatoharvest/config_spec.rb
+- spec/lib/tomatoharvest/list_loader_spec.rb
 - spec/lib/tomatoharvest/list_spec.rb
 - spec/lib/tomatoharvest/time_entry_spec.rb
 - spec/lib/tomatoharvest/timer_spec.rb
+- spec/support/file_helpers.rb
+- spec/support/harvest_helpers.rb
 - tomatoharvest.gemspec
 homepage: http://github.com/samuelreh/tomatoharvest/
 licenses:
@@ -167,17 +171,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Log your pomodoros to Harvest
@@ -185,7 +189,10 @@ test_files:
 - spec/helper.rb
 - spec/lib/tomatoharvest/cli_spec.rb
 - spec/lib/tomatoharvest/config_spec.rb
+- spec/lib/tomatoharvest/list_loader_spec.rb
 - spec/lib/tomatoharvest/list_spec.rb
 - spec/lib/tomatoharvest/time_entry_spec.rb
 - spec/lib/tomatoharvest/timer_spec.rb
+- spec/support/file_helpers.rb
+- spec/support/harvest_helpers.rb
 has_rdoc: