rtt 0.0.0.47 → 0.0.0.48

data/lib/models/user.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+class User < ActiveRecord::Base
+
+  BLANK_FIELD = ''
+  DEFAULT_NICK = 'Default user'
+
+  has_many :tasks
+  has_many :projects, :through => :tasks
+
+  def self.default
+    find_or_create_by_active(true)
+  end
+
+  def self.find_or_create_active
+    last_user = User.last
+    if last_user.present?
+      last_user.active = true
+      last_user.save
+      last_user
+    else
+      self.default
+    end
+  end
+
+  def activate
+    self.active = true
+    self.save
+    self
+  end
+
+  def deactivate
+    self.active = false
+    self.save
+    self
+  end
+
+  def full_name
+    "#{first_name.present? ? first_name : ''} #{last_name.present? ? last_name : ''}".strip
+  end
+
+  def full_name_and_nickname
+    "#{full_name.present? ? full_name : ''} #{full_name.present? ? "(#{nickname})" : nickname }".strip
+  end
+
+  def location
+    "#{self.city}#{self.city.present? && self.country.present? ? ', ' : ''}#{self.country}".strip
+  end
+end

data/lib/rtt.rb

@@ -1,13 +1,14 @@
 #!/usr/bin/env ruby
 require 'thread'
-require 'rtt/boot'
-require 'active_support'
-%w( dm-core dm-validations dm-migrations highline/import).each { |lib| require lib }
-Dir[File.expand_path(File.join(File.dirname(__FILE__), 'rtt', '*'))].each { |lib| require lib; }
+require File.expand_path 'lib/rtt/boot'
+%w( active_support active_record highline/import).each { |lib| require lib }
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'extensions', '*'))].each { |lib| require lib; }
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'models', '*'))].each { |lib| require lib; }
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'rtt', '*'))].each { |lib| require(lib) unless File.directory?(lib); }
 
 module Rtt
 
-  VERSION = '1.0'
+  VERSION = '0.0.0.48'
 
   extend self
 
@@ -24,7 +25,7 @@ module Rtt
     end
 
     def current_user
-      active = User.first :active => true
+      active = User.where(:active => true).first
       return active if active.present?
       User.find_or_create_active
     end
@@ -41,7 +42,7 @@ module Rtt
       user = if nickname.blank?
                current_user
              else
-               User.first(:nickname => nickname)
+               User.where(:nickname => nickname).first
       end
       current_user.deactivate if current_user
       if user.blank? || configure
@@ -119,7 +120,7 @@ module Rtt
         raise ParametersNotMatchCommandSignatureError if project_name.blank?
         deactivate_current_project if current_project
         client = client(client_name) unless client_name.nil?
-        project = Project.first_or_create :name => project_name
+        project = Project.find_or_create_by_name project_name
         project.client = client
         project.description = project_name
         unless project.active
@@ -150,21 +151,21 @@ module Rtt
     end
 
     def current_client
-      Client.first :active => true
+      Client.where(:active => true).first
     end
 
     def current_project
-      Project.first :active => true
+      Project.where(:active => true).first
     end
 
     def current_task
-      Task.first :active => true
+      Task.where(:active => true).first
     end
 
     private
 
     def client(name)
-      Client.first_or_create :name => name, :description => name
+      Client.find_or_create_by_name_and_description(name, name)
     end
 
     def deactivate_current_client

data/lib/rtt/cmd_line_parser.rb

@@ -99,7 +99,14 @@ module Rtt
 
     def env_filters
       [ 'date', 'nickname', 'from', 'to', 'client', 'project' ].inject({}) do |filters, key|
-        filters[key.to_sym] = env_variable(key) if env_variable(key).present?
+        if env_variable(key).present?
+          value = if key == 'date' || key == 'from' || key == 'to'
+            Date.parse(env_variable(key))
+          else
+            env_variable(key)
+          end
+          filters[key.to_sym] = value
+        end
         filters
       end
     end
@@ -152,7 +159,8 @@ module Rtt
         when ConfigureCommand
           case cmd.name.downcase
             when 'task'
