baby-bro 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/baby-bro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{baby-bro}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Doughty"]
-  s.date = %q{2010-12-07}
+  s.date = %q{2010-12-08}
   s.default_executable = %q{bro}
   s.description = %q{Baby Bro monitors timestamp changes of files and and estimates time spent actively working in project directories.}
   s.email = %q{billdoughty@capitalthought.com}

data/lib/baby-bro/exec.rb

@@ -73,7 +73,7 @@ module BabyBroExec
       # @param opts [OptionParser]
       def set_opts(opts)
         opts.banner = <<END
-Usage: bro [options] [command]
+Usage: bro [options] [command] [date_string]
 
 Command is one of the following:
 
@@ -83,6 +83,15 @@ Command is one of the following:
   restart - restarts the monitor process (forces re-reading of config file)
   report - prints out time tracking reports
   
+date_string is an optional argument for the report command and can be a 
+qualified date string, 'today', 'yesterday' or a number representing an
+offset from today's date.
+
+eg. 'bro report 2' would print the report for all projects from two days ago.
+
+If date_string can't be parsed, reporter will default to today's date.
+
+Options are as follows:
 END
 
         @options[:config_file] = "#{ENV["HOME"]}/.babybrorc"
@@ -91,7 +100,7 @@ END
           @options[:config_file] = config_file
         end
 
-        opts.on('-t', '--tron', :NONE, 'Trace on.  Show debug output and a full stack trace on error') do
+        opts.on('-t', '--tron', :NONE, 'Trace on.  Show debug output and a full stack trace on error.') do
           @options[:tron] = true
         end
 
@@ -99,6 +108,10 @@ END
           @options[:force_start] = true
         end
 
+        opts.on('-b', '--brief', :NONE, "Ignore inactive projects and display daily totals without individual sessions.") do
+          @options[:brief] = true
+        end
+
         opts.on_tail("-?", "-h", "--help", "Show this message") do
           puts opts
           exit

data/lib/baby-bro/monitor.rb

@@ -132,9 +132,5 @@ module BabyBro
       def tron string
         $stdout.puts if @config && @config.tron
       end
-
-      def tron string
-        $stdout.puts if @config && @config.tron
-      end
   end
 end

data/lib/baby-bro/reporter.rb

@@ -8,14 +8,31 @@ module BabyBro
     attr_accessor :data_directory, :projects, :config
 
     def initialize( options, args )
-      @config = HashObject.new( process_base_config( options ) )
+      @config = HashObject.new( process_base_config( options ), true )
       process_reporting_config( @config )
       initialize_database
+      date_string = args.shift
+      if date_string == 'today'
+        @date = Date.today
+      elsif date_string == 'yesterday'
+        @date = Date.today - 1
+      elsif date_string
+        begin
+          @date = Date.parse(date_string)
+        rescue
+          @date = Date.today - date_string.to_i
+        end
+      end
     end
     
     def run
+      if @config.brief && @date
+        $stdout.puts
+        $stdout.puts "#{@date.strftime("%Y-%m-%d")}:" 
+      end
+      @longest_project_name = @projects.inject(0){|max,p| p.name.size>max ? p.name.size : max}
       @projects.each do |project|
-        print_project_report( project )
+        print_project_report( project, @date )
       end
     end
     
@@ -23,26 +40,35 @@ module BabyBro
       def process_reporting_config( config )
       end
       
-      def print_project_report( project, date=nil )
-        $stdout.puts
-        $stdout.puts "#{project.name}"
-        $stdout.puts "="*project.name.size
-        cumulative_time = 0
+      def print_project_report( project, report_date=nil )
         sessions = project.sessions
-        if sessions.any?
-          sessions_by_date = sessions.group_by(&:start_date)
-          sessions_by_date.keys.sort.each do |date|
-            sessions = sessions_by_date[date].sort
-            $stdout.puts "  #{date.strftime("%Y-%m-%d")}"
-            sessions.each do |session|
-              $stdout.puts "      #{session.start_time.strftime("%I:%M %p")} - #{session.duration_in_english}"
-              cumulative_time += session.duration
+        return if @config.brief && sessions.empty?
+        if true
+          if @config.brief && report_date
+            $stdout.print "  #{project.name}#{" "*(@longest_project_name - project.name.size)}  :"
+          else
+            $stdout.puts
+            $stdout.puts "#{project.name}"
+            $stdout.puts "="*project.name.size
+          end
+          cumulative_time = 0
+          if sessions.any?
+            sessions_by_date = sessions.group_by(&:start_date)
+            sessions_by_date.keys.sort.each do |date|
+              next if report_date && date != report_date
+              sessions = sessions_by_date[date].sort
+              $stdout.puts "  #{date.strftime("%Y-%m-%d")}" unless @config.brief && report_date
+              sessions.each do |session|
+                $stdout.puts "      #{session.start_time.strftime("%I:%M %p")} - #{session.duration_in_english}" unless @config.brief
+                cumulative_time += session.duration
+              end
+              $stdout.print "    Total:" unless @config.brief && report_date
+              $stdout.puts "  #{Session.duration_in_english(sessions.inject(0){|sum,n| sum = sum+n.duration})}"
             end
-            $stdout.puts "    Total:  #{Session.duration_in_english(sessions.inject(0){|sum,n| sum = sum+n.duration})}"
+            $stdout.puts "Grand Total: #{Session.duration_in_english(cumulative_time)}" unless @config.brief
+          else
+            $stdout.puts "  No sessions for this project."
           end
-          $stdout.puts "Grand Total: #{Session.duration_in_english(cumulative_time)}"
-        else
-          $stdout.puts "  No sessions for this project."
         end
       end
   end

data/lib/baby-bro/session.rb

@@ -58,7 +58,7 @@ module BabyBro
       end
       time << "#{time_duration.to_i}s"
       breakdown = time.join(' ')
-      output = "#{"%05.2f" % (duration/1.hour)} hours or #{breakdown}"
+      output = "#{(duration/1.hour).to_i < 10 ? " " : ""}#{"%.2f" % (duration/1.hour)} hours or #{breakdown}"
     end
     
     def <=> b

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: baby-bro
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Bill Doughty
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -06:00
+date: 2010-12-08 00:00:00 -06:00
 default_executable: bro
 dependencies: 
 - !ruby/object:Gem::Dependency