kit 0.1.2 → 0.2.0

data/lib/kit.rb

@@ -37,7 +37,7 @@ class Kit
 		@@info = config[:info]
 		@@unique = config[:unique]
 		@@actions = config[:actions]
-		@@status_types = [ :pending, :completed, :queued ]
+		@@status_types = [ :pending, :completed, :failed, :running ]
 		@@db = Backend.new config[:db_config]
 
 		# Run initialization specific to the kit.
@@ -112,7 +112,7 @@ class Kit
 			fail NoAction, "#{action}" unless @@actions.include? action
 			@@db.insert_action action, options
 		rescue NoAction => ex
-			puts "Could not add task: no such action: '#{ex.message}'."
+			puts "Could not add task, no such action: '#{ex.message}'."
 		end
 	end
 
@@ -133,7 +133,6 @@ class Kit
 			end
 
 			b.run_all
-			# TODO try and use blocks here to set status to running and then complete / failed as each task runs and finishes
 		end
 	end
 

data/lib/kit/bit.rb

@@ -15,6 +15,14 @@ class Bit < Kit
 	class MissingValues < RuntimeError
 	end
 
+	# Raised when an action runs but fails due to an invalid combination of options.
+	class InvalidAction < RuntimeError
+	end
+
+	# Raised when an action runs but encounters a fatal error.
+	class FailedAction < RuntimeError
+	end
+
 	attr_reader :id
 
 	# Loads all bit info from database, or attempts to add new bit to database.
@@ -135,14 +143,23 @@ class Bit < Kit
 
 		tasks.each do |t|
 			a = t[:action]
+			id = t[:rowid]
+			status[a] ||= {}
 			begin
+				@@db.update_action_status a, id, { :status => :running }
 				self.send a, t
-				status[a] = "complete"
-			rescue
-				status[a] = "failed"
+				stat = :complete
+				msg = nil
+			rescue InvalidAction, FailedAction => e
+				stat = :failed
+				msg = "#{e.class}: #{e.message}"
+			ensure
+				s = { :status => stat, :message => msg }
+				status[a].merge! ( { id => s } )
+				@@db.update_action_status a, id, s
 			end
-			status
 		end
+		status
 	end
 
 	# Finds bit ids that match given criteria.

data/lib/kit/db_sqlite3.rb

@@ -191,6 +191,20 @@ class Backend < Kit
 		@action_db.last_insert_row_id
 	end
 
+	# Updates the status of a task in an action table.
+	# @param [Symbol] table name of the action table
+	# @param [Integer] action rowid to update
+	# @param [Hash] data key / value pairs to set
+	def update_action_status table, id, data
+		data.merge! ( { :status => data[:status].to_s, :time => Time.now.to_i } )
+		set = []
+		data.each do |key, value|
+			set << "`#{key}` = '#{value}'"
+		end
+
+		@action_db.execute "UPDATE #{table} SET #{set.join ", "} WHERE `rowid` = '#{id}'"
+	end
+
 	# 	def delete_action_by_id action, id
 	# 		puts "DELETE FROM `#{action}` WHERE `rowid` = #{id}"
 	# 	end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Evan Boyd Sosenko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-06 00:00:00 -07:00
+date: 2011-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency