sunzi 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ffa01c88c6e07a1cad033e00d59dc101f5682eb
-  data.tar.gz: 292cbdf52feafdf63b92b8dac2b87d1f1469a219
+  metadata.gz: 0a3f735ba4adee8e29059770569406897d42e9a7
+  data.tar.gz: 3ec26e19e5ca10213f79726d0963e29b03672dc9
 SHA512:
-  metadata.gz: 3c46c9e363903f7e6440ae3b7c0d6685b695e1bf469df7f3b41f1b9d446b85d7c8dc0a131c49b9c71d777dff0f8c7632cbc746f5a6d77295df1a302d4def8696
-  data.tar.gz: 0ee5d4d9f5c9a00aa889e4a787be66a3b636d119f0506ff14d7915795c2025de3d33ecd8059bb5d1c2c1e150cf191f4da547e2fc3a6f0de5dc154ac6da69ed68
+  metadata.gz: 361584e1a3104439e3c1e4ab735ce920b32fdbb052af1815d47f3c5c88c7ffb801cb2b007c7cd5edb53897848aec88dd67239921a1edac9d585d61119c0b49cc
+  data.tar.gz: 564fa3ae5ac3f99ce117c79251a5249307f7e81a79dabbb5c49b973c3f3e1e9fdba766ae124377166600e8d000c9d435e6e5a946f420266cbea7475cf580a57d

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-# Specify your gem's dependencies in sunzi.gemspec
 gemspec

data/README.md

@@ -18,6 +18,8 @@ Its design goals are:
 
 ### What's new:
 
+* v1.1: "set -e" by default. apt-get everywhere in place of aptitude. Linode DNS support for DigitalOcean instances.
+* v1.0: System functions are refactored into sunzi.mute() and sunzi.install().
 * v0.9: Support for [DigitalOcean](https://www.digitalocean.com) setup / teardown.
 * v0.8: Added `--sudo` option to `sunzi deploy`.
 * v0.7: Added `erase_remote_folder` and `cache_remote_recipes` preferences for customized behavior.
@@ -85,8 +87,7 @@ sunzi/
   recipes/        # put commonly used scripts here, referred from install.sh
     sunzi.sh
   roles/          # when role is specified, scripts here will be concatenated
-    app.sh        # to install.sh in the compile phase
-    db.sh
+    db.sh         # to install.sh in the compile phase
     web.sh
   compiled/       # everything under this folder will be transferred to the
                   # remote server (do not edit directly)

data/Rakefile

@@ -1,11 +1,9 @@
-require "bundler/gem_tasks"
+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
-
+  t.libs << 'test'
+  t.test_files = FileList['test/test*.rb']
+  t.verbose = true
+end
 task :default => :test

data/lib/sunzi/cli.rb

@@ -47,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/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

data/lib/sunzi/cloud/digital_ocean.rb

@@ -80,6 +80,13 @@ module Sunzi
           # Set the public IP to AWS Route 53
           say "Setting the public IP to AWS Route 53..."
           Route53::DNSRecord.new(@fqdn, "A", "300", [@public_ip], @route53_zone).create
+        when 'linode'
+          Sunzi::Dependency.load('linode') # FIXME: this should run at the beginning
+          linode = ::Linode.new(:api_key => @config['linode']['api_key'])
+          # Set the public IP to Linode DNS Manager
+          say "Setting the public IP to Linode DNS Manager..."
+          domainid = linode.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
+          linode.domain.resource.create(:DomainID => domainid, :Type => 'A', :Name => @fqdn, :Target => @public_ip)
         end
 
         # Save the instance info
@@ -128,6 +135,13 @@ module Sunzi
           say 'deleting the public IP from AWS Route 53...'
           @record = @route53_zone.get_records.find{|i| i.values.first == @instance[:ip_address] }
           @record.delete if @record
+        when 'linode'
+          Sunzi::Dependency.load('linode') # FIXME: this should run at the beginning
+          linode = ::Linode.new(:api_key => @config['linode']['api_key'])
+          say 'deleting the public IP from Linode DNS Manager...'
+          domainid = linode.domain.list.find{|i| i.domain == @config['fqdn']['zone'] }.domainid
+          resource = linode.domain.resource.list(:DomainID => domainid).find{|i| i.target == @instance[:ip_address] }
+          linode.domain.resource.delete(:DomainID => domainid, :ResourceID => resource.resourceid)
         end
 
         # Remove the instance config file

data/lib/sunzi/dependency.rb

@@ -5,7 +5,7 @@ module Sunzi
         'linode' =>   { :require => 'linode',   :version => '>= 0.7.9' },
         'highline' => { :require => 'highline', :version => '>= 1.6.11'},
         'route53' =>  { :require => 'route53',  :version => '>= 0.2.1' },
-        'digital_ocean' =>  { :require => 'digital_ocean',  :version => '>= 0.0.1' },
+        'digital_ocean' =>  { :require => 'digital_ocean',  :version => '>= 1.0.0' },
       }
     end
 

