rtt 0.0.0.1 → 0.0.0.2

data/Manifest

@@ -4,10 +4,6 @@ README.rdoc
 Rakefile
 USAGE.txt
 bin/rtt
-db/rtt.sqlite3
-db/test.sqlite3
-db/test.sqlite3-journal
-init.sh
 lib/rtt.rb
 lib/rtt/client.rb
 lib/rtt/cmd_line_interpreter.rb
@@ -20,9 +16,7 @@ lib/rtt/task.rb
 lib/rtt/user.rb
 lib/rtt/user_configurator.rb
 rtt.gemspec
-rtt_report
 spec/datamapper_spec_helper.rb
 spec/lib/rtt/task_spec.rb
 spec/lib/rtt_spec.rb
 tasks/rtt.rake
-todo.txt

data/Rakefile

@@ -3,12 +3,12 @@ require 'echoe'
 
 # PACKAGING ============================================================
 
-Echoe.new('rtt', '0.0.0.1') do |p|
+Echoe.new('rtt', '0.0.0.2') do |p|
   p.description = 'RTT is a tool for tracking time'
   p.url = 'http://www.marklazz.com'
   p.author = 'Marcelo Giorgi'
   p.email = 'marklazz.uy@gmail.com'
-  p.ignore_pattern = [ 'tmp/*', 'script/*' ]
+  p.ignore_pattern = [ 'tmp/*', 'script/*', 'db/*', '*.sh' ]
   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'] ]
   p.development_dependencies = [ 'spec' ]
 end

data/lib/rtt/cmd_line_interpreter.rb

@@ -65,6 +65,8 @@ module Rtt
           command.optional = arguments if arguments.present?
           Array(command)
         end
+      else
+        puts_usage
       end
     end
 

data/lib/rtt/report_generator.rb

@@ -55,6 +55,14 @@ module Rtt
       end
     end
 
+    def full_path(output_path = nil)
+      entered_filename = output_path || DEFAULT_FILENAME
+      filename, directory, extension = File.basename(entered_filename), File.dirname(entered_filename), File.extname(entered_filename)
+      path = directory.present? && directory != '.' && File.exists?(directory) ? directory : ENV['HOME']
+      ext = extension.present? ? extension : 'pdf'
+      "#{File.join(path, filename)}.#{ext}"
+    end
+
     #
     #
     def report options = {}
@@ -65,9 +73,10 @@ module Rtt
       fixed_fields = extract_fixed_fields(options)
       fixed_fields_and_values = fixed_fields.inject({}) { |hash, key| hash[key] = options[key.downcase.to_sym]; hash }
       @data = { :fixed_fields => fixed_fields_and_values, :rows => query(options) }
+      filename_path = full_path(path)
       case extension
         when :pdf
-          report_to_pdf path
+          report_to_pdf filename_path
         when :csv
           raise 'CSV format report not implemented yet'
           report_to_csv path
@@ -142,17 +151,19 @@ module Rtt
 
         move_down 50
 
-        table data,
-          :headers => columns,
-          #:position => :center,
-          :position => :left,
-          :border_width   => 1,
-          :row_colors => [ 'fafafa', 'f0f0f0' ],
-          :font_size => 12,
-          :padding => 5,
-          :align => :left
-          #:width =>  535
-          #:column_widths => { 1=> 50, 2 => 40, 3 => 30}
+        if data.present?
+            table data,
+              :headers => columns,
+              #:position => :center,
+              :position => :left,
+              :border_width   => 1,
+              :row_colors => [ 'fafafa', 'f0f0f0' ],
+              :font_size => 12,
+              :padding => 5,
+              :align => :left
+              #:width =>  535
+              #:column_widths => { 1=> 50, 2 => 40, 3 => 30}
+        end
 
         move_down 20
         text "Total: #{total_h}h#{total_m}m"
@@ -165,11 +176,12 @@ module Rtt
             #}.draw
         #end
         number_pages "Page <page> / <total>", [bounds.right - 80, 0]
-
-        render_file(output_path || DEFAULT_FILENAME)
+        render_file output_path
       end
     rescue LoadError
       puts "Missing gem: prawn, prawn/layout or prawn/measurement_extensions"
+    rescue => e
+      puts "[rtt] Error while generating report: #{e.to_s}"
     end
 
     def calculate_fixed_fields_based_on_data

data/rtt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rtt}
-  s.version = "0.0.0.1"
+  s.version = "0.0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcelo Giorgi"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = %q{marklazz.uy@gmail.com}
   s.executables = ["rtt"]
   s.extra_rdoc_files = ["LICENSE", "README.rdoc", "bin/rtt", "lib/rtt.rb", "lib/rtt/client.rb", "lib/rtt/cmd_line_interpreter.rb", "lib/rtt/hash_extensions.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", "tasks/rtt.rake"]
