sunzi 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7c118fcfb05d687e587068fea6079f6e365ffbf637ef0a4f73dbd1920dc8f138
-  data.tar.gz: 251b57a131bd76db42637bdcd0dad5b373b1a37e964680f5fde2531ff995b768
+SHA1:
+  metadata.gz: ae08190a203a96afbc856240713e37d197d97381
+  data.tar.gz: 4afc33d68da0dc9758c87b0d2f10a6a5edb10f17
 SHA512:
-  metadata.gz: 19c134eda8a7b0b53570ad335e79b019daa553ae46cb5f554bc80f2157ac11e10e04e51f0c6444d249d6b97f14aa806a85a7c78a11e555eddccb849fd320666b
-  data.tar.gz: be46e99817efb6b0a8e85c5b562297b1b755c3a552ff4977039e70bf672aea636b6fc9cc4e81520120c82f5267e3ff2ba249aed0f061dae9fa4b9adcc48ee1c4
+  metadata.gz: 74efe9a99bf9579337169c780f7891cd88a1b25aa167bff4a45ca1c994d3e20d6046933beeb9cdb7bf1c1bc6d5a6ebf906336031dbd63ceb6342183f270ccf83
+  data.tar.gz: 065bcc712a06c87d7c488463a145f45c4ea66009c91781f2044aaa2113d94c28f6f84a90fb72e689dcddbffa76486f717e2d89412ac052ea2f38d36a3b793d1a

data/.gitignore

@@ -1,5 +1,4 @@
-*.gem
-.bundle
-Gemfile.lock
-pkg/*
-sandbox
+/.bundle/
+/pkg/
+/tmp/
+/Gemfile.lock

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2.0, release 2018-01
+## 2.0, release 2018-01-14
 * Plug-in support for commands.
 * Separate "setup" and "teardown" commands for VPS into the "sunzi-vps" gem as a plugin.
 * "attributes" are now "vars" in sunzi.yml and shell scripts.

data/Gemfile

@@ -1,3 +1,3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

data/README.md

@@ -1,20 +1,30 @@
 Sunzi
 =====
 
+[![Build Status](https://secure.travis-ci.org/kenn/sunzi.png)](http://travis-ci.org/kenn/sunzi)
+
 ```
 "The supreme art of war is to subdue the enemy without fighting." - Sunzi
 ```
 
-Sunzi is the easiest [server provisioning](http://en.wikipedia.org/wiki/Provisioning#Server_provisioning) utility designed for mere mortals. If Chef or Puppet is driving you nuts, try Sunzi!
+Sunzi is the easiest configuration automation and [infrastructure as code](https://en.wikipedia.org/wiki/Infrastructure_as_Code) utility designed for mere mortals.
+
+If Chef, Puppet, Ansible or SaltStack is driving you nuts, try Sunzi!
 
 Sunzi assumes that modern Linux distributions have (mostly) sane defaults and great package managers.
 
 Its design goals are:
 
 * **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.
+
+* **Minimal 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 reason what you are really doing.
+
+* **Minimum dependencies.** No configuration server required. You don't even need a Ruby runtime on the remote server, sunzi runs a combined shell script over SSH.
+
+See also:
+
+* [sunzi-vps](https://github.com/kenn/sunzi-vps) - Interactive server provisioning plugin for Linode and DigitalOcean.
+* [sunzi-recipes](https://github.com/kenn/sunzi-recipes) - Sample repository for remote recipes.
 
 ### What's new:
 
@@ -26,7 +36,7 @@ Quickstart
 Install:
 
 ```bash
-$ [sudo] gem install sunzi
+$ gem install sunzi
 ```
 
 Go into your project directory (if it's a Rails project, `config` would be a good place to start with), then:
@@ -119,7 +129,7 @@ For instance, if you have the following line in `sunzi.yml`,
 
 ```yaml
 recipes:
-  rvm: https://raw.github.com/kenn/sunzi-recipes/master/ruby/rvm.sh
+  rvm: https://raw.githubusercontent.com/kenn/sunzi-recipes/master/ruby/rvm.sh
 ```
 
 `rvm.sh` will be available and you can refer to that recipe by `source recipes/rvm.sh`.

data/Rakefile

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

data/lib/sunzi/cli.rb

@@ -10,8 +10,8 @@ module Sunzi
 
     desc 'deploy [user@host:port] [role] [--sudo]', 'Deploy sunzi project'
     method_options sudo: false
-    def deploy(first, *args)
-      Sunzi::Command.new.deploy(first, *args)
+    def deploy(target, role = nil)
+      Sunzi::Command.new.deploy(target, role, options)
     end
 
     desc 'compile', 'Compile sunzi project'

data/lib/sunzi/command.rb

@@ -5,7 +5,7 @@ module Sunzi
   class Command
     include Sunzi::Actions::Delegate
 
-    delegate_to_thor :copy_file, :template, :get, :append_to_file, :options
+    delegate_to_thor :copy_file, :template, :get, :append_to_file
 
     def create(project)
       copy_file 'templates/create/.gitignore',         "#{project}/.gitignore"
@@ -17,15 +17,13 @@ module Sunzi
       copy_file 'templates/create/files/.gitkeep',     "#{project}/files/.gitkeep"
     end
 
-    def deploy(first, *args)
-      role = args[0]
-
-      sudo = 'sudo ' if options.sudo?
-      endpoint = Endpoint.new(first)
-
+    def deploy(target, role, options)
       # compile vars and recipes
       compile(role)
 
+      sudo = 'sudo ' if options.sudo?
+      endpoint = Endpoint.new(target)
+
       # The host key might change when we instantiate a new VM, so
       # we remove (-R) the old host key from known_hosts.
       `ssh-keygen -R #{endpoint.host} 2> /dev/null`
@@ -60,6 +58,7 @@ module Sunzi
     end
 
     def compile(role = nil)
+      abort_with 'You must be in a sunzi folder' unless File.exist?('sunzi.yml')
       abort_with "#{role} doesn't exist!" if role && !File.exist?("roles/#{role}.sh")
       abort_with 'As of v2, "attributes" are now "vars" in sunzi.yml and shell scripts.' if config.attributes
 
@@ -73,7 +72,7 @@ module Sunzi
       @vars = config.vars # Used within ERB templates
 
       # Copy local files to compiled folder
-      files = Dir['{recipes,roles,files}/**/*'].select { |file| File.file?(file) }
+      files = glob('{recipes,roles,files}/**/*').select { |file| File.file?(file) }
 
       files.each do |file|
         render file, "compiled/#{file}"
