kuzushi 0.0.15 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/lib/kuzushi.rb

@@ -111,7 +111,6 @@ class Kuzushi
 	end
 
 	def process_volumes(v)
-		handle_tmpfs  v if v.media == "tmpfs"
 		handle_ebs    v if v.media == "ebs"
 		handle_raid   v if v.media == "raid"
 		set_readahead v if v.readahead
@@ -149,16 +148,11 @@ class Kuzushi
 		o.join(",")
 	end
 
-	def handle_tmpfs(m)
-		m.format ||= "tmpfs"
-		m.device ||= "tmpfs"
-	end
-
 	def handle_mount(m)
 		task "mount #{m.mount}" do
 			unless mounted?(m.mount)
 				shell "mv #{m.mount} #{m.mout}.old" if File.exists?(m.mount)
-				shell "mkdir -p #{m.mount} && mount -o #{mount_options(m)} -t #{m.format} #{m.device} #{m.mount}"
+				shell "mkdir -p #{m.mount} && mount -o #{mount_options(m)} -t #{m.format || m.media} #{m.device || m.media} #{m.mount}"
 				shell "chown -R #{m.user}:#{m.group} #{m.mount}" if m.user or m.group
 			end
 		end
@@ -183,7 +177,7 @@ class Kuzushi
 			write_file("/templates/#{f.template}", f.file) do |file|
 				@system = system
 				t = ERB.new File.read(file), 0, '<>'
-				t.result(binding))
+				t.result(binding)
 			end
 		else
 			src = f.source || File.basename(f.file)
@@ -196,7 +190,7 @@ class Kuzushi
 	def write_file(src, dest, &blk)
 		fetch(src) do |file|
 			FileUtils.mkdir_p(File.dirname(dest))
-			File.open(f.file,"w") { |f| f.write(blk.call) }
+			File.open(dest,"w") { |f| f.write(blk.call(file)) }
 		end
 	end
 
@@ -221,9 +215,10 @@ class Kuzushi
 	end
 
 	def handle_format(v)
+		return if v.format == "tmpfs"
 		task "formatting #{v.device}", :init => true do
 			label = "-L " + v.label rescue ""
-			shell "mkfs.#{v.format} #{label} #{v.device}"
+			shell "mkfs.#{v.format} #{label} #{v.device}" unless v.mount && mounted?(v.mount)
 		end
 		add_package "xfsprogs" if v.format == "xfs"
 	end
@@ -307,7 +302,7 @@ class Kuzushi
 
 	def shell(cmd)
 		puts "# #{cmd}"
-		puts Rush.bash cmd
+		puts Kernel.system cmd ## FIXME - need to handle/report exceptions here
 	end
 
 	def init?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuzushi
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Orion Henry