lib/sunzi/cli.rb in sunzi-0.4.4 vs lib/sunzi/cli.rb in sunzi-0.5.0

@@ -7,18 +7,18 @@
     desc "create", "Create sunzi project"
     def create(project = 'sunzi')
       do_create(project)
     end
 
-    desc "deploy example.com (or [e-mail]:2222)", "Deploy sunzi project"
-    def deploy(target)
-      do_deploy(target)
+    desc "deploy [user@host:port] [role]", "Deploy sunzi project"
+    def deploy(target, role = nil)
+      do_deploy(target, role)
     end
 
     desc "compile", "Compile sunzi project"
-    def compile
-      do_compile
+    def compile(role = nil)
+      do_compile(role)
     end
 
     desc "setup [linode|ec2]", "Setup a new VM"
     def setup(target)
       Cloud::Base.choose(self, target).setup
@@ -36,69 +36,87 @@
         File.expand_path('../../',__FILE__)
       end
 
       def do_create(project)
         empty_directory project
-        empty_directory "#{project}/remote"
-        empty_directory "#{project}/remote/recipes"
-        template "templates/create/sunzi.yml",                 "#{project}/sunzi.yml"
-        template "templates/create/remote/install.sh",         "#{project}/remote/install.sh"
-        template "templates/create/remote/recipes/ssh_key.sh", "#{project}/remote/recipes/ssh_key.sh"
+        empty_directory "#{project}/recipes"
+        empty_directory "#{project}/roles"
+        # template "templates/create/.gitignore",         "#{project}/.gitignore"
+        template "templates/create/sunzi.yml",          "#{project}/sunzi.yml"
+        template "templates/create/install.sh",         "#{project}/install.sh"
+        template "templates/create/recipes/ssh_key.sh", "#{project}/recipes/ssh_key.sh"
+        template "templates/create/roles/app.sh",       "#{project}/roles/app.sh"
+        template "templates/create/roles/db.sh",        "#{project}/roles/db.sh"
+        template "templates/create/roles/web.sh",       "#{project}/roles/web.sh"
       end
 
-      def do_deploy(target)
+      def do_deploy(target, role)
         user, host, port = parse_target(target)
         endpoint = "#{user}@#{host}"
 
         # compile attributes and recipes
-        compile
+        compile(role)
 
         # The host key might change when we instantiate a new VM, so
         # we remove (-R) the old host key from known_hosts.
         `ssh-keygen -R #{host} 2> /dev/null`
 
-        commands = <<-EOS
-        cd remote
-        tar cz . | ssh -o 'StrictHostKeyChecking no' #{endpoint} -p #{port} '
+        remote_commands = <<-EOS
         rm -rf ~/sunzi &&
         mkdir ~/sunzi &&
         cd ~/sunzi &&
         tar xz &&
-        bash install.sh'
+        bash install.sh
         EOS
 
-        Open3.popen3(commands) do |stdin, stdout, stderr|
+        local_commands = <<-EOS
+        cd compiled
+        tar cz . | ssh -o 'StrictHostKeyChecking no' #{endpoint} -p #{port} '#{remote_commands}'
+        EOS
+
+        Open3.popen3(local_commands) do |stdin, stdout, stderr|
           stdin.close
-          t = Thread.new(stderr) do |terr|
-            while (line = terr.gets)
-              print shell.set_color(line, :red, true)
+          t = Thread.new do
+            while (line = stderr.gets)
+              print line.color(:red).bright
             end
           end
           while (line = stdout.gets)
-            print print shell.set_color(line, :green, true)
+            print line.color(:green).bright
           end
           t.join
         end
       end
 
-      def do_compile
+      def do_compile(role)
         # Check if you're in the sunzi directory
-        unless File.exists?('sunzi.yml')
-          abort_with "You must be in the sunzi folder"
-        end
+        abort_with "You must be in the sunzi folder" unless File.exists?('sunzi.yml')
+        # Check if role exists
+        abort_with "#{role} doesn't exist!" if role and !File.exists?("roles/#{role}.sh")
 
         # Load sunzi.yml
         hash = YAML.load(File.read('sunzi.yml'))
-        empty_directory 'remote/attributes'
-        empty_directory 'remote/recipes'
+        empty_directory 'compiled'
+        empty_directory 'compiled/attributes'
+        empty_directory 'compiled/recipes'
+        empty_directory 'compiled/files'
 
-        # Compile attributes.yml
-        hash['attributes'].each do |key, value|
-          File.open("remote/attributes/#{key}", 'w'){|file| file.write(value) }
-        end
-        # Compile recipes.yml
-        hash['recipes'].each do |key, value|
-          get value, "remote/recipes/#{key}.sh"
+        # Break down attributes into individual files
+        hash['attributes'].each {|key, value| create_file "compiled/attributes/#{key}", value }
+
+        # Retrieve remote recipes via HTTP
+        hash['recipes'].each {|key, value| get value, "compiled/recipes/#{key}.sh" }
+
+        # Copy local files
+        Dir['recipes/*'].each {|file| copy_file File.expand_path(file), "compiled/recipes/#{File.basename(file)}" }
+        Dir['roles/*'].each   {|file| copy_file File.expand_path(file), "compiled/roles/#{File.basename(file)}" }
+        hash['files'].each    {|file| copy_file File.expand_path(file), "compiled/files/#{File.basename(file)}" }
+
+        # Build install.sh
+        if role
+          create_file 'compiled/install.sh', File.binread("install.sh") << "\n" << File.binread("roles/#{role}.sh")
+        else
+          copy_file File.expand_path('install.sh'), 'compiled/install.sh'
         end
       end
 
       def parse_target(target)
         target.match(/(.*@)?(.*?)(:.*)?$/)