sunzi 0.5.1 → 0.6.0

data/README.md

@@ -18,7 +18,8 @@ Its design goals are:
 
 ### What's new:
 
-* v0.5: Role-based configuration supported. Reworked directory structure. (Incompatible with previous versions)
+* v0.6: System function sunzi::silencer() added for succinct log messages.
+* v0.5: Role-based configuration supported. Reworked directory structure. **Incompatible with previous versions**.
 
 Quickstart
 ----------

data/lib/sunzi/cli.rb

@@ -40,6 +40,7 @@ module Sunzi
         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/sunzi.sh",   "#{project}/recipes/sunzi.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"

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/templates/create/install.sh

@@ -1,14 +1,24 @@
 #!/bin/bash
 
-# This line is necessary for automated provisioning for Debian/Ubuntu
+# Load base utility functions like sunzi::silencer()
+source recipes/sunzi.sh
+
+# This line is necessary for automated provisioning for Debian/Ubuntu.
+# Remove if you're not on Debian/Ubuntu.
 export DEBIAN_FRONTEND=noninteractive
 
+# Add Dotdeb repository. Recommended if you're using Debian. See http://www.dotdeb.org/about/
+# source recipes/dotdeb.sh
+
 # SSH key
 source recipes/ssh_key.sh $(cat attributes/ssh_key)
 
-# Add Dotdeb repository
-source recipes/dotdeb.sh
-
-# Update apt catalog
+# Update apt catalog. If you prefer less verbosity, use the sunzi::silencer version instead
 aptitude update
 aptitude -y safe-upgrade
+# sunzi::silencer "aptitude update"
+# sunzi::silencer "aptitude -y safe-upgrade"
+
+# Install packages. If you prefer less verbosity, use the sunzi::silencer version instead
+aptitude -y install git-core ntp
+# sunzi::silencer "aptitude -y install git-core ntp"

data/lib/templates/create/recipes/ssh_key.sh

@@ -5,6 +5,7 @@ if [ -f ~/.ssh/authorized_keys ]; then
   echo 'authorized_keys already created'
 else
   if [ -f "files/$1" ]; then
+    echo 'Creating authorized_keys'
     mkdir -p ~/.ssh
     cat "files/$1" > ~/.ssh/authorized_keys
     rm "files/$1"

data/lib/templates/create/recipes/sunzi.sh

@@ -0,0 +1,6 @@
+# This file is used to define functions under the sunzi:: namespace.
+
+function sunzi::silencer() {
+  echo "Running \"$@\""
+  eval "$@ > /dev/null 2>&1"
+}

data/lib/templates/create/roles/db.sh

@@ -1,5 +1,5 @@
 # Install Database Server
 
-source recipes/mongodb-10gen.sh       # MongoDB
-# source recipes/mysql-server.sh 5.5  # MySQL 5.5
-# source recipes/redis-server.sh      # Redis
+source recipes/mongodb-10gen.sh             # MongoDB
+# aptitude -q -y install mysql-server-5.5   # MySQL 5.5 - You may need to enable Dotdeb in install.sh first
+# aptitude -y install redis-server          # Redis - You may need to enable Dotdeb in install.sh first

data/lib/templates/create/roles/web.sh

@@ -1,4 +1,4 @@
 # Install Web server
 
-source recipes/nginx.sh       # Nginx
-# source recipes/apache2.sh   # Apache
+aptitude -y install nginx       # Nginx
+# aptitude -y install apache2   # Apache

data/lib/templates/create/sunzi.yml

@@ -8,12 +8,8 @@ attributes:
 # Remote recipes here will be downloaded to compiled/recipes.
 recipes:
   rvm: https://raw.github.com/kenn/sunzi-recipes/master/ruby/rvm.sh
-  dotdeb: https://raw.github.com/kenn/sunzi-recipes/master/debian/dotdeb.sh
-  # nginx: https://raw.github.com/kenn/sunzi-recipes/master/debian/nginx.sh
-  # apache2: https://raw.github.com/kenn/sunzi-recipes/master/debian/apache2.sh
+  # dotdeb: https://raw.github.com/kenn/sunzi-recipes/master/debian/dotdeb.sh
   # mongodb-10gen: https://raw.github.com/kenn/sunzi-recipes/master/debian/mongodb-10gen.sh
-  # mysql-server: https://raw.github.com/kenn/sunzi-recipes/master/debian/mysql-server.sh
-  # redis-server: https://raw.github.com/kenn/sunzi-recipes/master/debian/redis-server.sh
 
 # Files specified here will be copied to compiled/files.
 files:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000 Z
+date: 2012-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2165136600 !ruby/object:Gem::Requirement
+  requirement: &2165105300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165136600
+  version_requirements: *2165105300
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2165136160 !ruby/object:Gem::Requirement
+  requirement: &2165104840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165136160
+  version_requirements: *2165104840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165135720 !ruby/object:Gem::Requirement
+  requirement: &2165104400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165135720
+  version_requirements: *2165104400
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com
@@ -69,6 +69,7 @@ files:
 - lib/templates/create/.gitignore
 - lib/templates/create/install.sh
 - lib/templates/create/recipes/ssh_key.sh
+- lib/templates/create/recipes/sunzi.sh
 - lib/templates/create/roles/app.sh
 - lib/templates/create/roles/db.sh
 - lib/templates/create/roles/web.sh