-              update_task(cmd.optional, env_filters)
+              name = cmd.next_optional
+              update_task(name, env_filters)
             when 'project'
               name = cmd.next_optional
               client = cmd.next_optional

data/lib/rtt/interactive_configurator.rb

@@ -6,7 +6,7 @@ module Rtt
       say "Please fill in your Client information"
       say "======================================"
       client = if name.blank?
-       if (active_client = Client.first :active => true) && agree_or_enter("Want to modify current")
+       if (active_client = Client.where(:active => true).first) && agree_or_enter("Want to modify current")
          active_client
        else
          modify_name_or_create_model(:client, name)
@@ -29,7 +29,7 @@ module Rtt
       say "======================================="
       project = if name.blank?
           project_name = ask_or_default('Project name', "Project name:", name, /^\w+$/)
-          Project.first_or_create(:name => project_name)
+          Project.find_or_create_by_name(project_name)
         else
           modify_name_or_create_model(:project, name)
       end
@@ -37,7 +37,7 @@ module Rtt
       client_found = false
       while !client_found
         client_name=(ask("Client name:") { |q| q.validate = /^\w+$/ }) if client_name.blank?
-        client = Client.first :name => client_name
+        client = Client.where(:name => client_name).first
         if client.blank?
           say "A Client with this name is not registered."
           create_client = agree_or_enter("Want to created a Client with that name")
@@ -69,7 +69,7 @@ module Rtt
       if !skip_name || nickname.blank? || nickname == User::DEFAULT_NICK
         nickname = ask_or_default('nickname', 'Nickname (Required):', nickname, /^\w+$/)
       end
-      existing = User.first :nickname => nickname
+      existing = User.where(:nickname => nickname).first
       first_name = ask_or_default('first name', "First name:", (existing.first_name if existing.present?))
       last_name = ask_or_default('last name', 'Last name:', (existing.last_name if existing.present?))
       company = ask_or_default('company', 'Company:', (existing.company if existing.present?))
@@ -91,7 +91,11 @@ module Rtt
 
     def configure_task(name = nil, conditions = {})
       conditions.merge!(name.blank? ? { :active => true } : { :name => name })
-      task = name.blank? ? Task.first(conditions) : Task.first_or_create(conditions)
+      task = if name.blank?
+        Task.where(conditions).first
+        else
+         Task.where(conditions).first || Task.create(conditions)
+      end
       if task.present?
           say "Modify the task information (with name: #{task.name})"
           say "================================"
@@ -152,8 +156,8 @@ module Rtt
 
     def modify_name_or_create_model(model_name, name)
       class_name = model_name.to_s.capitalize
-      klazz = "Rtt::#{class_name}".constantize
-      instance = klazz.first :name => name
+      klazz = class_name.constantize
+      instance = klazz.where(:name => name).first
       if instance.present?
         instance.name=(ask("#{class_name} name:") { |q| q.validate = /^\w+$/ }) unless agree_or_enter('Want to keep current name')
         instance.save

data/lib/rtt/query_builder.rb

@@ -5,17 +5,22 @@ module Rtt
     # 
     #
     def query options = {}
-      Task.all(rtt_build_conditions(options))
+      relation = Task.where(rtt_build_conditions(options))
+      relation = relation.where(table[:date].gt(Date.parse(options.delete(:from)))) if options[:from]
+      relation = relation.where(table[:date].lt(Date.parse(options.delete(:to)))) if options[:to]
+      relation
     end
 
     private
 
+    def table
+      @table ||= Task.arel_table
+    end
+
     def rtt_build_conditions options
       # default filter for today unless a date range is specified
       options[:date] = Date.today.strftime('%d-%m-%Y') if options[:to].blank? and options[:from].blank? and options[:date].blank?
