rtt 0.0.0.47 → 0.0.0.48

data/Gemfile

@@ -3,19 +3,16 @@ source 'http://gems.github.com'
 
 gem 'echoe'
 gem 'highline', '1.5.2'
-gem 'activesupport', ['>= 2.3.5', '<= 2.3.8']
+gem 'activesupport', '3.2.6'
 gem 'prawn', '0.8.4'
-gem 'data_objects', '0.10.2'
-gem 'dm-core', '1.0.0'
-gem 'dm-validations', '1.0.0'
-gem 'dm-migrations', '1.0.0'
-gem 'dm-sqlite-adapter', '1.0.0'
+gem 'activerecord', '3.2.6'
+gem 'sqlite3'
 gem 'rake', '0.8.2'
 gem 'gemcutter', '0.7.1'
 
 group :development do
+  gem 'debugger'
   gem 'rspec', '1.3.0'
   gem 'mocha'
   gem 'hanna'
-  gem 'ruby-debug'
 end

data/Gemfile.lock

@@ -2,32 +2,32 @@ GEM
   remote: http://rubygems.org/
   remote: http://gems.github.com/
   specs:
-    activesupport (2.3.8)
-    addressable (2.2.7)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     allison (2.0.3)
+    arel (3.0.2)
+    builder (3.0.0)
     columnize (0.3.6)
-    data_objects (0.10.2)
-      addressable (~> 2.1)
-    dm-core (1.0.0)
-      addressable (~> 2.1)
-      extlib (~> 0.9.15)
-    dm-do-adapter (1.0.0)
-      data_objects (~> 0.10.1)
-      dm-core (~> 1.0.0)
-    dm-migrations (1.0.0)
-      dm-core (~> 1.0.0)
-    dm-sqlite-adapter (1.0.0)
-      dm-do-adapter (~> 1.0.0)
-      do_sqlite3 (~> 0.10.2)
-    dm-validations (1.0.0)
-      dm-core (~> 1.0.0)
-    do_sqlite3 (0.10.2)
-      data_objects (= 0.10.2)
+    debugger (1.2.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.1.1)
+      debugger-ruby_core_source (~> 1.1.3)
+    debugger-linecache (1.1.2)
+      debugger-ruby_core_source (>= 1.1.1)
+    debugger-ruby_core_source (1.1.3)
     echoe (4.5.6)
       allison
       gemcutter
       rubyforge
-    extlib (0.9.15)
     gemcutter (0.7.1)
     haml (2.2.24)
     hanna (0.1.12)
@@ -35,12 +35,12 @@ GEM
       rake (~> 0.8.2)
       rdoc (~> 2.3.0)
     highline (1.5.2)
+    i18n (0.6.0)
     json_pure (1.6.5)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
     metaclass (0.0.1)
     mocha (0.10.4)
       metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     prawn (0.8.4)
       prawn-core (>= 0.8.4, < 0.9)
       prawn-layout (>= 0.8.4, < 0.9)
@@ -49,27 +49,20 @@ GEM
     prawn-layout (0.8.4)
     prawn-security (0.8.4)
     rake (0.8.2)
-    rbx-require-relative (0.0.5)
     rdoc (2.3.0)
     rspec (1.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    sqlite3 (1.3.6)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 2.3.5, <= 2.3.8)
-  data_objects (= 0.10.2)
-  dm-core (= 1.0.0)
-  dm-migrations (= 1.0.0)
-  dm-sqlite-adapter (= 1.0.0)
-  dm-validations (= 1.0.0)
+  activerecord (= 3.2.6)
+  activesupport (= 3.2.6)
+  debugger
   echoe
   gemcutter (= 0.7.1)
   hanna
@@ -78,4 +71,4 @@ DEPENDENCIES
   prawn (= 0.8.4)
   rake (= 0.8.2)
   rspec (= 1.3.0)
-  ruby-debug
+  sqlite3

data/Manifest

@@ -6,25 +6,25 @@ README.rdoc
 Rakefile
 USAGE.txt
 bin/rtt
-db/rtt.sqlite3
+db/config.yml
+db/schema.rb
 db/test.sqlite3
+lib/extensions/array.rb
+lib/extensions/date.rb
+lib/extensions/hash.rb
+lib/extensions/kernel.rb
+lib/models/client.rb
+lib/models/project.rb
+lib/models/task.rb
+lib/models/user.rb
 lib/rtt.rb
-lib/rtt/array_extensions.rb
 lib/rtt/boot.rb
-lib/rtt/client.rb
 lib/rtt/cmd_line_parser.rb
-lib/rtt/hash_extensions.rb
 lib/rtt/interactive_configurator.rb
-lib/rtt/project.rb
 lib/rtt/query_builder.rb
 lib/rtt/report_generator.rb
 lib/rtt/storage.rb
-lib/rtt/system_extensions.rb
-lib/rtt/task.rb
-lib/rtt/user.rb
-log/rtt.sqlite3
-rtt.gemspec
-spec/datamapper_spec_helper.rb
-spec/lib/rtt/task_spec.rb
+spec/ar_spec_helper.rb
+spec/lib/models/task_spec.rb
 spec/lib/rtt_spec.rb
 tasks/rtt.rake

