profig 0.01 → 0.02

data/lib/profig/config.rb

@@ -3,30 +3,40 @@ require 'yaml'
 module Profig
 
 
-class Resource
+# An individual piece of configuration
+class Item
 	attr_reader :name
 	attr_reader :opts
+
+	def initialize(name, opts)
+		@name = name
+		@opts = opts
+	end
 end
 
+# A group of configuration items that are of the same type and should
+# be handled at the same time
+class Section
+	attr_reader :type
+	attr_reader :items
 
-# Take an array of configs, and merge them into a single list
-def self.merge_config(confs)
-	merge = {}
-	confs.each do |c|
-		c.each do |name, items|
-			if merge.has_key? name:
-				merge[name].concat(items)
-			else
-				merge[name] = items
-			end
+	def initialize(type)
+		@type = type
+		@items = []
+	end
+
+	def <<(item)
+		if not item.instance_of? Item
+			raise 'Unknown item type'
 		end
+		@items << item
 	end
-	return merge
 end
 
 
 def self.load_config_yaml(directory)
-	files = Dir.glob("#{directory}/*")
+	# do a stable ordering by alphabetical
+	files = Dir.glob("#{directory}/*").sort
 	confs = []
 	files.each do |f|
 		if File.file?(f)
@@ -37,9 +47,50 @@ def self.load_config_yaml(directory)
 end
 
 
+def self.yaml_items(yitems)
+	yitems.each do |item|
+		if item.instance_of? String
+			name = item
+			opts = nil
+		else
+			name = item.keys[0]
+			opts = item[name]
+		end
+		yield name, opts
+	end
+end
+
+def self.yaml_sections(yaml)
+	yaml.each do |doc|
+		if not doc.has_key? 'profig'
+			raise 'Invalid configuration format'
+		end
+
+		doc['profig'].each do |yaml_section|
+			type = yaml_section.keys[0]
+			items = yaml_section[type]
+			yield type, items
+		end
+	end
+end
+
+def self.yaml_to_sections(yaml)
+	section_acc = []
+	yaml_sections(yaml) do |type, yitems|
+		section = Section.new(type)
+		yaml_items(yitems) do |name, opts|
+			section << Item.new(name, opts).freeze
+		end
+		section.freeze
+		section_acc << section
+	end
+	return section_acc
+end
+
+
 def self.load_config(directory)
 	confs = load_config_yaml(directory)
-	return merge_config(confs)
+	return yaml_to_sections(confs)
 end
 
 

data/lib/profig/linux.rb

@@ -4,20 +4,32 @@ require 'fileutils'
 module Profig
 
 
+def self.handle_linux_file(name, opts)
+	src = opts['source']
+	owner, group = split_owner(opts['owner'])
+	mode = opts['mode']
+
+	FileUtils.copy(src, name)
+	FileUtils.chown(owner, group, name)
+	FileUtils.chmod(mode, name) if mode
+end
+
+
 def self.handle_linux_dir(name, opts)
+	owner, group = split_owner(opts['owner'])
+	mode = opts['mode']
+
 	FileUtils.mkdir_p(name)
-	if opts.has_key? 'owner'
-		owner, group = split_owner(opts['owner'])
-		FileUtils.chown(owner, group, name)
-	end
-	if opts.has_key? 'mode'
-		mode = opts['mode']
-		FileUtils.chmod(mode, name)
-	end
+	FileUtils.chown(owner, group, name)
+	FileUtils.chmod(mode, name) if mode
 end
 
 
 def self.split_owner(owner_str)
+	if owner_str.nil?
+		return nil, nil
+	end
+
 	split_owner = owner_str.split(':')
 	owner, group = nil, nil
 	if split_owner.length == 1

data/lib/profig/main.rb

@@ -4,21 +4,15 @@ require 'profig/ubuntu'
 module Profig
 
 
-def self.run_handler(handler, items)
+# Run all items one at a time
+def self.run_item_handler(handler, items)
 	items.each do |i|
-		if i.instance_of? String
-			name = i
-			opts = nil
-		else
-			name = i.keys[0]
-			opts = i[name]
-		end
-		handler.call(name, opts)
+		handler.call(i.name, i.opts)
 	end
 end
 
 
-def self.run(os, config)
+def self.run(os, sections)
 	users_groups = `id -G`.split()
 	if not users_groups.include? "0"
 		# this should be made an exception at some point
@@ -26,16 +20,27 @@ def self.run(os, config)
 		exit
 	end
 
-	config.each do |name, items|
-		handler_name = "handle_#{os}_#{name}"
-
-		if not Profig.respond_to? handler_name
-			puts "No #{name} handler for #{os}"
+	sections.each do |section|
+		type = section.type
+		section_handler_name = "handle_#{type}_section_for_#{os}"
+		#item_handler_name = "handle_#{type}_item_for_#{os}"
+		item_handler_name = "handle_#{os}_#{type}"
+
+		# first check if there's a section handler for this type
+		# a section handler takes all items at once
+		if Profig.respond_to? section_handler_name
+			handler = method(section_handler_name)
+			handler.call(section.items)
+		# second, check if tere's a handler for individual items
+		# this type of handler will process items one at a time
+		elsif Profig.respond_to? item_handler_name
+			handler = method(item_handler_name)
+			run_item_handler(handler, section.items)
+		# if no handlers, complain about it and move on
+		else
+			puts "No #{type} handlers for #{os}"
 			next
 		end
-
-		handler = method(handler_name)
-		run_handler(handler, items)
 	end
 end
 

data/lib/profig/ubuntu.rb

@@ -33,5 +33,9 @@ def self.handle_ubuntu_dir(name, opts)
 	Profig.handle_linux_dir(name, opts)
 end
 
+def self.handle_ubuntu_file(name, opts)
+	Profig.handle_linux_file(name, opts)
+end
+
 
 end # module

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: profig
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.01"
+  - 2
+  version: "0.02"
 platform: ruby
 authors: 
 - Matthew Graham
@@ -18,7 +18,7 @@ date: 2010-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Push-modeled system configuration manager with limited feature set
+description: A YAML-based system configuration manager with no central server
 email: 
 - mdg149@gmail.com
 executables: 
@@ -67,6 +67,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Limited system configuration manager
+summary: A YAML-based system configuration manager
 test_files: []