sunzi 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ec250a135b740f0a34196be384788cdebf33d5a
-  data.tar.gz: 27cf354835d55b8463964df7e8095c8880d3750a
+  metadata.gz: cb8a4617f357a7694046748161711229c0e17188
+  data.tar.gz: 11937bf1031b74d004b8c89b18344d779dd895f5
 SHA512:
-  metadata.gz: 22a9585b4f2228b01509924b4c7509ca8b20b5ffd300a5a06338db32cbb12e8d1a6b23d129f9be2513d86435bb2c0c708f82b162ea708eeaefbf2cb412281414
-  data.tar.gz: d50ddebc4f553446f4c54fcec5099c7dfab232fc1e74888bdcdc1890b06506c401cac336e6c6e860806f277bd8263c31efedec045b443f715e7fdeae70dd4988
+  metadata.gz: 79d7b23cc2151b0a93bd6ba0095014f05d06b60905fe3ca65e8833cb7d198ef16d10056f62fc2d626b4910b9cddc22cb2c67a747a28b23526582c3d9072d44de
+  data.tar.gz: 557af77389587f53612de8b5d3ec43b416ed5a96a76dbcac9177703525245ce6eb4aa36e9fba0007d294f0788e24838489095612d8c4d2cf2178a4f0e6fccb67

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -18,6 +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().

data/lib/sunzi/cli.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'ostruct'
+require 'net/ssh'
 
 module Sunzi
   class Cli < Thor
@@ -136,7 +137,11 @@ module Sunzi
 
       def parse_target(target)
         target.match(/(.*@)?(.*?)(:.*)?$/)
-        [ ($1 && $1.delete('@') || 'root'), $2, ($3 && $3.delete(':') || '22') ]
+        # Load ssh config if it exists
+        config = Net::SSH::Config.for($2)
+        [ ($1 && $1.delete('@') || config[:user] || 'root'), 
+          config[:host_name] || $2, 
+          ($3 && $3.delete(':') || config[:port] && config[:port].to_s || '22') ]
       end
     end
   end

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

@@ -36,15 +36,12 @@ function sunzi.installed() {
 # otherwise the script may exit unexpectedly when the package is already installed.
 #
 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
+  if sunzi.installed "$@"; then
+    echo "$@ already installed"
+    return 1
+  else
+    echo "No packages found matching $@. Installing..."
+    sunzi.mute "$sunzi_pkg -y install $@"
+    return 0
+  fi
 }

data/sunzi.gemspec

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

data/test/test_cli.rb

@@ -1,5 +1,6 @@
 require 'sunzi'
 require 'test/unit'
+require 'minitest/mock'
 
 class TestCli < Test::Unit::TestCase
   def setup
@@ -14,6 +15,24 @@ class TestCli < Test::Unit::TestCase
     assert_equal ['root', '192.168.0.1', '22'],   @cli.parse_target('192.168.0.1')
   end
 
+  def test_parse_target_with_ssh_config
+    ssh_config = lambda do |host|
+      if host == 'example.com'
+        { :host_name => "buzz.example.com", :user => "foobar", :port => 2222 }
+      else
+        {}
+      end
+    end
+
+    Net::SSH::Config.stub(:for, ssh_config) do
+      assert_equal ['foobar', 'buzz.example.com', '2222'], @cli.parse_target('example.com')
+      assert_equal ['foobar', 'buzz.example.com', '8080'], @cli.parse_target('example.com:8080')
+      assert_equal ['piyo', 'buzz.example.com', '2222'], @cli.parse_target('piyo@example.com')
+      assert_equal ['piyo', 'buzz.example.com', '8080'], @cli.parse_target('piyo@example.com:8080')
+      assert_equal ['root', '192.168.0.1', '22'], @cli.parse_target('192.168.0.1')
+    end
+  end
+
   def test_create
     @cli.create 'sandbox'
     assert File.exist?('sandbox/sunzi.yml')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunzi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Kenn Ejima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -109,10 +124,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: