bookie_accounting 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 51d9831cfce7c78318df081d81a40661536c00d4
+  data.tar.gz: 0da6780bd2c5f3fd1db7fcbc2207338873ab1c28
+SHA512:
+  metadata.gz: 6fdab8622a6f572d45e4c7895d4f9ceab4d0bddb3e3f306f6c4e25a1735ddf4715ca39f916d9e125187bd7b93ca801eda70245c9bde68f4b66f69bd528a7c43e
+  data.tar.gz: 3cc99f7f5346c2fa5a41373a33b093568ef4632d40eb443df62d0a336c879c8454184c663b83a3180cd7292aceb99caa51c7ee4965066c750345e2691d332463

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'bundler', :group => :development
+gem 'mocha', :group => :development
+gem 'rspec', :group => :development
+gem 'sqlite3', :group => :development
+

data/bookie_accounting.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |gem|
   #To do: figure out how to remove (file issue?)
   gem.add_dependency('mysql2')
   gem.add_dependency('pacct')
+  #Introduces the old ActiveRecord mass assignment security methods
+  #(until I update the database code for the new methods)
+  gem.add_dependency('protected_attributes')
   gem.add_dependency('spreadsheet')
-  gem.add_development_dependency('bundler')
-  gem.add_development_dependency('mocha')
-  gem.add_development_dependency('rspec')
-  gem.add_development_dependency('sqlite3')
 end
+

data/lib/bookie/database.rb

@@ -2,6 +2,8 @@ require 'bookie/config'
 require 'bookie/extensions'
 
 require 'active_record'
+#To do: remove when code is updated.
+require 'protected_attributes'
 
 module Bookie
   ##
@@ -176,8 +178,10 @@ module Bookie
       #Returns an array of all jobs, pre-loading relations to reduce the need for extra queries
       #
       #Relations are not cached between calls.
+      #
+      #To do: use ActiveRecord's #includes instead of this scheme?
       def self.all_with_relations
-        jobs = all
+        jobs = self.all.to_a
         users = {}
         groups = {}
         systems = {}
@@ -439,7 +443,7 @@ module Bookie
         date_range = date_begin ... date_end
         
         unscoped = self.unscoped
-        summaries = by_date_range(date_range).order(:date).all
+        summaries = by_date_range(date_range).order(:date).to_a
         index = 0
         date_range.each do |date|
           new_index = index
@@ -625,7 +629,7 @@ Please make sure that all previous systems with this hostname have been marked a
       #
       #Relations are not cached between calls.
       def self.all_with_relations
-        systems = all
+        systems = self.all.to_a
         system_types = {}
         systems.each do |system|
           system_type = system_types[system.system_type_id]

data/lib/bookie/sender.rb

@@ -138,7 +138,7 @@ module Bookie
     #Used internally by #send_data and #undo_send
     def clear_summaries(date_min, date_max)      
       #Since joins don't mix with DELETE statements, we have to do this the hard way.
-      systems = Database::System.by_name(@config.hostname).all
+      systems = Database::System.by_name(@config.hostname).to_a
       systems.map!{ |sys| sys.id }
       Database::JobSummary.where('job_summaries.system_id in (?)', systems).where('date >= ? AND date <= ?', date_min, date_max).delete_all
     end

data/lib/bookie/version.rb

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

data/spec/comma_dump_formatter_spec.rb

@@ -33,7 +33,7 @@ describe Bookie::Formatters::CommaDump do
   
   it "correctly formats jobs" do
     with_utc do
-      @formatter.print_jobs(@jobs.order(:start_time).limit(2).all)
+      @formatter.print_jobs(@jobs.order(:start_time).limit(2).to_a)
       @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", "0 weeks, 0 days, 01:00:00", "0 weeks, 0 days, 00:01:40", "200kb (avg)", "vi", "0"

data/spec/database_spec.rb

@@ -124,7 +124,7 @@ describe Bookie::Database do
     
     it "correctly filters by user" do
       user = Bookie::Database::User.by_name('test').order(:id).first
-      jobs = @jobs.by_user(user).all
+      jobs = @jobs.by_user(user).to_a
       jobs.each do |job|
         job.user.should eql user
       end
@@ -132,29 +132,29 @@ describe Bookie::Database do
     end
     
     it "correctly filters by user name" do
-      jobs = @jobs.by_user_name('root').all
+      jobs = @jobs.by_user_name('root').to_a
       jobs.length.should eql 10
       jobs[0].user.name.should eql "root"
-      jobs = @jobs.by_user_name('test').order(:end_time).all
+      jobs = @jobs.by_user_name('test').order(:end_time).to_a
       jobs.length.should eql 20
       jobs.each do |job|
         job.user.name.should eql 'test'
       end
       jobs[0].user_id.should_not eql jobs[-1].user_id
-      jobs = @jobs.by_user_name('user').all
+      jobs = @jobs.by_user_name('user').to_a
       jobs.length.should eql 0
     end
   
     it "correctly filters by group name" do
-      jobs = @jobs.by_group_name("root").all
+      jobs = @jobs.by_group_name("root").to_a
       jobs.length.should eql 10
       jobs.each do |job|
         job.user.group.name.should eql "root"
       end
-      jobs = @jobs.by_group_name("admin").order(:start_time).all
+      jobs = @jobs.by_group_name("admin").order(:start_time).to_a
       jobs.length.should eql 20
       jobs[0].user.name.should_not eql jobs[1].user.name
-      jobs = @jobs.by_group_name("test").all
+      jobs = @jobs.by_group_name("test").to_a
       jobs.length.should eql 0
     end
     
@@ -259,9 +259,8 @@ describe Bookie::Database do
     
     describe "#summary" do
       before(:all) do
-        Time.expects(:now).returns(base_time + 36000 * 4).at_least_once
         @jobs = Bookie::Database::Job
-        @length = @jobs.all.length
+        @length = @jobs.count
         @summary = Helpers::create_summaries(@jobs, base_time)
       end
       
@@ -355,8 +354,8 @@ describe Bookie::Database do
     describe "" do
       before(:all) do
         d = Date.new(2012)
-        Bookie::Database::User.all.each do |user|
-          Bookie::Database::System.all.each do |system|
+        Bookie::Database::User.find_each do |user|
+          Bookie::Database::System.find_each do |system|
             ['vi', 'emacs'].each do |command_name|
               (d ... d + 2).each do |date|
                 Bookie::Database::JobSummary.create!(
@@ -376,7 +375,7 @@ describe Bookie::Database do
       
       it "correctly filters by date" do
         d = Date.new(2012)
-        sums = Bookie::Database::JobSummary.by_date(d).all
+        sums = Bookie::Database::JobSummary.by_date(d).to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.date.should eql d
@@ -395,7 +394,7 @@ describe Bookie::Database do
       
       it "correctly filters by user" do
         u = Bookie::Database::User.first
-        sums = Bookie::Database::JobSummary.by_user(u).all
+        sums = Bookie::Database::JobSummary.by_user(u).to_a
         sums.length.should eql 16
         sums.each do |sum|
           sum.user.should eql u
@@ -403,7 +402,7 @@ describe Bookie::Database do
       end
       
       it "correctly filters by user name" do
-        sums = Bookie::Database::JobSummary.by_user_name('test').all
+        sums = Bookie::Database::JobSummary.by_user_name('test').to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.user.name.should eql 'test'
@@ -412,7 +411,7 @@ describe Bookie::Database do
       
       it "correctly filters by group" do
         g = Bookie::Database::Group.find_by_name('admin')
-        sums = Bookie::Database::JobSummary.by_group(g).all
+        sums = Bookie::Database::JobSummary.by_group(g).to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.user.group.should eql g
@@ -420,7 +419,7 @@ describe Bookie::Database do
       end
       
       it "correctly filters by group name" do
-        sums = Bookie::Database::JobSummary.by_group_name('admin').all
+        sums = Bookie::Database::JobSummary.by_group_name('admin').to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.user.group.name.should eql 'admin'
@@ -429,7 +428,7 @@ describe Bookie::Database do
       
       it "correctly filters by system" do
         s = Bookie::Database::System.first
-        sums = Bookie::Database::JobSummary.by_system(s).all
+        sums = Bookie::Database::JobSummary.by_system(s).to_a
         sums.length.should eql 16
         sums.each do |sum|
           sum.system.should eql s
@@ -437,7 +436,7 @@ describe Bookie::Database do
       end
       
       it "correctly filters by system name" do
-        sums = Bookie::Database::JobSummary.by_system_name('test1').all
+        sums = Bookie::Database::JobSummary.by_system_name('test1').to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.system.name.should eql 'test1'
@@ -446,7 +445,7 @@ describe Bookie::Database do
       
       it "correctly filters by system type" do
         s = Bookie::Database::SystemType.first
-        sums = Bookie::Database::JobSummary.by_system_type(s).all
+        sums = Bookie::Database::JobSummary.by_system_type(s).to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.system.system_type.should eql s
@@ -454,7 +453,7 @@ describe Bookie::Database do
       end
       
       it "correctly filters by command name" do
-        sums = Bookie::Database::JobSummary.by_command_name('vi').all
+        sums = Bookie::Database::JobSummary.by_command_name('vi').to_a
         sums.length.should eql 32
         sums.each do |sum|
           sum.command_name.should eql 'vi'
@@ -488,7 +487,7 @@ describe Bookie::Database do
         d = Date.new(2012)
         range = base_time ... base_time + 1.days
         Bookie::Database::JobSummary.summarize(d)
-        sums = Bookie::Database::JobSummary.all
+        sums = Bookie::Database::JobSummary.all.to_a
         found_sums = Set.new
         sums.each do |sum|
           sum.date.should eql Date.new(2012)
@@ -498,7 +497,7 @@ describe Bookie::Database do
           found_sums.add([sum.user.id, sum.system.id, sum.command_name])
         end
         #Is it catching all of the combinations of categories?
-        Bookie::Database::Job.by_time_range_inclusive(range).select('user_id, system_id, command_name').uniq.all.each do |values|
+        Bookie::Database::Job.by_time_range_inclusive(range).select('user_id, system_id, command_name').uniq.find_each do |values|
           values = [values.user_id, values.system_id, values.command_name]
           found_sums.include?(values).should eql true
         end
@@ -507,7 +506,7 @@ describe Bookie::Database do
       it "creates dummy summaries when there are no jobs" do
         d = Date.new(2012) + 5
         Bookie::Database::JobSummary.summarize(d)
-        sums = Bookie::Database::JobSummary.by_date(d).all
+        sums = Bookie::Database::JobSummary.by_date(d).to_a
         sums.length.should eql 1
         sum = sums[0]
         sum.cpu_time.should eql 0
@@ -603,8 +602,9 @@ describe Bookie::Database do
         Bookie::Database::JobSummary.delete_all
         empty = Bookie::Database::System.limit(0)
         #Check the case where there are no systems.
-        ActiveRecord::Relation.any_instance.expects(:'any?').at_least_once.returns(false)
-        ActiveRecord::Relation.any_instance.expects(:first).at_least_once.returns(nil)
+        #Stub out methods of System's "Relation" class:
+        Bookie::Database::System.where('1=1').class.any_instance.expects(:'any?').at_least_once.returns(false)
+        Bookie::Database::System.where('1=1').class.any_instance.expects(:first).at_least_once.returns(nil)
         sum = Bookie::Database::JobSummary.summary
         sum.should eql({
           :num_jobs => 0,
@@ -612,7 +612,6 @@ describe Bookie::Database do
           :memory_time => 0,
           :successful => 0,
         })
-        ActiveRecord::Relation.any_instance.unstub(:'any?')
         Bookie::Database::JobSummary.any?.should eql false
       end
       
@@ -688,7 +687,7 @@ describe Bookie::Database do
   
   describe Bookie::Database::User do
     it "correctly filters by name" do
-      users = Bookie::Database::User.by_name('test').all
+      users = Bookie::Database::User.by_name('test').to_a
       users.length.should eql 2
       users.each do |user|
         user.name.should eql 'test'
@@ -872,7 +871,7 @@ describe Bookie::Database do
         @summary[:empty][:avail_memory_time].should eql 0
         @summary[:empty][:avail_memory_avg].should eql 0.0
         begin
-          @systems.all.each do |system|
+          @systems.find_each do |system|
             unless system.id == 1
               system.end_time = Time.now
               system.save!
@@ -885,7 +884,7 @@ describe Bookie::Database do
           s2[:avail_memory_avg] = Float(1000000 * system_total_wall_time) / (3600 * 41)
           summary_all_systems_ended.should eql s2
         ensure
-          @systems.all.each do |system|
+          @systems.find_each do |system|
             unless system.id == 1
               system.end_time = nil
               system.save!

data/spec/formatter_spec.rb

@@ -36,7 +36,7 @@ describe Bookie::Formatter do
   
   it "correctly calculates fields for jobs" do
     with_utc do
-      @formatter.send(:fields_for_each_job, @jobs.limit(1).all) do |fields|
+      @formatter.send(:fields_for_each_job, @jobs.limit(1).to_a) do |fields|
         fields.should eql [
             'root',
             'root',

data/spec/sender_spec.rb

@@ -118,7 +118,7 @@ describe Bookie::Sender do
     #The filename is just a dummy argument.
     sender.send_data('snapshot/pacct')
     
-    jobs = Bookie::Database::Job.by_system_name(@config.hostname).order(:end_time).all
+    jobs = Bookie::Database::Job.by_system_name(@config.hostname).order(:end_time).to_a
     jobs[0].system.should eql @sys_1
     jobs[1].system.should eql @sys_2
   end
@@ -177,7 +177,7 @@ describe Bookie::Sender do
       
       sender.send(:clear_summaries, date_start + 1, date_end - 1)
       
-      sums = Bookie::Database::JobSummary.all
+      sums = Bookie::Database::JobSummary.all.to_a
       sums.length.should eql 9
       sums.each do |sum|
         unless sum.system == @sys_dummy

data/spec/spreadsheet_formatter_spec.rb

@@ -75,7 +75,7 @@ describe Bookie::Formatters::Spreadsheet do
   
   it "correctly formats jobs" do
     with_utc do
-      @formatter.print_jobs(@jobs.limit(2).all)
+      @formatter.print_jobs(@jobs.limit(2).to_a)
       w = @m.worksheet('Details')
       w.last_row_index.should eql 2
       w.mock_columns.length.should eql Bookie::Formatter::DETAILS_FIELD_LABELS.length

metadata

@@ -1,158 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: bookie_accounting
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Ben Merritt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pacct
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple system to record and query process accounting records
@@ -219,27 +158,26 @@ files:
 homepage: https://github.com/blm768/bookie/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple system to record and query process accounting records
 test_files:
 - spec/comma_dump_formatter_spec.rb