kit 0.0.2 → 0.0.3

data/README

@@ -0,0 +1 @@
+ 

data/{actions.sql → kits/my_kit/actions.sql}

@@ -1,16 +1,16 @@
 CREATE TABLE clones (
-	"site" INTEGER NOT NULL,
+	"bit" INTEGER NOT NULL,
 	"status" TEXT NOT NULL DEFAULT ('pending'),
 	"src" INTEGER NOT NULL
 );
 CREATE TABLE upgrades (
-	"site" INTEGER NOT NULL,
+	"bit" INTEGER NOT NULL,
 	"status" TEXT NOT NULL DEFAULT ('pending'),
 	"component" TEXT NOT NULL,
 	"file" TEXT NOT NULL
 );
 CREATE TABLE commits (
-	"site" INTEGER NOT NULL,
+	"bit" INTEGER NOT NULL,
 	"status" TEXT NOT NULL DEFAULT ('pending'),
 	"requested_commit" TEXT
 );

data/{actions/clones/otr.rb → kits/my_kit/clones/my_project.rb}

@@ -6,7 +6,7 @@ module Actions
 	end
 
 	def clones options
-		src = Site.new options[:src]
+		src = Bit.new options[:src]
 # 		fail ProjectMismatch unless @project_id == src.project_id
 
 		puts "cloning #{src.project_name}.#{src.name} to #{@project_name}.#{@name}"

data/{config.rb → kits/my_kit/config.rb}

@@ -1,16 +1,15 @@
+NAME = "my_kit"
 DB_BACKEND = :sqlite3
 DB_CONFIG = {
-	:info		=> "info.db",
-	:actions	=> "actions.db"
+	:info		=> "/home/razorx/development/kit/kits/my_kit/info.db",
+	:actions	=> "/home/razorx/development/kit/kits/my_kit/actions.db"
 }
 INFO = {
-	:sites => [ :rowid, :name, :project, :root, :commit, :commit_time ],
+	:bits => [ :rowid, :name, :project, :root, :commit, :commit_time ],
 	:projects => [ :rowid, :name, :git ]
 }
 ACTIONS = {
 	:clones		=> [ :rowid, :status, :src, :site ],
 	:upgrades	=> [ :rowid, :status, :site, :component, :file ],
 	:commits	=> [ :rowid, :status, :site, :requested_commit ]
-}
-ACTIONS_PATH = "./actions"
-NAME = "devel"
+}

data/{info.sql → kits/my_kit/info.sql}

@@ -1,12 +1,12 @@
 CREATE TABLE "permissions" (
 	"name" INTEGER NOT NULL,
-	"site" INTEGER NOT NULL
+	"bit" INTEGER NOT NULL
 );
 CREATE TABLE projects (
 	"name" TEXT NOT NULL,
 	"git" TEXT NOT NULL
 );
-CREATE TABLE sites (
+CREATE TABLE bits (
 	"name" TEXT NOT NULL,
 	"project" INTEGER NOT NULL,
 	"root" TEXT NOT NULL,

data/{info/devel.rb → kits/my_kit/my_kit.rb}

@@ -1,10 +1,10 @@
-class Site
+class Bit
 
 	def insert_new
 		@project_id = insert_new_project unless @project_id
 
 		data = { :name => @name, :project => @project_id, :root => @root, :commit => nil, :commit_time => nil }
-		@@db.insert_info :sites, data
+		@@db.insert_info :bits, data
 	end
 
 	def insert_new_project
@@ -17,7 +17,7 @@ class Site
 
 	def load_info
 
-		info = @@db.select_info_by_id :sites, @@info[:sites], @id
+		info = @@db.select_info_by_id :bits, @@info[:bits], @id
 
 		@name = info[:name]
 		@project_id = info[:project]

data/lib/kit.rb

@@ -0,0 +1,64 @@
+class Kit
+
+	def initialize path
+
+		load path + "config.rb"
+
+		load 'kit/db_sqlite3.rb' if DB_BACKEND == :sqlite3
+
+		load path + NAME + ".rb"
+
+		@@kit_path = path
+		@@db = Backend.new DB_CONFIG
+		@@info = INFO
+		@@actions = ACTIONS
+	end
+
+	def add_bit info
+		Bit.new info
+	end
+
+	def add_task action, options
+		fail NoAction unless @@actions.include? action
+		@@db.insert_action action, options
+	end
+
+	def run_tasks
+
+		collect_tasks_by_bit.each do |bit, tasks|
+			s = Bit.new bit
+
+			actions = tasks.group_by { |t| t[:action] } . keys
+
+			actions.each do |a|
+				load @@kit_path + "/#{a}/#{s.project_name}.rb"
+				s.extend Actions
+			end
+
+			tasks.each do |t|
+				s.add_task t
+			end
+
+			s.run_all
+
+		end
+	end
+
+	private
+	def collect_tasks_by_bit
+
+		tasks = []
+		@@actions.each_key do |action|
+			tasks.push @@db.select_all_actions_by_status action, @@actions[action], :pending
+		end
+		tasks.flatten!
+
+		tasks.group_by { |t| t[:bit] }
+	end
+
+	class NoAction < StandardError
+	end
+
+end
+
+require 'kit/bit'

data/{site.rb → lib/kit/bit.rb}

@@ -1,4 +1,4 @@
-class Site < SiteManager
+class Bit < Kit
 
 	attr_reader :id
 

data/{db_sqlite3.rb → lib/kit/db_sqlite3.rb}

@@ -24,7 +24,7 @@ module SQLite3Tools
 	end
 end
 
-class Backend < SiteManager
+class Backend < Kit
 
 	include SQLite3Tools
 
@@ -38,7 +38,7 @@ class Backend < SiteManager
 	def db_prepare db_paths
 
 		def db_initialize type, db
-			sql = File.read "#{type}.sql"
+			sql = File.read @@kit_path + "#{type}.sql"
 			db.execute_batch sql
 		end
 

data/spec/my_kit_spec.rb

@@ -0,0 +1,10 @@
+require 'kit'
+
+describe Kit do
+
+	describe "#new" do
+		k = Kit.new "/home/razorx/development/kit/kits/my_kit/"
+		b = { :name => "otr", :git => "git", :project_name => "otr", :root => "root" }
+		k.add_bit b
+	end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Evan Boyd Sosenko
@@ -27,20 +27,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- info.sql
-- actions.sql
-- ./info/devel.rb
-- ./site_manager.rb
-- ./actions/commits/otr.rb
-- ./actions/clones/otr.rb
-- ./actions/upgrades/otr.rb
-- ./config.rb
-- ./db_sqlite3.rb
-- ./site.rb
-- site_manager.rb
-- config.rb
-- db_sqlite3.rb
-- site.rb
+- lib/kit/bit.rb
+- lib/kit/db_sqlite3.rb
+- lib/kit.rb
+- README
+- kits/my_kit/commits/my_project.rb
+- kits/my_kit/info.sql
+- kits/my_kit/clones/my_project.rb
+- kits/my_kit/my_kit.rb
+- kits/my_kit/actions.sql
+- kits/my_kit/config.rb
+- kits/my_kit/upgrades/my_project.rb
+- spec/my_kit_spec.rb
 has_rdoc: true
 homepage: 
 licenses: 

data/site_manager.rb

@@ -1,73 +0,0 @@
-class SiteManager
-
-	def initialize name, db_backend, db_config, info, actions
-
-		load './db_sqlite3.rb' if db_backend == :sqlite3
-
-		load './info/' + name + ".rb"
-
-
-		@@db = Backend.new db_config
-		@@actions = actions
-		@@info = info
-	end
-
-	def add_site info
-		Site.new info
-	end
-
-	def add_task action, options
-		fail NoAction unless @@actions.include? action
-		@@db.insert_action action, options
-	end
-
-	def run_tasks
-
-		collect_tasks_by_site.each do |site, tasks|
-			s = Site.new site
-
-			actions = tasks.group_by { |t| t[:action] } . keys
-
-			actions.each do |a|
-				load ACTIONS_PATH + "/#{a}/#{s.project_name}.rb"
-				s.extend Actions
-			end
-
-			tasks.each do |t|
-				s.add_task t
-			end
-
-			s.run_all
-
-		end
-	end
-
-	private
-	def collect_tasks_by_site
-
-		tasks = []
-		@@actions.each_key do |action|
-			tasks.push @@db.select_all_actions_by_status action, @@actions[action], :pending
-		end
-		tasks.flatten!
-
-		tasks.group_by { |t| t[:site] }
-	end
-
-	class NoAction < StandardError
-	end
-
-end
-
-require './config.rb'
-require './site.rb'
-
-
-sm = SiteManager.new NAME, DB_BACKEND, DB_CONFIG, INFO, ACTIONS
-
-p = { :project_name => "otr", :name => "live", :root => "rootLive/", :git => "gitPath" }
-sm.add_site p
-ac = { :site => 1, :requested_commit => "co" }
-sm.add_task :commits, ac
-sm.run_tasks
-