sunzi 0.0.1 → 0.1.0

data/README.md

@@ -26,17 +26,17 @@ Go to your project directory, then:
 
     $ sunzi create
 
-It generates a `sunzi` folder, subdirectories and some templates for you. Inside `sunzi`, there's `here` folder, which will be kept in your local machine, that contains some scripts and definition files. Also there's `there` folder, which will be transferred to the remote server, that contains recipes and dynamic variables compiled from the definition files in the `here` folder.
+It generates a `sunzi` folder along with subdirectories and templates. Inside `sunzi`, there's `attributes.yml`, which defines dynamic attributes to be used from recipes. Also there's the `remote` folder, which will be transferred to the remote server, that contains recipes and dynamic variables compiled from `attributes.yml`.
 
-Go into the `here` directory, then run the `deploy.sh`:
+Go into the `sunzi` directory, then run the `sunzi deploy`:
 
-    $ cd sunzi/here
-    $ bash deploy.sh root@example.com
+    $ cd sunzi
+    $ sunzi deploy root@example.com
 
 Now, what it actually does is:
 
 1. SSH to `example.com` and login as `root`
-1. Transfer the content of the `there` directory to the remote server and extract in `$HOME/sunzi`
+1. Transfer the content of the `remote` directory to the remote server and extract in `$HOME/sunzi`
 1. Run `install.sh` in the remote server
 
 As you can see, what you need to do is edit `install.sh` and add some shell commands. That's it.
@@ -48,23 +48,22 @@ Here's the directory structure that `sunzi create` automatically generates:
 
 ```
 sunzi/
-  here/               ---- kept in your local machine
-    attributes.yml    ---- add custom variables here
-    compile.rb        ---- compile the content of attributes.yml to there/attributes/*
-    deploy.sh         ---- invoke this script
-  there/              ---- transferred to the remote server
-    attributes/       ---- compiled from attributes.yml at deploy
+  attributes.yml    ---- add custom variables here
+  remote/           ---- everything under this folder will be transferred to the remote server
+    attributes/     ---- compiled from attributes.yml at deploy
       env
       ssh_key
-    recipes/          ---- put commonly used scripts here, referred from install.sh
+    recipes/        ---- put commonly used scripts here, referred from install.sh
       ssh_key.sh
-    install.sh        ---- main scripts that gets run on the remote server
+    install.sh      ---- main scripts that gets run on the remote server
 ```
 
 Vagrant
 -------
 
-If you're using Sunzi with [Vagrant](http://vagrantup.com/), make sure you allowed SSH access for root, then:
+If you're using Sunzi with [Vagrant](http://vagrantup.com/), make sure you allowed SSH access for root.
+
+Since it uses port 2222 for SSH, you need to specify the port number:
 
     $ vagrant up
-    $ bash deploy.sh root@localhost -p 2222
+    $ sunzi deploy root@localhost 2222

data/lib/sunzi/cli.rb

@@ -1,4 +1,7 @@
 require 'thor'
+require 'yaml'
+require 'fileutils'
+require 'open3'
 
 module Sunzi
   CONFIG_DIR = File.join(ENV['HOME'],'.config','sunzi')
@@ -13,18 +16,64 @@ module Sunzi
     end
 
     map "c" => :create
+    map "d" => :deploy
 
     desc "create [PROJECT]", "Create sunzi project (Shortcut: c)"
     def create(project = 'sunzi')
       empty_directory project
-      empty_directory "#{project}/here"
-      empty_directory "#{project}/there"
-      empty_directory "#{project}/there/recipes"
-      template "templates/here/attributes.yml",       "#{project}/here/attributes.yml"
-      template "templates/here/compile.rb",           "#{project}/here/compile.rb"
-      template "templates/here/deploy.sh",            "#{project}/here/deploy.sh"
-      template "templates/there/install.sh",          "#{project}/there/install.sh"
-      template "templates/there/recipes/ssh_key.sh",  "#{project}/there/recipes/ssh_key.sh"
+      empty_directory "#{project}/remote"
+      empty_directory "#{project}/remote/recipes"
+      template "templates/attributes.yml",            "#{project}/attributes.yml"
+      template "templates/remote/install.sh",         "#{project}/remote/install.sh"
+      template "templates/remote/recipes/ssh_key.sh", "#{project}/remote/recipes/ssh_key.sh"
     end
+
+    desc "deploy [USER@HOST] [PORT]", "Deploy sunzi project (Shortcut: d)"
+    def deploy(*target)
+      if target.empty? or !target.first.match(/@/)
+        puts "Usage: sunzi deploy root@example.com"
+        abort
+      end
+
+      # Compile attributes.yml
+      unless File.exists?('attributes.yml')
+        puts "You must be in the sunzi folder"
+        abort
+      end
+      hash = YAML.load(File.read('attributes.yml'))
+      FileUtils.mkdir_p('remote/attributes')
+      hash.each do |key, value|
+        File.open("remote/attributes/#{key}", 'w'){|file| file.write(value) }
+      end
+
+      host, port = target
+      port ||= 22
+      user, domain = host.split('@')
+
+      commands = <<-EOS
+      ssh-keygen -R #{domain}
+      cd remote
+      tar cz . | ssh -o 'StrictHostKeyChecking no' #{host} -p #{port} '
+      rm -rf ~/sunzi &&
+      mkdir ~/sunzi &&
+      cd ~/sunzi &&
+      tar xz &&
+      bash install.sh'
+      EOS
+
+      Open3.popen3(commands) do |stdin, stdout, stderr|
+        stdin.close
+        t = Thread.new(stderr) do |terr|
+          while (line = terr.gets)
+            print "\e[31m#{line}\e[0m"
+          end
+        end
+        while (line = stdout.gets)
+          print "\e[32m#{line}\e[0m"
+        end
+        t.join
+      end
+    end
+
   end
 end

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/templates/{here/attributes.yml → attributes.yml}

@@ -1,3 +1,3 @@
---- # Dynamic variables here will be compiled to individual files in there/attributes.
+--- # Dynamic variables here will be compiled to individual files in remote/attributes.
 env: production
 ssh_key: id_rsa.pub

data/lib/templates/{there → remote}/recipes/ssh_key.sh

@@ -11,7 +11,9 @@ else
     chmod 700 ~/.ssh
     chmod 600 ~/.ssh/authorized_keys
   else
-    echo 'The public key file ($1) not found! Copy it from $HOME/.ssh to the "there" directory.'
-    echo 'If the file name found in .ssh is different from $1, edit here/attributes.yml as appropriate.'
+    echo "The public key file is not found! Try the following command:"
+    echo "cp ~/.ssh/$1 remote"
+    echo "If the file name found in ~/.ssh is different from \"$1\", edit attributes.yml as appropriate."
+    exit 1
   fi
 fi

data/sunzi.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["kenn.ejima@gmail.com"]
   s.homepage    = "http://github.com/kenn/sunzi"
   s.summary     = %q{Server provisioning tool for minimalists}
-  s.description = %q{The supreme art of war is to subdue the enemy without fighting.}
+  s.description = %q{Server provisioning tool for minimalists}
 
   s.rubyforge_project = "sunzi"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2160818440 !ruby/object:Gem::Requirement
+  requirement: &2160735500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,8 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160818440
-description: The supreme art of war is to subdue the enemy without fighting.
+  version_requirements: *2160735500
+description: Server provisioning tool for minimalists
 email:
 - kenn.ejima@gmail.com
 executables:
@@ -39,11 +39,9 @@ files:
 - lib/sunzi/base.rb
 - lib/sunzi/cli.rb
 - lib/sunzi/version.rb
-- lib/templates/here/attributes.yml
-- lib/templates/here/compile.rb
-- lib/templates/here/deploy.sh
-- lib/templates/there/install.sh
-- lib/templates/there/recipes/ssh_key.sh
+- lib/templates/attributes.yml
+- lib/templates/remote/install.sh
+- lib/templates/remote/recipes/ssh_key.sh
 - sunzi.gemspec
 homepage: http://github.com/kenn/sunzi
 licenses: []

data/lib/templates/here/compile.rb

@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'yaml'
-hash = YAML.load(File.read('attributes.yml'))
-
-require 'fileutils'
-FileUtils.mkdir_p('../there/attributes')
-
-hash.each do |key, value|
-  File.open("../there/attributes/#{key}", 'w'){|file| file.write(value) }
-end

data/lib/templates/here/deploy.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# Usage: bash deploy.sh [host] [-p 2222]
-
-if [ -z "$1" ]; then
-  echo "Usage: bash deploy.sh user@example.com"
-  exit 1
-fi
-
-# Compile attributes
-ruby compile.rb
-
-# The host key might change when we instantiate a new VM, so
-# we remove (-R) the old host key from known_hosts
-host="$1"
-ssh-keygen -R "${host#*@}" 2> /dev/null
-
-# Connect to the remote server and deploy
-cd ../there
-tar cz . | ssh -o 'StrictHostKeyChecking no' "$host" "$2" "$3" '
-rm -rf ~/sunzi &&
-mkdir ~/sunzi &&
-cd ~/sunzi &&
-tar xz &&
-bash install.sh'