profig 0.06 → 0.07

data/bin/profig

@@ -24,12 +24,11 @@ def main()
 	p opts
 	p args
 
-	os = :ubuntu
 	dir = opts[:directory]
 	dir = '/var/lib/profig/conf.d' if dir.nil?
 
 	config = Profig.load_config(dir)
-	Profig.run(os, config)
+	Profig.run(config)
 end
 
 

data/lib/profig/install.rb

@@ -0,0 +1,32 @@
+
+module Profig
+# Handlers for various installers / package managers
+
+
+def self.handle_cabal(pkg_name, opts)
+	cmd = "cabal install #{package_name}"
+	system cmd
+end
+
+def self.handle_deb(pkg_name, opts)
+	cmd = "apt-get install -y #{pkg_name}"
+	system cmd
+end
+
+def self.handle_egg(egg_name, opts)
+	cmd = "pip install #{egg_name}"
+	system cmd
+end
+
+def self.handle_gem(gem_name, opts)
+	cmd = "gem install #{gem_name}"
+	system cmd
+end
+
+def self.handle_yum(pkg_name, opts)
+	cmd = "yum install -y #{pkg_name}"
+	system cmd
+end
+
+
+end # module

data/lib/profig/linux.rb

@@ -4,7 +4,29 @@ require 'fileutils'
 module Profig
 
 
-def self.handle_linux_file(name, opts)
+def self.handle_user(user_name, opts)
+	if not user_name.instance_of? String
+		raise 'Unknown user type'
+	elsif not /[a-zA-Z][a-zA-Z0-9_]+/.match user_name
+		raise 'Invalid user format'
+	end
+
+	cmd = "adduser -q --system --no-create-home"
+	cmd += " --disabled-password --disabled-login #{user_name}"
+	system cmd
+end
+
+def self.handle_group(group_name, opts)
+	if not group_name.instance_of? String
+		raise 'Unknown group definition'
+	end
+
+	cmd = "addgroup -q --system #{group_name}"
+	system(cmd)
+end
+
+
+def self.handle_file(name, opts)
 	src = opts['source']
 	owner, group = split_owner(opts['owner'])
 	mode = opts['mode']
@@ -15,7 +37,7 @@ def self.handle_linux_file(name, opts)
 end
 
 
-def self.handle_linux_dir(name, opts)
+def self.handle_dir(name, opts)
 	owner, group = split_owner(opts['owner'])
 	mode = opts['mode']
 

data/lib/profig/main.rb

@@ -1,5 +1,5 @@
-require 'profig/ubuntu'
-
+require 'profig/install'
+require 'profig/linux'
 
 module Profig
 
@@ -12,7 +12,7 @@ def self.run_item_handler(handler, items)
 end
 
 
-def self.run(os, sections)
+def self.run(sections)
 	users_groups = `id -G`.split()
 	if not users_groups.include? "0"
 		# this should be made an exception at some point
@@ -22,9 +22,9 @@ def self.run(os, sections)
 
 	sections.each do |section|
 		type = section.type
-		section_handler_name = "handle_#{type}_section_for_#{os}"
+		section_handler_name = "handle_#{type}_section"
 		#item_handler_name = "handle_#{type}_for_#{os}"
-		item_handler_name = "handle_#{os}_#{type}"
+		item_handler_name = "handle_#{type}"
 
 		# first check if there's a section handler for this type
 		# a section handler takes all items at once

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: profig
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.06"
+  - 7
+  version: "0.07"
 platform: ruby
 authors: 
 - Matthew Graham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -05:00
+date: 2011-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,14 +29,10 @@ extra_rdoc_files: []
 
 files: 
 - bin/profig
-- lib/profig/debian.rb
-- lib/profig/ubuntu.rb
-- lib/profig/config.rb
-- lib/profig/haskell.rb
-- lib/profig/ruby.rb
-- lib/profig/main.rb
-- lib/profig/python.rb
 - lib/profig/linux.rb
+- lib/profig/main.rb
+- lib/profig/config.rb
+- lib/profig/install.rb
 has_rdoc: true
 homepage: http://github.com/mdg/profig
 licenses: []

data/lib/profig/debian.rb

@@ -1,9 +0,0 @@
-
-module Profig
-
-def self.handle_debian_deb(pkg_name, opts)
-	cmd = "apt-get install -y #{pkg_name}"
-	system cmd
-end
-
-end # module

data/lib/profig/haskell.rb

@@ -1,11 +0,0 @@
-
-module Profig
-
-
-def self.handle_cabal(package_name, opts)
-	cmd = "cabal install #{package_name}"
-	system cmd
-end
-
-
-end # module

data/lib/profig/python.rb

@@ -1,11 +0,0 @@
-
-module Profig
-
-
-def self.handle_egg(egg_name, opts)
-	cmd = "pip install #{egg_name}"
-	system cmd
-end
-
-
-end # module

data/lib/profig/ruby.rb

@@ -1,11 +0,0 @@
-
-module Profig
-
-
-def self.handle_gem(gem_name, opts)
-	cmd = "gem install #{gem_name}"
-	system cmd
-end
-
-
-end # module

data/lib/profig/ubuntu.rb

@@ -1,56 +0,0 @@
-require 'profig/linux'
-require 'profig/debian'
-require 'profig/haskell'
-require 'profig/python'
-require 'profig/ruby'
-
-module Profig
-
-
-def self.handle_ubuntu_group(group_name, opts)
-	if not group_name.instance_of? String
-		raise 'Unknown group definition'
-	end
-
-	cmd = "addgroup -q --system #{group_name}"
-	system(cmd)
-end
-
-def self.handle_ubuntu_user(user_name, opts)
-	if not user_name.instance_of? String
-		raise 'Unknown user type'
-	elsif not /[a-zA-Z][a-zA-Z0-9_]+/.match user_name
-		raise 'Invalid user format'
-	end
-
-	cmd = "adduser -q --system --no-create-home"
-	cmd += " --disabled-password --disabled-login #{user_name}"
-	system cmd
-end
-
-def self.handle_ubuntu_cabal(pkg_name, opts)
-	Profig.handle_cabal(pkg_name, opts)
-end
-
-def self.handle_ubuntu_deb(pkg_name, opts)
-	Profig.handle_debian_deb(pkg_name, opts)
-end
-
-def self.handle_ubuntu_egg(egg_name, opts)
-	Profig.handle_egg(egg_name, opts)
-end
-
-def self.handle_ubuntu_gem(gem_name, opts)
-	Profig.handle_gem(gem_name, opts)
-end
-
-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