kuzushi 0.0.3 → 0.0.6

data/Rakefile

@@ -12,6 +12,7 @@ Jeweler::Tasks.new do |s|
 	s.executables = %w(kuzushi)
 	s.add_dependency "rest-client"
 	s.add_dependency "json"
+	s.add_dependency "rush"
 end
 
 Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.6

data/lib/kuzushi.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'json'
 require 'restclient'
 require 'ostruct'
+require 'rush'
 
 class Kuzushi
 	def initialize(url)
@@ -98,7 +99,7 @@ class Kuzushi
 
 	def process_mounts(m)
 		task "mount #{m.label}" do
-			shell "mount -o #{m.options} -L #{m.label} #{m.label}"
+			shell "mkdir -p #{m.label} && mount -o #{m.options} -L #{m.label} #{m.label}"
 		end
 	end
 
@@ -113,7 +114,7 @@ class Kuzushi
 	def process_users(user)
 		(user.authorized_keys || []).each do |key|
 			task "add authorized_key for user #{user.name}" do
-				shell "su - #{user.name} -c 'mkdir -p .ssh; echo \"#{key}\" >> .ssh/authorized_keys; chmod -R 600 .ssh'"
+				shell "su - #{user.name} -c 'mkdir -p .ssh; echo \"#{key}\" >> .ssh/authorized_keys; chmod -R 0600 .ssh'"
 			end
 		end 
 	end
@@ -165,7 +166,7 @@ class Kuzushi
 		file = "#{tmp_dir}/#{File.basename(file)}"
 		File.open(file,"w") do |f|
 			f.write(content)
-			f.chmod(700)
+			f.chmod(0700)
 		end if content
 		block.call(file) if block
 		file
@@ -199,7 +200,10 @@ class Kuzushi
 	end
 
 	def wait_for_volume(vol)
-		puts "waiting for volume #{vol}"
+		until File.exists?("/sys/block/#{File.basename(vol)}") do
+			puts "waiting for volume #{vol}"
+			sleep 2
+		end
 	end
 
 	def start
@@ -212,7 +216,8 @@ class Kuzushi
 	end
 
 	def shell(cmd, env = {})
-		puts "  SHELL: #{cmd}"
+		puts "# #{cmd}"
+		puts Rush.bash cmd, :env => env
 	end
 
 	def task(description, &blk)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuzushi
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors: 
 - Orion Henry
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rush
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A tool used by the sumo gem for performing instance setup and management in AWS
 email: orion@heroku.com
 executables: