tempo-cli 0.1.6 → 0.2.1

data/lib/tempo/views/formatters/screen.rb

@@ -13,7 +13,7 @@ module Tempo
 
       class Screen < Tempo::Views::Formatters::Base
 
-        def message_block record
+        def message_block(record)
           record.format do |m|
             case m.category
             when :error
@@ -25,18 +25,18 @@ module Tempo
           end
         end
 
-        def duration_block record
+        def duration_block(record)
           record.format do |d|
             puts "#{ d.hours.to_s }:#{ d.minutes.to_s.rjust(2, '0') }"
           end
         end
 
         # spacer for project titles, active project marked with *
-        def active_indicator( project )
+        def active_indicator(project)
           indicator = project.current ? "* " : "  "
         end
 
-        def tag_partial tags, title_length
+        def tag_partial(tags, title_length)
           max_length = ViewRecords::Project.max_title_length
           max_length += ViewRecords::Project.max_depth * 2 if @options[:depth]
           max_length += 6 if @options[:id]
@@ -50,11 +50,11 @@ module Tempo
           view[0..-3] + "]"
         end
 
-        def id_partial id
+        def id_partial(id)
           @options[:id] ? "[#{id}] ".rjust(6, ' ') : ""
         end
 
-        def project_block record
+        def project_block(record)
 
           record.format do |r|
             @options[:active] = @options.fetch( :active, false )
@@ -71,7 +71,7 @@ module Tempo
           end
         end
 
-        def timerecord_block record
+        def timerecord_block(record)
           record.format do |r|
             id = id_partial r.id
             running = r.running ? "*" : " "

data/lib/tempo/views/projects_view.rb

@@ -6,7 +6,7 @@ module Tempo
         ViewRecords::Project.new project, depth: depth
       end
 
-      def projects_list_view projects=Tempo::Model::Project.index, parent=:root, depth=0
+      def projects_list_view(projects=Tempo::Model::Project.index, parent=:root, depth=0)
         return no_items( "projects" ) if projects.empty?
 
         Tempo::Model::Project.sort_by_title projects do |projects|
@@ -26,7 +26,7 @@ module Tempo
       end
 
       # list of sorted projects, no hierarchy
-      def projects_flat_list_view projects=Tempo::Model::Project.index
+      def projects_flat_list_view(projects=Tempo::Model::Project.index)
 
         Tempo::Model::Project.sort_by_title projects do |projects|
           projects.each do |p|
@@ -35,32 +35,32 @@ module Tempo
         end
       end
 
-      def project_added project
+      def project_added(project)
         ViewRecords::Message.new "added project:"
         project_view project
       end
 
-      def project_deleted project
+      def project_deleted(project)
         ViewRecords::Message.new "deleted project:"
         project_view project
       end
 
-      def project_checkout project
+      def project_checkout(project)
         ViewRecords::Message.new "switched to project:"
         project_view project
       end
 
-      def project_already_current project
+      def project_already_current(project)
         ViewRecords::Message.new "already on project:"
         project_view project
       end
 
-      def project_tags project
+      def project_tags(project)
         ViewRecords::Message.new "altered project tags:"
         project_view project
       end
 
-      def ambiguous_project( matches, command )
+      def ambiguous_project(matches, command)
 
         ViewRecords::Message.new "The following projects matched your search:"
 

data/lib/tempo/views/report_view.rb

@@ -2,13 +2,13 @@ module Tempo
   module Views
     class << self
 
-      def report_records_view options={}
+      def report_records_view(options={})
 
-        projects = options.fetch( :projects, Tempo::Model::Project.index )
-        return no_items( "projects" ) if projects.empty?
+        projects = options.fetch(:projects, Tempo::Model::Project.index)
+        return no_items("projects") if projects.empty?
 
         time_records = options.fetch( :time_records, Tempo::Model::TimeRecord.days_index )
-        return no_items( "time records" ) if time_records.empty?
+        return no_items("time records") if time_records.empty?
 
         time_records.each do |d_id, days_record|
 
@@ -23,4 +23,4 @@ module Tempo
       end
     end
   end
-end
+end

data/lib/tempo/views/reporter.rb

@@ -27,7 +27,7 @@ module Tempo
       class << self
         attr_accessor :view_records
 
-        def add_format *formats
+        def add_format(*formats)
           @@formats ||= []
           formats.each {|format| @@formats << format}
         end
@@ -40,12 +40,12 @@ module Tempo
           @@options ||= {}
         end
 
-        def add_options options
+        def add_options(options)
           @@options ||= {}
           @@options.merge! options
         end
 
-        def add_view_record record
+        def add_view_record(record)
           @@view_records ||= []
 
           if /Views::ViewRecords/.match record.class.name
@@ -67,4 +67,4 @@ module Tempo
       end
     end
   end
-end
+end

data/lib/tempo/views/time_record_view.rb

@@ -2,26 +2,26 @@ module Tempo
   module Views
     class << self
 
-      def time_record_view time_record
+      def time_record_view(time_record)
         ViewRecords::TimeRecord.new time_record
       end
 
-      def start_time_record_view time_record
+      def start_time_record_view(time_record)
         ViewRecords::Message.new "time record started:"
         time_record_view time_record
       end
 
-      def end_time_record_view time_record
+      def end_time_record_view(time_record)
         ViewRecords::Message.new "time record ended:"
         time_record_view time_record
       end
 
-      def update_time_record_view time_record
+      def update_time_record_view(time_record)
         ViewRecords::Message.new "time record updated:"
         time_record_view time_record
       end
 
-      def delete_time_record_view time_record
+      def delete_time_record_view(time_record)
         ViewRecords::Message.new "time record deleted:"
         time_record_view time_record
       end

data/lib/tempo/views/view_records/base.rb

@@ -30,14 +30,14 @@ module Tempo
       class Message
         attr_accessor :type, :message, :category
 
-        def initialize message, options={}
+        def initialize(message, options={})
           @message = message
           @category = options.fetch( :category, :info )
           @type = "message"
           Reporter.add_view_record self
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda {|m| "#{m.message}"}
           block.call self
         end
@@ -63,18 +63,18 @@ module Tempo
           @total = seconds
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda do |d|
             "#{ d.hours.to_s }:#{ d.minutes.to_s.rjust(2, '0') }"
           end
           block.call self
         end
 
-        def add seconds
+        def add(seconds)
           @total += seconds
         end
 
-        def subtract seconds
+        def subtract(seconds)
           @total -= seconds
         end
 
@@ -96,7 +96,7 @@ module Tempo
       class Model
         attr_accessor :id, :type
 
-        def initialize model, options={}
+        def initialize(model, options={})
           @id = model.id
 
           # example: Tempo::Model::Something => "something"
@@ -104,11 +104,11 @@ module Tempo
           Reporter.add_view_record self
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda {|model| "#{ model.type.capitalize} #{model.id}"}
           block.call self
         end
       end
     end
   end
-end
+end

data/lib/tempo/views/view_records/composite.rb

@@ -18,23 +18,23 @@ module Tempo
         attr_accessor :depth
 
         class << self
-          def max_depth depth=0
+          def max_depth(depth=0)
             @max_depth ||= 0
             @max_depth = @max_depth > depth ? @max_depth : depth
           end
         end
 
-        def initialize model, options={}
+        def initialize(model, options={})
           super model, options
           @depth = options.fetch(:depth, 0)
           self.class.max_depth @depth
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda {|model| "#{"  " * model.depth}#{ model.type.capitalize} #{model.id}"}
           block.call self
         end
       end
     end
   end
-end
+end

data/lib/tempo/views/view_records/log.rb

@@ -12,17 +12,17 @@ module Tempo
       class Log < ViewRecords::Model
         attr_accessor :start_time, :d_id
 
-        def initialize model, options={}
+        def initialize(model, options={})
           super model, options
           @start_time = model.start_time
           @d_id = model.d_id
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda {|model| "#{ model.type.capitalize} #{model.d_id}-#{model.id} #{model.start_time.strftime('%H:%M')}"}
           block.call self
         end
       end
     end
   end
-end
+end

data/lib/tempo/views/view_records/project.rb

@@ -12,13 +12,13 @@ module Tempo
         attr_accessor :title, :tags, :current, :duration
 
         class << self
-          def max_title_length len=0
+          def max_title_length(len=0)
             @max_title_length ||= 0
             @max_title_length = @max_title_length > len ? @max_title_length : len
           end
         end
 
-        def initialize model, options={}
+        def initialize(model, options={})
           super model, options
           @title = model.title
           @tags = model.tags
@@ -29,4 +29,4 @@ module Tempo
       end
     end
   end
-end
+end

data/lib/tempo/views/view_records/time_record.rb

@@ -11,18 +11,18 @@ module Tempo
         attr_accessor :description, :duration, :end_time, :project, :running
 
         class << self
-          def max_description_length len=0
+          def max_description_length(len=0)
             @max_description_length ||= 0
             @max_description_length = @max_description_length > len ? @max_description_length : len
           end
 
-          def max_project_length len=0
+          def max_project_length(len=0)
             @max_project_length ||= 0
             @max_project_length = @max_project_length > len ? @max_project_length : len
           end
         end
 
-        def initialize model, options={}
+        def initialize(model, options={})
           super model, options
           @description = model.description
           @description ||= ""
@@ -34,7 +34,7 @@ module Tempo
           self.class.max_project_length @project.length
         end
 
-        def format &block
+        def format(&block)
           block ||= lambda do |m|
             running = m.running ? "*" : " "
             description = @description ? "#{m.project}: #{m.description}" : "#{m.project}"
@@ -45,4 +45,4 @@ module Tempo
       end
     end
   end
-end
+end

data/lib/tempo.rb

@@ -15,6 +15,8 @@ require 'tempo/controllers/base.rb'
 Dir[File.dirname(__FILE__) + '/tempo/controllers/*.rb'].each {|file| require file }
 
 require 'tempo/views/view_records/base.rb'
+require 'tempo/views/view_records/composite.rb'
+require 'tempo/views/view_records/log.rb'
 Dir[File.dirname(__FILE__) + '/tempo/views/view_records/*.rb'].each {|file| require file }
 
 require 'tempo/views/reporter.rb'
@@ -25,4 +27,5 @@ require 'tempo/views/base.rb'
 Dir[File.dirname(__FILE__) + '/tempo/views/*.rb'].each {|file| require file }
 
 require 'file_record/directory.rb'
+require 'file_record/file_utility.rb'
 require 'file_record/record.rb'

data/lib/time_utilities.rb

@@ -5,9 +5,9 @@ require 'chronic'
 class Time
 
   class << self
-    def parse time
+    def parse(time)
       # Chronic will usually return nil when unable to parse time
-      # it throws an error, on 't' and a few other string, so we
+      # it throws an error, on 't' and a few other strings, so we
       # capture these here an assure that nil is returned
       begin
         chron = Chronic.parse time
@@ -19,12 +19,12 @@ class Time
   end
 
   #default to whole minutes
-  def round options={}
+  def round(options={})
     seconds = 60
     Time.at((self.to_f / seconds).round * seconds)
   end
 
-  def add_days days
+  def add_days(days)
     t = self + days * 86400 # 24 * 60 * 60
   end
 end

data/tempo-cli.gemspec

@@ -5,6 +5,7 @@ spec = Gem::Specification.new do |s|
   s.version = Tempo::VERSION
   s.author = 'Jonathan Gabel'
   s.email = 'hello@jonathangabel.com'
+  s.license = 'MIT'
   s.homepage = 'https://github.com/josankapo/tempo-cli'
   s.platform = Gem::Platform::RUBY
   s.summary = 'A command line time tracker for recording by day and by project'
