rtt 0.0.0.7 → 0.0.0.8

data/Manifest

@@ -5,21 +5,53 @@ Rakefile
 USAGE.txt
 bin/rtt
 db/rtt.sqlite3
+db/rtt2.sqlite3
 db/test.sqlite3
 lib/rtt.rb
 lib/rtt/client.rb
-lib/rtt/cmd_line_interpreter.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/task.rb
 lib/rtt/user.rb
-lib/rtt/user_configurator.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
+todo.txt
+vendor/highline-1.5.2/CHANGELOG
+vendor/highline-1.5.2/INSTALL
+vendor/highline-1.5.2/LICENSE
+vendor/highline-1.5.2/README
+vendor/highline-1.5.2/Rakefile
+vendor/highline-1.5.2/TODO
+vendor/highline-1.5.2/examples/ansi_colors.rb
+vendor/highline-1.5.2/examples/asking_for_arrays.rb
+vendor/highline-1.5.2/examples/basic_usage.rb
+vendor/highline-1.5.2/examples/color_scheme.rb
+vendor/highline-1.5.2/examples/limit.rb
+vendor/highline-1.5.2/examples/menus.rb
+vendor/highline-1.5.2/examples/overwrite.rb
+vendor/highline-1.5.2/examples/page_and_wrap.rb
+vendor/highline-1.5.2/examples/password.rb
+vendor/highline-1.5.2/examples/trapping_eof.rb
+vendor/highline-1.5.2/examples/using_readline.rb
+vendor/highline-1.5.2/lib/highline.rb
+vendor/highline-1.5.2/lib/highline/color_scheme.rb
+vendor/highline-1.5.2/lib/highline/compatibility.rb
+vendor/highline-1.5.2/lib/highline/import.rb
+vendor/highline-1.5.2/lib/highline/menu.rb
+vendor/highline-1.5.2/lib/highline/question.rb
+vendor/highline-1.5.2/lib/highline/system_extensions.rb
+vendor/highline-1.5.2/setup.rb
+vendor/highline-1.5.2/test/tc_color_scheme.rb
+vendor/highline-1.5.2/test/tc_highline.rb
+vendor/highline-1.5.2/test/tc_import.rb
+vendor/highline-1.5.2/test/tc_menu.rb
+vendor/highline-1.5.2/test/ts_all.rb

data/README.rdoc

@@ -10,11 +10,11 @@ If no <task-name> is specified the last paused one is activated, otherwise a tas
 
 Then to stop the timer, you can do:
 
-$ rtt stop
+$ rtt stop | pause | resume (if there is a paused task)
 
 Also, by just typying: 'rtt start', without specifying the task, it would default to the previous task.
 
-If you start a task with the same name as one already stored for the very same day, then the elapsed time for both activities will be sum into just one task.
+If you start a task with the same name as one already stored for the very same day, then both task will be merged (suming the time of each one of those).
 
 Installation
 ------------
@@ -23,12 +23,18 @@ Installation
 
 After installing the gem you will need to setup some basic information of yours (data to be printed in the reports). With the following command:
 
-$ rtt user <user-nick-name>
+$ rtt configure user [<user-nick-name>]
 
 Then you will be prompt for First name, Last name, country, city, e-mail, site, etc. Information that will be used to fill-in the reports. 
 
 The only required field is the Nickname, which identifies the user.
 
+To configure the current Project and Client you can use an analogous command:
+
+$ rtt configure project | rtt configure client
+
+After which, you'll be prompted for the attributes for those models.
+
 How to start a task?
 --------------------
 
@@ -37,15 +43,17 @@ $ rtt '<task-name>' ( or the more explicit way: 'rtt start <task-name>')
 
 That simple!
 
+Note: This command will create a task for the current configured user, project and client.
+
 More about the API
 ------------------
 
-Task can be grouped in Projects. For that you must set the project before starting the timer, in the following way:
+To change the current project. You can do this:
 
 $ rtt project <project-name>
 ..
 
-Anagolous, you can define a Client for the current project by typing:
+Anagolous, you can change the current Client by typing:
 
 $ rtt client <client-name>
 
@@ -72,6 +80,10 @@ $ PROJECT=SomeProject rtt report
 
 This will generate a report for the project 'SomeProject'.
 
+$ FROM=20-01-2010 TO=25-01-2010 CLIENT=SomeClient rtt report
+
+The output for this command will produce a report only for the task started after 20th of January and before 25th of January and also that were produced for the client called 'SomeClient'.
+
 Questions/Comments
 ------------------
 

data/Rakefile

@@ -3,13 +3,13 @@ require 'echoe'
 
 # PACKAGING ============================================================
 
-Echoe.new('rtt', '0.0.0.7') do |p|
+Echoe.new('rtt', '0.0.0.8') 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.0'], ['prawn', '>= 0.8.0'], 'data_mapper', 'dm-sqlite-adapter' ]
+  p.runtime_dependencies = [ ['highline', ">= 1.5.2"], ['activesupport', '>= 2.3.0'], ['prawn', '>= 0.8.0'], ['dm-core', '>= 1.0.0'], [ 'dm-migrations', '>= 1.0.0'], 'dm-sqlite-adapter' ]
   p.development_dependencies = [ 'spec' ]
 end
 

data/USAGE.txt

@@ -1,13 +1,51 @@
+
 RTT is a tool for tracking time. It's primary extend is to be used from command line.
+=====================================================================================
 
 Usage:
 
- rtt start <task-name>
- rtt pause
- rtt stop
- rtt user <nickname>
- rtt client <client-name>
- rtt project <project-name>
- rtt rename <new-name-current-task>
- rtt list
- rtt report <filename>.pdf
+ - rtt start <task-name> | rtt <task-name>
+
+ Starts a new task (or existing task with that name) for the current project/client/user.
+
+ - rtt pause
+
+ Pauses the current task.
+
+ - rtt resume
+
+ Resumes the last paused task.
+
+ - rtt stop
+
+ Stops the current task.
+
+ - rtt user <nickname>
+
+ Changes the current user. If there is no user with the nickname specified it ask for user information interactivly.
+
+ - rtt client <client-name>
+
+ Sets the current client with with name specified (creates one client if there no client stored with that name).
+
+ - rtt project <project-name>
+
+ Sets the current project with the specified name.
+
+ - rtt rename <new-name-current-task>
+
+ Rename current task
+
+ - CLIENT=some_client rtt list | CLIENT=some_client PROJECT=some_project rtt list | PROJECT=some_project rtt list
+
+ List all tasks created for the filters provided.
+
+ - rtt report <filename>
+
+ Generates a report to be stored on on the path specified.
+
+ - rtt configure (client|project|user|task)
+
+ Allows to change properties of current objects.
+
+Enjoy!

data/lib/rtt.rb

@@ -10,22 +10,44 @@ module Rtt
 
   class << self
     
-    include CmdLineInterpreter
+    include CmdLineParser
     include QueryBuilder
     include ReportGenerator
     include Storage
 
+    def update_task(name, conditions)
+      extend(InteractiveConfigurator)
+      configure_task(name, conditions)
+    end
+
     def current_user
-      User.first :active => true
+      active = User.first :active => true
+      return active if active.present?
+      User.find_or_create_active
     end
 
-    def set_user(nickname = nil)
-      current_user.deactivate if current_user
-      if nickname && (user = User.first(:nickname => nickname)).present?
-        user.activate
+    def delete(options = {})
+      if current_task && options.blank?
+        current_task.destroy
       else
-        extend(UserConfigurator)
+          require 'ruby-debug'; debugger;
+          
+        query(options).map(&:destroy)
+      end
+    end
+
+    def set_user(nickname = nil, configure = false)
+      user = if nickname.blank?
+               current_user
+             else
+               User.first(:nickname => nickname)
+      end
+      current_user.deactivate if current_user
+      if user.blank? || configure
+        extend(InteractiveConfigurator)
         configure_user(nickname)
+      else
+        user.activate
       end
     end
 
@@ -49,10 +71,10 @@ module Rtt
     #   Rtt.list :from => '2010-5-3', :to => '2010-5-20'
     #
     def list options = {}
-      puts 'Task List'
-      puts '========='
+      say 'Task List'
+      say '========='
       query(options).each do |task|
-        puts "Name: #{task.name} elapsed time: #{task.duration} #{'[ACTIVE]' if task.active}"
+        say "Name: #{task.name} || Client: #{task.client.name} || Project: #{task.project.name} || User: #{task.user.nickname} || Elapsed time: #{task.duration} #{'[ACTIVE]' if task.active} \n"
       end
     end
 
@@ -72,17 +94,39 @@ module Rtt
     # Usage
     #
     # set_client name
-    def set_client name
-      deactivate_current_client if current_client
-      client = client(name)
-      client.activate
+    def set_client(name = nil, configure = false)
+      if name.blank? || configure
+        extend(InteractiveConfigurator)
+        configure_client(name)
+      else
+        raise ParametersNotMatchCommandSignatureError if name.blank?
+        deactivate_current_client if current_client
+        client = client(name)
+        unless client.active
+          client.activate
+        else
+          client.save
+        end
+      end
     end
 
-    def set_project project_name, client_name = nil
-      deactivate_current_project if current_project
-      client = client(client_name) unless client_name.nil?
-      project = Project.first_or_create :name => project_name, :description => project_name
-      project.activate_with_client(client)
+    def set_project(project_name = nil, client_name = nil, configure = false)
+      if project_name.blank? || configure
+        extend(InteractiveConfigurator)
+        configure_project(project_name, client_name)
+      else
+        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.client = client
+        project.description = project_name
+        unless project.active
+          project.activate
+        else
+          project.save
+        end
+      end
     end
 
     # Starts a new timer. It stops the current task if there is any.
@@ -104,6 +148,18 @@ module Rtt
       current_task.stop if current_task
     end
 
+    def current_client
+      Client.first :active => true
+    end
+
+    def current_project
+      Project.first :active => true
+    end
+
+    def current_task
+      Task.first :active => true
+    end
+
     private
 
     def client(name)
@@ -121,17 +177,5 @@ module Rtt
       project.active = false
       project.save
     end
-
-    def current_client
-      Client.first :active => true
-    end
-
-    def current_project
-      Project.first :active => true
-    end
-
-    def current_task
-      Task.first :active => true
-    end
   end
 end

data/lib/rtt/client.rb

@@ -12,14 +12,31 @@ module Rtt
     property :active, Boolean, :default => false
     has n, :projects #, :through => Resource
 
+    before :create do |client|
+      client.active = true if Client.all.length == 0
+      true
+    end
+
     def self.default
       first_or_create :active => true
     end
 
+    def self.current_active?
+      first :active => true
+    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
 end

data/lib/rtt/{cmd_line_interpreter.rb → cmd_line_parser.rb}

@@ -2,18 +2,28 @@
 module Rtt
   class Command
     attr_accessor :name, :optional
+
+    def next_optional
+      optional.shift if optional.present?
+    end
+  end
+  class ConfigureCommand < Command
+    NUMBER_OF_PARAM_REQUIRED = 1
+  end
+  class DeleteCommand < Command
+    NUMBER_OF_PARAM_REQUIRED = 0
   end
   class PauseCommand < Command
     NUMBER_OF_PARAM_REQUIRED = 0
   end
   class SetProjectCommand < Command
-    NUMBER_OF_PARAM_REQUIRED = 1
+    NUMBER_OF_PARAM_REQUIRED = 0
   end
   class SetUserCommand < Command
     NUMBER_OF_PARAM_REQUIRED = 0
   end
   class SetClientCommand < Command
-    NUMBER_OF_PARAM_REQUIRED = 1
+    NUMBER_OF_PARAM_REQUIRED = 0
   end
   class StartCommand < Command
     NUMBER_OF_PARAM_REQUIRED = 0
@@ -32,8 +42,9 @@ module Rtt
   end
   class CommandNotFoundError < StandardError; end
   class TaskNotStartedError < StandardError; end
+  class ParametersNotMatchCommandSignatureError < StandardError; end
 
-  module CmdLineInterpreter
+  module CmdLineParser
 
     COMMAND_MAPPING = {
      :project => SetProjectCommand,
@@ -45,7 +56,9 @@ module Rtt
      :list => QueryCommand,
      :pause => PauseCommand,
      :resume => StartCommand,
-     :user => SetUserCommand
+     :user => SetUserCommand,
+     :delete => DeleteCommand,
+     :configure => ConfigureCommand
     }
 
     def capture(arguments)
@@ -55,8 +68,14 @@ module Rtt
           klazz = COMMAND_MAPPING[operation]
           if arguments.length >= klazz::NUMBER_OF_PARAM_REQUIRED
             command = klazz.new
-            command.name = arguments.shift
-            command.optional = arguments if arguments.present?
+            first_argument = arguments.shift
+            if /^--.*$/.match(first_argument)
+              command.name = nil
+              command.optional = [first_argument]
+            else
+              command.name = first_argument
+              command.optional = arguments if arguments.present?
+            end
             Array(command)
           end
         elsif operation.present?
@@ -71,7 +90,7 @@ module Rtt
     end
 
     def env_filters
-      [ 'client', 'project' ].inject({}) do |filters, key|
+      [ 'date', 'nickname', 'from', 'to', 'client', 'project' ].inject({}) do |filters, key|
         filters[key.to_sym] = env_variable(key) if env_variable(key).present?
         filters
       end
@@ -83,7 +102,7 @@ module Rtt
 
     def execute(cmds)
       cmds.each { |cmd| execute_single(cmd) }
-      puts "Operation(s) succeded."
+      say "Operation(s) succeded."
     rescue => e
       handle_error(e)
     end
@@ -91,12 +110,14 @@ module Rtt
     def execute_single(cmd)
       case cmd
         when SetProjectCommand
-          client = cmd.optional if cmd.optional.present?
+          client = cmd.optional.shift if cmd.optional.present? && (/^--.*$/.match(cmd.optional.first)).blank?
           set_project(cmd.name, client)
         when SetClientCommand
           set_client(cmd.name)
         when StartCommand
           start(cmd.name)
+        when RenameCommand
+          rename(cmd.name)
         when PauseCommand
           if current_task.present?
               pause
@@ -112,6 +133,25 @@ module Rtt
           list(env_filters)
         when SetUserCommand
           set_user(cmd.name)
+        when DeleteCommand
+          delete(env_filters)
+        when ConfigureCommand
+          case cmd.name.downcase
+            when 'task'
+              update_task(cmd.optional, env_filters)
+            when 'project'
+              name = cmd.next_optional
+              client = cmd.next_optional
+              set_project(name, client, true)
+            when 'client'
+              name = cmd.next_optional
+              set_client(name, true)
+            when 'user'
+              name = cmd.next_optional
+              set_user(name, true)
+            else
+              raise CommandNotFoundError
+          end
         else
           raise CommandNotFoundError
       end
@@ -122,18 +162,18 @@ module Rtt
         when CommandNotFoundError
           return puts_usage
         when TaskNotStartedError
-          puts "There is no active task. Pause is not valid at this point."
+          say "There is no active task. Pause is not valid at this point."
       end
     end
 
     def puts_usage
-      puts
+      say('')
       File.open(File.join( File.dirname(__FILE__), '..', '..', "USAGE.txt")) do |file|
         while content = file.gets
-          puts content
+          say content
         end
       end
-      puts
+      say('')
     end
   end
 end