watch_tower 0.0.1.beta11 → 0.0.1.beta12

data/README.md

@@ -88,6 +88,8 @@ to update the path to the WatchTower binary in the boot loader.
 
 # Usage
 
+## Opening the web interface
+
 The installation process creates a launcher on login that starts
 __WatchTower__. You can view your WatchTower Home Page via the web interface
 by going to http://localhost:9282, or from the command line:
@@ -96,6 +98,14 @@ by going to http://localhost:9282, or from the command line:
 $ watchtower open
 ```
 
+## Rehash
+
+If for some reason, you think that the elapsed time of any of your
+projects is wrong (c.f #9) then you can recalculate the elapsed time of
+all projects and all their files by visiting
+[http://localhost:9282/rehash](http://localhost:9282/rehash), but please
+keep in mind that this can take a long time to process.
+
 # Commands
 
 For more information on available commands, you can take a look at the

data/lib/watch_tower/editor/vim.rb

@@ -73,7 +73,7 @@ module WatchTower
             version = nil
             Open3.popen2 "#{editor_command} --version" do |stdin, stdout, wait_thr|
               parsed_stdout = stdout.read.scan(/^VIM - Vi IMproved (\d+\.\d+).*/)
-              LOG.info "#{__FILE__}:#{__LINE__ - 1}: Parsed vim --version: #{parsed_stdout.inspect}"
+              LOG.debug "#{__FILE__}:#{__LINE__ - 1}: Parsed vim --version: #{parsed_stdout.inspect}"
               version = parsed_stdout.try(:first).try(:first)
             end
 

data/lib/watch_tower/eye.rb

@@ -85,7 +85,7 @@ module WatchTower
           else
             LOG.debug("#{__FILE__}:#{__LINE__}: #{editor.to_s} is not running")
           end
-        end
+        end unless $pause_eye
 
         # If $stop global is set, please stop, otherwise sleep for 10 seconds.
         if $close_eye

data/lib/watch_tower/server/app.rb

@@ -16,6 +16,7 @@ module WatchTower
 
       # Routes
       paths :root => '/'
+      paths :rehash => '/rehash'
       paths :project => '/project/:id'
 
       # Enable sessions
@@ -48,7 +49,7 @@ module WatchTower
       get :root do
         @title = "Projects"
         @durations = Duration.date_range(session[:date_filtering][:from_date], session[:date_filtering][:to_date])
-        @projects = @durations.collect(&:file).collect(&:project).uniq
+        @projects = @durations.collect(&:file).collect(&:project).uniq.sort_by { |p| p.elapsed_time }.reverse
 
         haml :index, layout: (request.xhr? ? false : :layout)
       end
@@ -58,10 +59,24 @@ module WatchTower
         @project = Project.find(params[:id])
         @title = "Project - #{@project.name.camelcase}"
         @durations = @project.durations.date_range(session[:date_filtering][:from_date], session[:date_filtering][:to_date])
-        @files = @durations.collect(&:file).uniq
+        @files = @durations.collect(&:file).uniq.sort_by { |f| f.elapsed_time }.reverse
 
         haml :project, layout: (request.xhr? ? false : :layout)
       end
+
+      # Rehash the elapsed_times
+      get :rehash do
+        # Pause the eye to avoid conflicts
+        $pause_eye = true
+        # Iterate over all projects and recalculate_elapsed_time
+        Project.all.each do |p|
+          p.recalculate_elapsed_time
+        end
+        # Resume the eye
+        $pause_eye = false
+        # Redirect back to the home page.
+        redirect path_to(:root)
+      end
     end
   end
-end
+end

data/lib/watch_tower/server/models/project.rb

@@ -42,6 +42,28 @@ module WatchTower
       def self.sum_elapsed_time
         sum(:elapsed_time)
       end
+
+      # Recalucate the elapsed time
+      def recalculate_elapsed_time
+        # Reset the elapsed_time of the project
+        self.elapsed_time = 0
+        # Save the project
+        self.save!
+        # Operate on all files
+        files.each do |f|
+          # Reset the elapsed_time of the files
+          f.elapsed_time = 0
+          # Save the file
+          f.save!
+          # Delete all durations
+          f.durations.delete_all
+          # Send calculate_elapsed_time to all time_entries ordered by
+          # their id
+          f.time_entries.order('id ASC').each do |t|
+            t.send(:calculate_elapsed_time)
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/watch_tower/server/models/time_entry.rb

@@ -43,7 +43,7 @@ module WatchTower
           if this_time_entry_date == last_time_entry_date
             # Calculate the time
             time_entry_elapsed = this_time_entry.mtime - last_time_entry.mtime rescue 0
-            unless time_entry_elapsed > pause_time
+            if time_entry_elapsed <= pause_time && time_entry_elapsed >= 0
               # Update the file elapsed time
               file.elapsed_time += time_entry_elapsed
               # Update the project's elapsed time
@@ -66,4 +66,4 @@ module WatchTower
         end
     end
   end
-end
+end

data/lib/watch_tower/version.rb

@@ -4,7 +4,7 @@ module WatchTower
   MAJOR = 0
   MINOR = 0
   TINY = 1
-  PRE = 'beta11'
+  PRE = 'beta12'
 
   def self.version
     # Init the version

data/spec/spec_helper.rb

@@ -23,4 +23,7 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   # config.mock_with :rspec
-end
+
+  # Treat symbols as metadata keys with true values
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end

data/spec/watch_tower/eye_spec.rb

@@ -164,4 +164,20 @@ describe Eye do
       -> { subject.start }.should_not raise_error
     end
   end
+
+  describe "#pause" do
+    before(:each) do
+      Editor.expects(:editors).never
+      $pause_eye = true
+    end
+
+    after(:each) do
+      $pause_eye = false
+    end
+
+    it "should not run if it is paused" do
+
+      subject.start
+    end
+  end
 end

data/spec/watch_tower/server/app_spec.rb

@@ -1,7 +1,14 @@
 require 'spec_helper'
+require 'rack/test'
 
 module Server
   describe App do
+    include Rack::Test::Methods
+
+    def app
+      Server::App
+    end
+
     before(:each) do
       @projects = {
         empty: {files: [], time_entries:[] },
@@ -50,6 +57,10 @@ module Server
         visit '/'
       end
 
+      it "should assings @durations"
+      it "should assigns @projects"
+      it "should return the projects sorted by their elapsed_time"
+
       it "should render the layout" do
         page.should have_selector :xpath, '//html/head/title'
       end
@@ -138,6 +149,10 @@ module Server
         visit "/project/#{@projects[:not_empty][:project].id}"
       end
 
+      it "should assings @durations"
+      it "should assigns @files"
+      it "should return the files sorted by their elapsed_time"
+
       it "should render the layout" do
         page.should have_selector :xpath, '//html/head/title'
       end
@@ -232,5 +247,23 @@ module Server
         page.should have_content "No files available for the selected date range."
       end
     end
+
+    describe "#rehash" do
+      before(:each) do
+        get '/rehash'
+      end
+
+      it "should send :recalculate_elapsed_time to all projects" do
+        Project.all do |p|
+          p.expects(:recalculate_elapsed_time).once
+        end
+      end
+
+      it "should redirect to the root_path" do
+        last_response.should be_redirect
+        follow_redirect!
+        last_request.url.should =~ /.+\//
+      end
+    end
   end
-end
+end

data/spec/watch_tower/server/models/file_spec.rb

@@ -184,6 +184,22 @@ module Server
         @file.file_hash.should == t1.file_hash
       end
 
+      it "should not record a negative diff, which can result from a git revert." do
+        # Freeze the time
+        Timecop.freeze(Time.now)
+        # Create two time entries to get an elapsed time
+        FactoryGirl.create :time_entry, file: @file, mtime: Time.now
+        FactoryGirl.create :time_entry, file: @file, mtime: Time.now + 1.minute
+        # Make sure we have the correct elapsed time at this point
+        @file.reload.elapsed_time.should == 1.minute
+        # Travel 1h behind
+        Timecop.travel(Time.now - 1.hour)
+        # Create a new time_entry
+        FactoryGirl.create :time_entry, file: @file, mtime: Time.now
+        # Make sure we did not add a negative elapsed_time
+        @file.reload.elapsed_time.should == 1.minute
+      end
+
     end
 
     describe "scopes" do
@@ -345,4 +361,4 @@ module Server
       end
     end
   end
-end
+end

data/spec/watch_tower/server/models/project_spec.rb

@@ -290,6 +290,50 @@ module Server
           @projects.first.percent.should == 50
         end
       end
+
+      describe "#recalculate_elapsed_time" do
+        before(:each) do
+          @project = FactoryGirl.create(:project)
+          @files = []
+          Timecop.freeze(Time.now)
+          2.times do
+            @files << FactoryGirl.create(:file, project: @project)
+            2.times do |n|
+              FactoryGirl.create :time_entry, file: @files.last, mtime: Time.now + 2 * n
+            end
+          end
+          Timecop.return
+
+          @project.reload
+          @elapsed_time = @project.elapsed_time
+          @durations = @files.collect(&:durations).flatten
+        end
+
+        subject { @project }
+
+        it { should respond_to(:recalculate_elapsed_time) }
+
+        it "should calculate the correct elapsed_time" do
+          subject.elapsed_time = -56456
+          subject.save
+
+          subject.recalculate_elapsed_time
+          subject.reload.elapsed_time.should == @elapsed_time
+        end
+
+        it "should generate the same durations" do
+          subject.elapsed_time = -56454
+          subject.save
+
+          subject.recalculate_elapsed_time
+          subject.reload
+          durations = subject.files.collect(&:durations).flatten
+          durations.each_with_index do |duration, index|
+            duration.date.should == @durations[index].date
+            duration.duration.should == @durations[index].duration
+          end
+        end
+      end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watch_tower
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta11
+  version: 0.0.1.beta12
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &5402520 !ruby/object:Gem::Requirement
+  requirement: &5090600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *5402520
+  version_requirements: *5090600
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &4966260 !ruby/object:Gem::Requirement
+  requirement: &5044080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *4966260
+  version_requirements: *5044080
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &5093740 !ruby/object:Gem::Requirement
+  requirement: &5437320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *5093740
+  version_requirements: *5437320
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &5092860 !ruby/object:Gem::Requirement
+  requirement: &5524100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *5092860
+  version_requirements: *5524100
 - !ruby/object:Gem::Dependency
   name: sinatra-snap
-  requirement: &5092160 !ruby/object:Gem::Requirement
+  requirement: &5519840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *5092160
+  version_requirements: *5519840
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &5089700 !ruby/object:Gem::Requirement
+  requirement: &5608420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *5089700
+  version_requirements: *5608420
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &5048100 !ruby/object:Gem::Requirement
+  requirement: &5607880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *5048100
+  version_requirements: *5607880
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &5439660 !ruby/object:Gem::Requirement
+  requirement: &5607240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *5439660
+  version_requirements: *5607240
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &5523540 !ruby/object:Gem::Requirement
+  requirement: &5606200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *5523540
+  version_requirements: *5606200
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &5608600 !ruby/object:Gem::Requirement
+  requirement: &5605060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 3.1.10
   type: :runtime
   prerelease: false
-  version_requirements: *5608600
+  version_requirements: *5605060
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &5608120 !ruby/object:Gem::Requirement
+  requirement: &5604100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *5608120
+  version_requirements: *5604100
 - !ruby/object:Gem::Dependency
   name: cronedit
-  requirement: &5607480 !ruby/object:Gem::Requirement
+  requirement: &5602760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *5607480
+  version_requirements: *5602760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &5606940 !ruby/object:Gem::Requirement
+  requirement: &5601660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.8.4
   type: :development
   prerelease: false
-  version_requirements: *5606940
+  version_requirements: *5601660
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &5606120 !ruby/object:Gem::Requirement
+  requirement: &5600700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *5606120
+  version_requirements: *5600700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &5604680 !ruby/object:Gem::Requirement
+  requirement: &5677640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *5604680
+  version_requirements: *5677640
 - !ruby/object:Gem::Dependency
   name: guard-sprockets2
-  requirement: &5603880 !ruby/object:Gem::Requirement
+  requirement: &5676620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *5603880
+  version_requirements: *5676620
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &5603200 !ruby/object:Gem::Requirement
+  requirement: &5674520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *5603200
+  version_requirements: *5674520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &5602120 !ruby/object:Gem::Requirement
+  requirement: &5670780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *5602120
+  version_requirements: *5670780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &5601240 !ruby/object:Gem::Requirement
+  requirement: &5723420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *5601240
+  version_requirements: *5723420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &5678180 !ruby/object:Gem::Requirement
+  requirement: &5721240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *5678180
+  version_requirements: *5721240
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &5677000 !ruby/object:Gem::Requirement
+  requirement: &5719060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 2.0.5
   type: :development
   prerelease: false
-  version_requirements: *5677000
+  version_requirements: *5719060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &5674720 !ruby/object:Gem::Requirement
+  requirement: &5717740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *5674720
+  version_requirements: *5717740
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &5672560 !ruby/object:Gem::Requirement
+  requirement: &5731960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *5672560
+  version_requirements: *5731960
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &5671000 !ruby/object:Gem::Requirement
+  requirement: &5729440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,10 +274,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *5671000
+  version_requirements: *5729440
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &5724100 !ruby/object:Gem::Requirement
+  requirement: &5726660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,7 +285,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *5724100
+  version_requirements: *5726660
 description: ! 'Did you ever want to keep track of how much time you _really_ spend
   on all of