data/Rakefile

@@ -3,15 +3,15 @@ require 'echoe'
 
 # PACKAGING ============================================================
 
-Echoe.new('rtt', '0.0.0.47') do |p|
+Echoe.new('rtt', '0.0.0.48') do |p|
   p.description = 'RTT is a tool for tracking time'
   p.url = 'http://github.com/marklazz/rtt'
   p.author = 'Marcelo Giorgi'
   p.email = 'marklazz.uy@gmail.com'
   p.ignore_pattern = [ 'tmp/*', 'script/*', '*.sh' ]
   p.runtime_dependencies = [
-      ['highline', "1.5.2"], ['activesupport', '>= 2.3.5', '<= 2.3.8'], ['prawn', '0.8.4'], ['dm-core', '1.0.0'], [ 'dm-validations', '1.0.0'], [ 'dm-migrations', '1.0.0'], ['dm-sqlite-adapter', '1.0.0'], [ 'rake', '0.8.2' ], [ 'addressable', '2.2.7' ],
-      [ 'allison', '2.0.3'], [ 'data_objects', '0.10.2' ], [ 'extlib', '0.9.15' ], [ 'json_pure', '1.6.5' ], [ 'prawn-core', '0.8.4' ], [ 'prawn-layout', '0.8.4'], ['prawn-security', '0.8.4'],  ['haml', '2.2.24'], ['hanna', '0.1.12'], ['metaclass', '0.0.1'],
+      ['highline', "1.5.2"], ['activerecord', '3.2.6'], ['activesupport', '3.2.6'], ['prawn', '0.8.4'], [ 'rake', '0.8.2' ],
+      [ 'allison', '2.0.3'], [ 'extlib', '0.9.15' ], [ 'json_pure', '1.6.5' ], [ 'prawn-core', '0.8.4' ], [ 'prawn-layout', '0.8.4'], ['prawn-security', '0.8.4'],  ['haml', '2.2.24'], ['hanna', '0.1.12'], ['metaclass', '0.0.1'],
       ['rspec', '1.3.0' ], ['mocha', '0.10.4'], ['rubyforge', '2.0.4'], ['rdoc', '2.3.0'], [ 'gemcutter', '0.7.1'], ['echoe', '4.5.6']
    ]
   p.development_dependencies = [ ]

data/bin/rtt

@@ -2,9 +2,9 @@
 # The command line Haml parser.
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
-require 'rtt/system_extensions'
+require 'extensions/kernel'
 with_warnings_suppressed do
-    require 'rtt'
+  require 'rtt'
   Rtt.init
   command = Rtt.capture(ARGV)
   Rtt.execute(command)

data/db/config.yml

@@ -0,0 +1,10 @@
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/db/schema.rb

@@ -0,0 +1,43 @@
+ActiveRecord::Schema.define :version => 0 do
+
+  create_table :clients, :force => true do |t|
+    t.string :name, :default => Client::DEFAULT_NAME
+    t.string :description, :default => Client::DEFAULT_DESCRIPTION
+    t.boolean :active, :default => false
+  end
+
+  create_table :projects, :force => true do |t|
+    t.string :name, :default => Project::DEFAULT_NAME
+    t.string :description, :default => Project::DEFAULT_DESCRIPTION
+    t.boolean :active, :default => false
+    t.float :rate
+    t.integer :client_id
+  end
+
+  create_table :tasks, :force => true do |t|
+    t.string :name
+    t.date :date
+    t.boolean :active, :default => false
+    t.datetime :start_at
+    t.datetime :end_at
+    t.float :accumulated_spent_time, :default => 0
+    t.float :rate, :default => 0
+    t.integer :user_id
+    t.integer :project_id
+  end
+
+  create_table :users, :force => true do |t|
+    t.string :nickname
+    t.string :first_name
+    t.string :last_name
+    t.string :company
+    t.string :address
+    t.string :city
+    t.string :country
+    t.string :email
+    t.string :phone
+    t.string :zip
+    t.string :site
+    t.boolean :active, :default => false
+  end
+end

data/lib/extensions/date.rb

@@ -0,0 +1,15 @@
+class Date
+
+  class << self
+    unless method_defined?(:day_fraction_to_time)
+      SECONDS_IN_DAY = Rational(1, 86400)
+
+      def day_fraction_to_time(fr)
+        ss,  fr = fr.divmod(SECONDS_IN_DAY) # 4p
+        h,   ss = ss.divmod(3600)
+        min, s  = ss.divmod(60)
+        return h, min, s, fr
+      end
+    end
+  end
+end

data/lib/models/client.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+class Client < ActiveRecord::Base
+
+  DEFAULT_NAME = 'default'
+  DEFAULT_DESCRIPTION = 'Default Client'
+
+  has_many :projects
+
+  before_create do |client|
+    client.active = true if Client.all.length == 0
+  end
+
+  def self.default
+    first_or_create :active => true
+  end
+
+  def self.current_active?
+    where(:active => true).first
+  end
+
+  def activate
+    deactivate_all
+    self.active = true
+    self.save
+    self
+  end
+
+  def deactivate_all
+    Client.all.each do |client|
+      client.active = false
+      client.save
+    end
+  end
+end

data/lib/models/project.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/ruby -w
+class Project < ActiveRecord::Base
+
+  DEFAULT_NAME = 'default'
+  DEFAULT_DESCRIPTION = 'Default Project'
+
+  has_many :tasks
+  has_many :users, :through => :tasks
+  belongs_to :client
+
+  before_validation :set_default_client
+
+  before_create do |project|
+    project.active = true if Project.all.length == 0
+  end
+
+  def self.default
+    find_or_create_by_active true
+  end
+
+  def self.current_active?
+    where(:active => true).first
+  end
+
+  def activate
+    deactivate_all
+    self.active = true
+    self.save
+    self
+  end
+
+  def deactivate_all
+    Project.all.each do |project|
+      if project.id != self.id
+        project.active = false
+        project.save
+      end
+    end
+  end
+
+  def set_default_client
+    self.client = Client.default if self.client.nil?
+  end
+end

data/lib/models/task.rb

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+class Task < ActiveRecord::Base
+
+  DEFAULT_NAME = 'Default task'
+
+  belongs_to :project
+  has_one :client, :through => :project
+  belongs_to :user
+
+  before_validation :set_default_project
+  before_validation :set_default_user
+
+  def self.task(task_name)
+    base_attributes = { :name => task_name, :user_id => Rtt.current_user.id, :date => Date.today, :rate => (Rtt.current_project.rate if Rtt.current_project.present?) }
+    if task_name.nil?
+      existing_task = Task.where(:active => true).first
+      if existing_task
+        existing_task
+      else
+        base_attributes.merge!(:name => DEFAULT_NAME) if task_name.blank?
+        Task.create(base_attributes)
+      end
+    elsif (existing_task = Task.where(base_attributes).where(Task.arel_table[:start_at].gt(Date.today.beginning_of_day)).first).present?
+      existing_task
+    else
+      Task.create(base_attributes)
+    end
+  end
+
+  def start
+    self.start_at = DateTime.now
+    self.active = true
+    save
+    self
+  end
+
+  def add_current_spent_time_to_accumulated_spent_time
+    self.accumulated_spent_time = self.accumulated_spent_time + self.time_difference_since_start_at
+  end
+
+  def clone_task(task)
+    task = self.dup
+    task.id = nil
+    task
+  end
+
+  def duration
+    return '-' if end_at.blank?
+    convert_to_hour_and_minutes(accumulated_spent_time)
+  end
+
+  def duration=(d)
+    return unless !!/^(\d{1,2})[hH]{1,2}(\d{1,2})[mM]{1,2}$/.match(d)
+    self.start_at = DateTime.parse('00:00:01', self.date)
+    self.end_at = DateTime.parse('00:00:01', self.date).advance(:hours => $1.to_i, :minutes => $2.to_i, :seconds => 1)
+    self.accumulated_spent_time = self.time_difference_since_start_at
+  end
+
+  def set_default_project
+    self.project = Project.default if self.project.nil?
+  end
+
+  def set_default_user
+    self.user = User.default if self.user.nil?
+  end
+
+  def stop
+    split_task if span_multiple_days?
+    finish
+    self
+  end
+
+  def pause
+    split_task if span_multiple_days?
+    finish(DateTime.now, true)
+    self
+  end
+
+  def time_difference_since_start_at
+    end_date_or_now = self.end_at ? self.end_at : DateTime.now
+    end_date_or_now.to_datetime - self.start_at.to_datetime
+  end
+
+  private
+
+  def convert_to_hour_and_minutes(dif)
+    hours, mins = time_diff_in_hours_and_minutes(dif)
+    "#{hours}h#{mins}m"
+  end
+
+  def finish(end_at = DateTime.now, activation = false)
+    self.end_at = end_at
+    self.date = end_at.to_date
+    self.add_current_spent_time_to_accumulated_spent_time
+    self.active = activation
+    self.save
+  end
+
+  def save_in_between_days_split(date)
+    task = clone_task(self)
+    task.start_at = date.beginning_of_day
+    end_at = date.end_of_day.to_datetime
+    task.send(:finish, end_at)
+    task.save
+  end
+
+  def save_last_task_split(date)
+    task = clone_task(self)
+    end_at = date.end_of_day.to_datetime
+    task.send(:finish, end_at)
+    task.save
+  end
+
+  def span_multiple_days?
+    self.start_at.day != Date.today.day
+  end
+
+  def split_task
+    date = Date.today - 1
+    while (date.to_datetime > self.start_at)
+      save_in_between_days_split(date)
+      date -= 1
+    end
+    save_last_task_split(date)
+    self.start_at = Date.today.beginning_of_day.to_datetime
+  end
+
+  def time_diff_in_hours_and_minutes(dif)
+    Date::day_fraction_to_time(dif)
+  end
+end