bookie_accounting 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d726372976ed3f86e19d29e2a391d233c972d5d
-  data.tar.gz: 99ea6555c0e94a6be3d04c5168a4a45dde020d90
+  metadata.gz: 2c891f54836ddb4da00b36831ab8a62dcea1b8cb
+  data.tar.gz: 5afc39ea463dcf38dfee8d4526e83185b160b697
 SHA512:
-  metadata.gz: e123b58f99c5529014a135948ccfbbcde6c2090a2436d5b9076b49bcb839fce55d1f37636713301c7eb783b3aeffbc7444d5f4b424a757ab92c3dd30464c13b5
-  data.tar.gz: 3fad9d7b47452444935ea70b821229c066789a04f8b929d2cf33cae6e10b8573c7ff87ebe2d581e33f5bd7082b6b4efabc5faefd85825d353feb72c17eb10308
+  metadata.gz: 4ad6f4d440ef1c1537a584aa99937bcee203227b0d233805405210e92398dd87c00b7f870fedaefb04ed6de3d39961b682b3c32df2453154389ffbfe1a320c99
+  data.tar.gz: e28d51f6afa886edc644e8a526473efd2b9dd26db271e82b543a4c289bc251ab4e4721af5eb3fe2682cfd1598a458031b8287825198d2976b987b07ed3e08b87

data/Gemfile

@@ -8,4 +8,5 @@ gem 'mocha', :group => :test
 gem 'rspec', :group => :test
 gem 'simplecov', :group => :test
 gem 'sqlite3', :group => :development
+gem 'mysql2', :group => :development
 

data/Rakefile

@@ -10,13 +10,6 @@ task :default => :spec
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec) do |task|
   task.rspec_opts =%w{--color --order rand --format progress}
-  paths = []
-  Find.find('spec') do |path|
-    if File.directory?(path)
-      paths << "#{path}/*_spec.rb"
-    end
-  end
-  task.pattern = paths.join(" ")
 end
 
 task :rdoc do

data/TODO

@@ -1 +1,14 @@
+Use bulk inserts?
+Replace by_* methods with a "find_all_by()" method? (or just "where"...)
+Allow configuration of date boundary to midnight in local time zone?
+Make sure all source files have the required "require"s
+Use "let" in RSpect tests?
+Replace 3600 with 2.hours, etc.
+Also clear out other "magic" numbers.
+Split some tests up.
+Validate uniqueness?
+Unit test uniqueness constraints?
+Use optimistic concurrency control?
+Make units more independent.
+Make unit test success more independent.
 

data/bookie_accounting.gemspec

@@ -15,18 +15,10 @@ Gem::Specification.new do |gem|
   gem.name          = "bookie_accounting"
   gem.require_paths = ["lib"]
   gem.version       = Bookie::VERSION
-  
+
   gem.add_dependency('activerecord')
   gem.add_dependency('json')
-  #We need this because Bundler has no concept of optional dependencies
-  #and complains about using non-dependency gems.
-  #TODO: figure out how to remove
-  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)
-  #TODO: get rid of this.
-  gem.add_dependency('protected_attributes')
   gem.add_dependency('spreadsheet')
 end
 

data/lib/bookie/database.rb

@@ -2,8 +2,6 @@ require 'bookie/config'
 require 'bookie/extensions'
 
 require 'active_record'
-#TODO: remove when code is updated.
-require 'protected_attributes'
 
 require 'bookie/database/job'
 require 'bookie/database/job_summary'
@@ -21,7 +19,7 @@ module Bookie
     #- <tt>:avg => 1</tt>
     #- <tt>:max => 2</tt>
     #
-      
+
     ##
     #Database migrations
     module Migration
@@ -35,12 +33,12 @@ module Bookie
             t.index [:name, :group_id], :unique => true
           end
         end
-        
+
         def down
           drop_table :users
         end
       end
-      
+
       class CreateGroups < ActiveRecord::Migration
         def up
           create_table :groups do |t|
@@ -50,12 +48,12 @@ module Bookie
             t.index :name, :unique => true
           end
         end
-        
+
         def down
           drop_table :groups
         end
       end
-      
+
       class CreateSystems < ActiveRecord::Migration
         def up
           create_table :systems do |t|
@@ -73,12 +71,12 @@ module Bookie
             t.index :system_type_id
           end
         end
-        
+
         def down
           drop_table :systems
         end
       end
-      
+
       class CreateSystemTypes < ActiveRecord::Migration
         def up
           create_table :system_types do |t|
@@ -89,12 +87,12 @@ module Bookie
             t.index :name, :unique => true
           end
         end
-        
+
         def down
           drop_table :system_types
         end
       end
-      
+
       class CreateJobs < ActiveRecord::Migration
         def up
           create_table :jobs do |t|
@@ -118,12 +116,12 @@ module Bookie
             t.index :exit_code
           end
         end
-      
+
         def down
           drop_table :jobs
         end
       end
-      
+
       class CreateJobSummaries < ActiveRecord::Migration
         def up
           create_table :job_summaries do |t|
@@ -140,12 +138,12 @@ module Bookie
             t.index :date
           end
         end
-        
+
         def down
          drop_table :job_summaries
         end
       end
-      
+
       class CreateLocks < ActiveRecord::Migration
         def up
           create_table :locks do |t|
@@ -154,17 +152,17 @@ module Bookie
           change_table :locks do |t|
             t.index :name, :unique => true
           end
-          
+
           ['users', 'groups', 'systems', 'system_types', 'job_summaries'].each do |name|
             Lock.create!(:name => name)
           end
         end
-          
+
         def down
           drop_table :locks
         end
       end
-    
+
       class << self;
         ##
         #Brings up all migrations
@@ -178,7 +176,7 @@ module Bookie
           CreateJobSummaries.new.up
           CreateLocks.new.up
         end
-        
+
         ##
         #Brings down all migrations
         #

data/lib/bookie/database/group.rb

@@ -19,14 +19,14 @@ module Bookie
         group = known_groups[name] if known_groups
         unless group
           Lock[:groups].synchronize do
-            group = find_by_name(name)
-            group ||= create!(:name => name)
+            group = find_by(name: name)
+            group ||= create!(name: name)
           end
           known_groups[name] = group if known_groups
         end
         group
       end
-      
+
       validates_presence_of :name
     end
   end

data/lib/bookie/database/job.rb

@@ -21,7 +21,7 @@ module Bookie
       belongs_to :system
       has_one :group, :through => :user
       has_one :system_type, :through => :system
-      
+
       ##
       #The time at which the job ended
       def end_time
@@ -33,17 +33,17 @@ module Bookie
       end
 
       #To consider: disable #end_time= ?
-      
+
       def self.by_user(user)
         where('jobs.user_id = ?', user.id)
       end
-      
+
       ##
       #Filters by user name
       def self.by_user_name(user_name)
         joins(:user).where('users.name = ?', user_name)
       end
-      
+
       def self.by_system(system)
         where('jobs.system_id = ?', system.id)
       end
@@ -53,27 +53,30 @@ module Bookie
       def self.by_system_name(system_name)
         joins(:system).where('systems.name = ?', system_name)
       end
-      
+
       ##
       #Filters by group name
       def self.by_group_name(group_name)
-        group = Group.find_by_name(group_name)
-        return joins(:user).where('users.group_id = ?', group.id) if group
-        self.none
+        group = Group.find_by(name: group_name)
+        if group then
+          joins(:user).where('users.group_id = ?', group.id)
+        else
+          self.none
+        end
       end
-      
+
       ##
       #Filters by system type
       def self.by_system_type(system_type)
         joins(:system).where('systems.system_type_id = ?', system_type.id)
       end
-      
+
       ##
       #Filters by command name
       def self.by_command_name(c_name)
         where('jobs.command_name = ?', c_name)
       end
-      
+
       ##
       #Finds all jobs that were running at some point in a given time range
       def self.by_time_range(time_range)
@@ -100,7 +103,7 @@ module Bookie
           where('? <= jobs.start_time AND jobs.end_time <= ?', time_range.begin, time_range.end)
         end
       end
-      
+
       ##
       #Finds all jobs that overlap the edges of the given time range
       def self.overlapping_edges(time_range)
@@ -112,7 +115,7 @@ module Bookie
           where(query_str, {:begin => time_range.begin, :end => time_range.end})
         end
       end
-     
+
       ##
       #Produces a summary of the jobs in the given time interval
       #
@@ -177,22 +180,22 @@ module Bookie
           :memory_time => memory_time,
         }
       end
-      
+
       before_save do
         write_attribute(:end_time, end_time)
       end
-      
+
       before_update do
         write_attribute(:end_time, end_time)
       end
-      
+
       validates_presence_of :user, :system, :cpu_time,
         :start_time, :wall_time, :memory, :exit_code
-        
+
       validates_each :command_name do |record, attr, value|
         record.errors.add(attr, 'must not be nil') if value == nil
       end
-       
+
       validates_each :cpu_time, :wall_time, :memory do |record, attr, value|
         record.errors.add(attr, 'must be a non-negative integer') unless value && value >= 0
       end

data/lib/bookie/database/job_summary.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'protected_attributes'
 
 require 'bookie/database/job'
 require 'bookie/database/system'
@@ -13,12 +12,10 @@ module Bookie
     #Most summary operations should be performed through this class to improve efficiency.
     class JobSummary < ActiveRecord::Base
       self.table_name = :job_summaries
-    
+
       belongs_to :user
       belongs_to :system
 
-      attr_accessible :date, :user, :user_id, :system, :system_id, :command_name, :cpu_time, :memory_time
-      
       ##
       #Filters by date
       def self.by_date(date)
@@ -35,25 +32,25 @@ module Bookie
           where('? <= job_summaries.date AND job_summaries.date <= ?', range.begin, range.end)
         end
       end
-      
+
       ##
       #Filters by user
       def self.by_user(user)
         where('job_summaries.user_id = ?', user.id)
       end
-      
+
       ##
       #Filters by user name
       def self.by_user_name(name)
         joins(:user).where('users.name = ?', name)
       end
-      
+
       ##
       #Filters by group
       def self.by_group(group)
         joins(:user).where('users.group_id = ?', group.id)
       end
-      
+
       ##
       #Filters by group name
       def self.by_group_name(name)
@@ -64,31 +61,31 @@ module Bookie
           self.none
         end
       end
-      
+
       ##
       #Filters by system
       def self.by_system(system)
         where('job_summaries.system_id = ?', system.id)
       end
-      
+
       ##
       #Filters by system name
       def self.by_system_name(name)
         joins(:system).where('systems.name = ?', name)
       end
-      
+
       ##
       #Filters by system type
       def self.by_system_type(type)
         joins(:system).where('systems.system_type_id = ?', type.id)
       end
-      
+
       ##
       #Filters by command name
       def self.by_command_name(cmd)
         where('job_summaries.command_name = ?', cmd)
       end
-      
+
       ##
       #Create cached summaries for the given date
       #
@@ -100,12 +97,12 @@ module Bookie
       def self.summarize(date)
         jobs = Job
         unscoped = self.unscoped
-        time_min = date.to_utc_time 
+        time_min = date.to_utc_time
         time_range = time_min ... time_min + 1.days
         day_jobs = jobs.by_time_range(time_range)
 
         #Find the unique combinations of values for some of the jobs' attributes.
-        value_sets = day_jobs.select('user_id, system_id, command_name').uniq
+        value_sets = day_jobs.uniq.pluck(:user_id, :system_id, :command_name)
         if value_sets.empty?
           #There are no jobs, so create a dummy summary.
           user = User.select(:id).first
@@ -128,17 +125,17 @@ module Bookie
         else
           value_sets.each do |set|
             summary_jobs = jobs.where(
-              :user_id => set.user_id,
-              :system_id => set.system_id,
-              :command_name => set.command_name
+              :user_id => set[0],
+              :system_id => set[1],
+              :command_name => set[2]
             )
             summary = summary_jobs.summary(time_range)
             Lock[:job_summaries].synchronize do
               sum = unscoped.find_or_initialize_by(
                 :date => date,
-                :user_id => set.user_id,
-                :system_id => set.system_id,
-                :command_name => set.command_name
+                :user_id => set[0],
+                :system_id => set[1],
+                :command_name => set[2]
               )
               sum.cpu_time = summary[:cpu_time]
               sum.memory_time = summary[:memory_time]
@@ -147,7 +144,7 @@ module Bookie
           end
         end
       end
-      
+
       ##
       #Returns a summary of jobs in the database
       #
@@ -178,7 +175,7 @@ module Bookie
         end
 
         time_range = time_range.normalized
-        
+
         date_begin = time_range.begin.utc.to_date
         rounded_date_begin = false
         #Round date_begin up.
@@ -199,7 +196,7 @@ module Bookie
         successful = jobs_in_range.where('jobs.exit_code = 0').count
         cpu_time = 0
         memory_time = 0
-        
+
         #To consider: check if num_jobs is zero so we can skip all this?
         if rounded_date_begin
           #We need to get a summary for the chunk up to the first whole day.
@@ -218,7 +215,7 @@ module Bookie
         end
 
         date_range = date_begin ... date_end
-        
+
         #Now we can process the cached summaries.
         unscoped = self.unscoped
         summaries = by_date_range(date_range).order(:date).to_a
@@ -245,7 +242,7 @@ module Bookie
           end
           index = new_index
         end
-        
+
         {
           :num_jobs => num_jobs,
           :successful => successful,
@@ -253,13 +250,13 @@ module Bookie
           :memory_time => memory_time,
         }
       end
-      
+
       validates_presence_of :user_id, :system_id, :date, :cpu_time, :memory_time
-      
+
       validates_each :command_name do |record, attr, value|
         record.errors.add(attr, 'must not be nil') if value == nil
       end
-      
+
       validates_each :cpu_time, :memory_time do |record, attr, value|
         record.errors.add(attr, 'must be a non-negative integer') unless value && value >= 0
       end