kuzushi 0.0.34 → 0.0.35

data/README

@@ -2,8 +2,10 @@
   Kuzushi ( ka ZU she ) - a technique used by martial artists to control of an
   opponent by keeping them slightly off balance.
 
-The 'kuzushi' gem is a companion to the 'sumo' gem.  Sumo handles
+The 'kuzushi' gem is a companion to the 'judo' gem.  Judo handles
 AWS/instance/volume management of a server based on its specificatoion.
 Kuzushi handles the management from inside the server by installing packages,
 setting up drives and users, writing config files, etc
 
+See the Judo readme here: http://github.com/orionz/judo
+

data/VERSION

@@ -1 +1 @@
-0.0.34
+0.0.35

data/lib/kuzushi.rb

@@ -13,16 +13,15 @@ require 'erb'
 ## user configs
 
 class Kuzushi
-	attr_accessor :config, :config_names
+	attr_accessor :config
 
 	def initialize(url)
 		@url = url
 		@base_url = File.dirname(url)
-		if @url =~ /s3.amazonaws.com.*\/([^\/]*).(\d+).tar.gz/
+		if @url =~ /s3.amazonaws.com.*\/([^\/]*)[.](\d+)[.]tar[.]gz/
 			@name = $1
 			@version = $2
 		end
-		@config_names = []
 		@configs = []
 		@packages = []
 		@tasks = []
@@ -37,12 +36,15 @@ class Kuzushi
 		shell "mkdir -p /tmp/kuzushi/"
 		shell "cd /tmp/kuzushi/ ; curl --silent '#{@url}' | tar xzv"
 		@config = JSON.parse(File.read("/tmp/kuzushi/#{@name}/config.json"))
-		@config_names = [ @name ]
 	end
 
 	def start
 #		load_config_stack(@name)
 		boot
+		run
+	end
+
+	def run
 		process_stack
 		log "----"
 		@tasks.each do |t|
@@ -64,16 +66,6 @@ class Kuzushi
 		RestClient.get(url)
 	end
 
-	def load_config_stack(name)
-		@config_names << name
-		@configs << JSON.parse(http_get("#{@base_url}/#{name}").body)
-		if import = @configs.last["import"]
-			load_config_stack(import)
-		else
-			@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
-		end
-	end
-
 	def process_stack
 		script get("before")
 
@@ -112,11 +104,7 @@ class Kuzushi
 	def process_packages
 		@packages = get_array("packages")
 		task "install packages" do
-#			shell "apt-get update"
 			shell "apt-get install -y #{@packages.join(" ")}" unless @packages.empty?
-#			@packages.each do |pkg|
-#				shell "apt-get install -y #{pkg}"
-#			end
 		end
 	end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 34
-  version: 0.0.34
+  - 35
+  version: 0.0.35
 platform: ruby
 authors: 
 - Orion Henry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: kuzushi
 dependencies: 
 - !ruby/object:Gem::Dependency