sunzi 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb8a4617f357a7694046748161711229c0e17188
-  data.tar.gz: 11937bf1031b74d004b8c89b18344d779dd895f5
+  metadata.gz: 2e3cdb0743553811ee1eabba13a157b8e083bb0c
+  data.tar.gz: 1a84c8f3f1de7377d64eb0b81ec1c0b5bb53f3c9
 SHA512:
-  metadata.gz: 79d7b23cc2151b0a93bd6ba0095014f05d06b60905fe3ca65e8833cb7d198ef16d10056f62fc2d626b4910b9cddc22cb2c67a747a28b23526582c3d9072d44de
-  data.tar.gz: 557af77389587f53612de8b5d3ec43b416ed5a96a76dbcac9177703525245ce6eb4aa36e9fba0007d294f0788e24838489095612d8c4d2cf2178a4f0e6fccb67
+  metadata.gz: 9d02df7f0f7be31227a1a31221afec080d4e642e314426d9b9053e8c874f70aa1d7f4913cb017e3e33194bbff979af2ac5236064611354c85525aa590a6198eb
+  data.tar.gz: 68ed831c1d46e064dfd442ac43a4bf57a8c755965e513bbb9bf2beafb1cda0c372280ed77d5ea416b673ce3febb247c728cd31ef228e21fa2f2937173c9efb4c

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## 1.4, release 2013-09-27
+* `sunzi teardown` no longer requires instance names as an argument, it lets you choose from a list instead.
+
+## Past Releases
+* v1.3: SSH config support. Thanks to @toooooooby
+* v1.2: Evaluate everything as ERB templates by default. Added "files" folder.
+* 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.
+* v0.6: System function sunzi::silencer() added for succinct log messages.
+* v0.5: Role-based configuration supported. Reworked directory structure. **Incompatible with previous versions**.

data/README.md

@@ -18,15 +18,7 @@ Its design goals are:
 
 ### What's new:
 
