rtt 0.0.3 → 0.0.4

data/Gemfile

@@ -11,7 +11,7 @@ gem 'rake', '0.8.2'
 gem 'gemcutter', '0.7.1'
 
 group :development do
-  gem 'debugger'
+  gem 'debugger', '1.2.0'
   gem 'rspec', '1.3.0'
   gem 'mocha'
   gem 'hanna'

data/Gemfile.lock

@@ -62,7 +62,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 3.2.6)
   activesupport (= 3.2.6)
-  debugger
+  debugger (= 1.2.0)
   echoe
   gemcutter (= 0.7.1)
   hanna

data/Manifest

@@ -8,8 +8,8 @@ USAGE.txt
 bin/rtt
 db/config.yml
 db/production.sqlite3
+db/rtt.sqlite3
 db/schema.rb
-db/test.sqlite3
 lib/extensions/array.rb
 lib/extensions/date.rb
 lib/extensions/hash.rb

data/README.textile

@@ -110,4 +110,4 @@ Enjoy!
 
 h2. Questions/Comments
 
-Feel free to email {Marcelo Andrés Giorgi Martínez}[mailto:marklazz.uy@gmail.com] for any comment or question.
+Feel free to email "Marcelo Andrés Giorgi Martínez":mailto:marklazz.uy@gmail.com for any comment or question.

data/Rakefile

@@ -3,7 +3,7 @@ require 'echoe'
 
 # PACKAGING ============================================================
 
-Echoe.new('rtt', '0.0.3') do |p|
+Echoe.new('rtt', '0.0.4') do |p|
   p.description = 'RTT is a tool for tracking time'
   p.url = 'http://github.com/marklazz/rtt'
   p.author = 'Marcelo Giorgi'

data/db/config.yml

@@ -8,3 +8,4 @@ test:
   database: db/test.sqlite3
   pool: 5
   timeout: 5000
+

data/lib/rtt.rb

@@ -8,7 +8,7 @@ Dir[File.expand_path(File.join(File.dirname(__FILE__), 'rtt', '*'))].each { |lib
 
 module Rtt
 
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 
   extend self
 

data/lib/rtt/query_builder.rb

@@ -6,8 +6,8 @@ module Rtt
     #
     def query 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 = relation.where(table[:date].gt(options.delete(:from))) if options[:from]
+      relation = relation.where(table[:date].lt(options.delete(:to))) if options[:to]
       relation
     end
 
@@ -19,9 +19,9 @@ module Rtt
 
     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?
+      options[:date] = Date.today if options[:to].blank? and options[:from].blank? and options[:date].blank?
       conditions = options.reject { |k,_| k.to_s == 'from' || k.to_s == 'to' }
-      conditions[:date] = Date.parse(options.delete(:date)) if options[:date]
+      conditions[:date] = options.delete(:date) if options[:date]
       conditions[:user] = { :nickname => options.delete(:nickname) } if options[:nickname]
       conditions[:project] = { :name => options.delete(:project) } if options[:project]
       conditions.deep_merge!({ :project => { :client => { :name => options.delete(:client) } }}) if options[:client]

data/rtt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rtt"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]
@@ -11,12 +11,12 @@ Gem::Specification.new do |s|
   s.email = "marklazz.uy@gmail.com"
   s.executables = ["rtt"]
   s.extra_rdoc_files = ["LICENSE", "README.textile", "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.textile", "Rakefile", "USAGE.txt", "bin/rtt", "db/config.yml", "db/production.sqlite3", "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", "rtt.gemspec", "spec/ar_spec_helper.rb", "spec/lib/models/task_spec.rb", "spec/lib/rtt_spec.rb", "tasks/rtt.rake", "Manifest"]
+  s.files = ["Gemfile", "Gemfile.lock", "LICENSE", "Manifest", "README.textile", "Rakefile", "USAGE.txt", "bin/rtt", "db/config.yml", "db/rtt.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", "rtt.gemspec"]
   s.homepage = "http://github.com/marklazz/rtt"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtt", "--main", "README.textile"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "rtt"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.11"
   s.summary = "RTT is a tool for tracking time"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtt
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,324 +13,224 @@ date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23495160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+  version_requirements: *23495160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23494500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
+  version_requirements: *23494500
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23493980 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
+  version_requirements: *23493980
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23493240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+  version_requirements: *23493240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23492400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+  version_requirements: *23492400
 - !ruby/object:Gem::Dependency
   name: allison
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23489740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
+  version_requirements: *23489740
 - !ruby/object:Gem::Dependency
   name: extlib
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23526360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.9.15
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.15
+  version_requirements: *23526360
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23525100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.5
+  version_requirements: *23525100
 - !ruby/object:Gem::Dependency
   name: prawn-core
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23523600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+  version_requirements: *23523600
 - !ruby/object:Gem::Dependency
   name: prawn-layout
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23521960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+  version_requirements: *23521960
 - !ruby/object:Gem::Dependency
   name: prawn-security
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23520460 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.4
+  version_requirements: *23520460
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23544800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.2.24
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.2.24
+  version_requirements: *23544800
 - !ruby/object:Gem::Dependency
   name: hanna
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23542760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.1.12
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.12
+  version_requirements: *23542760
 - !ruby/object:Gem::Dependency
   name: metaclass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23541580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
+  version_requirements: *23541580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23540900 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+  version_requirements: *23540900
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23539940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.10.4
+  version_requirements: *23539940
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23538740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+  version_requirements: *23538740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23537420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
+  version_requirements: *23537420
 - !ruby/object:Gem::Dependency
   name: gemcutter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23552760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+  version_requirements: *23552760
 - !ruby/object:Gem::Dependency
   name: echoe
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &23551380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 4.5.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.5.6
+  version_requirements: *23551380
 description: RTT is a tool for tracking time
 email: marklazz.uy@gmail.com
 executables:
@@ -360,14 +260,13 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Manifest
 - README.textile
 - Rakefile
 - USAGE.txt
 - bin/rtt
 - db/config.yml
-- db/production.sqlite3
-- db/schema.rb
-- db/test.sqlite3
+- db/rtt.sqlite3
 - lib/extensions/array.rb
 - lib/extensions/date.rb
 - lib/extensions/hash.rb
@@ -383,12 +282,11 @@ files:
 - lib/rtt/query_builder.rb
 - lib/rtt/report_generator.rb
 - lib/rtt/storage.rb
-- rtt.gemspec
 - spec/ar_spec_helper.rb
 - spec/lib/models/task_spec.rb
 - spec/lib/rtt_spec.rb
 - tasks/rtt.rake
-- Manifest
+- rtt.gemspec
 homepage: http://github.com/marklazz/rtt
 licenses: []
 post_install_message: 
@@ -415,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: rtt
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: RTT is a tool for tracking time

data/db/schema.rb

@@ -1,43 +0,0 @@
-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