sunzi 0.4.1 → 0.4.2

data/README.md

@@ -11,7 +11,7 @@ Sunzi assumes that modern Linux distributions have (mostly) sane defaults and gr
 
 Its design goals are:
 
-* **It's just shell script.** No clunky Ruby DSL involved. Sunzi recipes are written in a plain shell script. Most of the information about server configuration on the web is written in shell commands. Just copy-paste them, rather than translate it into an arbitrary DSL. Also, Bash is the greatest common denominator on minimum Linux installs.
+* **It's just shell script.** No clunky Ruby DSL involved. Most of the information about server configuration on the web is written in shell commands. Just copy-paste them, rather than translate it into an arbitrary DSL. Also, Bash is the greatest common denominator on minimum Linux installs.
 * **Focus on diff from default.** No big-bang overwriting. Append or replace the smallest possible piece of data in a config file. Loads of custom configurations make it difficult to understand what you are really doing.
 * **Always use the root user.** Think twice before blindly assuming you need a regular user - it doesn't add any security benefit for server provisioning, it just adds extra verbosity for nothing. However, it doesn't mean that you shouldn't create regular users with Sunzi - feel free to write your own recipes.
 * **Minimum dependencies.** No configuration server required. You don't even need a Ruby runtime on the remote server.
@@ -22,44 +22,44 @@ Quickstart
 Install:
 
 ```bash
-gem install sunzi
+$ gem install sunzi
 ```
 
 Go to your project directory, then:
 
 ```bash
-sunzi create
+$ sunzi create
 ```
 
-It generates a `sunzi` folder along with subdirectories and templates. Inside `sunzi`, there's `sunzi.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 `sunzi.yml`.
+It generates a `sunzi` folder along with subdirectories and templates. Inside `sunzi`, there's `sunzi.yml`, which defines your own dynamic attributes to be used from scripts. Also there's the `remote` folder, which will be transferred to the remote server, that contains recipes and dynamic variables compiled from `sunzi.yml`.
 
 Go into the `sunzi` directory, then run `sunzi deploy`:
 
 ```bash
-cd sunzi
-sunzi deploy example.com
+$ cd sunzi
+$ sunzi deploy example.com
 ```
 
 Now, what it actually does is:
 
-1. Compile sunzi.yml to generate attributes and retrieve remote recipes
+1. Compile `sunzi.yml` to generate attributes and retrieve remote recipes
 1. SSH to `example.com` and login as `root`
 1. Transfer the content of the `remote` directory to the remote server and extract in `$HOME/sunzi`
 1. Run `install.sh` on the remote server
 
 As you can see, all you need to do is edit `install.sh` and add some shell commands. That's it.
 
-A Sunzi project with no recipes is totally fine, so that you can start small, go big later.
+A Sunzi project with no recipes is totally fine, so that you can start small, go big as you get along.
 
 Commands
 --------
 
 ```bash
-sunzi               # Show command help
-sunzi create        # Create a new Sunzi project
-sunzi deploy        # Deploy Sunzi project
-sunzi setup         # Setup a new VM on the Cloud services
-sunzi teardown      # Teardown an existing VM on the Cloud services
+$ sunzi                               # Show command help
+$ sunzi create                        # Create a new Sunzi project
+$ sunzi deploy [user@host:port]       # Deploy Sunzi project
+$ sunzi setup [linode|ec2]            # Setup a new VM on the Cloud services
+$ sunzi teardown [linode|ec2] [name]  # Teardown an existing VM on the Cloud services
 ```
 
 Directory structure
@@ -170,5 +170,5 @@ and now run `vagrant up`, it will change the root password to `vagrant`.
 Also keep in mind that you need to specify the port number 2222.
 
 ```bash
-sunzi deploy localhost:2222
+$ sunzi deploy localhost:2222
 ```

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+
+Rake::TestTask.new do |t|
+    t.libs << "test"
+    t.test_files = FileList['test/test*.rb']
+    t.verbose = true
+  end

data/bin/sunzi

@@ -4,5 +4,5 @@
 Signal.trap(:INT) { abort "\nAborting." }
 
 # Load the main lib and invoke CLI.
-require File.expand_path('../../lib/sunzi',__FILE__)
-Sunzi::Cli.start
+require 'sunzi'
+Sunzi::Cli.start

data/lib/sunzi/version.rb

@@ -1,3 +1,3 @@
 module Sunzi
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/lib/sunzi.rb

@@ -1,19 +1,17 @@
-LIB_PATH = File.join(File.dirname(__FILE__), 'sunzi')
-
 require 'thor'
 require 'rainbow'
 require 'yaml'
 
 module Sunzi
-  autoload :Cli,        File.join(LIB_PATH, 'cli')
-  autoload :Dependency, File.join(LIB_PATH, 'dependency')
-  autoload :Logger,     File.join(LIB_PATH, 'logger')
-  autoload :Utility,    File.join(LIB_PATH, 'utility')
-  autoload :Version,    File.join(LIB_PATH, 'version')
+  autoload :Cli,        'sunzi/cli'
+  autoload :Dependency, 'sunzi/dependency'
+  autoload :Logger,     'sunzi/logger'
+  autoload :Utility,    'sunzi/utility'
+  autoload :Version,    'sunzi/version'
 
   module Cloud
-    autoload :Base,     File.join(LIB_PATH, 'cloud', 'base')
-    autoload :Linode,   File.join(LIB_PATH, 'cloud', 'linode')
-    autoload :EC2,      File.join(LIB_PATH, 'cloud', 'ec2')
+    autoload :Base,     'sunzi/cloud/base'
+    autoload :Linode,   'sunzi/cloud/linode'
+    autoload :EC2,      'sunzi/cloud/ec2'
   end
 end

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

@@ -13,7 +13,7 @@ else
   else
     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."
+    echo "If the file name found in ~/.ssh is different from \"$1\", edit sunzi.yml as appropriate."
     exit 1
   fi
 fi

data/sunzi.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "rainbow"
+  s.add_development_dependency "rake"
 end

data/test/test_cli.rb

@@ -1,5 +1,5 @@
+require 'sunzi'
 require 'test/unit'
-require '../lib/sunzi'
 
 class TestCli < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2164966260 !ruby/object:Gem::Requirement
+  requirement: &2152827160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164966260
+  version_requirements: *2152827160
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2164965000 !ruby/object:Gem::Requirement
+  requirement: &2152825860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164965000
+  version_requirements: *2152825860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2152824980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152824980
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com