lib/kuzushi.rb in kuzushi-0.0.37 vs lib/kuzushi.rb in kuzushi-0.0.38

@@ -13,10 +13,13 @@
 ## user configs
 
 class Kuzushi
   attr_accessor :config
 
+  def self.version
+  end
+
   def initialize(url)
     @url = url
     @base_url = File.dirname(url)
     if @url =~ /s3.amazonaws.com.*\/([^\/]*)[.](\d+)[.]tar[.]gz/
       @name = $1
@@ -72,13 +75,13 @@
     process :packages
     process :local_packages
     process :gems
     process :volumes
     process :files
-    process :services
     process :users
     process :crontab
+    process :services
 
     script get("after")
     script get("init") if init?
   end
 
@@ -112,13 +115,15 @@
     else
       file << "exec #{service.command}"
     end
   end
 
-  def process_service(service)
-    put_file(service_file(service), "/etc/init/#{service.name}.conf")
-    shell "service #{service.name} start"
+  def process_services(service)
+    task "installing service #{service.name}" do
+      put_file(service_file(service), "/etc/init/#{service.name}.conf")
+      shell "service #{service.name} start"
+    end
   end
 
   def process_packages
     @packages = get_array("packages")
     task "install packages" do
@@ -311,15 +316,17 @@
       fetch("/files/#{f.source || File.basename(f.file)}", &blk) unless f.template
     end
   end
 
   def git_fetch(f)
-    FileUtils.mkdir_p(f.dir)
-    shell "cd dir && git init"
-    shell "cd dir && git remote add origin #{f.git}"
-    shell "cd dir && git fetch"
-    shell "cd dir && git checkout master"
-    shell "chown -R #{f.user}:#{f.group} #{f.dir}" if f.user || f.group  ## is this needed?  handled above in files?
+    task "install packages" do
+      FileUtils.mkdir_p(f.file)
+      shell "cd #{f.file} && git init"
+      shell "cd #{f.file} && git remote add origin #{f.git}"
+      shell "cd #{f.file} && git fetch"
+      shell "cd #{f.file} && git checkout master"
+      shell "chown -R #{f.user}:#{f.group} #{f.dir}" if f.user || f.group  ## is this needed?  handled above in files?
+    end
   end
 
   ### this needs to be brought up to date - way last version - no need to read and filter...
   def fetch(file, filter = lambda { |d| d }, &block)
     begin