sunzi 0.9.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ffa01c88c6e07a1cad033e00d59dc101f5682eb
+  data.tar.gz: 292cbdf52feafdf63b92b8dac2b87d1f1469a219
+SHA512:
+  metadata.gz: 3c46c9e363903f7e6440ae3b7c0d6685b695e1bf469df7f3b41f1b9d446b85d7c8dc0a131c49b9c71d777dff0f8c7632cbc746f5a6d77295df1a302d4def8696
+  data.tar.gz: 0ee5d4d9f5c9a00aa889e4a787be66a3b636d119f0506ff14d7915795c2025de3d33ecd8059bb5d1c2c1e150cf191f4da547e2fc3a6f0de5dc154ac6da69ed68

data/README.md

@@ -30,7 +30,7 @@ Quickstart
 Install:
 
 ```bash
-$ gem install sunzi
+$ [sudo] gem install sunzi
 ```
 
 Go into your project directory (if it's a Rails project, `config` would be a good place to start with), then:
@@ -63,13 +63,13 @@ Commands
 --------
 
 ```bash
-$ sunzi                                         # Show command help
-$ sunzi compile                                 # Compile Sunzi project
-$ sunzi create                                  # Create a new Sunzi project
-$ sunzi deploy [user@host:port] [role] [--sudo] # Deploy Sunzi project
+$ sunzi                                           # Show command help
+$ sunzi compile                                   # Compile Sunzi project
+$ sunzi create                                    # Create a new Sunzi project
+$ sunzi deploy [user@host:port] [role] [--sudo]   # Deploy Sunzi project
 
-$ sunzi setup [linode|digital_ocean]            # Setup a new VM on the Cloud services
-$ sunzi teardown [linode|digital_ocean] [name]  # Teardown an existing VM on the Cloud services
+$ sunzi setup [linode|digital_ocean]              # Setup a new VM on the cloud services
+$ sunzi teardown [linode|digital_ocean] [name]    # Teardown an existing VM on the cloud services
 ```
 
 Directory structure
@@ -83,7 +83,7 @@ sunzi/
   sunzi.yml       # add custom attributes and remote recipes here
 
   recipes/        # put commonly used scripts here, referred from install.sh
-    ssh_key.sh
+    sunzi.sh
   roles/          # when role is specified, scripts here will be concatenated
     app.sh        # to install.sh in the compile phase
     db.sh
@@ -171,7 +171,7 @@ The following screenshot says it all.
 
 ![Sunzi for Linode](http://farm8.staticflickr.com/7210/6783789868_ab89010d5c.jpg)
 
-Right now, only [Linode](http://www.linode.com/) is supported, but EC2 and Rackspace are coming.
+Right now, only [Linode](http://www.linode.com/) and [DigitalOcean](https://www.digitalocean.com) are supported.
 
 For DNS, Linode and [Amazon Route 53](http://aws.amazon.com/route53/) are supported.
 

data/lib/sunzi.rb

@@ -7,12 +7,10 @@ module Sunzi
   autoload :Dependency, 'sunzi/dependency'
   autoload :Logger,     'sunzi/logger'
   autoload :Utility,    'sunzi/utility'
-  autoload :Version,    'sunzi/version'
 
   module Cloud
     autoload :Base,         'sunzi/cloud/base'
     autoload :Linode,       'sunzi/cloud/linode'
-    autoload :EC2,          'sunzi/cloud/ec2'
     autoload :DigitalOcean, 'sunzi/cloud/digital_ocean'
   end
 end

data/lib/sunzi/cli.rb

@@ -30,6 +30,11 @@ module Sunzi
       Cloud::Base.choose(self, target).teardown(name)
     end
 
+    desc 'version', 'Show version'
+    def version
+      puts Gem.loaded_specs['sunzi'].version.to_s
+    end
+
     no_tasks do
       include Sunzi::Utility
 
@@ -42,7 +47,6 @@ module Sunzi
         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"
         template 'templates/create/roles/web.sh',       "#{project}/roles/web.sh"

data/lib/sunzi/cloud/base.rb

@@ -9,8 +9,6 @@ module Sunzi
         case target
         when 'linode'
           Cloud::Linode.new(cli)
-        when 'ec2'
-          Cloud::EC2.new(cli)
         when 'digital_ocean'
           Cloud::DigitalOcean.new(cli)
         else

data/lib/templates/create/install.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Load base utility functions like sunzi::silencer()
+# Load base utility functions like sunzi.mute() and sunzi.install()
 source recipes/sunzi.sh
 
 # This line is necessary for automated provisioning for Debian/Ubuntu.
@@ -10,15 +10,40 @@ 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)
+# Update installed packages
+sunzi.mute "aptitude update"
+sunzi.mute "aptitude -y safe-upgrade"
 
-# 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
+sunzi.install "git-core ntp curl"
 
-# 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"
+# Set RAILS_ENV
+environment=$(cat attributes/environment)
+
+if ! grep -Fq "RAILS_ENV" ~/.bash_profile; then
+  echo 'Setting up RAILS_ENV...'
+  echo "export RAILS_ENV=$environment" >> ~/.bash_profile
+  source ~/.bash_profile
+fi
+
+# Install Ruby using RVM
+source recipes/rvm.sh
+ruby_version=$(cat attributes/ruby_version)
+
+if [[ "$(which ruby)" != /usr/local/rvm/rubies/ruby-$ruby_version* ]]; then
+  echo "Installing ruby-$ruby_version"
+  sunzi.install build-essential libssl-dev libreadline6-dev
+  rvm install $ruby_version
+  rvm $ruby_version --default
+  echo 'gem: --no-ri --no-rdoc' > ~/.gemrc
+
+  # Install Bundler
+  gem update --system
+  gem install bundler
+fi
+
+# Install sysstat, then configure if this is a new install.
+if sunzi.install "sysstat"; then
+  sed -i 's/ENABLED="false"/ENABLED="true"/' /etc/default/sysstat
+  /etc/init.d/sysstat restart
+fi

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

@@ -1,6 +1,47 @@
-# This file is used to define functions under the sunzi:: namespace.
+# This file is used to define functions under the sunzi.* namespace.
 
-function sunzi::silencer() {
+# Set $sunzi_pkg to "aptitude" or "yum", or abort.
+#
+if which aptitude >/dev/null 2>&1; then
+  export sunzi_pkg=aptitude
+elif which yum >/dev/null 2>&1; then
+  export sunzi_pkg=yum
+fi
+
+if [ "$sunzi_pkg" = '' ]; then
+  echo 'sunzi only supports aptitude and yum!' >&2
+  exit 1
+fi
+
+# Mute STDOUT and STDERR
+#
+function sunzi.mute() {
   echo "Running \"$@\""
-  eval "$@ > /dev/null 2>&1"
+  `$@ >/dev/null 2>&1`
+  return $?
+}
+
+# Installer
+#
+function sunzi.installed() {
+  if [ "$sunzi_pkg" = 'aptitude' ]; then
+    dpkg -s $@ >/dev/null 2>&1
+  elif [ "$sunzi_pkg" = 'yum' ]; then
+    rpm -qa | grep $@ >/dev/null
+  fi
+  return $?
+}
+
+function sunzi.install() {
+  for name in $@
+  do
+    if sunzi.installed "$name"; then
+      echo "$name already installed"
+      return 1
+    else
+      echo "No packages found matching $name. Installing..."
+      sunzi.mute "$sunzi_pkg -y install $name"
+      return 0
+    fi
+  done
 }

data/lib/templates/create/sunzi.yml

@@ -1,9 +1,8 @@
 ---
 # Dynamic variables here will be compiled to individual files in compiled/attributes.
 attributes:
-  ssh_key: id_rsa.pub
-  environment: development
-  ruby_version: 1.9.3
+  environment: production
+  ruby_version: 2.0.0
 
 # Remote recipes here will be downloaded to compiled/recipes.
 recipes:
@@ -12,8 +11,8 @@ recipes:
   # mongodb-10gen: https://raw.github.com/kenn/sunzi-recipes/master/debian/mongodb-10gen.sh
 
 # Files specified here will be copied to compiled/files.
-files:
-  - ~/.ssh/id_rsa.pub
+# files:
+#   - ~/.ssh/id_rsa.pub
 
 # Fine tune how Sunzi should work.
 preferences:

data/sunzi.gemspec

@@ -1,25 +1,21 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "sunzi/version"
+# coding: utf-8
 
-Gem::Specification.new do |s|
-  s.name        = "sunzi"
-  s.version     = Sunzi::VERSION
-  s.authors     = ["Kenn Ejima"]
-  s.email       = ["kenn.ejima@gmail.com"]
-  s.homepage    = "http://github.com/kenn/sunzi"
-  s.summary     = %q{Server provisioning utility for minimalists}
-  s.description = %q{Server provisioning utility for minimalists}
+Gem::Specification.new do |spec|
+  spec.name          = 'sunzi'
+  spec.version       = '1.0.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.authors       = ['Kenn Ejima']
+  spec.email         = ['kenn.ejima@gmail.com']
+  spec.homepage      = 'http://github.com/kenn/sunzi'
+  spec.summary       = %q{Server provisioning utility for minimalists}
+  spec.description   = %q{Server provisioning utility for minimalists}
+  spec.license       = 'MIT'
 
-  s.rubyforge_project = "sunzi"
+  spec.files         = `git ls-files`.split($/)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-
-  # s.add_development_dependency "rspec"
-  s.add_runtime_dependency "thor"
-  s.add_runtime_dependency "rainbow"
-  s.add_development_dependency "rake"
+  spec.add_runtime_dependency 'thor'
+  spec.add_runtime_dependency 'rainbow'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Server provisioning utility for minimalists
 email:
 - kenn.ejima@gmail.com
@@ -76,15 +69,12 @@ files:
 - lib/sunzi/cli.rb
 - lib/sunzi/cloud/base.rb
 - lib/sunzi/cloud/digital_ocean.rb
-- lib/sunzi/cloud/ec2.rb
 - lib/sunzi/cloud/linode.rb
 - lib/sunzi/dependency.rb
 - lib/sunzi/logger.rb
 - lib/sunzi/utility.rb
-- lib/sunzi/version.rb
 - 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
@@ -95,34 +85,29 @@ files:
 - sunzi.gemspec
 - test/test_cli.rb
 homepage: http://github.com/kenn/sunzi
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3774298767527921378
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3774298767527921378
-  none: false
 requirements: []
-rubyforge_project: sunzi
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Server provisioning utility for minimalists
 test_files:
 - test/test_cli.rb
+has_rdoc: 

data/lib/sunzi/cloud/ec2.rb

@@ -1,13 +0,0 @@
-module Sunzi
-  module Cloud
-    class EC2 < Base
-      def setup
-        Logger.error 'EC2 is not implemented yet!'
-      end
-
-      def teardown(target)
-        Logger.error 'EC2 is not implemented yet!'
-      end
-    end
-  end
-end

data/lib/sunzi/version.rb

@@ -1,3 +0,0 @@
-module Sunzi
-  VERSION = "0.9.0"
-end

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

@@ -1,18 +0,0 @@
-# SSH key
-# $1: SSH key filename
-
-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"
-    chmod 700 ~/.ssh
-    chmod 600 ~/.ssh/authorized_keys
-  else
-    echo "The public key file \"$1\" is not found! Look into files section in sunzi.yml."
-    exit 1
-  fi
-fi