@@ -96,11 +95,7 @@ module Sunzi
   private
 
     def config
-      @config ||= begin
-        abort_with 'You must be in a sunzi folder' unless File.exist?('sunzi.yml')
-
-        YAML.load(File.read('sunzi.yml')).to_hashugar
-      end
+      @config ||= YAML.load(ERB.new(File.read('sunzi.yml')).result).to_hashugar
     end
 
     # template method requires absolute path to work with current directory
@@ -109,5 +104,9 @@ module Sunzi
       template File.expand_path(source), target, context: binding
     end
 
+    def glob(pattern)
+      Dir.glob(pattern, File::FNM_DOTMATCH) - ['.', '..']
+    end
+
   end
 end

data/lib/sunzi/dependency.rb

@@ -28,7 +28,7 @@ module Sunzi
           else
             'install'
           end
-          text = ERB.new(base.join("#{which}.erb").read, nil, '-').result(binding)
+          text = ERB.new(base.join("#{which}.erb").read).result(binding)
           abort_with text
         end
       end

data/lib/sunzi/plugin.rb

@@ -2,7 +2,6 @@ module Sunzi
   module Plugin
     class << self
       # Find gems that start with "sunzi-*" and require them automatically.
-      # If that gem is a plugin, it will call the register method on load.
 
       def load
         plugins = Gem::Specification.find_all.select{|plugin| plugin.name =~ /sunzi-.+/ }

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi'
-  spec.version       = '2.0.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '2.1.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
   spec.authors       = ['Kenn Ejima']
   spec.email         = ['kenn.ejima@gmail.com']
   spec.summary       = %q{Server provisioning utility for minimalists}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists