time_tap 0.2.0 → 0.4.0.pre

data/lib/time_tap/server.rb

@@ -5,27 +5,27 @@ require 'action_view'
 
 module TimeTap
   class Server < Sinatra::Application
-  
+
     include ActionView::Helpers::DateHelper
     set :haml, { :format        => :html5,
-                 :attr_wrapper  => '"' , 
+                 :attr_wrapper  => '"' ,
                  :encoding => RUBY19 ? 'UTF-8' : nil}
     set :root, File.dirname(__FILE__)
     set :views, Proc.new { File.expand_path("../views", __FILE__) }
-  
-  
+
+
     before do
       content_type "text/html", :charset => "utf-8"
-      Project.load_file('~/.tap_history')
+      # Project.load_file('~/.tap_history')
     end
-  
-  
-  
-  
-  
+
+
+
+
+
     get '/' do
       sort = (params[:sort] || :last).to_sym
-    
+
       @projects = Project.all.sort_by do |project|
         case sort
         when :name;     project.name
@@ -36,15 +36,15 @@ module TimeTap
     
       haml :index
     end
-  
+
     get '/project/:name' do
       @project = Project.find(params[:name])
       redirect '/' if @project.nil?
-    
+
       haml :project
     end
-  
-  
+
+
     get "/project/:name/:day" do
       @project = Project.find(params[:name])
       redirect '/' if @project.nil?
@@ -61,9 +61,9 @@ module TimeTap
       content_type "text/css", :charset => "utf-8"
       sass :stylesheet
     end
-  
+
     get '/mate' do
-      tm_project = File.expand_path("#{TimeTap.config[:textmate][:projects] || 'Development/Current Projects'}/#{File.basename(params[:path])}.tmproj")
+      tm_project = Dir[ params[:path]+'/*.tmproj' ].first
       if File.exist?(tm_project)
         `open "#{tm_project}"`
       else
@@ -71,11 +71,11 @@ module TimeTap
       end
       redirect '/'
     end
-  
+
     get '/stop' do
       $stop = true
       Process.exit
     end
-  
+
   end
-end
+end

data/lib/time_tap/version.rb

@@ -0,0 +1,3 @@
+module TimeTap
+  VERSION = '0.4.0.pre'
+end

data/lib/time_tap/views/project.haml

@@ -13,12 +13,14 @@
 %table.days
   - current = 0
   - @project.days.to_a.sort_by(&:first).reverse.each do |day, pinches|
-    - time = pinches.map(&:duration).inject(0.seconds, &:+)
+    - time = pinches.sum(&:duration)
     - if time >= 1.minute
       %tr.day
         %td
-          %a.day{  :href=> "/project/#{@project.name}/#{current}" } #{( this_year != day.year ? day.strftime("%Y %b %d, %a") : day.strftime("%b %d, %a") )}
+          %a.day{:href => "/project/#{@project.name}/#{current}"} #{( this_year != day.year ? day.strftime("%Y %b %d, %a") : day.strftime("%b %d, %a") )}
         %td
           %span.work{:style => "background-color:green;color:#ccc;overflow:visible;height:1em"}= ' ' * (time / 5.minutes.to_f)
-          %span.tip= time_ago_in_words Time.now - time
+          %b= time_ago_in_words Time.now - time
+        %td
+          %span.tip= "#{'%.2f' % (time / 1.hour.to_f)} hours"
     - current = current + 1

data/lib/time_tap/views/project_day.haml

@@ -10,6 +10,7 @@
 %h2
   Detailed View For:
   %b=( this_year != @current_day.year ? @current_day.strftime("%Y %b %d, %a") : @current_day.strftime("%b %d, %a") )
