kuzushi 0.0.21 → 0.0.22

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/lib/kuzushi.rb

@@ -11,6 +11,8 @@ require 'erb'
 ## ruby 1.9 compatibility
 
 class Kuzushi
+	attr_accessor :config, :config_names
+
 	def initialize(url)
 		@base_url = File.dirname(url)
 		@name = File.basename(url)
@@ -18,8 +20,6 @@ class Kuzushi
 		@configs = []
 		@packages = []
 		@tasks = []
-		load_config_stack(@name)
-		@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
 	end
 
 	def init
@@ -28,13 +28,14 @@ class Kuzushi
 	end
 
 	def start
+		load_config_stack(@name)
 		process_stack
-		puts "----"
+		log "----"
 		@tasks.each do |t|
-			puts "TASK: #{t[:description]}"
+			log "TASK: #{t[:description]}"
 			t[:blk].call
 		end
-		puts "----"
+		log "----"
 	end
 
 	protected
@@ -45,11 +46,17 @@ class Kuzushi
 		ohai
 	end
 
+	def http_get(url)
+		RestClient.get("#{@base_url}/#{name}")
+	end
+
 	def load_config_stack(name)
 		@config_names << name
-		@configs << JSON.parse(RestClient.get("#{@base_url}/#{name}"))
+		@configs << JSON.parse(http_get("#{@base_url}/#{name}"))
 		if import = @configs.last["import"]
 			load_config_stack(import)
+		else
+			@config = @configs.reverse.inject({}) { |i,c| i.merge(c) }
 		end
 	end
 
@@ -175,53 +182,24 @@ class Kuzushi
 		`dpkg --print-architecture`.chomp
 	end
 
-	def process_files(f)
-		if f.template
-			write_file("/templates/#{f.template}", f.file) do |file|
-				@system = system
-				t = ERB.new File.read(file), 0, '<>'
-				t.result(binding)
-			end
-		else
-			src = f.source || File.basename(f.file)
-			write_file("/files/#{src}", f.file) do |file|
-				File.read(file)
-			end
-		end
-	end
-
-	def write_file(src, dest, &blk)
-		fetch(src) do |file|
-			task "write #{dest}" do
-				FileUtils.mkdir_p(File.dirname(dest))
-				File.open(dest,"w") { |f| f.write(blk.call(file)) }
-			end
-		end
+	def erb(data)
+			@system = system
+			ERB.new(data, 0, '<>').result(binding)
 	end
 
-	def handle_crontab(src, user = "root", &blk)
-		## FIXME - this is getting a little silly calling tmpfile twice - should be able to pass erb to fetch as an opton...
-		## unify code for process crontabs + process files
-		fetch(src) do |file|
-			tmpfile(blk.call(file)) do |tmp|
-				task "process crontab for #{user}" do
-					shell "crontab -u #{user} #{tmp}"
-				end
+	def process_files(f)
+		file(f) do |tmp|
+			task "write #{f.file}" do
+				cp_file(tmp, f.file)
 			end
 		end
 	end
 
 	def process_crontab(cron)
-		if cron.template
-			handle_crontab("/templates/#{cron.template}", cron.user) do |file|
-				@system = system
-				t = ERB.new File.read(file), 0, '<>'
-				t.result(binding)
-			end
-		else
-			src = cron.source || File.basename(cron.file)
-			handle_crontab("/files/#{src}", cron.user) do |file|
-				File.read(file)
+		user = cron.user || "root"
+		file(cron) do |tmp|
+			task "process crontab for #{user}" do
+				shell "crontab -u #{user} #{tmp}"
 			end
 		end
 	end
@@ -285,22 +263,23 @@ class Kuzushi
 	end
 
 	def tmpfile(content, file = "tmp_#{rand(1_000_000_000)}", &block)
-		tmp_dir = "/tmp/kuzushi"
-		Dir.mkdir(tmp_dir) unless File.exists?(tmp_dir)
-		file = "#{tmp_dir}/#{File.basename(file)}"
-		File.open(file,"w") do |f|
-			f.write(content)
-			f.chmod(0700)
-		end if content
-		block.call(file) if block
-		file
+		path = "/tmp/kuzushi/#{File.basename(file)}"
+		put_file(content, path)
+		block.call(path) if block
+		path
+	end
+
+	def file(f, &blk)
+		## no magic here - move along
+		fetch("/templates/#{f.template}", lambda { |data| erb data  }, &blk) if f.template 
+		fetch("/files/#{f.source || File.basename(f.file)}", &blk) unless f.template
 	end
 
-	def fetch(file, &block)
-		names = @config_names.clone
+	def fetch(file, filter = lambda { |d| d }, &block)
+		names = config_names.clone
 		begin
 			## its important that we try each name for the script - allows for polymorphic scripts
-			tmpfile RestClient.get("#{@base_url}/#{names.first}#{file}"), file do |tmp|
+			tmpfile(filter.call(http_get("#{@base_url}/#{names.first}#{file}")), file) do |tmp|
 				block.call(tmp)
 			end
 		rescue RestClient::ResourceNotFound
@@ -314,10 +293,11 @@ class Kuzushi
 
 	def error(message, exception = nil)
 		puts "ERROR :#{message}"
+		puts exception.message
 	end
 
 	def get(key)
-		@config[key.to_s]
+		config[key.to_s]
 	end
 
 	def get_array(key)
@@ -327,14 +307,14 @@ class Kuzushi
 	def wait_for_volume(vol)
 		## Maybe use ohai here instead -- FIXME
 		until dev_exists? vol do
-			puts "waiting for volume #{vol}"
+			log "waiting for volume #{vol}"
 			sleep 2
 		end
 	end
 
 	def shell(cmd)
-		puts "# #{cmd}"
-		puts Kernel.system cmd ## FIXME - need to handle/report exceptions here
+		log "# #{cmd}"
+		Kernel.system cmd ## FIXME - need to handle/report exceptions here
 	end
 
 	def init?
@@ -349,4 +329,21 @@ class Kuzushi
 	def dev_exists?(dev)
 		File.exists?("/sys/block/#{File.basename(dev)}")
 	end
+
+	def cp_file(src, dest)
+		FileUtils.mkdir_p(File.dirname(dest))
+		FileUtils.cp(src, dest)
+	end
+
+	def put_file(data, dest)
+		FileUtils.mkdir_p(File.dirname(dest))
+		File.open(dest,"w") do |f|
+			f.write(data)
+			f.chmod(0700)
+		end
+	end
+
+	def log(message)
+		puts message
+	end
 end

data/spec/kuzushi_spec.rb

@@ -2,10 +2,80 @@ require File.dirname(__FILE__) + '/base'
 
 describe Kuzushi do
 	before do
-		# hello 
+		@url = "http://myurl/foo"
+		@kuzushi = Kuzushi.new(@url)
+		@kuzushi.stubs(:log)
+		@kuzushi.stubs(:config_names).returns(["foo"])
+		@kuzushi.stubs(:load_config_stack)
 	end
 	
-	it "is a class" do
-		Kuzushi.class.should == Class
+	it "processes a simple file" do
+		@kuzushi.stubs(:config).returns( {
+			"files" => [ {
+				"file" => "/var/lib/zing.conf"
+		} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/files/zing.conf").returns( "123" )
+		@kuzushi.expects(:put_file).with("123", "/tmp/kuzushi/zing.conf")
+		@kuzushi.expects(:cp_file).with("/tmp/kuzushi/zing.conf", "/var/lib/zing.conf")
+		should.not.raise { @kuzushi.start }
+	end
+
+	it "processes a simple file with a different source" do
+		@kuzushi.stubs(:config).returns( {
+			"files" => [ {
+				"file" => "/var/lib/zing.conf",
+				"source" => "zing-8.2"
+			} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/files/zing-8.2").returns( "123" )
+		@kuzushi.expects(:put_file).with("123", "/tmp/kuzushi/zing-8.2")
+		@kuzushi.expects(:cp_file).with("/tmp/kuzushi/zing-8.2", "/var/lib/zing.conf")
+		should.not.raise { @kuzushi.start }
+	end
+
+	it "processes a file from an erb template" do
+		@kuzushi.stubs(:config).returns( {
+			"files" => [ {
+				"file" => "/var/lib/zing.conf",
+				"template" => "zing-8.2.erb"
+			} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/templates/zing-8.2.erb").returns( "I love <%= ['e','r','b'].join('') %>" )
+		@kuzushi.expects(:put_file).with("I love erb", "/tmp/kuzushi/zing-8.2.erb")
+		@kuzushi.expects(:cp_file).with("/tmp/kuzushi/zing-8.2.erb", "/var/lib/zing.conf")
+		should.not.raise { @kuzushi.start }
+	end
+
+	it "can handle a basic crontab with a specified file" do
+		@kuzushi.stubs(:config).returns( {
+			"crontab" => [ {
+				"file" => "mycrontab",
+			} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/files/mycrontab").returns("abc123")
+		@kuzushi.expects(:put_file).with("abc123", tmpfile = "/tmp/kuzushi/mycrontab")
+		@kuzushi.expects(:shell).with("crontab -u root #{tmpfile}")
+		should.not.raise { @kuzushi.start }
+	end
+
+	it "can handle a basic crontab with a specified source or a different user" do
+		@kuzushi.stubs(:config).returns( {
+			"crontab" => [ {
+				"source" => "mycrontab",
+				"user" => "bob",
+			} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/files/mycrontab").returns("abc123")
+		@kuzushi.expects(:put_file).with("abc123", tmpfile = "/tmp/kuzushi/mycrontab")
+		@kuzushi.expects(:shell).with("crontab -u bob #{tmpfile}")
+		should.not.raise { @kuzushi.start }
+	end
+
+	it "can handle a basic crontab with a specified source" do
+		@kuzushi.stubs(:config).returns( {
+			"crontab" => [ {
+				"template" => "mycrontab.erb",
+			} ] } )
+		@kuzushi.expects(:http_get).with("#{@url}/templates/mycrontab.erb").returns("Hello <%= 'world' %>")
+		@kuzushi.expects(:put_file).with("Hello world", tmpfile = "/tmp/kuzushi/mycrontab.erb")
+		@kuzushi.expects(:shell).with("crontab -u root #{tmpfile}")
+		should.not.raise { @kuzushi.start }
 	end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kuzushi
 version: !ruby/object:Gem::Version 
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors: 
 - Orion Henry
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: kuzushi
 dependencies: 
 - !ruby/object:Gem::Dependency