bookie_accounting 1.0.0 → 1.1.0

data/spec/formatter_spec.rb

@@ -30,46 +30,51 @@ describe Bookie::Formatter do
   end
   
   it "correctly formats durations" do
-    Bookie::Formatter.format_duration(3600 * 6 + 60 * 5 + 4).should eql '06:05:04'
+    Bookie::Formatter.format_duration(1.seconds + 2.minutes + 3.hours + 4.days + 5.weeks).should eql '5 weeks, 4 days, 03:02:01'
+    Bookie::Formatter.format_duration(1.weeks + 1.days).should eql '1 week, 1 day, 00:00:00'
   end
   
   it "correctly calculates fields for jobs" do
-    @formatter.send(:fields_for_each_job, @jobs.limit(1).all) do |fields|
-      fields.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)',
-          'vi',
-          0,
-        ]
-    end
-    jobs = [Bookie::Database::Job.first]
-    jobs[0].system.system_type.memory_stat_type = :unknown
-    @formatter.send(:fields_for_each_job, jobs) do |fields|
-      fields[8].should eql '200kb'
+    with_utc do
+      @formatter.send(:fields_for_each_job, @jobs.limit(1).all) do |fields|
+        fields.should eql [
+            'root',
+            'root',
+            'test1',
+            'Standalone',
+            '2012-01-01 00:00:00',
+            '2012-01-01 01:00:00',
+            '0 weeks, 0 days, 01:00:00',
+            '0 weeks, 0 days, 00:01:40',
+            '200kb (avg)',
+            'vi',
+            0,
+          ]
+      end
+      jobs = [Bookie::Database::Job.first]
+      jobs[0].system.system_type.memory_stat_type = :unknown
+      @formatter.send(:fields_for_each_job, jobs) do |fields|
+        fields[8].should eql '200kb'
+      end
     end
   end
   
   describe "#print_summary" do
     it "prints the correct summary fields" do
-      Time.expects(:now).returns(Time.local(2012) + 3600 * 40).at_least_once
-      @formatter.print_summary(@jobs, @summaries, Bookie::Database::System)
-      @formatter.flush
-      $field_values.should eql [40, "01:06:40", "50.0000%", "140:00:00", "0.7937%", "1750000 kb", "0.0114%"]
-      Bookie::Database::System.expects(:summary).returns(
-        :avail_cpu_time => 0,
-        :avail_memory_time => 0,
-        :avail_memory_avg => 0
-      )
-      @formatter.print_summary(@jobs, @summaries, Bookie::Database::System, Time.local(2012) ... Time.local(2012))
-      @formatter.flush
-      $field_values.should eql [0, "00:00:00", "0.0000%", "00:00:00", "0.0000%", "0 kb", "0.0000%"]
+      with_utc do
+        Time.expects(:now).returns(base_time + 40.hours).at_least_once
+        @formatter.print_summary(@jobs, @summaries, Bookie::Database::System)
+        @formatter.flush
+        $field_values.should eql [40, "0 weeks, 0 days, 01:06:40", "50.0000%", "0 weeks, 5 days, 20:00:00", "0.7937%", "1750000 kb", "0.0114%"]
+        Bookie::Database::System.expects(:summary).returns(
+          :avail_cpu_time => 0,
+          :avail_memory_time => 0,
+          :avail_memory_avg => 0
+        )
+        @formatter.print_summary(@jobs, @summaries, Bookie::Database::System, base_time ... base_time)
+        @formatter.flush
+        $field_values.should eql [0, "0 weeks, 0 days, 00:00:00", "0.0000%", "0 weeks, 0 days, 00:00:00", "0.0000%", "0 kb", "0.0000%"]
+      end
     end
     
     it "returns the summary objects" do

data/spec/sender_spec.rb

@@ -5,27 +5,48 @@ class JobStub
   attr_accessor :group_name
   attr_accessor :command_name
   attr_accessor :start_time
-  attr_accessor :end_time
   attr_accessor :wall_time
   attr_accessor :cpu_time
   attr_accessor :memory
   attr_accessor :exit_code
   
   include Bookie::ModelHelpers
+
+  def self.from_job(job)
+    stub = self.new
+    stub.user_name = job.user.name
+    stub.group_name = job.user.group.name
+    stub.command_name = job.command_name
+    stub.start_time = job.start_time
+    stub.wall_time = job.wall_time
+    stub.cpu_time = job.cpu_time
+    stub.memory = job.memory
+    stub.exit_code = job.exit_code
+    stub
+  end
 end
 
 describe Bookie::Sender do
   before(:all) do
-    base_time = Date.new(2012).to_time
     Bookie::Database::Migration.up
-    Bookie::Database::System.create!(
+    fields = {
       :name => 'localhost',
       :system_type => Bookie::Sender.new(@config).system_type,
-      :start_time => base_time,
-      :end_time => nil,
       :cores => @config.cores,
-      :memory => @config.memory
-    )
+      :memory => @config.memory,
+    }
+    @sys_1 = Bookie::Database::System.new(fields)
+    @sys_1.start_time = base_time
+    @sys_1.end_time = base_time + 1000
+    @sys_1.save!
+    @sys_2 = Bookie::Database::System.new(fields)
+    @sys_2.start_time = base_time + 1001
+    @sys_2.end_time = nil
+    @sys_2.save!
+    fields[:name] = 'dummy'
+    @sys_dummy = Bookie::Database::System.new(fields)
+    @sys_dummy.start_time = base_time
+    @sys_dummy.save!
   end
   
   after(:all) do
@@ -76,34 +97,17 @@ describe Bookie::Sender do
   end
   
   it "chooses the correct systems" do
-    @config.expects(:hostname).returns('test').at_least_once
+    Bookie::Database::Job.delete_all
     sender = Bookie::Sender.new(@config)
-    sys_type = sender.system_type
-    t = Date.new(2012).to_time
-    fields = {
-      :name => 'test',
-      :system_type => sys_type,
-      :cores => @config.cores,
-      :memory => @config.memory,
-    }
-    sys_1 = Bookie::Database::System.new(fields)
-    sys_1.start_time = t
-    sys_1.end_time = t + 1000
-    sys_1.save!
-    sys_2 = Bookie::Database::System.new(fields)
-    sys_2.start_time = t + 1001
-    sys_2.end_time = nil
-    sys_2.save!
-    
+
     def sender.each_job(filename)
-      t = Date.new(2012).to_time
       [0, 1001].each do |offset|
         job = JobStub.new
         job.user_name = 'blm'
         job.group_name = 'blm'
         job.command_name = 'vi'
-        job.start_time = t
-        job.wall_time = offset
+        job.start_time = Helpers::BASE_TIME + offset
+        job.wall_time = 1000
         job.cpu_time = 2
         job.memory = 300
         job.exit_code = 0
@@ -111,54 +115,105 @@ describe Bookie::Sender do
       end
     end
     
-    sender.send_data('snapshot/torque_large')
+    #The filename is just a dummy argument.
+    sender.send_data('snapshot/pacct')
     
-    jobs = Bookie::Database::Job.by_system_name('test').order(:end_time).all
-    jobs[0].system.should eql sys_1
-    jobs[1].system.should eql sys_2
+    jobs = Bookie::Database::Job.by_system_name(@config.hostname).order(:end_time).all
+    jobs[0].system.should eql @sys_1
+    jobs[1].system.should eql @sys_2
+  end
+
+  it "correctly finds duplicates" do
+    job = Bookie::Database::Job.first
+    stub = JobStub.from_job(job)
+    duplicate = @sender.duplicate(stub, job.system)
+    duplicate.should eql job
+    @sender.duplicate(stub, @sys_2).should eql nil
+    [:user_name, :group_name, :command_name, :start_time, :wall_time, :cpu_time, :memory, :exit_code].each do |field|
+      old_val = stub.send(field)
+      if old_val.is_a?(String)
+        stub.send("#{field}=", 'string')
+      else
+        stub.send("#{field}=", old_val + 1)
+      end
+      @sender.duplicate(stub, @sys_2).should eql nil
+      stub.send("#{field}=", old_val)
+    end
   end
   
   it "deletes cached summaries that overlap the new jobs" do
     Bookie::Database::Job.delete_all
-    sender = Bookie::Sender.new(@config)
-    user = Bookie::Database::User.first
-    systems = [
-      Bookie::Database::System.find_current(sender),
-      Bookie::Database::System.create!(
-        :name => 'test',
-        :system_type => Bookie::Database::SystemType.first,
-        :start_time => Time.new,
-        :cores => 1,
-        :memory => 1000000
-      )
-    ]
-    date_start = Date.new(2012) - 2
-    date_end = date_start + 4
-    (date_start .. date_end).each do |date|
-      systems.each do |system|
-        sum = Bookie::Database::JobSummary.create!(
-          :date => date,
-          :system => system,
-          :user => user,
-          :command_name => 'vi',
-          :num_jobs => 1,
-          :cpu_time => 1,
-          :memory_time => 100,
-          :successful => 1
-        )
+    @sender.send_data('snapshot/torque_large')
+    time_min = Bookie::Database::Job.order(:start_time).first.start_time
+    time_max = Bookie::Database::Job.order('end_time DESC').first.end_time
+    Bookie::Database::Job.delete_all
+    @sender.expects(:clear_summaries).with(time_min.to_date, time_max.to_date)
+    @sender.send_data('snapshot/torque_large')
+  end
+  
+  describe "#clear_summaries" do
+    it "deletes cached summaries" do
+      Bookie::Database::Job.delete_all
+      sender = Bookie::Sender.new(@config)
+      sender.send_data('snapshot/torque_large')
+      
+      user = Bookie::Database::User.first
+      date_start = Date.new(2012) - 2
+      date_end = date_start + 4
+      (date_start .. date_end).each do |date|
+        [@sys_1, @sys_2, @sys_dummy].each do |system|
+          sum = Bookie::Database::JobSummary.create!(
+            :date => date,
+            :system => system,
+            :user => user,
+            :command_name => 'vi',
+            :num_jobs => 1,
+            :cpu_time => 1,
+            :memory_time => 100,
+            :successful => 1
+          )
+        end
       end
-    end
-    sender.send_data('snapshot/torque_large')
-    sums = Bookie::Database::JobSummary.all
-    sums.length.should eql 9
-    sums.each do |sum|
-      if sum.system == systems[0]
-        sum.date.should_not eql Date.new(2012)
+      
+      sender.send(:clear_summaries, date_start + 1, date_end - 1)
+      
+      sums = Bookie::Database::JobSummary.all
+      sums.length.should eql 9
+      sums.each do |sum|
+        unless sum.system == @sys_dummy
+          (date_start + 1 .. date_end - 1).cover?(sum.date).should eql false
+        end
       end
+      sums = Bookie::Database::JobSummary.by_date(Date.new(2012))
+      sums.count.should eql 1
+      sums.first.system.should eql @sys_dummy
+    end
+  end
+  
+  describe "#undo_send" do
+    it "removes the correct entries" do
+      Bookie::Database::Job.delete_all
+      @sender.send_data('snapshot/torque_large')
+      @sender.send_data('snapshot/torque')
+      @sender.undo_send('snapshot/torque_large')
+      
+      Bookie::Database::Job.count.should eql 1
+      job = Bookie::Database::Job.first
+      Bookie::Database::Job.delete_all
+      @sender.send_data('snapshot/torque')
+      job2 = Bookie::Database::Job.first
+      job2.id = job.id
+      job2.should eql job
+    end
+    
+    it "deletes cached summaries in the affected range" do
+      Bookie::Database::Job.delete_all
+      @sender.send_data('snapshot/torque_large')
+      time_min = Bookie::Database::Job.order(:start_time).first.start_time
+      time_max = Bookie::Database::Job.order('end_time DESC').first.end_time
+      @sender.expects(:clear_summaries).with(time_min.to_date, time_max.to_date)
+      @sender.undo_send('snapshot/torque_large')
     end
-    sums = Bookie::Database::JobSummary.by_date(Date.new(2012)).all
-    sums.length.should eql 1
-    sums[0].system.should eql systems[1]
   end
 end
 
@@ -186,4 +241,8 @@ describe Bookie::ModelHelpers do
     djob.memory.should eql @job.memory
     djob.exit_code.should eql @job.exit_code
   end
+
+  it "correctly calculates end time" do
+    @job.end_time.should eql @job.start_time + @job.wall_time
+  end
 end

data/spec/spec_helper.rb

@@ -52,8 +52,14 @@ end
 module Helpers
   extend self
 
+  BASE_TIME = Time.utc(2012)
+
+  #To get around the 'formal argument cannot be a constant' error
+  def base_time
+    BASE_TIME
+  end
+
   def generate_database
-    base_time = Time.local(2012)
     #Create test database
     groups = {}
     group_names = ['root', 'default', 'admin', 'admin']
@@ -118,4 +124,12 @@ module Helpers
       job.save!
     end
   end
+
+  def with_utc
+    prev = ENV['TZ']
+    ENV['TZ'] = 'UTC'
+    yield
+  ensure
+    ENV['TZ'] = prev
+  end
 end

data/spec/spreadsheet_formatter_spec.rb

@@ -74,31 +74,33 @@ describe Bookie::Formatters::Spreadsheet do
   end
   
   it "correctly formats jobs" do
-    @formatter.print_jobs(@jobs.limit(2).all)
-    w = @m.worksheet('Details')
-    w.last_row_index.should eql 2
-    w.mock_columns.length.should eql Bookie::Formatter::DETAILS_FIELD_LABELS.length
-    w.mock_columns.each do |col|
-      col.width.should_not eql nil
+    with_utc do
+      @formatter.print_jobs(@jobs.limit(2).all)
+      w = @m.worksheet('Details')
+      w.last_row_index.should eql 2
+      w.mock_columns.length.should eql Bookie::Formatter::DETAILS_FIELD_LABELS.length
+      w.mock_columns.each do |col|
+        col.width.should_not eql nil
+      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", "0 weeks, 0 days, 01:00:00", "0 weeks, 0 days, 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", "0 weeks, 0 days, 01:00:00", "0 weeks, 0 days, 00:01:40", "200kb (avg)", 'emacs', 1]
     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)", '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)", 'emacs', 1]
   end
   
   it "correctly formats summaries" do
-    Time.expects(:now).returns(Time.local(2012) + 3600 * 40).at_least_once
+    Time.expects(:now).returns(base_time + 40.hours).at_least_once
     @formatter.print_summary(@jobs, @summaries, Bookie::Database::System)
     w = @m.worksheet('Summary')
     w.column(0).width.should_not eql nil
     w.last_row_index.should eql 6
     w.mock_rows.should eql [
       ["Number of jobs", 40],
-      ["Total CPU time", "01:06:40"],
+      ["Total CPU time", "0 weeks, 0 days, 01:06:40"],
       ["Successful", "50.0000%"],
-      ["Available CPU time", "140:00:00"],
+      ["Available CPU time", "0 weeks, 5 days, 20:00:00"],
       ["CPU time used", "0.7937%"],
       ["Available memory (average)", "1750000 kb"],
       ["Memory used (average)", "0.0114%"],

data/spec/stdout_formatter_spec.rb

@@ -34,25 +34,27 @@ describe Bookie::Formatters::Stdout do
   end
   
   it "correctly formats jobs" do
+    with_utc do
     @formatter.print_jobs(@jobs.order(:start_time).limit(2))
     @formatter.flush
     @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          
+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        0 weeks, 0 days, 01:00:00      0 weeks, 0 days, 00:01:40      200kb (avg)          vi                   0          
+test            default         test1                Standalone           2012-01-01 01:00:00        2012-01-01 02:00:00        0 weeks, 0 days, 01:00:00      0 weeks, 0 days, 00:01:40      200kb (avg)          emacs                1          
 eos
+    end
   end
-  
+    
   it "correctly formats summaries" do
-    Time.expects(:now).returns(Time.local(2012) + 36000 * 4).at_least_once
+    Time.expects(:now).returns(base_time + 40.hours).at_least_once
     @formatter.print_summary(@jobs, @summaries, Bookie::Database::System)
     @formatter.flush
     @m.buf.should eql <<-eos
 Number of jobs:               40
-Total CPU time:               01:06:40
+Total CPU time:               0 weeks, 0 days, 01:06:40
 Successful:                   50.0000%
-Available CPU time:           140:00:00
+Available CPU time:           0 weeks, 5 days, 20:00:00
 CPU time used:                0.7937%
 Available memory (average):   1750000 kb
 Memory used (average):        0.0114%

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookie_accounting
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ben Merritt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-13 00:00:00 +02:00
+date: 2013-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: pacct
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: spreadsheet
+  name: mysql2
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: pacct
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -72,10 +72,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: spreadsheet
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -86,10 +86,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sqlite3
+  name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,6 +102,48 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: A simple system to record and query process accounting records
 email: 
 - blm768@gmail.com
@@ -119,6 +161,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - bin/bookie-create-tables
 - bin/bookie-data
 - bin/bookie-send
@@ -126,6 +169,7 @@ files:
 - lib/bookie.rb
 - lib/bookie/config.rb
 - lib/bookie/database.rb
+- lib/bookie/extensions.rb
 - lib/bookie/formatter.rb
 - lib/bookie/formatters/comma_dump.rb
 - lib/bookie/formatters/spreadsheet.rb
@@ -150,6 +194,7 @@ files:
 - spec/comma_dump_formatter_spec.rb
 - spec/config_spec.rb
 - spec/database_spec.rb
+- spec/extensions_spec.rb
 - spec/formatter_spec.rb
 - spec/sender_spec.rb
 - spec/spec_helper.rb
@@ -195,6 +240,7 @@ test_files:
 - spec/comma_dump_formatter_spec.rb
 - spec/config_spec.rb
 - spec/database_spec.rb
+- spec/extensions_spec.rb
 - spec/formatter_spec.rb
 - spec/sender_spec.rb
 - spec/spec_helper.rb