time_tree 2.1.0

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.swp
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use 1.9.3@time_log

data/Gemfile

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

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Andy White
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,57 @@
+# Timetree
+
+Timetree is a command line utility that prints a tree-like breakdown of time spent on activities based on a simple, human readable time logging language stored in plain text files.
+
+## Installation
+
+    $ gem install time_tree
+
+## Time Log Format
+
+Each day's log should start with a date in YYYY/MM/DD format. Any text following is ignored as comments. Following this are lines starting with a time in 24 hour format - HHMI, followed by an activity which must contain no spaces, any text following is ignored and considered as comments. Activities may have nested subcategories to any level separated by forward slashes - these will be printed as a hierarchy by timetree. Use a dash (-) for the activity to be ignored and not reported on - this means a day's log must always end with a time followed by a dash to denote when the previous line's activity finished.
+
+Blank lines are ignored and lines starting with # are ignored as comments.
+
+Here's an example:
+
+    2013/04/21 A splendid day!
+    
+    0930 admin some comments
+    0945 development/project1 some more comments
+    1005 -
+    1030 developemnt/project2
+    1115 -
+    
+    # Did some work in the evening!
+    2230 bugfixing/project3  # Use a hash after a time line if you want but not needed
+    2315 -
+
+
+A day's log can't span across more than one file, but a file may contain multiple day's logs. This gives flexibility, all time may be stored in one big file or there may be multiple files, one for each day or week for example. Multiple files may be stored in a nested folder hierarchy - time tree will recursively search for files, ignoring those starting with . (dot).
+
+## Usage
+
+    $ timetree [options] [path]
+
+### Options
+
+Reports on the given date or period. Weeks are deemed to start on Monday.
+
+  * *--all*, *-a* - include all dates recorded
+  * *--today*, *-t* - this is the assumed default
+  * *--yesterday*, *-y*
+  * *--week [weeks-previous]*, *-w* - the current week so far. To report on previous weeks use the optional *weeks-previous* argument, 0 (the assumed default) would mean the current week, 1 would mean last week, 2 would mean the week previous to that and so on.
+  * *--month [months-previous]*, *-m* - the current calendar month so far. The optional *months-revious* argument works in a similar way to *--week weeks-previous*
+  * *--date YYYY/MM/DD*, *-d*
+  * *--between YYYY/MM/DD:YYYY/MM/DD*, *-b* - reports on the given inclusive range of dates
+  * *--filter search-string[,search-string]*, *-f* - only reports on activities matching *search-string*
+
+If given no path, Timetree will look in the users's home directory for a file or directory called *Time*, *time* or *.time*.
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/bin/timetree

@@ -0,0 +1,89 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path(File.join('..', '..', 'lib'), __FILE__)
+require 'time_tree'
+require 'optparse'
+
+module TimeTree
+  options = {:today => true}
+  
+  option_parser = OptionParser.new do |opts|
+    opts.banner = "Usage: #{File.basename($0)} [options] [data_path]"
+    
+    opts.on('-a', '--all') do
+      options[:all] = true
+      options[:today] = false
+    end
+    
+    opts.on('-t', '--today') do
+      options[:all] = false
+      options[:today] = true
+    end
+    
+    opts.on('-y', '--yesterday') do
+      options[:yesterday] = true
+      options[:all] = false
+      options[:today] = false
+    end
+    
+    opts.on('-w [WEEKS_PREVIOUS]', '--week', 'The current week is the default') do |weeks_previous|
+      options[:week] = weeks_previous.to_i || 0
+      options[:all] = false
+      options[:today] = false
+    end
+    
+    opts.on('-m [MONTHS_PREVIOUS]', '--month', 'The current month is the default') do |months_previous|
+      options[:month] = months_previous.to_i || 0
+      options[:all] = false
+      options[:today] = false
+    end
+
+    opts.on('-d DATE', '--date', 'Date must be of format YYYY/MM/DD') do |date|
+      if date =~ /\d\d\d\d\/\d\d\/\d\d/
+        options[:date] = date
+        options[:all] = false
+        options[:today] = false
+      else
+        puts "Invalid date format. Must be YYYY/MM/DD"
+        exit 1
+      end
+    end
+
+    opts.on('-r RANGE', '--range', 'Range must be of format YYYY/MM/DD:YYYY/MM/DD') do |range|
+      if range =~ /\d\d\d\d\/\d\d\/\d\d:\d\d\d\d\/\d\d\/\d\d/
+        options[:range] = range
+        options[:all] = false
+        options[:today] = false
+      else
+        puts "Invalid date range. Must be YYYY/MM/DD:YYYY/MM/DD"
+        exit 1
+      end
+    end
+
+    opts.on('-f SEARCH', '--filter') do |search|
+      options[:filter] = search.split(',')
+    end
+  end  
+  
+  option_parser.parse!  
+  tree = ActivityTree.new
+  parser = FileParser.new(tree, options)
+  
+  if ARGV[0]
+    parser.process_file(ARGV[0])
+  else
+    home = ENV['HOME']
+    path = parser.find_path([File.join(home, 'Time'), File.join(home, 'time'),
+             File.join(home, '.time')])
+    parser.process_file(path) if path
+  end
+
+  if parser.valid?
+    tree.process
+    tree.print
+    exit 0
+  else
+    STDERR.puts "ERRORS:"
+    STDERR.puts parser.errors.join("\n")
+    exit 1
+  end
+end

data/fixtures/.a_dot_file

@@ -0,0 +1 @@
+foo

data/fixtures/real.txt

@@ -0,0 +1,17 @@
+1975/06/01
+0755 i/bug - failing article filtering - on train
+0825 -
+0910 i/bug
+0925 i/sysadm - fixing dead teamcity with Al
+0955 i/bug
+1025 i/adm emails
+1040 i/adm weekly update meeting
+1110 i/sysadm - learning how to do end of sprint release
+1135 i/adm tech scrum
+1200 i/bug/1760 optimise edit schedules page
+1255 - lunch
+1355 i/adm listening in on user meeting
+1405 i/sysadm release to live & sanity test
+1505 i/bug/1760
+1750 i/adm log time
+1800 -

data/fixtures/time/jun1.txt

@@ -0,0 +1,3 @@
+1975/06/01
+1200 jun1stuff
+1201 -

data/fixtures/time/jun2.txt

@@ -0,0 +1,3 @@
+1975/06/02
+1100 jun2stuff
+1102 -

data/fixtures/time/jun3.txt

@@ -0,0 +1,3 @@
+1975/06/03
+1000 jun3stuff
+1003 -

data/fixtures/time.txt

@@ -0,0 +1,3 @@
+1975/06/02
+1205 jun2stuff a comment
+1235 -

data/lib/time_tree/activity_tree.rb

@@ -0,0 +1,36 @@
+module TimeTree
+  class ActivityTree
+    attr_reader :activities, :output
+    
+    def initialize
+      @activities = {}
+      @output = []
+    end
+    
+    def load(activities, minutes, level = 0, target = @activities)
+      activities.unshift 'All' if level == 0
+      activity = activities.shift
+      target[activity] = {:minutes => 0, :children => {}} unless target[activity]
+      target[activity][:minutes] += minutes
+      load(activities, minutes, level+1, target[activity][:children]) if activities.any?
+    end
+    
+    def process(level = 0, target = activities)
+      target.each do |activity, values|
+        output << "%-25s %4d min (%s)" % ["#{(1..level*2).to_a.map{' '}.join}#{activity}",
+                                                values[:minutes],
+                                                to_hrs_mins(values[:minutes])]
+        process(level+1, values[:children]) if values[:children].any?
+      end
+    end
+
+    def to_hrs_mins(mins)
+      hours = (mins/60.0).floor
+      "%d:%02d" % [hours, mins - (hours*60)]
+    end
+    
+    def print
+      puts output.join("\n")
+    end
+  end
+end

data/lib/time_tree/date_calculator.rb

@@ -0,0 +1,37 @@
+require 'date'
+
+module TimeTree
+  module DateCalculator
+    def prev_weekday(date, weekday, count = 0)
+      delta = (7 + date.wday - daynum(weekday)) % 7
+      date - (delta + (count * 7))
+    end
+
+    def next_weekday(date, weekday, count = 0)
+      delta = (7 - date.wday + daynum(weekday)) % 7
+      delta = 7 if delta == 0
+      date + (delta + (count * 7))
+    end
+  
+    def date_between?(date, from, to)
+      date >= from && to >= date
+    end
+    
+    def in_prev_week?(date, count = 0, ref_date = Date.today)
+      monday = prev_weekday(ref_date, :mon, count)
+      sunday = monday + 6
+      date_between?(date, monday, sunday)
+    end
+    
+    def in_prev_month?(date, count = 0, ref_date = Date.today)
+      ref_month = ref_date >> (-1 * count)
+      date.year == ref_month.year && date.month == ref_month.month
+    end
+  
+    private
+  
+    def daynum(weekday)
+      {:mon => 1, :tue => 2, :wed => 3, :thu => 4, :fri => 5, :sat => 6, :sun => 7}[weekday]
+    end
+  end
+end

data/lib/time_tree/file_parser.rb

@@ -0,0 +1,143 @@
+require 'date'
+require 'time_tree/date_calculator'
+
+module TimeTree
+  class FileParser
+    include DateCalculator 
+    attr_reader :errors
+
+    def initialize(tree, options)
+      @errors = []
+      @activity_tree = tree
+      @options = options
+    end
+    
+    def find_path(paths)
+      paths.each do |path|
+        return path if File.exist?(path)
+      end
+      
+      @errors << "File not found in: #{paths.join(', ')}"
+      false
+    end
+    
+    def set_file(path)
+      @path = path
+      @line_number = 0
+    end
+    
+    def set_date(date)
+      @date = date
+      @prev_mins = nil
+      @prev_activities = nil
+    end
+    
+    def process_file(path)
+      if File.exist?(path)
+        if File.directory?(path)
+          process_folder(path)
+        else
+          set_file(path)
+          File.read(path).each_line {|line| parse_line(line) }
+          true
+        end
+      else
+        @errors << "File not found: #{path}"
+        false
+      end
+    end
+    
+    def process_folder(path)
+      Dir.new(path).each do |file|
+        process_file(File.join(path, file)) unless file =~ /^\./
+      end
+    end
+    
+    def parse_line(line)
+      @line_number += 1
+      
+      case line.chomp.sub(/#.*/, '').strip
+      when ''
+        # ignore blank lines and comments
+        true
+
+      when /^(\d\d\d\d\/\d\d\/\d\d) *.*$/
+        set_date($1)
+        true
+
+      when /^(\d\d\d\d) +([^ ]+) *.*$/
+        if minutes = mins($1)
+          unless @prev_mins.nil?
+            if minutes > @prev_mins
+              if @prev_activities != '-' && selected?(@date, @prev_activities)
+                process_line(minutes, @prev_activities) 
+              end
+            else
+              add_error(line, 'time does not advance')
+              return false
+            end
+          end
+           
+          @prev_mins = minutes
+          @prev_activities = $2
+          true
+        else
+          false
+        end
+
+      else
+        add_error(line, 'line not understood')
+        false
+      end
+    end
+    
+    def add_error(line, message)
+      @errors << "%s:%d: %s - %s" % [File.basename(@path), @line_number, line.chomp, message]
+    end
+    
+    def valid?
+      errors.empty?
+    end
+    
+    def selected?(date = @date, activities = '', options = @options)
+      date_options = [:today, :yesterday, :week, :month, :date, :range]
+      parsed_date = Date.parse(date)
+      
+      (
+        options.detect { |key, val| date_options.include?(key) }.nil? ||
+          options[:all] ||
+          options[:today] && parsed_date == Date.today ||
+          options[:yesterday] && parsed_date == Date.today-1 ||
+          options[:week] && in_prev_week?(parsed_date, options[:week]) ||
+          options[:month] && in_prev_month?(parsed_date, options[:month]) ||
+          options[:date] && parsed_date == Date.parse(options[:date]) ||
+          options[:range] && parsed_date >= Date.parse(options[:range].split(':').first) &&
+                             parsed_date <= Date.parse(options[:range].split(':').last)
+      ) && 
+      (
+        options[:filter] && options[:filter].detect { |f| activities =~ Regexp.new(f) } ||
+          options[:filter].nil?
+      )
+    end
+    
+    private
+
+    def process_line(minutes, activities)
+      duration = minutes - @prev_mins
+      @activity_tree.load(activities.split('/'), duration)
+    end
+
+    def mins(str)
+      return 1440 if str == '0000' && @prev_mins
+      hours = str[0..1].to_i
+      mins  = str[2..3].to_i
+
+      if hours <= 23 && mins <= 59
+        (hours * 60) + mins
+      else
+        add_error(str, 'invalid time')
+        false
+      end
+    end
+  end
+end

data/lib/time_tree/version.rb

@@ -0,0 +1,3 @@
+module TimeTree
+  VERSION = "2.1.0"
+end

data/lib/time_tree.rb

@@ -0,0 +1,3 @@
+require 'time_tree/version'
+require 'time_tree/file_parser'
+require 'time_tree/activity_tree'

data/spec/activity_tree_spec.rb

@@ -0,0 +1,45 @@
+require 'time_tree/activity_tree'
+
+module TimeTree
+  describe ActivityTree do
+    let(:tree) { ActivityTree.new }
+
+    before do
+      tree.load(%w{foo bar baz}, 10)
+      tree.load(%w{foo bar bam}, 5)
+      tree.load(%w{blah}, 12)
+    end
+      
+    it "should have 2 root activities" do  
+      tree.activities['All'][:children].size.should == 2
+    end
+    
+    it "foo should have 15 mins" do
+      tree.activities['All'][:children]['foo'][:minutes].should == 15
+    end
+
+    it "bar should have 15 mins" do
+      tree.activities['All'][:children]['foo'][:children]['bar'][:minutes].should == 15
+    end
+
+    it "baz should have 10 mins" do
+      tree.activities['All'][:children]['foo'][:children]['bar'][:children]['baz'][:minutes].should == 10
+    end
+
+    it "bam should have 5 mins" do
+      tree.activities['All'][:children]['foo'][:children]['bar'][:children]['bam'][:minutes].should == 5
+    end
+
+    it "blah should have 12 mins" do
+      tree.activities['All'][:children]['blah'][:minutes].should == 12
+    end
+
+    it "blah should have no children" do
+      tree.activities['All'][:children]['blah'][:children].size.should == 0
+    end
+    
+    it "should print" do
+      tree.print
+    end
+  end
+end

data/spec/date_calculator_spec.rb

@@ -0,0 +1,110 @@
+require 'time_tree/date_calculator'
+
+module TimeTree
+  describe DateCalculator do
+    include DateCalculator
+    
+    describe "prev_weekday" do
+      it "monday" do
+        prev_weekday(Date.new(2013, 5, 5), :mon, 0).should == Date.new(2013, 4, 29)
+      end
+
+      it "tuesday" do
+        prev_weekday(Date.new(2013, 5, 6), :tue, 0).should == Date.new(2013, 4, 30)
+      end
+
+      it "sunday" do
+        prev_weekday(Date.new(2013, 5, 7), :sun, 0).should == Date.new(2013, 5, 5)
+      end
+
+      it "sunday prev week" do
+        prev_weekday(Date.new(2013, 5, 8), :sun, 1).should == Date.new(2013, 4, 28)
+      end
+
+      it "tuesday prev prev week" do
+        prev_weekday(Date.new(2013, 5, 9), :tue, 2).should == Date.new(2013, 4, 23)
+      end
+    end
+  
+    describe "next_weekday" do
+      it "monday" do
+        next_weekday(Date.new(2013, 5, 6), :mon, 0).should == Date.new(2013, 5, 13)
+      end
+
+      it "tuesday" do
+        next_weekday(Date.new(2013, 5, 6), :tue, 0).should == Date.new(2013, 5, 7)
+      end
+
+      it "sunday" do
+        next_weekday(Date.new(2013, 5, 7), :sun, 0).should == Date.new(2013, 5, 12)
+      end
+
+      it "sunday next week" do
+        next_weekday(Date.new(2013, 5, 8), :sun, 1).should == Date.new(2013, 5, 19)
+      end
+
+      it "tuesday next next week" do
+        next_weekday(Date.new(2013, 5, 9), :tue, 2).should == Date.new(2013, 5, 28)
+      end
+    end
+
+    describe "date_between" do
+      let(:jun1) { Date.new(2000, 6, 1) }
+      let(:jun2) { Date.new(2000, 6, 2) }
+      let(:jun3) { Date.new(2000, 6, 3) }
+
+      it "between" do
+        date_between?(jun2, jun1, jun3).should be_true
+      end
+
+      it "outside" do
+        date_between?(jun1, jun2, jun3).should be_false
+      end
+    
+      it "at start" do
+        date_between?(jun1, jun1, jun3).should be_true
+      end
+    
+      it "at end" do
+        date_between?(jun3, jun1, jun3).should be_true
+      end
+    end
+
+    describe "in_prev_week?" do
+      let(:may7) { Date.new(2013, 5, 7) }
+      let(:may1) { Date.new(2013, 5, 1) }
+      
+      it "within - zero count" do
+        in_prev_week?(may7, 0, may7).should be_true
+      end
+
+      it "within - 1 count" do
+        in_prev_week?(may1, 1, may7).should be_true
+      end
+
+      it "outside" do
+        in_prev_week?(may7, 1, may7).should be_false
+      end
+    end
+    
+    describe"in_prev_month?" do
+      let(:may31) { Date.new(2013, 5, 31) }
+      let(:may7)  { Date.new(2013, 5, 7) }
+      let(:may1)  { Date.new(2013, 5, 1) }
+      let(:apr1)  { Date.new(2013, 4, 1) }
+      
+      it "within - zero count" do
+        in_prev_month?(may1, 0, may7).should be_true
+        in_prev_month?(may31, 0, may7).should be_true
+      end
+
+      it "within - 1 count" do
+        in_prev_month?(apr1, 1, may7).should be_true
+      end
+
+      it "outside" do
+        in_prev_month?(apr1, 0, may7).should be_false
+      end
+    end
+  end
+end

data/spec/file_parser_spec.rb

@@ -0,0 +1,276 @@
+require 'time_tree/file_parser'
+require 'helper'
+
+module TimeTree
+  describe FileParser do
+    let(:tree) { mock('ActivityTree', :load => nil) }
+    let(:parser) { FileParser.new(tree, {}) }
+    let(:home) { ENV['HOME'] }
+
+    describe "#find_path" do
+      it "finds a path" do
+        parser.find_path(['/not/on/your/nelly', "#{home}/.bash_profile"]).should =~ /bash_profile/
+      end
+      
+      it "finds no path" do
+        parser.find_path(['/not/on/your/nelly', "#/not/there"]).should be_false
+      end
+    end
+    
+    describe "#process_file" do
+      context "is a directory" do
+        before do
+          FileParser.any_instance.stub(:process_folder => true)
+        end
+
+        it "returns true" do
+          parser.process_file(fixtures).should be_true
+        end
+
+        it "calls #process_folder" do
+          parser.should_receive(:process_folder).with(fixtures).once
+          parser.process_file(fixtures)
+        end
+      end
+
+      context "is a file" do
+        before do
+          FileParser.any_instance.stub(:parse_line => true)
+        end
+
+        it "returns true" do
+          parser.process_file(fixtures('time.txt')).should be_true
+        end
+
+        it "calls process_line for each line of the file" do
+          parser.should_receive(:parse_line).exactly(3).times
+          parser.process_file(fixtures('time.txt'))
+        end
+      end
+
+      context "file or directory not found" do
+        before do
+          @result = parser.process_file('does/not/exist')
+        end
+
+        it "returns false" do
+          @result.should be_false
+        end
+
+        it "flags an error and sets object invalid" do
+          parser.errors.size.should == 1
+          parser.valid?.should be_false
+        end
+      end
+    end
+
+    describe "#process_folder" do
+      before do
+        FileParser.any_instance.stub(:process_file => true)
+      end
+
+      it "calls #process_file for each contained file" do
+        parser.should_receive(:process_file).with(fixtures('time/jun1.txt')).once
+        parser.should_receive(:process_file).with(fixtures('time/jun2.txt')).once
+        parser.should_receive(:process_file).with(fixtures('time/jun3.txt')).once
+        parser.process_folder(fixtures('time'))
+      end
+
+      it "ignores files starting with dot" do
+        File.open(fixtures('.a_dot_file'), 'w') {|f| f.write('foo')}
+        parser.should_not_receive(:process_file).with(fixtures('.a_dot_file'))
+        parser.process_folder(fixtures)
+      end
+    end
+
+    describe "#parse_line" do
+      before do
+        parser.set_file('my_file.txt')
+      end
+
+      context "date lines" do
+        before do
+          FileParser.any_instance.stub(:set_date => true)
+        end
+
+        context "well formed date" do
+          let(:good_date) { '2013/04/23 some comments' }
+
+          it "returns true" do
+            parser.parse_line(good_date).should be_true
+          end
+
+          it "calls set_date" do
+            parser.should_receive(:set_date).once
+            parser.parse_line(good_date)
+          end
+        end
+
+        context "malformed date" do
+          let(:bad_date) { '201b/foo/bar' }
+
+          it "returns false" do
+            parser.parse_line(bad_date).should be_false
+          end
+
+          it "does not call set_date" do
+            parser.should_not_receive(:set_date)
+            parser.parse_line(bad_date)
+          end
+
+          it "logs an error" do
+            parser.parse_line(bad_date)
+            parser.errors.size.should == 1
+          end
+        end
+      end
+
+      context "time lines" do
+        before do
+          parser.set_date('2013/01/02')
+        end
+
+        context "normal activities" do
+          it "returns true and remains valid" do
+            parser.parse_line("1634 adm/foo/bar dhffhkdhsdhjdf").should be_true
+            parser.parse_line("1635 adm/foo/bar dhffh kdh sdhjdf  ").should be_true
+            parser.parse_line("1636    adm/foo/bar     dhffh kdh sdhjdf  ").should be_true
+            parser.parse_line("1637 adm").should be_true
+            parser.parse_line("1638 -").should be_true
+            parser.parse_line("1639 - sdf sdfs sfsad").should be_true
+            parser.valid?.should be_true
+          end
+
+          it "calls ActivityTree#load after first line" do
+            tree.should_receive(:load).with(%w{adm foo bar}, 1).once
+            parser.parse_line("1634 adm/foo/bar dhffhkdhsdhjdf")
+            parser.parse_line("1635 -")
+          end
+
+          it "flags invalid times" do
+            parser.parse_line("2435 - df sdfsdg").should be_false
+            parser.parse_line("2x3d - df sdfsdg").should be_false
+            parser.valid?.should be_false
+          end
+
+          it "flags non-advancing times" do
+            parser.parse_line("1253 - df sdfsdg").should be_true
+            parser.parse_line("1253 - df sdfsdg").should be_false
+            parser.valid?.should be_false
+          end
+        end
+      end
+
+      context "dash for activity" do
+        it "returns true and remains valid" do
+          parser.parse_line("1634 -").should be_true
+          parser.valid?.should be_true
+        end
+
+        it "does not call ActivityTree#load after first line" do
+          tree.should_not_receive(:load).with(%w{-}, 1)
+          parser.parse_line("1634 -")
+          parser.parse_line("1635 foo")
+        end
+      end
+
+      context "comment lines" do
+        it "should return true" do
+          parser.parse_line("# a comment").should be_true
+        end
+
+        it "should not log errors" do
+          parser.parse_line("# a comment")
+          parser.errors.size.should == 0
+        end
+      end
+    end
+
+    describe "#selected?" do
+      it "should be true if no date selectors" do
+        parser.selected?('2013/01/01', {:bish => true, :bosh => :tigers}).should be_true
+      end
+
+      context "today" do
+        let(:options) { {:today => true} }
+
+        it "should be true if date is today" do
+          parser.selected?(Time.now.strftime("%Y/%m/%d"), options).should be_true
+        end
+
+        it "should be false if date is not today" do
+          parser.selected?('1962/01/03', '', options).should be_false
+        end
+      end
+
+      context "yesterday" do
+        let(:options) { {:yesterday => true} }
+
+        it "should be true if date is yesterday" do
+          parser.selected?((Time.now-(24*60*60)).strftime("%Y/%m/%d"), options).should be_true
+        end
+
+        it "should be false if date is not yesterday" do
+          parser.selected?('1962/01/03', '', options).should be_false
+        end
+      end
+      
+      context "week" do
+      end
+      
+      context "month" do
+      end
+
+      context "specific date" do
+        let(:options) { {:date => '2012/01/01'} }
+
+        it "should be true if date matches" do
+          parser.selected?('2012/01/01', options).should be_true
+        end
+
+        it "should be false if date does not match" do
+          parser.selected?('1962/01/03', '', options).should be_false
+        end
+      end
+
+      context "date range" do
+        let(:options) { {:range => '2012/01/01:2012/01/02'} }
+
+        it "should be true if date within" do
+          parser.selected?('2012/01/01', options).should be_true
+          parser.selected?('2012/01/02', options).should be_true
+        end
+
+        it "should be false if date outside" do
+          parser.selected?('1962/01/03', '', options).should be_false
+        end
+      end
+      
+      context "filter" do
+        it "finds a hit" do
+          parser.selected?('1962/01/03', 'foo/bar', {:filter => ['foo', 'boo']}).should be_true
+        end
+
+        it "finds no hit" do
+          parser.selected?('1962/01/03', 'foo/bar', {:filter => ['blork', 'flange']}).should be_false
+        end
+      end
+    end
+
+    describe "midnight edge case" do
+      context "no previous mins" do
+        it "returns 0 mins" do
+          parser.send(:mins, '0000').should == 0
+        end
+      end
+      
+      context "previous mins" do
+        it "returns 1440 mins (1 day)" do
+          parser.set_file('afile')
+          parser.parse_line('2359 foo')
+          parser.send(:mins, '0000').should == 1440
+        end
+      end
+    end
+  end
+end

data/spec/helper.rb

@@ -0,0 +1,4 @@
+def fixtures(path = '')
+  File.expand_path(File.join('..', '..', 'fixtures', path), __FILE__)
+end
+  

data/spec/integration_spec.rb

@@ -0,0 +1,90 @@
+require 'time_tree/activity_tree'
+require 'time_tree/file_parser'
+require 'helper'
+
+module TimeTree
+  describe 'Integration' do
+    let(:tree) { ActivityTree.new }
+    
+    it "nominal" do
+      parser = FileParser.new(tree, {})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output[0].should =~ /All +6 min/
+      tree.output[1].should =~ /jun1stuff +1 min/
+      tree.output[2].should =~ /jun2stuff +2 min/
+      tree.output[3].should =~ /jun3stuff +3 min/
+      tree.output.size.should == 4
+    end
+    
+    it "specific date" do
+      parser = FileParser.new(tree, {:date => '1975/06/02'})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output[0].should =~ /All +2 min/
+      tree.output[1].should =~ /jun2stuff +2 min/
+      tree.output.size.should == 2
+    end
+    
+    it "date range" do
+      parser = FileParser.new(tree, {:range => '1975/06/02:1975/06/03'})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output[0].should =~ /All +5 min/
+      tree.output[1].should =~ /jun2stuff +2 min/
+      tree.output[2].should =~ /jun3stuff +3 min/
+      tree.output.size.should == 3
+    end
+    
+    it "today" do
+      parser = FileParser.new(tree, {:today => true})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "yesterday" do
+      parser = FileParser.new(tree, {:yesterday => true})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "this week" do
+      parser = FileParser.new(tree, {:week => 0})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "last week" do
+      parser = FileParser.new(tree, {:week => 1})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "this month" do
+      parser = FileParser.new(tree, {:month => 0})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "last month" do
+      parser = FileParser.new(tree, {:month => 1})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output.size.should == 0
+    end
+    
+    it "filter" do
+      parser = FileParser.new(tree, {:filter => ['jun2stuff']})
+      parser.process_file(fixtures('time'))
+      tree.process
+      tree.output[0].should =~ /All +2 min/
+      tree.output[1].should =~ /jun2stuff +2 min/
+      tree.output.size.should == 2
+    end
+  end
+end

data/time_tree.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'time_tree/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "time_tree"
+  gem.version       = TimeTree::VERSION
+  gem.authors       = ["Andy White"]
+  gem.email         = ["andy@wireworldmedia.co.uk"]
+  gem.description   = %q{Summarises a time file}
+  gem.summary       = %q{Summarises a time file}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
+  gem.add_development_dependency "rspec", "~> 2.11.0"
+end

metadata

@@ -0,0 +1,91 @@
+--- !ruby/object:Gem::Specification
+name: time_tree
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
+platform: ruby
+authors:
+- Andy White
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2013-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+description: Summarises a time file
+email:
+- andy@wireworldmedia.co.uk
+executables:
+- timetree
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- .rvmrc
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- bin/timetree
+- fixtures/.a_dot_file
+- fixtures/real.txt
+- fixtures/time.txt
+- fixtures/time/jun1.txt
+- fixtures/time/jun2.txt
+- fixtures/time/jun3.txt
+- lib/time_tree.rb
+- lib/time_tree/activity_tree.rb
+- lib/time_tree/date_calculator.rb
+- lib/time_tree/file_parser.rb
+- lib/time_tree/version.rb
+- spec/activity_tree_spec.rb
+- spec/date_calculator_spec.rb
+- spec/file_parser_spec.rb
+- spec/helper.rb
+- spec/integration_spec.rb
+- time_tree.gemspec
+homepage: ''
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.25
+signing_key: 
+specification_version: 3
+summary: Summarises a time file
+test_files:
+- spec/activity_tree_spec.rb
+- spec/date_calculator_spec.rb
+- spec/file_parser_spec.rb
+- spec/helper.rb
+- spec/integration_spec.rb