-  s.files = ["LICENSE", "Manifest", "README.rdoc", "Rakefile", "USAGE.txt", "bin/rtt", "db/rtt.sqlite3", "db/test.sqlite3", "init.sh", "lib/rtt.rb", "lib/rtt/client.rb", "lib/rtt/cmd_line_interpreter.rb", "lib/rtt/hash_extensions.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", "rtt.gemspec", "rtt_report", "spec/datamapper_spec_helper.rb", "spec/lib/rtt/task_spec.rb", "spec/lib/rtt_spec.rb", "tasks/rtt.rake", "todo.txt"]
+  s.files = ["LICENSE", "Manifest", "README.rdoc", "Rakefile", "USAGE.txt", "bin/rtt", "lib/rtt.rb", "lib/rtt/client.rb", "lib/rtt/cmd_line_interpreter.rb", "lib/rtt/hash_extensions.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", "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://www.marklazz.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rtt", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: rtt
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 75
   prerelease: false
   segments: 
   - 0
   - 0
   - 0
-  - 1
-  version: 0.0.0.1
+  - 2
+  version: 0.0.0.2
 platform: ruby
 authors: 
 - Marcelo Giorgi
@@ -142,9 +142,6 @@ files:
 - Rakefile
 - USAGE.txt
 - bin/rtt
-- db/rtt.sqlite3
-- db/test.sqlite3
-- init.sh
 - lib/rtt.rb
 - lib/rtt/client.rb
 - lib/rtt/cmd_line_interpreter.rb
@@ -157,12 +154,10 @@ files:
 - lib/rtt/user.rb
 - lib/rtt/user_configurator.rb
 - rtt.gemspec
-- rtt_report
 - spec/datamapper_spec_helper.rb
 - spec/lib/rtt/task_spec.rb
 - spec/lib/rtt_spec.rb
 - tasks/rtt.rake
-- todo.txt
 has_rdoc: true
 homepage: http://www.marklazz.com
 licenses: []

data/init.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-rm db/rtt.sqlite3
-bin/rtt client 'Emex'
-bin/rtt project 'Emex'
-bin/rtt user #'marklazz' 'Marcelo' 'Giorgi' 'marklazz' 'marklazz.uy@gmail.com' 'Uruguay' 'Montevideo' 'Palermo 5626/302' '+598 2 6000437' 'www.marklazz.com'

data/rtt_report

@@ -1,401 +0,0 @@
-%PDF-1.3
-%����
-1 0 obj
-<< /Producer (Prawn)
-/Creator (Prawn)
->>
-endobj
-2 0 obj
-<< /Type /Pages
-/Count 1
-/Kids [5 0 R]
->>
-endobj
-3 0 obj
-<< /Pages 2 0 R
-/Type /Catalog
->>
-endobj
-4 0 obj
-<< /Length 4667
->>
-stream
-/DeviceRGB cs
-0.000 0.000 0.000 scn
-/DeviceRGB CS
-0.000 0.000 0.000 SCN
-q
-
-BT
-525.166456692913 797.102456692913 Td
-/F1.0 12 Tf
-[<6d6172> -15 <6b6c617a7a>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-0.000 0.000 0.000 scn
-
-BT
-28.3464566929134 806.858456692913 Td
-/F1.0 16 Tf
-[<52> 30 <5454205265706f72> -40 <74>] TJ
-ET
-
-
-BT
-28.3464566929134 788.362456692913 Td
-/F1.0 16 Tf
-[<3d3d3d3d3d3d3d3d3d3d>] TJ
-ET
-
-
-BT
-28.3464566929134 729.866456692913 Td
-/F1.0 16 Tf
-[<436c69656e743a> 50 <20456d65> 30 <78>] TJ
-ET
-
-
-BT
-28.3464566929134 711.370456692913 Td
-/F1.0 16 Tf
-[<50726f6a6563743a> 50 <20456d65> 30 <78>] TJ
-ET
-
-0.980 0.980 0.980 scn
-28.346 631.490 74.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-28.346 654.862 m
-28.346 629.990 l
-S
-102.346 654.862 m
-102.346 629.990 l
-S
-28.346 654.362 m
-102.346 654.362 l
-S
-28.346 630.490 m
-102.346 630.490 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-33.3464566929134 638.118456692913 Td
-/F1.0 12 Tf
-[<4e616d65>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.980 0.980 0.980 scn
-102.346 631.490 59.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-102.346 654.862 m
-102.346 629.990 l
-S
-161.346 654.862 m
-161.346 629.990 l
-S
-102.346 654.362 m
-161.346 654.362 l
-S
-102.346 630.490 m
-161.346 630.490 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-107.346456692913 638.118456692913 Td
-/F1.0 12 Tf
-[<44617465>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.980 0.980 0.980 scn
-161.346 631.490 56.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-161.346 654.862 m
-161.346 629.990 l
-S
-217.346 654.862 m
-217.346 629.990 l
-S
-161.346 654.362 m
-217.346 654.362 l
-S
-161.346 630.490 m
-217.346 630.490 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-166.346456692913 638.118456692913 Td
-/F1.0 12 Tf
-[<447572> 10 <6174696f6e>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-28.346 606.118 74.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-28.346 630.990 m
-28.346 606.118 l
-S
-102.346 630.990 m
-102.346 606.118 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-33.3464566929134 614.246456692913 Td
-/F1.0 12 Tf
-[<6d6f6e6f6c6f636f>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-102.346 606.118 59.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-102.346 630.990 m
-102.346 606.118 l
-S
-161.346 630.990 m
-161.346 606.118 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-107.346456692913 614.246456692913 Td
-/F1.0 12 Tf
-[<30362d31392d3130>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-161.346 606.118 56.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-161.346 630.990 m
-161.346 606.118 l
-S
-217.346 630.990 m
-217.346 606.118 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-166.346456692913 614.246456692913 Td
-/F1.0 12 Tf
-[<3268316d>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.980 0.980 0.980 scn
-28.346 582.246 74.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-28.346 607.118 m
-28.346 582.246 l
-S
-102.346 607.118 m
-102.346 582.246 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-33.3464566929134 590.374456692913 Td
-/F1.0 12 Tf
-[<446566> 30 <61756c74207461736b>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.980 0.980 0.980 scn
-102.346 582.246 59.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-102.346 607.118 m
-102.346 582.246 l
-S
-161.346 607.118 m
-161.346 582.246 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-107.346456692913 590.374456692913 Td
-/F1.0 12 Tf
-[<30362d31392d3130>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.980 0.980 0.980 scn
-161.346 582.246 56.000 24.372 re
-f
-0.000 0.000 0.000 scn
-1 w
-161.346 607.118 m
-161.346 582.246 l
-S
-217.346 607.118 m
-217.346 582.246 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-166.346456692913 590.374456692913 Td
-/F1.0 12 Tf
-[<3068316d>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-28.346 559.874 74.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-28.346 583.246 m
-28.346 558.374 l
-S
-102.346 583.246 m
-102.346 558.374 l
-S
-28.346 558.874 m
-102.346 558.874 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-33.3464566929134 566.502456692913 Td
-/F1.0 12 Tf
-[<67> 10 <72> 10 <616e20706f6c6f>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-102.346 559.874 59.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-102.346 583.246 m
-102.346 558.374 l
-S
-161.346 583.246 m
-161.346 558.374 l
-S
-102.346 558.874 m
-161.346 558.874 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-107.346456692913 566.502456692913 Td
-/F1.0 12 Tf
-[<30362d31392d3130>] TJ
-ET
-
-0.000 0.000 0.000 scn
-0.941 0.941 0.941 scn
-161.346 559.874 56.000 22.872 re
-f
-0.000 0.000 0.000 scn
-1 w
-161.346 583.246 m
-161.346 558.374 l
-S
-217.346 583.246 m
-217.346 558.374 l
-S
-161.346 558.874 m
-217.346 558.874 l
-S
-0.000 0.000 0.000 SCN
-1 w
-
-BT
-166.346456692913 566.502456692913 Td
-/F1.0 12 Tf
-[<2d>] TJ
-ET
-
-0.000 0.000 0.000 scn
-
-BT
-28.3464566929134 527.386456692913 Td
-/F1.0 16 Tf
-[<54> 120 <6f74616c3a> 50 <203268326d>] TJ
-ET
-
-
-BT
-486.933543307087 28.3464566929133 Td
-/F1.0 16 Tf
-[<50> 40 <6167652031202f2031>] TJ
-ET
-
-Q
-
-endstream
-endobj
-5 0 obj
-<< /Parent 2 0 R
-/Type /Page
-/MediaBox [0 0 595.28 841.89]
-/Resources << /Font << /F1.0 6 0 R
->>
-/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
->>
-/Contents 4 0 R
->>
-endobj
-6 0 obj
-<< /BaseFont /Helvetica
-/Encoding /WinAnsiEncoding
-/Subtype /Type1
-/Type /Font
->>
-endobj
-xref
-0 7
-0000000000 65535 f 
-0000000015 00000 n 
-0000000071 00000 n 
-0000000128 00000 n 
-0000000177 00000 n 
-0000004896 00000 n 
-0000005076 00000 n 
-trailer
-<< /Size 7
-/Root 3 0 R
-/Info 1 0 R
->>
-startxref
-5173
-%%EOF

data/todo.txt

@@ -1,3 +0,0 @@
-1) Acomodar la firma del user en el pdf
-2) Un script para inicializar el user
-1) Hacer q el current project cambie el client