rtt 0.0.0.12 → 0.0.0.13

data/Rakefile

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

data/lib/rtt.rb

@@ -72,7 +72,7 @@ module Rtt
       say 'Task List'
       say '========='
       query(options).each do |task|
-        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"
+        say "Task: #{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
 

data/lib/rtt/cmd_line_parser.rb

@@ -134,7 +134,8 @@ module Rtt
         when SetUserCommand
           set_user(cmd.name)
         when DeleteCommand
-          options = env_filters.merge!(:name => cmd.next_optional)
+          name = cmd.name
+          options = name.present? ? env_filters.merge!(:name => name) : env_filters
           delete(options)
         when ConfigureCommand
           case cmd.name.downcase

data/lib/rtt/interactive_configurator.rb

@@ -92,28 +92,34 @@ 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)
-      say "Modify the task information (with name: #{task.name})"
-      say "================================"
-      name = unless agree_or_enter('Want to keep current name')
-              ask("Name:") { |q| q.validate = /^\w+$/ }
-             else
-              task.name
+      if task.present?
+          say "Modify the task information (with name: #{task.name})"
+          say "================================"
+          name = unless agree_or_enter('Want to keep current name')
+                  ask("Name:") { |q| q.validate = /^\w+$/ }
+                 else
+                  task.name
+          end
+          rate = ask_or_default('rate', "Rate:", (task.rate if task.present?), /^[\d]+(\.[\d]+){0,1}$/)
+          task.rate = rate.to_f
+          task.name = name
+          date= ask_or_default('Date', "Date [Format: DD-MM-YYYY]:", (task.date.strftime("%d-%m-%Y") if task.present? && task.date.present?), /^\d{2,2}-\d{2,2}-\d{4,4}$/)
+          task.date = Date.parse(date) if date.present? && task.date != date
+          task.start_at = date
+          task.end_at = date
+          duration = ask_or_default('duration', "Duration:", (task.duration if task.present?), /^(\d{1,2})[hH]{1,2}(\d{1,2})[mM]{1,2}$/)
+          task.duration=(duration) if duration.present?
+          project_name = ask_or_default('project', 'Project name:', (task.project.name if task.present? && task.project.present?), /^\w+$/)
+          task.project=(build_project_if_not_exists(project_name)) if task.project.blank? || project_name != task.project.name
+          user_name = ask_or_default('user', 'User nickname:', (task.user.nickname if task.present? && task.user.present?), /^\w+$/)
+          task.user=(build_user_if_not_exists(user_name)) if task.user.blank? || user_name != task.user.nickname
+          task.save
+          task
+      else
+          name.blank? ?
+          say("There is no active task to configure. Please add the name of task, to this command, to modify it.") :
+          say("There is no task with that name. Please check the available tasks with 'rtt list'.")
       end
-      rate = ask_or_default('rate', "Rate:", (task.rate if task.present?), /^[\d]+(\.[\d]+){0,1}$/)
-      task.rate = rate.to_f
-      task.name = name
-      date= ask_or_default('Date', "Date [Format: DD-MM-YYYY]:", (task.date.strftime("%d-%m-%Y") if task.present? && task.date.present?), /^\d{2,2}-\d{2,2}-\d{4,4}$/)
-      task.date = Date.parse(date) if date.present? && task.date != date
-      task.start_at = date
-      task.end_at = date
-      duration = ask_or_default('duration', "Duration:", (task.duration if task.present?), /^(\d{1,2})[hH]{1,2}(\d{1,2})[mM]{1,2}$/)
-      task.duration=(duration) if duration.present?
-      project_name = ask_or_default('project', 'Project name:', (task.project.name if task.present? && task.project.present?), /^\w+$/)
-      task.project=(build_project_if_not_exists(project_name)) if task.project.blank? || project_name != task.project.name
-      user_name = ask_or_default('user', 'User nickname:', (task.user.nickname if task.present? && task.user.present?), /^\w+$/)
-      task.user=(build_user_if_not_exists(user_name)) if task.user.blank? || user_name != task.user.nickname
-      task.save
-      task
     end
 
     private

data/lib/rtt/report_generator.rb

@@ -18,12 +18,14 @@ module Rtt
     }
 
     def column_widths(fixed_fields)
-      case fixed_fields.length
-        when 2
-          { 0 => 360, 1 => 60, 2 => 60, 3 => 60 } # total = 540 px
-        when 1
+      case fixed_fields
+        when ['Date', 'Client', 'Project']
+          { 0 => 430, 1 => 50, 2 => 60 } # total = 540 px
+        when ['Client', 'Project']
+          { 0 => 360, 1 => 60, 2 => 60, 3 => 60 }
+        when ['Project', '']
           { 0 => 80, 1 => 290, 2 => 60, 3 => 50, 4 => 60 }
-        else
+        when []
           { 0 => 80, 1 => 80, 2 => 210, 3 => 60, 4 => 50, 5 => 60 }
       end
     end
@@ -82,6 +84,7 @@ module Rtt
     def has_default_value?(field)
       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")
     end
 
@@ -156,6 +159,7 @@ module Rtt
                      :right_margin => 1.cm,    # units
                      :top_margin => 0.1.dm,    # work
                      :bottom_margin => 0.01.m, # well
+                     :bottom_padding => 0.04.m,
                      :page_size => 'A4') do
 
         report_generator.fill_user_information(self) if report_generator.custom_user_is_defined?
@@ -195,8 +199,10 @@ module Rtt
         text "Total costs: $#{sprintf('%.1f', total_amount)}"
         move_down 10
 
-        number_pages "Page <page> / <total>", [bounds.right - 80, 0]
+        font_size 14
+        number_pages "Page <page> / <total>", [bounds.right - 80, -10]
         say "Report saved at #{output_path}"
+
         render_file output_path
       end
     rescue LoadError

data/rtt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rtt}
-  s.version = "0.0.0.12"
+  s.version = "0.0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rtt
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 0
   - 0
-  - 12
-  version: 0.0.0.12
+  - 13
+  version: 0.0.0.13
 platform: ruby
 authors: 
 - Marcelo Giorgi