-      conditions = options
-      conditions[:date.gte] = Date.parse(options.delete(:from)) if options[:from]
-      conditions[:date.lte] = Date.parse(options.delete(:to)) if options[:to]
+      conditions = options.reject { |k,_| k.to_s == 'from' || k.to_s == 'to' }
       conditions[:date] = Date.parse(options.delete(:date)) if options[:date]
       conditions[:user] = { :nickname => options.delete(:nickname) } if options[:nickname]
       conditions[:project] = { :name => options.delete(:project) } if options[:project]

data/lib/rtt/report_generator.rb

@@ -32,7 +32,7 @@ module Rtt
     end
 
     def custom_user_is_defined?
-      current_user.present? && current_user.nickname != Rtt::User::DEFAULT_NICK
+      current_user.present? && current_user.nickname != User::DEFAULT_NICK
     end
 
     def fill_user_information(pdf)
@@ -89,7 +89,7 @@ module Rtt
       task = self.data[:rows].first
       return true if task.nil?
       return false if !(field == 'Client' || field == 'Project' || field == 'User')
-      (REPORT_FIELD_OUTPUT[field].call(task) if task.present?) == eval("Rtt::#{field}::DEFAULT_NAME")
+      (REPORT_FIELD_OUTPUT[field].call(task) if task.present?) == eval("#{field}::DEFAULT_NAME")
     end
 
     #
@@ -101,8 +101,7 @@ module Rtt
       path = options.delete(extension)
       fixed_fields = extract_fixed_fields(options)
       fixed_fields_and_values = fixed_fields.inject({}) { |hash, key| hash[key] = options[key.downcase.to_sym]; hash }
-      filter_options = options.merge({ :order => [:date.desc] })
-      @data = { :fixed_fields => fixed_fields_and_values, :rows => query(filter_options) }
+      @data = { :fixed_fields => fixed_fields_and_values, :rows => query(options).order('date desc') }
       filename_path = full_path(path)
       case extension
         when :pdf

data/lib/rtt/storage.rb

@@ -1,31 +1,38 @@
 #!/usr/bin/env ruby
+require 'rubygems'
+require 'active_record'
+require 'logger'
 module Rtt
   module Storage
 
-    DEFAULT_STORAGE_NAME = :rtt
+    def database_file
+      File.expand_path(File.join(File.dirname(__FILE__), '..', '..') + config[:production][:database])
+    end
 
     def export filename
       require 'fileutils'
-      FileUtils.cp(File.join( File.dirname(__FILE__), '..', '..', 'db', "#{DEFAULT_STORAGE_NAME.to_s}.sqlite3"), filename)
+      FileUtils.cp(database_file, filename)
     end
 
     def import filename
       require 'fileutils'
-      FileUtils.cp(filename, File.join( File.dirname(__FILE__), '..', '..', 'db', "#{DEFAULT_STORAGE_NAME.to_s}.sqlite3"))
+      FileUtils.cp(filename, database_file)
     end
 
-    def init(database = :rtt)
-      DataMapper.setup(:default, {:adapter => "sqlite3", :database => File.join( File.dirname(__FILE__), '..', '..', 'db', "#{database.to_s}.sqlite3") })
-      migrate unless missing_tables
-      #DataObjects::Sqlite3.logger = DataMapper::Logger.new(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'log', 'sqlite3.log')), 0)
+    def config(env)
+      @config ||= YAML::load_file(File.join(File.dirname(__FILE__), '..', '..', 'db', 'config.yml'))[env.to_s]
     end
 
-    def migrate #:nodoc:
-      DataMapper.auto_migrate!
+    def init(env = :production)
+      ActiveRecord::Base.establish_connection(config(env))
+      ActiveRecord::Base.logger = Logger.new(File.open(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'log', 'database.log')), 'a'))
+      silence_stream(STDOUT) do
+        require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'db', 'schema.rb')) unless tables_exists?
+      end
     end
 
-    def missing_tables
-      %W(rtt_projects rtt_users rtt_clients rtt_tasks).reject { |table| DataMapper.repository.storage_exists?(table) }.empty?
+    def tables_exists?
+      %w(projects clients tasks users).any? { |t| ActiveRecord::Base.connection.tables.include?(t) }
     end
   end
 end

data/rtt.gemspec

@@ -1,40 +1,34 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rtt}
-  s.version = "0.0.0.47"
+  s.name = "rtt"
+  s.version = "0.0.0.48"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]
-  s.date = %q{2012-02-26}
-  s.default_executable = %q{rtt}
-  s.description = %q{RTT is a tool for tracking time}
-  s.email = %q{marklazz.uy@gmail.com}
+  s.date = "2012-07-30"
+  s.description = "RTT is a tool for tracking time"
+  s.email = "marklazz.uy@gmail.com"
   s.executables = ["rtt"]
-  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/rtt", "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", "tasks/rtt.rake"]
-  s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "USAGE.txt", "bin/rtt", "db/rtt.sqlite3", "db/test.sqlite3", "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/lib/rtt_spec.rb", "tasks/rtt.rake"]
-  s.homepage = %q{http://github.com/marklazz/rtt}
+  s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/rtt", "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/boot.rb", "lib/rtt/cmd_line_parser.rb", "lib/rtt/interactive_configurator.rb", "lib/rtt/query_builder.rb", "lib/rtt/report_generator.rb", "lib/rtt/storage.rb", "tasks/rtt.rake"]
+  s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "README.rdoc", "Rakefile", "USAGE.txt", "bin/rtt", "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/boot.rb", "lib/rtt/cmd_line_parser.rb", "lib/rtt/interactive_configurator.rb", "lib/rtt/query_builder.rb", "lib/rtt/report_generator.rb", "lib/rtt/storage.rb", "spec/ar_spec_helper.rb", "spec/lib/models/task_spec.rb", "spec/lib/rtt_spec.rb", "tasks/rtt.rake", "Manifest", "rtt.gemspec"]
+  s.homepage = "http://github.com/marklazz/rtt"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtt", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rtt}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{RTT is a tool for tracking time}
+  s.rubyforge_project = "rtt"
+  s.rubygems_version = "1.8.23"
+  s.summary = "RTT is a tool for tracking time"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<highline>, ["= 1.5.2"])
-      s.add_runtime_dependency(%q<activesupport>, ["<= 2.3.8", ">= 2.3.5"])
+      s.add_runtime_dependency(%q<activerecord>, ["= 3.2.6"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 3.2.6"])
       s.add_runtime_dependency(%q<prawn>, ["= 0.8.4"])
-      s.add_runtime_dependency(%q<dm-core>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<dm-validations>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<rake>, ["= 0.8.2"])
-      s.add_runtime_dependency(%q<addressable>, ["= 2.2.7"])
       s.add_runtime_dependency(%q<allison>, ["= 2.0.3"])
-      s.add_runtime_dependency(%q<data_objects>, ["= 0.10.2"])
       s.add_runtime_dependency(%q<extlib>, ["= 0.9.15"])
       s.add_runtime_dependency(%q<json_pure>, ["= 1.6.5"])
       s.add_runtime_dependency(%q<prawn-core>, ["= 0.8.4"])
@@ -51,16 +45,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<echoe>, ["= 4.5.6"])
     else
       s.add_dependency(%q<highline>, ["= 1.5.2"])
-      s.add_dependency(%q<activesupport>, ["<= 2.3.8", ">= 2.3.5"])
+      s.add_dependency(%q<activerecord>, ["= 3.2.6"])
+      s.add_dependency(%q<activesupport>, ["= 3.2.6"])
       s.add_dependency(%q<prawn>, ["= 0.8.4"])
-      s.add_dependency(%q<dm-core>, ["= 1.0.0"])
-      s.add_dependency(%q<dm-validations>, ["= 1.0.0"])
-      s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
       s.add_dependency(%q<rake>, ["= 0.8.2"])
-      s.add_dependency(%q<addressable>, ["= 2.2.7"])
       s.add_dependency(%q<allison>, ["= 2.0.3"])
-      s.add_dependency(%q<data_objects>, ["= 0.10.2"])
       s.add_dependency(%q<extlib>, ["= 0.9.15"])
       s.add_dependency(%q<json_pure>, ["= 1.6.5"])
       s.add_dependency(%q<prawn-core>, ["= 0.8.4"])
@@ -78,16 +67,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<highline>, ["= 1.5.2"])
-    s.add_dependency(%q<activesupport>, ["<= 2.3.8", ">= 2.3.5"])
+    s.add_dependency(%q<activerecord>, ["= 3.2.6"])
+    s.add_dependency(%q<activesupport>, ["= 3.2.6"])
     s.add_dependency(%q<prawn>, ["= 0.8.4"])
