watch_tower 0.0.0.1 → 0.0.1.beta1

data/lib/watch_tower/server/vendor/assets/stylesheets/jquery.datepick.css

@@ -0,0 +1,226 @@
+/* Default styling for jQuery Datepicker v4.0.6. */
+.datepick {
+	background-color: #fff;
+	color: #000;
+	border: 1px solid #444;
+    border-radius: 0.25em;
+    -moz-border-radius: 0.25em;
+    -webkit-border-radius: 0.25em;
+	font-family: Arial,Helvetica,Sans-serif;
+	font-size: 90%;
+}
+.datepick-rtl {
+	direction: rtl;
+}
+.datepick-popup {
+	z-index: 1000;
+}
+.datepick-disable {
+	position: absolute;
+	z-index: 100;
+	background-color: white;
+	opacity: 0.5;
+	filter: alpha(opacity=50);
+}
+.datepick a {
+	color: #fff;
+	text-decoration: none;
+}
+.datepick a.datepick-disabled {
+	color: #888;
+	cursor: auto;
+}
+.datepick button {
+    margin: 0.25em;
+    padding: 0.125em 0em;
+    background-color: #fcc;
+    border: none;
+    border-radius: 0.25em;
+    -moz-border-radius: 0.25em;
+    -webkit-border-radius: 0.25em;
+    font-weight: bold;
+}
+.datepick-nav, .datepick-ctrl {
+	float: left;
+	width: 100%;
+	background-color: #000;
+	color: #fff;
+	font-size: 90%;
+	font-weight: bold;
+}
+.datepick-ctrl {
+	background-color: #600;
+}
+.datepick-cmd {
+	width: 30%;
+}
+.datepick-cmd:hover {
+	background-color: #777;
+}
+.datepick-ctrl .datepick-cmd:hover {
+	background-color: #f08080;
+}
+.datepick-cmd-prevJump, .datepick-cmd-nextJump {
+	width: 8%;
+}
+a.datepick-cmd {
+	height: 1.5em;
+}
+button.datepick-cmd {
+	text-align: center;
+}
+.datepick-cmd-prev, .datepick-cmd-prevJump, .datepick-cmd-clear {
+	float: left;
+	padding-left: 2%;
+}
+.datepick-cmd-current, .datepick-cmd-today {
+	float: left;
+	width: 35%;
+	text-align: center;
+}
+.datepick-cmd-next, .datepick-cmd-nextJump, .datepick-cmd-close {
+	float: right;
+	padding-right: 2%;
+	text-align: right;
+}
+.datepick-rtl .datepick-cmd-prev, .datepick-rtl .datepick-cmd-prevJump,
+.datepick-rtl .datepick-cmd-clear {
+	float: right;
+	padding-left: 0%;
+	padding-right: 2%;
+	text-align: right;
+}
+.datepick-rtl .datepick-cmd-current, .datepick-rtl .datepick-cmd-today {
+	float: right;
+}
+.datepick-rtl .datepick-cmd-next, .datepick-rtl .datepick-cmd-nextJump,
+.datepick-rtl .datepick-cmd-close {
+	float: left;
+	padding-left: 2%;
+	padding-right: 0%;
+	text-align: left;
+}
+.datepick-month-nav {
+	float: left;
+	background-color: #777;
+	text-align: center;
+}
+.datepick-month-nav div {
+	float: left;
+	width: 12.5%;
+	margin: 1%;
+	padding: 1%;
+}
+.datepick-month-nav span {
+	color: #888;
+}
+.datepick-month-row {
+	clear: left;
+}
+.datepick-month {
+	float: left;
+	width: 15em;
+	border: 1px solid #444;
+	text-align: center;
+}
+.datepick-month-header, .datepick-month-header select, .datepick-month-header input {
+	height: 1.5em;
+	background-color: #444;
+	color: #fff;
+	font-weight: bold;
+}
+.datepick-month-header select, .datepick-month-header input {
+	height: 1.4em;
+	border: none;
+}
+.datepick-month-header input {
+	position: absolute;
+	display: none;
+}
+.datepick-month table {
+	width: 100%;
+	border-collapse: collapse;
+}
+.datepick-month thead {
+	border-bottom: 1px solid #aaa;
+}
+.datepick-month th, .datepick-month td {
+	margin: 0em;
+	padding: 0em;
+	font-weight: normal;
+	text-align: center;
+}
+.datepick-month th {
+	border: 1px solid #777;
+}
+.datepick-month th, .datepick-month th a {
+	background-color: #777;
+	color: #fff;
+}
+.datepick-month td {
+	background-color: #eee;
+	border: 1px solid #aaa;
+}
+.datepick-month td.datepick-week {
+	border: 1px solid #777;
+}
+.datepick-month td.datepick-week * {
+	background-color: #777;
+	color: #fff;
+	border: none;
+}
+.datepick-month a {
+	display: block;
+	width: 100%;
+	padding: 0.125em 0em;
+	background-color: #eee;
+	color: #000;
+	text-decoration: none;
+}
+.datepick-month span {
+	display: block;
+	width: 100%;
+	padding: 0.125em 0em;
+}
+.datepick-month td span {
+	color: #888;
+}
+.datepick-month td .datepick-other-month {
+	background-color: #fff;
+}
+.datepick-month td .datepick-weekend {
+	background-color: #ddd;
+}
+.datepick-month td .datepick-today {
+	background-color: #f0c0c0;
+}
+.datepick-month td .datepick-highlight {
+	background-color: #f08080;
+}
+.datepick-month td .datepick-selected {
+	background-color: #777;
+	color: #fff;
+}
+.datepick-month th.datepick-week {
+	background-color: #777;
+	color: #fff;
+}
+.datepick-status {
+	clear: both;
+	background-color: #ddd;
+	text-align: center;
+}
+.datepick-clear-fix {
+	clear: both;
+}
+.datepick-cover {
+    display: none;
+    display/**/: block;
+    position: absolute;
+    z-index: -1;
+    filter: mask();
+    top: -1px;
+    left: -1px;
+    width: 100px;
+    height: 100px;
+}

data/lib/watch_tower/server/views/_project.haml

@@ -1,13 +1,10 @@
-%article.project[project]
-  .name
-    %a{href: path_to(:project).with(project.id), alt: project.path}
-      = project.name.camelcase
-  .percentage_img_container
-    .percentage
-      -# TODO: Move this to the presenter after having resolved the presenter
-      -#       issues, in Draper I can't access helpers for some reason
-      - max_elapsed = ::WatchTower::Server::Project.order('elapsed_time DESC').first.elapsed_time
-      - percentage = (project.elapsed_time * 100 / max_elapsed).to_i rescue 100
-      %img.percentage_img{src: asset_path('percentage.png'), 'data-width' => percentage}/
-  .elapsed= project.elapsed
-  .clearfix
+- present project do |presenter|
+  %article.project[project]
+    .name
+      %a{href: path_to(:project).with(presenter.id), alt: presenter.path}
+        = presenter.name.camelcase
+    .percentage_img_container
+      .percentage
+        %img.percentage_img{src: asset_path('percentage.png'), alt: "#{presenter.percent}% of total time", 'data-width' => presenter.percent}/
+    .elapsed= presenter.elapsed(project.durations.date_range(session[:date_filtering][:from_date], session[:date_filtering][:to_date]).sum(:duration))
+    .clearfix

data/lib/watch_tower/server/views/index.haml

@@ -1,7 +1,10 @@
 %section#projects
-  %header
-    .name Project
-    .percentage Percentage
-    .elapsed Total time
-    .clearfix
-  = partial('project', collection: @projects)
+  - if @projects.any?
+    %header
+      .name Project
+      .percentage Percentage
+      .elapsed Total time
+      .clearfix
+    = partial('project', collection: @projects)
+  - else
+    No projects available for the selected date range.

data/lib/watch_tower/server/views/layout.haml

@@ -8,6 +8,8 @@
     %meta{:charset => "utf-8"}/
     %meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
     %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
+    %meta{name: 'date_filtering_from', content: session[:date_filtering][:from_date] }/
+    %meta{name: 'date_filtering_to', content: session[:date_filtering][:to_date]}/
 
     / Link tags
     %link{:href => asset_path('application.css'), :rel => "stylesheet"}/
@@ -23,10 +25,11 @@
             %h1 Watch Tower
 
       %section#main
-        = yield
+        %aside#date
+          %input{type: 'text'}
+        .page= yield
 
       %section#footer
-        WatchTower
-        -
-        %a{href: 'http://www.technogate.fr'}
+        © Copyright 2011
+        %a{href: 'https://github.com/TechnoGate', target: '_blank'}
           TechnoGate

data/lib/watch_tower/server/views/project.haml

@@ -1,12 +1,10 @@
-%article#project
-  %header
-    %h1.project_name= @project.name.camelcase
-    %h2.project_path= @project.path
-  %section#files
+- present @project do |presenter|
+  %article#project
     %header
-      .path
-        File path
-      .elapsed
-        Total Time
-      .clearfix
-    = partial('file', collection: FileDecorator.decorate(@project.files.worked_on))
+      %h1.project_name= presenter.name.camelcase
+      %h2.project_path= presenter.path
+    %section#files
+      - if @files.any?
+        = presenter.file_tree(@files)
+      - else
+        No files available for the selected date range.

data/lib/watch_tower/server.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 module WatchTower
   module Server
     extend ::ActiveSupport::Autoload
@@ -9,7 +11,7 @@ module WatchTower
     autoload :TimeEntry, ::File.join(MODELS_PATH, 'time_entry.rb')
     autoload :Helpers
     autoload :Configurations
-    autoload :Decorator
+    autoload :Presenters
     autoload :App
 
     # Start the server
@@ -45,6 +47,10 @@ module WatchTower
         WatchTower.threads[:web_server] = Thread.new do
           LOG.debug("#{__FILE__}:#{__LINE__}: Starting a new Thread for the web server.")
 
+          # Signal handling
+          Signal.trap("INT")  { exit }
+          Signal.trap("TERM") { exit }
+
           begin
             LOG.debug("#{__FILE__}:#{__LINE__}: Starting the web server in the new Thread.")
 
@@ -52,6 +58,7 @@ module WatchTower
             App.run!(options)
 
             LOG.debug("#{__FILE__}:#{__LINE__}: The server has stopped.")
+            exit
           rescue Exception => e
             LOG.fatal "#{__FILE__}:#{__LINE__ - 4}: #{e}"
             raise e

data/lib/watch_tower/templates/{watchtower.plist → watchtower.plist.erb}

@@ -4,19 +4,18 @@
 <dict>
   <key>Label</key>
   <string>fr.technogate.WatchTower</string>
-
-  <key>Program</key>
-  <string>watchtower</string>
-
   <key>ProgramArguments</key>
   <array>
+    <string><%= ruby_binary %></string>
+    <string><%= watch_tower_binary %></string>
     <string>start</string>
     <string>--bootloader</string>
+    <string>--foreground</string>
   </array>
-
+  <key>KeepAlive</key>
+  <true/>
   <key>OnDemand</key>
   <false/>
-
   <key>RunAtLoad</key>
   <true/>
 </dict>

data/lib/watch_tower/version.rb

@@ -1,8 +1,17 @@
+# -*- encoding: utf-8 -*-
+
 module WatchTower
   MAJOR = 0
   MINOR = 0
-  PATCH = 0
-  PRE = 1
+  TINY = 1
+  PRE = "beta1"
 
-  VERSION = [MAJOR, MINOR, PATCH, PRE].join('.')
+  def self.version
+    # Init the version
+    version = [MAJOR, MINOR, TINY]
+    # Add the pre if available
+    version << PRE unless PRE.nil? || PRE !~ /\S/
+    # Return the version joined by a dot
+    version.join('.')
+  end
 end

data/lib/watch_tower.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 # RubyGems is needed at first
 require 'rubygems'
 
@@ -33,7 +35,7 @@ FileUtils.mkdir_p LOG_PATH
 module WatchTower
 
   # Create a logger
-  LOG = Logger.new(File.join(LOG_PATH, 'watch_tower.log'))
+  LOG = Logger.new(File.join(LOG_PATH, "#{ENV['WATCH_TOWER_ENV']}.log"))
 
   # Threads
   # Hash
