bookie_accounting 1.0.0 → 1.1.0

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
 gemspec
+

data/Rakefile

@@ -11,12 +11,12 @@ RSpec::Core::RakeTask.new(:spec) do |task|
   task.pattern = 'spec/*_spec.rb'
 end
 
-task :docs do
+task :rdoc do
   system("rdoc rdoc lib")
 end
 
-desc "Build RPM and dependencies (intended for IBEST internal use)"
-task :rpm_deps do
+desc "Build RPM and dependencies (intended for University of Idaho IBEST internal use)"
+task :rpm_deps => [:build] do
   require 'erb'
   require 'yaml'
 
@@ -27,9 +27,6 @@ task :rpm_deps do
       :gem_file => "bookie_accounting-#{Bookie::VERSION}.gem",
       :license => 'MIT',
       :skip_deps => Set.new(['sqlite3']),
-    },
-    'bundler' => {
-
     },
     'spreadsheet' => {
       :has_binaries => true,
@@ -136,7 +133,7 @@ def build_rpms(modules_to_build)
       end
     end
 
-    msg = `rpmbuild -bb #{spec_filename}`
+    msg = `rpmbuild -ba #{spec_filename}`
     unless $?.success?
       puts msg
       exit 1

data/TODO

@@ -0,0 +1 @@
+

data/bin/bookie-create-tables

@@ -33,7 +33,7 @@ config = Bookie::Config.new(config_file)
 config.connect
 
 if drop
-  STDOUT.write "Are you sure? This will destroy all tables in the database. "
+  STDOUT.write "Are you sure? This will destroy all tables in the database. (YES/NO): "
   response = nil
   until response
     response = STDIN.gets.chomp

data/bin/bookie-send

@@ -18,6 +18,7 @@ require 'bookie/sender'
 config_file = '/etc/bookie/config.json'
 will_create = false
 will_decommission = false
+will_undo = false
 system_start_time = nil
 system_hostname = nil
 system_end_time = nil
@@ -29,6 +30,10 @@ opts = OptionParser.new do |opts|
     config_file = file
   end
   
+  opts.on('-u', '--undo', String, "undo a previous send operation (file must be specified)") do
+    will_undo = true
+  end
+  
   opts.on("--create [TIME]",
   "Create an entry for this system, recording the given time as its start time") do |time|
     will_create = true
@@ -59,7 +64,11 @@ fail("No operation specified") unless filename || will_create || will_decommissi
 
 if filename
   sender = Bookie::Sender.new(config)
-  sender.send_data(filename)
+  if will_undo
+    sender.undo_send(filename)
+  else
+    sender.send_data(filename)
+  end
 end
 
 if will_decommission

data/bookie_accounting.gemspec

@@ -17,11 +17,14 @@ Gem::Specification.new do |gem|
   gem.version       = Bookie::VERSION
   
   gem.add_dependency('activerecord')
-  #For some reason, this is needed for Ruby 1.8.7 using RVM on CentOS.
-  #To do: remove when no longer needed
-  #gem.add_dependency('mysql2')
+  gem.add_dependency('json')
+  #We need this because Bundler has no concept of optional dependencies
+  #and complains about using non-dependency gems.
+  #To do: figure out how to remove (file issue?)
+  gem.add_dependency('mysql2')
   gem.add_dependency('pacct')
   gem.add_dependency('spreadsheet')
+  gem.add_development_dependency('bundler')
   gem.add_development_dependency('mocha')
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('sqlite3')