-    s.add_dependency(%q<dm-core>, ["= 1.0.0"])
-    s.add_dependency(%q<dm-validations>, ["= 1.0.0"])
-    s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["= 1.0.0"])
     s.add_dependency(%q<rake>, ["= 0.8.2"])
-    s.add_dependency(%q<addressable>, ["= 2.2.7"])
     s.add_dependency(%q<allison>, ["= 2.0.3"])
-    s.add_dependency(%q<data_objects>, ["= 0.10.2"])
     s.add_dependency(%q<extlib>, ["= 0.9.15"])
     s.add_dependency(%q<json_pure>, ["= 1.6.5"])
     s.add_dependency(%q<prawn-core>, ["= 0.8.4"])

data/spec/ar_spec_helper.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'spec'
+require File.expand_path('lib/rtt')
+
+def setup_testing_env
+  Rtt.init(:test)
+  User.destroy_all
+  Client.destroy_all
+  Project.destroy_all
+  Task.destroy_all
+end

data/spec/lib/{rtt → models}/task_spec.rb

@@ -1,11 +1,10 @@
 require 'mocha'
-require File.join( File.dirname(__FILE__), '..', '..', 'datamapper_spec_helper')
+require File.expand_path(File.join( File.dirname(__FILE__), '..', '..', 'ar_spec_helper'))
 
-describe Rtt::Task do
+describe Task do
 
   before do
-    Rtt.init(:test)
-    Rtt.migrate
+    setup_testing_env
     @task_name = 'a_name'
     @now = Time.now
   end
@@ -16,7 +15,7 @@ describe Rtt::Task do
 
       before do
         start_at = Time.parse('May 10 13:45:00 2010', @now)
-        @task = Rtt::Task.create :name => @task_name, :start_at => start_at.to_datetime, :date => start_at.to_date
+        @task = Task.create :name => @task_name, :start_at => start_at.to_datetime, :date => start_at.to_date
       end
 
       context 'task has end_at: 2010-05-10 14:15:01' do
@@ -58,12 +57,12 @@ describe Rtt::Task do
         end
 
         it 'should have 2 tasks with the same name' do
-          Rtt::Task.all(:name => @task_name).length.should == 2
+          Task.where(:name => @task_name).count.should == 2
         end
 
         it 'should return 11h15m for 2010-05-10' do
           date = Time.parse('2010-05-10', @now).to_date
-          task = Rtt::Task.first(:name => @task_name, :date => date)
+          task = Task.where(:name => @task_name, :date => date).first
           task.duration.should == '10h14m'
         end
 
@@ -82,18 +81,18 @@ describe Rtt::Task do
         end
 
         it 'should have 3 tasks with the same name' do
-          Rtt::Task.all(:name => @task_name).length.should == 3
+          Task.where(:name => @task_name).count.should == 3
         end
 
         it 'should return 11h15m for 2010-05-11' do
           date = Time.parse('2010-05-11', @now).to_date
-          task = Rtt::Task.first(:name => @task_name, :date => date)
+          task = Task.where(:name => @task_name, :date => date).first
           task.duration.should == '23h59m'
         end
 
         it 'should return 11h15m for 2010-05-10' do
           date = Time.parse('2010-05-10', @now).to_date
-          task = Rtt::Task.first(:name => @task_name, :date => date)
+          task = Task.where(:name => @task_name, :date => date).first
           task.duration.should == '10h14m'
         end