-* v1.3: SSH config support. Thanks to @toooooooby
-* v1.2: Evaluate everything as ERB templates by default. Added "files" folder.
-* 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.
-* v0.6: System function sunzi::silencer() added for succinct log messages.
-* v0.5: Role-based configuration supported. Reworked directory structure. **Incompatible with previous versions**.
+Please see the [CHANGELOG](https://github.com/kenn/sunzi/blob/master/CHANGELOG.md).
 
 Quickstart
 ----------
@@ -73,7 +65,7 @@ $ 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 teardown [linode|digital_ocean]           # Teardown an existing VM on the cloud services
 ```
 
 Directory structure

data/lib/sunzi/cli.rb

@@ -27,9 +27,9 @@ module Sunzi
       Sunzi::Cloud.new(self, provider).setup
     end
 
-    desc 'teardown [linode|digital_ocean] [name]', 'Teardown an existing VM'
-    def teardown(provider, name)
-      Sunzi::Cloud.new(self, provider).teardown(name)
+    desc 'teardown [linode|digital_ocean]', 'Teardown an existing VM'
+    def teardown(provider)
+      Sunzi::Cloud.new(self, provider).teardown
     end
 
     desc 'version', 'Show version'

data/lib/sunzi/cloud/base.rb

@@ -12,14 +12,13 @@ module Sunzi
       end
 
       def setup
-        unless File.exist? "#{@provider}/#{@provider}.yml"
+        unless File.exist? provider_config_path
           @cli.empty_directory "#{@provider}/instances"
-          @cli.template "templates/setup/#{@provider}/#{@provider}.yml", "#{@provider}/#{@provider}.yml"
+          @cli.template "templates/setup/#{provider_config_path}", provider_config_path
           exit_with "Now go ahead and edit #{@provider}.yml, then run this command again!"
         end
 
-        @config = YAML.load(File.read("#{@provider}/#{@provider}.yml"))
-        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
+        assign_config_and_dns
 
         if @config['fqdn']['zone'] == 'example.com'
           abort_with "You must have your own settings in #{@provider}.yml"
@@ -32,27 +31,29 @@ module Sunzi
         abort_with '"label" field in linode.yml is no longer supported. rename it to "name".' if @config['label']
         @fqdn = @config['fqdn'][@env].gsub(/%{host}/, @host)
         @name = @config['name'][@env].gsub(/%{host}/, @host)
+        abort_with "#{@name} already exists!" if instance_config_path.exist?
 
         assign_api
         @attributes = {}
         do_setup
 
         # Save instance info
-        @cli.create_file "#{@provider}/instances/#{@name}.yml", YAML.dump(@instance)
+        @cli.create_file instance_config_path, YAML.dump(@instance)
 
         # Register IP to DNS
         @dns.add(@fqdn, @public_ip) if @dns
       end
 
-      def teardown(name)
-        unless File.exist?("#{@provider}/instances/#{name}.yml")
-          abort_with "#{name}.yml was not found in the instances directory."
-        end
+      def teardown
+        names = Dir.glob("#{@provider}/instances/*.yml").map{|i| i.split('/').last.sub('.yml','') }
+        abort_with "No match found with #{@provider}/instances/*.yml" if names.empty?
 
-        @config = YAML.load(File.read("#{@provider}/#{@provider}.yml"))
-        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
+        names.each{|i| say i }
+        @name = ask("which instance?: ", String) {|q| q.in = names }
 
-        @instance = YAML.load(File.read("#{@provider}/instances/#{name}.yml"))
+        assign_config_and_dns
+
+        @instance = YAML.load(instance_config_path.read)
 
         # Are you sure?
         moveon = ask("Are you sure about deleting #{@instance[:fqdn]} permanently? (y/n) ", String) {|q| q.in = ['y','n']}
@@ -66,11 +67,24 @@ module Sunzi
         @dns.delete(@instance[ip_key]) if @dns
 
         # Remove the instance config file
-        @cli.remove_file "#{@provider}/instances/#{name}.yml"
+        @cli.remove_file instance_config_path
 
         say 'Done.'
       end
 
+      def assign_config_and_dns
+        @config = YAML.load(provider_config_path.read)
+        @dns = Sunzi::DNS.new(@config, @provider) if @config['dns']
+      end
+
+      def provider_config_path
+        Pathname.new "#{@provider}/#{@provider}.yml"
+      end
+
+      def instance_config_path
+        Pathname.new "#{@provider}/instances/#{@name}.yml"
+      end
+
       def ask(question, answer_type, &details)
         @ui.ask(@ui.color(question, :green, :bold), answer_type, &details)
       end

data/lib/sunzi/cloud/digital_ocean.rb

@@ -55,6 +55,7 @@ module Sunzi
       end
 
       def choose(key, result)
+        abort "no #{key} found!" if result.first.nil?
         result.each{|i| say "#{i.id}: #{i.name}" }
         @attributes[:"#{key}_id"] = ask("which #{key}?: ", Integer) {|q| q.in = result.map(&:id); q.default = result.first.id }
         @attributes[:"#{key}_name"] = result.find{|i| i.id == @attributes[:"#{key}_id"] }.name

data/lib/templates/create/install.sh

@@ -10,6 +10,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Add Dotdeb repository. Recommended if you're using Debian. See http://www.dotdeb.org/about/
 # source recipes/dotdeb.sh
+# source recipes/backports.sh
 
 # Update apt catalog and upgrade installed packages
 sunzi.mute "apt-get update"

data/lib/templates/create/sunzi.yml

@@ -7,7 +7,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
+  # dotdeb: https://raw.github.com/kenn/sunzi-recipes/master/debian/dotdeb-wheezy.sh
+  # backports: https://raw.github.com/kenn/sunzi-recipes/master/debian/backports-wheezy.sh
   # mongodb-10gen: https://raw.github.com/kenn/sunzi-recipes/master/debian/mongodb-10gen.sh
 
 # Files specified here will be copied to compiled/files.
@@ -18,7 +19,7 @@ recipes:
 preferences:
   # Erase the generated folder on the server after deploy.
   # Turn on when you are done with testing and ready for production use.
-  erase_remote_folder: false
+  erase_remote_folder: true
 
   # Skip retrieving remote recipes when local copies already exist. This setting helps
   # iterative deploy testing considerably faster, when you have a lot of remote recipes.

data/sunzi.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sunzi'
-  spec.version       = '1.3.0' # retrieve this value by: Gem.loaded_specs['sunzi'].version.to_s
+  spec.version       = '1.4.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'
@@ -19,4 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rainbow'
   spec.add_runtime_dependency 'net-ssh'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest'
 end

data/test/test_cli.rb

@@ -1,8 +1,7 @@
 require 'sunzi'
-require 'test/unit'
-require 'minitest/mock'
+require 'minitest/autorun'
 
-class TestCli < Test::Unit::TestCase
+class TestCli < Minitest::Test
   def setup
     @cli = Sunzi::Cli.new
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  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,6 +90,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -124,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Server provisioning utility for minimalists