data/lib/templates/create/install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Load base utility functions like sunzi.mute() and sunzi.install()
 source recipes/sunzi.sh
@@ -11,11 +12,11 @@ export DEBIAN_FRONTEND=noninteractive
 # source recipes/dotdeb.sh
 
 # Update installed packages
-sunzi.mute "aptitude update"
-sunzi.mute "aptitude -y safe-upgrade"
+sunzi.mute "apt-get update"
+sunzi.mute "apt-get -y upgrade"
 
 # Install packages
-sunzi.install "git-core ntp curl"
+sunzi.mute "apt-get -y install git-core ntp curl"
 
 # Set RAILS_ENV
 environment=$(cat attributes/environment)
@@ -32,13 +33,12 @@ 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
+  # Install dependencies using RVM autolibs - see https://blog.engineyard.com/2013/rvm-ruby-2-0
+  rvm install --autolibs=3 $ruby_version
   rvm $ruby_version --default
   echo 'gem: --no-ri --no-rdoc' > ~/.gemrc
 
   # Install Bundler
-  gem update --system
   gem install bundler
 fi
 

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

@@ -1,15 +1,15 @@
 # This file is used to define functions under the sunzi.* namespace.
 
-# Set $sunzi_pkg to "aptitude" or "yum", or abort.
+# Set $sunzi_pkg to "apt-get" or "yum", or abort.
 #
-if which aptitude >/dev/null 2>&1; then
-  export sunzi_pkg=aptitude
+if which apt-get >/dev/null 2>&1; then
+  export sunzi_pkg=apt-get
 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
+  echo 'sunzi only supports apt-get or yum!' >&2
   exit 1
 fi
 
@@ -24,7 +24,7 @@ function sunzi.mute() {
 # Installer
 #
 function sunzi.installed() {
-  if [ "$sunzi_pkg" = 'aptitude' ]; then
+  if [ "$sunzi_pkg" = 'apt-get' ]; then
     dpkg -s $@ >/dev/null 2>&1
   elif [ "$sunzi_pkg" = 'yum' ]; then
     rpm -qa | grep $@ >/dev/null
@@ -32,6 +32,9 @@ function sunzi.installed() {
   return $?
 }
 
+# When there's "set -e" in install.sh, sunzi.install should be used with if statement,
+# otherwise the script may exit unexpectedly when the package is already installed.
+#
 function sunzi.install() {
   for name in $@
   do

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

@@ -1,5 +1,5 @@
 # Install Database Server
 
-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
+# source recipes/mongodb-10gen.sh           # MongoDB
+# apt-get -q -y install mysql-server-5.5    # MySQL 5.5 - You may need to enable Dotdeb in install.sh first
+# apt-get -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
 
-aptitude -y install nginx       # Nginx
-# aptitude -y install apache2   # Apache
+apt-get -y install nginx        # Nginx
+# apt-get -y install apache2    # Apache

data/lib/templates/setup/digital_ocean/digital_ocean.yml

@@ -17,10 +17,12 @@ name:
 # filter out large lists by keyword
 distributions_filter: debian
 
-# dns takes "route53"
+# DNS takes "route53" or "linode"
 # dns: route53
 
-# only used when route53 is chosen for DNS
+# Credentials for DNS
 route53:
   key: your_aws_key
   secret: your_aws_secret
+linode:
+  api_key: your_linode_api_key

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 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.version       = '1.1.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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-22 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -76,7 +76,6 @@ files:
 - lib/templates/create/.gitignore
 - lib/templates/create/install.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
 - lib/templates/create/sunzi.yml
@@ -104,10 +103,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists
 test_files:
 - test/test_cli.rb
-has_rdoc: 

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

@@ -1,30 +0,0 @@
-# Install Application Server
-
-# Required attributes: env, ruby_version
-export ENVIRONMENT=$(cat attributes/environment)
-export RUBY_VERSION=$(cat attributes/ruby_version)
-
-# Install RVM
-source recipes/rvm.sh
-
-# Set RAILS_ENV
-if grep -Fq "RAILS_ENV" ~/.bash_profile; then
-  echo 'RAILS_ENV entry already exists'
-else
-  echo "export RAILS_ENV=$ENVIRONMENT" >> ~/.bash_profile
-  source ~/.bash_profile
-fi
-
-# Install Ruby
-if [[ "$(which ruby)" == /usr/local/rvm/rubies/ruby-$RUBY_VERSION* ]]; then
-  echo 'ruby-$RUBY_VERSION already installed'
-else
-  aptitude -y install curl build-essential libssl-dev libreadline6-dev
-  rvm install $RUBY_VERSION
-  rvm $RUBY_VERSION --default
-  echo 'gem: --no-ri --no-rdoc' > ~/.gemrc
-
-  # Install RubyGems
-  gem update --system
-  gem install bundler
-fi