@@ -46,8 +48,24 @@ module WatchTower
     @@threads
   end
 
+  # Get WatchTower's environment
+  #
+  # @return [String] The current environment
+  def self.env
+    ENV['WATCH_TOWER_ENV']
+  end
+
+  # Set WatchTower's environment
+  #
+  # @param [String] The environment
+  def self.env=(environment)
+    ENV['WATCH_TOWER_ENV'] = environment
+  end
 end
 
+# Make sure we are running UTF-8
+Encoding.default_external = 'utf-8'
+
 # Require watch_tower's libraries
 require "watch_tower/version"
 require "watch_tower/errors"
@@ -57,4 +75,5 @@ require "watch_tower/cli"
 require "watch_tower/editor"
 require "watch_tower/project"
 require "watch_tower/eye"
+require "watch_tower/file_tree"
 require "watch_tower/server"

data/spec/factories.rb

@@ -13,6 +13,8 @@ FactoryGirl.define do
   factory :time_entry, class: Server::TimeEntry do
     file
     file_hash
+    editor_name "Textmate"
+    editor_version "1.5.10"
     mtime
   end
 

data/spec/watch_tower/appscript_spec.rb

@@ -1,6 +1,40 @@
 require 'spec_helper'
 require 'watch_tower/appscript'
 
-describe ::Appscript do
-  it { should be_kind_of(Module) }
+module ::Appscript
+  describe "Module" do
+    subject do
+      Class.new do
+        extend ::Appscript
+      end
+    end
+    describe "#app" do
+
+      it { should respond_to :app }
+
+      it "should return an instance of Application" do
+        subject.app.should be_instance_of ::Appscript::Application
+      end
+    end
+
+    describe "#its" do
+      it { should respond_to :its }
+    end
+
+    describe "#name" do
+      it { should respond_to :name }
+    end
+  end
+
+  describe "Application" do
+    subject { ::Appscript.app('TextMate') }
+
+    [:name, :version, :processes, :unix_id, :by_pid, :is_running?].each do |method|
+      it "should respond to #{method}" do
+        -> {
+          subject.send(method)
+        }.should_not raise_error NoMethodError
+      end
+    end
+  end
 end

data/spec/watch_tower/editor/base_appscript_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+module Editor
+  describe BaseAppscript do
+
+    subject do
+      Class.new do
+        include BaseAppscript
+      end.new
+    end
+
+    before(:each) do
+      @editor = mock
+      @editor.stubs(:is_running?).returns(true)
+      @documents = mock
+      @document = mock
+      @file_path = '/path/to/file.rb'
+      @path = mock
+      @path.stubs(:get).returns(@file_path)
+      @document.stubs(:path).returns(@path)
+      @documents.stubs(:get).returns([@document])
+      @editor.stubs(:document).returns(@documents)
+
+      subject.class.any_instance.stubs(:editor).returns(@editor)
+    end
+
+    describe "#is_running" do
+      it "should return true if the editor is running" do
+        @editor.expects(:is_running?).returns(true).once
+
+        subject.is_running?.should be_true
+      end
+
+      it "should return false if the editor is running" do
+        @editor.expects(:is_running?).returns(false).once
+
+        subject.is_running?.should be_false
+      end
+    end
+
+    describe "#cuurent_path" do
+      it { should respond_to :current_path }
+
+      it "should return the current_path if textmate running" do
+        @path.expects(:get).returns(@file_path).once
+        @document.expects(:path).returns(@path).once
+        @documents.expects(:get).returns([@document]).once
+
+        subject.current_path.should == @file_path
+      end
+
+      it "should return nil if textmate ain't running" do
+        @editor.stubs(:is_running?).returns(false)
+
+        subject.current_path.should be_nil
+      end
+    end
+
+    describe "#cuurent_path" do
+      it { should respond_to :current_paths }
+
+      it "should return the current_paths if textmate running" do
+        @path.expects(:get).returns(@file_path).once
+        @document.expects(:path).returns(@path).once
+        @documents.expects(:get).returns([@document]).once
+
+        subject.current_paths.should == [@file_path]
+      end
+
+      it "should return nil if textmate ain't running" do
+        @editor.stubs(:is_running?).returns(false)
+
+        subject.current_paths.should be_nil
+      end
+
+      it "should return nil if the application does not respond to document" do
+        @editor.stubs(:respond_to?).with(:document).returns(false)
+
+        subject.current_paths.should be_nil
+      end
+    end
+  end
+end

data/spec/watch_tower/editor/textmate_spec.rb

@@ -4,6 +4,12 @@ module Editor
   describe Textmate do
     it { should respond_to :current_path }
 
+    it { should respond_to :name }
+    its(:name) { should_not raise_error NotImplementedError }
+
+    it { should respond_to :version }
+    its(:version) { should_not raise_error NotImplementedError }
+
     describe "#is_running?" do
       it { should respond_to :is_running? }
 
@@ -14,6 +20,10 @@ module Editor
 
         subject.is_running?.should be_true
       end
+    end
+
+    describe "#cuurent_path" do
+      it { should respond_to :current_path }
 
       it "should return the current_path if textmate running" do
         app = mock()
@@ -37,7 +47,34 @@ module Editor
 
         subject.current_path.should be_nil
       end
+    end
+
+    describe "#cuurent_path" do
+      it { should respond_to :current_paths }
+
+      it "should return the current_paths if textmate running" do
+        app = mock()
+        app.expects(:is_running?).returns(true).once
+        documents = mock
+        document = mock
+        path = mock
+        path.expects(:get).returns('/path/to/file.rb')
+        document.expects(:path).returns(path).once
+        documents.expects(:get).returns([document]).once
+        app.expects(:document).returns(documents).once
+        Textmate.any_instance.stubs(:editor).returns(app)
+
+        subject.current_paths.should == ['/path/to/file.rb']
+      end
 
+      it "should return nil if textmate ain't running" do
+        app = mock()
+        app.expects(:is_running?).returns(false).once
+        Textmate.any_instance.stubs(:editor).returns(app)
+
+        subject.current_paths.should be_nil
+      end
     end
+
   end
 end

data/spec/watch_tower/editor/xcode_spec.rb

@@ -4,6 +4,12 @@ module Editor
   describe Xcode do
     it { should respond_to :current_path }
 
+    it { should respond_to :name }
+    pending(:name) { should_not raise_error NotImplementedError }
+
+    it { should respond_to :version }
+    pending(:version) { should_not raise_error NotImplementedError }
+
     describe "#is_running?" do
       it { should respond_to :is_running? }
 

data/spec/watch_tower/eye_spec.rb

@@ -9,12 +9,15 @@ describe Eye do
     @file_path = '/home/user/Code/OpenSource/watch_tower/lib/watch_tower/server/models/time_entries.rb'
     @project_path = '/home/user/Code/OpenSource/watch_tower'
     @project_name = 'watch_tower'
+    ::File.stubs(:exists?).with(@file_path).returns(true)
 
     # Mock the editor
     @editor = mock
     @editor.stubs(:new).returns(@editor)
     @editor.stubs(:is_running?).returns(true)
     @editor.stubs(:current_paths).returns([@file_path])
+    @editor.stubs(:name).returns("Textmate")
+    @editor.stubs(:version).returns("1.5.10")
     Editor.stubs(:editors).returns([@editor])
 
     # Mock the project
@@ -65,6 +68,12 @@ describe Eye do
       subject.start
     end
 
+    it "should call File.exists?" do
+      ::File.expects(:exists?).with(@file_path).returns(true).once
+
+      subject.start
+    end
+
     it "should get the file's hash from Digest::SHA1" do
       Digest::SHA1.expects(:file).with(@file_path).returns(@file_hash).once
 
@@ -99,6 +108,18 @@ describe Eye do
 
       subject.start
     end
+
+    it "should ask the editor for the name" do
+      @editor.expects(:name).returns("Textmate").once
+
+      subject.start
+    end
+
+    it "should ask the editor for the version" do
+      @editor.expects(:version).returns("1.5.10").once
+
+      subject.start
+    end
   end
 
   describe "#start database validations" do