bookie_accounting 0.0.3 → 1.0.0

data/bin/bookie-data

@@ -17,8 +17,7 @@ include_details = false
 output_type = :stdout
 filename = nil
 
-t_min = nil
-t_max = nil
+time_range = nil
 
 #Process arguments
 
@@ -78,8 +77,7 @@ opts = OptionParser.new do |opts|
   end
   
   opts.on('-r', '--time BEGIN,END', Array, "filter by a time range") do |t|
-    t_min = Time.parse(t[0])
-    t_max = Time.parse(t[1])
+    time_range = Time.parse(t[0]) ... Time.parse(t[1])
   end
   
   opts.on('-o', '--output-file FILENAME', "send formatted output to FILENAME",
@@ -106,7 +104,7 @@ end
 
 formatter = Bookie::Formatter.new(output_type, filename)
 
-jobs_summary, systems_summary = formatter.print_summary(jobs, summaries, systems, t_min, t_max)
-jobs = jobs.by_time_range_inclusive(t_min, t_max) if t_min
+jobs_summary, systems_summary = formatter.print_summary(jobs, summaries, systems, time_range)
+jobs = jobs.by_time_range_inclusive(time_range) if time_range
 formatter.print_jobs(jobs.all) if include_details
 formatter.flush

data/lib/bookie/formatter.rb

@@ -40,7 +40,7 @@ module Bookie
       #An array containing the labels for each field in a details table
       DETAILS_FIELD_LABELS = [
         'User', 'Group', 'System', 'System type', 'Start time', 'End time', 'Wall time',
-        'CPU time', 'Memory usage', 'Exit code'
+        'CPU time', 'Memory usage', 'Command', 'Exit code'
       ]
     
     ##
@@ -123,6 +123,7 @@ module Bookie
           Formatter.format_duration(job.end_time - job.start_time),
           Formatter.format_duration(job.cpu_time),
           "#{job.memory}kb#{memory_stat_type}",
+          job.command_name,
           job.exit_code
         ]
       end

data/lib/bookie/formatters/spreadsheet.rb

@@ -10,7 +10,7 @@ module Bookie
         @workbook = ::Spreadsheet::Workbook.new
       end
       
-      #Actual printing is delayed until object finalization due to the workings of the Spreadsheet gem.
+      #Actual file write is delayed until do_flush() due to the workings of the Spreadsheet gem.
       def do_print_summary(field_values)
         s = @workbook.worksheet("Summary") || @workbook.create_worksheet(:name => "Summary")
         
@@ -26,7 +26,7 @@ module Bookie
         s = @workbook.worksheet("Details") || @workbook.create_worksheet(:name => "Details")
         
         s.row(0).concat(Formatter::DETAILS_FIELD_LABELS)
-        (0 .. (Formatter::DETAILS_FIELD_LABELS.length - 1)).step do |i|
+        (0 ... Formatter::DETAILS_FIELD_LABELS.length).step do |i|
           s.column(i).width = 20
         end
         
@@ -42,4 +42,4 @@ module Bookie
       end
     end
   end
-end
+end

data/lib/bookie/formatters/stdout.rb

@@ -19,7 +19,7 @@ module Bookie
       
       def do_print_jobs(jobs)
         #To consider: optimize by moving out of the function?
-        format_string = "%-15.15s %-15.15s %-20.20s %-20.20s %-26.25s %-26.25s %-12.10s %-12.10s %-20.20s %-11.11s\n"
+        format_string = "%-15.15s %-15.15s %-20.20s %-20.20s %-26.25s %-26.25s %-12.10s %-12.10s %-20.20s %-20.20s %-11.11s\n"
         heading = sprintf(format_string, *Formatter::DETAILS_FIELD_LABELS)
         @io.write heading
         @io.puts '-' * (heading.length - 1)

data/lib/bookie/version.rb

@@ -1,4 +1,4 @@
 module Bookie
   #The library version
-  VERSION = "0.0.3"
+  VERSION = "1.0.0"
 end

data/spec/comma_dump_formatter_spec.rb

@@ -34,9 +34,9 @@ describe Bookie::Formatters::CommaDump do
   it "correctly formats jobs" do
     @formatter.print_jobs(@jobs.order(:start_time).limit(2).all)
     @m.buf.should eql <<-eos
-User, Group, System, System type, Start time, End time, Wall time, CPU time, Memory usage, Exit code
-root, root, test1, Standalone, 2012-01-01 00:00:00, 2012-01-01 01:00:00, 01:00:00, 00:01:40, 200kb (avg), 0
-test, default, test1, Standalone, 2012-01-01 01:00:00, 2012-01-01 02:00:00, 01:00:00, 00:01:40, 200kb (avg), 1
+User, Group, System, System type, Start time, End time, Wall time, CPU time, Memory usage, Command, Exit code
+root, root, test1, Standalone, 2012-01-01 00:00:00, 2012-01-01 01:00:00, 01:00:00, 00:01:40, 200kb (avg), vi, 0
+test, default, test1, Standalone, 2012-01-01 01:00:00, 2012-01-01 02:00:00, 01:00:00, 00:01:40, 200kb (avg), emacs, 1
 eos
   end
   

data/spec/formatter_spec.rb

@@ -40,11 +40,12 @@ describe Bookie::Formatter do
           'root',
           'test1',
           'Standalone',
-          "2012-01-01 00:00:00",
-          "2012-01-01 01:00:00",
+          '2012-01-01 00:00:00',
+          '2012-01-01 01:00:00',
           '01:00:00',
           '00:01:40',
           '200kb (avg)',
+          'vi',
           0,
         ]
     end

data/spec/spreadsheet_formatter_spec.rb

@@ -83,9 +83,9 @@ describe Bookie::Formatters::Spreadsheet do
     end
     w.row(0).should eql Bookie::Formatter::DETAILS_FIELD_LABELS
     w.row(1).should eql ["root", "root", "test1", "Standalone", "2012-01-01 00:00:00",
-      "2012-01-01 01:00:00", "01:00:00", "00:01:40", "200kb (avg)", 0]
+      "2012-01-01 01:00:00", "01:00:00", "00:01:40", "200kb (avg)", 'vi', 0]
     w.row(2).should eql ["test", "default", "test1", "Standalone", "2012-01-01 01:00:00",
-      "2012-01-01 02:00:00", "01:00:00", "00:01:40", "200kb (avg)", 1]
+      "2012-01-01 02:00:00", "01:00:00", "00:01:40", "200kb (avg)", 'emacs', 1]
   end
   
   it "correctly formats summaries" do

data/spec/stdout_formatter_spec.rb

@@ -36,17 +36,12 @@ describe Bookie::Formatters::Stdout do
   it "correctly formats jobs" do
     @formatter.print_jobs(@jobs.order(:start_time).limit(2))
     @formatter.flush
-    @m.buf.should eql \
-      "User            Group           System               System type          Start " +
-      "time                 End time                   Wall time    CPU time     Memory" +
-      " usage         Exit code  \n----------------------------------------------------" +
-      "--------------------------------------------------------------------------------" +
-      "------------------------------------------------------\nroot            root    " +
-      "        test1                Standalone           2012-01-01 00:00:00        201" +
-      "2-01-01 01:00:00        01:00:00     00:01:40     200kb (avg)          0        " +
-      "  \ntest            default         test1                Standalone           20" +
-      "12-01-01 01:00:00        2012-01-01 02:00:00        01:00:00     00:01:40     20" +
-      "0kb (avg)          1          \n"
+    @m.buf.should eql <<-eos
+User            Group           System               System type          Start time                 End time                   Wall time    CPU time     Memory usage         Command              Exit code  
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+root            root            test1                Standalone           2012-01-01 00:00:00        2012-01-01 01:00:00        01:00:00     00:01:40     200kb (avg)          vi                   0          
+test            default         test1                Standalone           2012-01-01 01:00:00        2012-01-01 02:00:00        01:00:00     00:01:40     200kb (avg)          emacs                1          
+eos
   end
   
   it "correctly formats summaries" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookie_accounting
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ben Merritt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-12 00:00:00 +02:00
+date: 2013-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency