kuzushi 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bin/kuzushi

@@ -5,9 +5,14 @@ require File.dirname(__FILE__) + '/../lib/kuzushi'
 usage = "usage: kuzushi start URL"
 
 fail(usage) unless ARGV.length == 2
-fail(usage) unless ARGV[0] == "start"
 
-url = ARGV[1]
+kuzushi = Kuzushi.new(ARGV[1])
 
-Kuzushi.new(url).start
+if ARGV[0] == "start"
+        kuzushi.start
+elsif ARGV[0] == "init"
+        kuzushi.init
+else
+        fail(usage)
+end
 

data/lib/kuzushi.rb

@@ -110,8 +110,8 @@ class Kuzushi
 	end
 
 	def process_volumes(v)
-		handle_ebs    v if v.type == "ebs"
-		handle_raid   v if v.type == "raid"
+		handle_ebs    v if v.media == "ebs"
+		handle_raid   v if v.media == "raid"
 		set_readahead v if v.readahead
 		set_scheduler v if v.scheduler
 		handle_format v if v.format
@@ -149,7 +149,7 @@ class Kuzushi
 	end
 
 	def mounted?(dev)
-		!!system.filesystem[dev]["mount"]
+		!!system.filesystem[File.basename(dev)]["mount"] rescue false
 	end
 
 	def package_arch
@@ -161,7 +161,7 @@ class Kuzushi
 			task "setting up #{f.file}" do
 				@system = system
 				t = ERB.new File.read(file), 0, '<>'
-				File.open(f.file,"w") { |f| f.write(t.render) }
+				File.open(f.file,"w") { |f| f.write(t.result) }
 			end
 		end
 	end
@@ -189,7 +189,7 @@ class Kuzushi
 	def handle_format(v)
 		task "formatting #{v.device}", :init => true do
 			label = "-L " + v.label rescue ""
-			"mkfs.#{v.format} #{label} #{v.device}"
+			shell "mkfs.#{v.format} #{label} #{v.device}"
 		end
 		add_package "xfsprogs" if v.format == "xfs"
 	end
@@ -279,7 +279,7 @@ class Kuzushi
 		@init ||= false
 	end
 
-	def task(description, options = {} &blk)
+	def task(description, options = {}, &blk)
 		return if options[:init] and not init?
 		@tasks << { :description => description, :blk => blk }
 	end

metadata

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