profig 0.08 → 0.09

data/bin/profig

@@ -11,6 +11,9 @@ def parse_args()
 	OptionParser.new do |opts|
 		opts.banner = 'Usage: profig'
 
+		opts.on('-f', '--file FILE', 'Select file') do |f|
+			options[:file] = f
+		end
 		opts.on('-d', '--directory DIR', 'Select directory') do |d|
 			options[:directory] = d
 		end
@@ -24,10 +27,19 @@ def main()
 	p opts
 	p args
 
+	file = opts[:file]
 	dir = opts[:directory]
-	dir = '/var/lib/profig/conf.d' if dir.nil?
-
-	config = Profig.load_config(dir)
+	if file.nil? and dir.nil?
+		config_path = '/var/lib/profig/conf.d'
+	elsif file.nil?
+		config_path = dir
+	elsif dir.nil?
+		config_path = file
+	else
+		config_path = [file,dir]
+	end
+
+	config = Profig.load_config(config_path)
 	Profig.run(config)
 end
 

data/lib/profig/config.rb

@@ -10,6 +10,7 @@ class Item
 
 	def initialize(name, opts)
 		@name = name
+		opts = {} if opts.nil?
 		@opts = opts
 	end
 end
@@ -38,7 +39,7 @@ class Section
 end
 
 
-def self.load_config_yaml(directory)
+def self.load_config_directory(directory)
 	# do a stable ordering by alphabetical
 	files = Dir.glob("#{directory}/*").sort
 	confs = []
@@ -91,9 +92,12 @@ def self.yaml_to_sections(yaml)
 	return section_acc
 end
 
-
-def self.load_config(directory)
-	confs = load_config_yaml(directory)
+def self.load_config(path)
+	if File.file? path then
+		confs = [YAML.load_file(path)]
+	elsif File.directory? path then
+		confs = load_config_directory(path)
+	end
 	return yaml_to_sections(confs)
 end
 

data/lib/profig/install.rb

@@ -2,7 +2,8 @@
 module Profig
 # Handlers for various installers / package managers
 
-
+# Package Installers
+#
 def self.handle_cabal(pkg_name, opts)
 	cmd = "cabal install #{package_name}"
 	system cmd
@@ -29,4 +30,15 @@ def self.handle_yum(pkg_name, opts)
 end
 
 
+# Source Installers
+#
+def self.handle_rake(path, opts)
+	pwd = Dir.pwd
+	Dir.chdir path
+	target = opts['target']
+	cmd = "rake #{target}"
+	system cmd
+	Dir.chdir pwd
+end
+
 end # module

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: profig
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 8
-  version: "0.08"
+  - 9
+  version: "0.09"
 platform: ruby
 authors: 
 - Matthew Graham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-31 00:00:00 -04:00
+date: 2011-08-06 00:00:00 -04:00
 default_executable: 
 dependencies: []