+  %span.tip (#{"%.2f" % (@pinches.sum(&:duration).to_i / 1.hours.to_f).to_s} hours)
 
 %table.pinches
   %tr

data/lib/time_tap/watcher.rb

@@ -1,49 +1,52 @@
-module TimeTap
-  module Watcher
-    extend self
-    
-    def keep_watching editor
-      last = nil
-
-      # TODO: pick which application the user wants...
-      editor = editor.new
-
-      File.open(File.join(TimeTap.config[:root], ".tap_history"), 'a') do |history|
-        history.sync = true
-        loop do
-          exit if $stop
-          begin
-            if editor.is_running? && !(path = editor.current_path).blank?
-              mtime = File.stat(path).mtime
-              current = [path, mtime]
-              
-              unless current == last
-                # The following equals to this shell code:
-                #   `echo \`date +%s\`: \`pwd\``
-                history << "#{mtime.to_i}: #{path}\n"
-                last = [path, mtime]
-              end
-            end
-          rescue Editors::EditorError
-            # do nothing
-          rescue
-            puts Time.now.to_s
-            puts $!.to_s
-            puts $!.backtrace.join("\n")
+require 'time_tap/project'
 
-            File.open(File.join(TimeTap.config[:root], ".tap_errors"), "w") do |file|
-              file.puts Time.now.to_s
-              file.puts $!.to_s
-              file.puts $!.backtrace.join("\n")
-            end
+class TimeTap::Watcher
+  attr_reader :editor, :backend
+  def initialize editor, backend
+    @editor, @backend = editor, backend
+    logger.info "new watcher #{[editor, backend].inspect}"
+  end
+    
+  def logger
+    TimeTap.logger
+  end
+    
+  def keep_watching
+    last = nil
 
-            raise if $!.kind_of?(SignalException)
-          end
-          sleep 30
-        end
+    loop do
+      break if $stop
+      logger.info "[TimeTap] checking current_path..."
+      
+      begin
+        last = watch!(last)
+      rescue
+        logger.error "#{$!}\n#{$!.backtrace.join("\n")}"
+        raise if $!.kind_of?(SignalException)
       end
+      
+      break if $stop
+      sleep 30
     end
+  end
+  
+  
+  def watch! last = nil
+    path = editor.current_path
     
-    
+    if path and File.exist? path
+      logger.info "[TimeTap::Watcher] path: #{path.inspect}"
+      mtime = File.mtime(path).to_i
+      current = [mtime, path]
+      logger.info "[TimeTap::Watcher] checking entry (#{current == last}): \n#{current.inspect} == \n#{last.inspect}"
+      
+      if current != last
+        backend.register *current
+        TimeTap::Project.register *current
+        TimeTap.logger.info "[TimeTap::Watcher] registered: #{current.inspect}"
+        last = current
+      end
+    end
   end
-end
+    
+end

data/log/.git-keep

@@ -0,0 +1 @@
+

data/spec/lib/time_tap/project_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'time_tap/project'
+
+describe TimeTap::Project do
+  before do
+    TimeTap::Project.reload!
+  end
+  
+  it 'has a 30m puse limit' do
+    TimeTap::Project.pause_limit.should eq(30.minutes)
+  end
+end

data/spec/spec_helper.rb

@@ -17,5 +17,7 @@ require 'rspec/autorun'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  config.before do
+    TimeTap.config[:file_name] = './.tap_history-test'
+  end
 end

data/spec/time_tap/backend_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+require 'time_tap/backend'
+
+describe 'Backend' do
+  let(:file_name) { './test-file_system-backend' }
+  
+  it 'loads a backend' do
+    backend = TimeTap::Backend.load :file_system, :file_name => file_name
+    backend.file_name.should eq(File.expand_path(file_name))
+    backend.should be_a(TimeTap::Backend::FileSystem)
+  end
+end

data/spec/time_tap/project_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'time_tap/project'
+
+describe TimeTap::Project do
+  let(:backend) { double('backend') }
+  it 'has a configuration' do
+    TimeTap::Project.pause_limit.should eq(30.minutes)
+  end
+  it 'reads from the backend' do
+    # backend.should_receive(:load_data).and_return([[Time.now, File.expand_path(__FILE__)]])
+    # TimeTap::Project.all.size.should eq(1)
+  end
+end

data/spec/time_tap/watcher_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+require 'time_tap/watcher'
+
+describe 'Watcher' do
+  let(:file) { __FILE__ }
+  let(:editor) { double('editor', :current_path => file) }
+  let(:backend) { double('backend') }
+  
+  it 'asks the editor the name of the currently opened file' do
+    backend.should_receive(:register).with(File.mtime(file).to_i, file)
+    watcher = TimeTap::Watcher.new(editor, backend)
+    watcher.watch!
+  end
+end

data/spec/time_tap_spec.rb

@@ -1,7 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
+require 'time_tap'
 
-describe "TimeTap" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe TimeTap do
+  it 'prepares the backend from the config' do
+    TimeTap.config[:backend] = :file_system
+    TimeTap.backend.should be_a(TimeTap::Backend::FileSystem)
   end
 end

data/time_tap.gemspec

@@ -1,115 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'time_tap/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{time_tap}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Elia Schito"]
-  s.date = %q{2010-10-17}
-  s.default_executable = %q{timetap}
+  s.name        = 'time_tap'
+  s.version     = TimeTap::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ['Elia Schito']
+  s.email       = ['perlelia@gmail']
+  s.homepage    = 'http://github.com/elia/timetap'
+  s.summary     = %q{Unobtrusive time-tracking for TextMate.}
   s.description = %q{TimeTap helps you track the time you spend coding on each project while in TextMate.}
-  s.email = %q{perlelia@gmail.com}
-  s.executables = ["timetap"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "bin/timetap",
-    "config.yaml",
-    "lib/time_tap.rb",
-    "lib/time_tap/daemon.rb",
-    "lib/time_tap/editors.rb",
-    "lib/time_tap/project.rb",
-    "lib/time_tap/server.rb",
-    "lib/time_tap/tasks.rb",
-    "lib/time_tap/views/index.haml",
-    "lib/time_tap/views/layout.haml",
-    "lib/time_tap/views/project.haml",
-    "lib/time_tap/views/project_day.haml",
-    "lib/time_tap/views/stylesheet.sass",
-    "lib/time_tap/watcher.rb",
-    "spec/.rspec",
-    "spec/spec_helper.rb",
-    "spec/time_tap_spec.rb",
-    "time_tap.gemspec"
-  ]
-  s.homepage = %q{http://github.com/elia/timetap}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Unobtrusive time tracking for TextMate}
-  s.test_files = [
-    "spec/spec_helper.rb",
-    "spec/time_tap_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = 'time_tap'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 2.3.8"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.8"])
-      s.add_runtime_dependency(%q<i18n>, ["~> 0.3.5"])
-      s.add_runtime_dependency(%q<haml>, [">= 0"])
-      s.add_runtime_dependency(%q<rb-appscript>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
-      s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
-      s.add_dependency(%q<i18n>, ["~> 0.3.5"])
-      s.add_dependency(%q<haml>, [">= 0"])
-      s.add_dependency(%q<rb-appscript>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["~> 2.3.8"])
-    s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
-    s.add_dependency(%q<i18n>, ["~> 0.3.5"])
-    s.add_dependency(%q<haml>, [">= 0"])
-    s.add_dependency(%q<rb-appscript>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
-end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.extra_rdoc_files = %w[LICENSE README.md]
 
+  s.add_runtime_dependency 'sinatra',        '~> 1.0'
+  s.add_runtime_dependency 'actionpack',     '~> 3.1.0'
+  s.add_runtime_dependency 'activesupport',  '~> 3.1.0'
+  s.add_runtime_dependency 'haml'
+  s.add_runtime_dependency 'sass'
+  s.add_runtime_dependency 'rb-appscript'
+  s.add_runtime_dependency 'bundler',        '~> 1.0'
+
+  s.add_development_dependency 'rspec',   '~> 2.0'
+  s.add_development_dependency 'spectator', '~> 1.1'
+end

data/vendor/SublimeText2/.gitignore

@@ -0,0 +1 @@
+*.pyc