@@ -14,11 +15,11 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.bindir = 'bin'
   s.executables << 'tempo'
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rdoc')
-  s.add_development_dependency('aruba')
-  s.add_development_dependency('turn', '~> 0.9.6')
-  s.add_development_dependency('pry','~> 0.9.12.2')
-  s.add_runtime_dependency('gli','2.6.1')
-  s.add_runtime_dependency "chronic", "~> 0.10.2"
+  s.add_development_dependency('rake', '~> 10.3')
+  s.add_development_dependency('rdoc', '~> 4.1')
+  s.add_development_dependency('aruba', '~> 0.5')
+  s.add_development_dependency('turn', '~> 0.9')
+  s.add_development_dependency('pry','~> 0.9')
+  s.add_runtime_dependency('gli', '~> 2.10')
+  s.add_runtime_dependency "chronic", "~> 0.10"
 end

data/test/lib/file_record/directory_test.rb

@@ -4,11 +4,13 @@ describe FileRecord do
 
   before do
     @dir = File.join(Dir.home,"tempo")
+    @alt_dir = File.join(Dir.home, "testdir", "tempo")
     FileUtils.rm_r @dir if File.exists?(@dir)
   end
 
   after do
     FileUtils.rm_r @dir if File.exists?(@dir)
+    FileUtils.rm_r @alt_dir if File.exists?(@alt_dir)
   end
 
 
@@ -25,6 +27,17 @@ describe FileRecord do
         File.exists?( project_file ).must_equal true
         File.exists?( readme ).must_equal true
       end
+
+      it "should take an optional directory parameter" do
+        project_file = File.join(@alt_dir, "tempo_projects.yaml")
+        readme = File.join(@alt_dir, "README.txt")
+        dir = File.join(Dir.home, "testdir")
+
+        FileRecord::Directory.create_new directory: dir
+        File.exists?( @alt_dir ).must_equal true
+        File.exists?( project_file ).must_equal true
+        File.exists?( readme ).must_equal true
+      end
     end
   end
-end
+end

data/test/lib/file_record/record_test.rb

@@ -12,81 +12,6 @@ describe FileRecord do
 
   describe "Record" do
 
-      before do
-        @file = File.join( @dir, "filerecord_create.txt")
-      end
-
-      after do
-        File.delete(@file) if File.exists?(@file)
-      end
-
-    describe "create" do
-
-      it "should create a new record" do
-        FileRecord::Record.create( @file, "" )
-        File.exists?( @file ).must_equal true
-      end
-
-      it "should raise and error if the file exists" do
-        FileRecord::Record.create( @file, "" )
-        proc { FileRecord::Record.create( @file, "" ) }.must_raise ArgumentError
-      end
-
-      it "should overwrite a file with option :force" do
-        File.open( @file,'w' ) do |f|
-          f.puts "Now this file already exists"
-        end
-        FileRecord::Record.create( @file, "overwrite file", force: true )
-        contents  = eval_file_as_array( @file )
-        contents.must_equal ["overwrite file"]
-      end
-    end
-
-    describe "recording a string" do
-      it "should be able to record a string" do
-        FileRecord::Record.create( @file, "a simple string" )
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["a simple string"]
-      end
-
-      it "should be able to record a string as yaml" do
-        FileRecord::Record.create( @file, "a simple string", format: 'yaml' )
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["--- a simple string", "..."]
-      end
-    end
-
-      describe "recording and array" do
-
-      it "should be able to record a shallow array as string" do
-        FileRecord::Record.create( @file, ["a","simple","array"], format: "string" )
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["a","simple","array"]
-      end
-
-      it "should default to recording a shallow array as yaml" do
-        FileRecord::Record.create( @file, ["a","simple","array"] )
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["---", "- a", "- simple", "- array"]
-      end
-
-      it "should record a nested array as yaml" do
-        FileRecord::Record.create( @file, ["a",["nested",["array"]]])
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["---", "- a", "- - nested", "  - - array"]
-      end
-    end
-
-    describe "recording a hash" do
-
-      it "should default to and record a hash as yaml" do
-        hash = {a: 1, b: true, c: Hash.new, d: "object", with: ['an', 'array']}
-        FileRecord::Record.create( @file, hash )
-        contents = eval_file_as_array( @file )
-        contents.must_equal ["---", ":a: 1", ":b: true", ":c: {}", ":d: object", ":with:", "- an", "- array"]
-      end
-    end
-
     describe "recording a Tempo Model" do
 
       it "should create a record of all instances" do
@@ -102,5 +27,45 @@ describe FileRecord do
                               "---", ":id: 5", ":genious: Panthera", ":species: p. zdanskyi"]
       end
     end
+
+    describe "redording a Tempo Log" do
+
+      it "should create daily records containing each instance" do
+        test_file_1 = File.join(ENV['HOME'],'tempo','tempo_message_logs', '20140101.yaml')
+        File.delete( test_file ) if File.exists?( test_file_1 )
+        test_file_2 = File.join(ENV['HOME'],'tempo','tempo_message_logs', '20140102.yaml')
+        File.delete( test_file ) if File.exists?( test_file_2 )
+
+        log_factory
+        FileRecord::Record.save_log(Tempo::Model::MessageLog)
+        contents = eval_file_as_array( test_file_1 )
+        contents.must_equal [ "---",
+                              ":start_time: 2014-01-01 07:00:00.000000000 -05:00",
+                              ":id: 1",
+                              ":message: day 1 pet the sheep",
+                              "---",
+                              ":start_time: 2014-01-01 07:30:00.000000000 -05:00",
+                              ":id: 2",
+                              ":message: day 1 drinking coffee, check on the mushrooms",
+                              "---",
+                              ":start_time: 2014-01-01 12:30:00.000000000 -05:00",
+                              ":id: 3",
+                              ":message: day 1 water the bonsai"]
+
+        contents = eval_file_as_array( test_file_2 )
+        contents.must_equal [ "---",
+                              ":start_time: 2014-01-02 07:15:00.000000000 -05:00",
+                              ":id: 1",
+                              ":message: day 2 pet the sheep",
+                              "---",
+                              ":start_time: 2014-01-02 07:45:00.000000000 -05:00",
+                              ":id: 2",
+                              ":message: day 2 drinking coffee, check on the mushrooms",
+                              "---",
+                              ":start_time: 2014-01-02 12:00:00.000000000 -05:00",
+                              ":id: 3",
+                              ":message: day 2 water the bonsai"]
+      end
+    end
   end
 end

data/test/lib/tempo/models/base_test.rb

@@ -10,7 +10,7 @@ describe Tempo do
 
   describe "Model::Base" do
 
-    it "inheritale from" do
+    it "is inheritable from" do
       Tempo::Model::Animal.superclass.must_equal Tempo::Model::Base
     end
 
@@ -30,7 +30,7 @@ describe Tempo do
       end
     end
 
-    it "creates a file name to save to" do
+    it "knows which file name to save to" do
       frog_factory
       Tempo::Model::Animal.file.must_equal "tempo_animals.yaml"
     end

data/test/lib/tempo/models/composite_test.rb

@@ -42,15 +42,15 @@ describe Tempo do
     end
 
     it "should revive a tree structure from a file" do
-       tree_factory
-       test_file = File.join(ENV['HOME'],'tempo','tempo_trees.yaml')
-       File.delete(test_file) if File.exists?( test_file )
-       contents = Tempo::Model::Tree.save_to_file
-       Tempo::Model::Tree.clear_all
-       Tempo::Model::Tree.read_from_file
-       branch1 = Tempo::Model::Tree.find_by_id 3
-       branch1.parent.must_equal 1
-       branch1.children.must_equal [7,8]
+      tree_factory
+      test_file = File.join(ENV['HOME'],'tempo','tempo_trees.yaml')
+      File.delete(test_file) if File.exists?( test_file )
+      contents = Tempo::Model::Tree.save_to_file
+      Tempo::Model::Tree.clear_all
+      Tempo::Model::Tree.read_from_file
+      branch1 = Tempo::Model::Tree.find_by_id 3
+      branch1.parent.must_equal 1
+      branch1.children.must_equal [7,8]
     end
 
     it "should have a << child method" do