itamae 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf3cb88e28148f0437e3457e52a6307ab21adf6
-  data.tar.gz: 8790859af544e3df7269ea58a42c0710eca16b12
+  metadata.gz: 8815e26260fcdb26ad53e3dfef5d0fffb1282244
+  data.tar.gz: 0db4ddf34079e91eab44ea5a39338e9591e92d8b
 SHA512:
-  metadata.gz: 3ce64e72722ba79059f0b376a1342ee716c098d4da9f52b7afe7c148107c1dea9512bc1b61409ba0317058ae3f7471c95c67b18db0d4d6e3d17766ab426bac64
-  data.tar.gz: d9dfa06f07755285ff7208eb618f5585bdafb378863b0aec21b1d9f7f07f8b7d855e94b8a6397d67b0967dcb0b8aca90e6ba43e7310b386c5c16f4c1a981eaa7
+  metadata.gz: 5479683a14d33546ef79cec19304e37bc9b1b1bd69a95ca72c2e29f7cbb4131ec6482646c5934aa34208dbc064f143bc392cac5593635822bd192c1f4ff35a60
+  data.tar.gz: 16b612e907f4c981e42b9964d322423413244ba55ac53777cf71f171b0da590c249031cb6c67b2d7e65c56592061810b31edb1a15e9618451bf4e35d51137fa6

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+## v1.2.8
+
+Improvements
+
+- [Load ~/.ssh/config (by @maruware)](https://github.com/itamae-kitchen/itamae/pull/115)
+
 ## v1.2.7
 
 Bugfixes
 
-- Backend::Docker#finalize should be public.
+- Backend::Docker#finalize should be public. (by @mizzy)
 
 ## v1.2.6
 

data/README.md

@@ -17,41 +17,13 @@ Simple and lightweight configuration management tool inspired by Chef.
 $ gem install itamae
 ```
 
-## Basic Usage
+## Getting Started
 
-### Run locally
-
-```
-$ sudo itamae local -j example/node.json recipe.rb
-```
-
-### Run via SSH
-
-```
-$ itamae ssh -j example/node.json -h 192.168.10.10 -p 22 -u user -i /path/to/private_key recipe.rb
-```
-
-#### Vagrant Integration
-
-```
-$ itamae ssh -h vagrant_vm_name --vagrant recipe.rb
-```
-
-## Recipes
-
-You can write recipes like Chef's one.
-
-```ruby
-package "dstat" do
-  action :install
-end
-```
-
-Further example is here: [spec/integration/recipes/default.rb](spec/integration/recipes/default.rb)
+https://github.com/itamae-kitchen/itamae/wiki/Getting-Started
 
 ## Documentations
 
-- https://github.com/itamae-kitchen/itamae/wiki
+https://github.com/itamae-kitchen/itamae/wiki
 
 ## Run tests
 

data/lib/itamae/backend.rb

@@ -1,6 +1,7 @@
 require 'specinfra/core'
 require 'singleton'
 require 'io/console'
+require 'net/ssh'
 
 Specinfra::Configuration.error_on_missing_backend_type = true
 
@@ -152,7 +153,10 @@ module Itamae
         opts = {}
 
         opts[:host_name] = @options[:host]
-        opts[:user] = @options[:user] || Etc.getlogin
+
+        # from ssh-config
+        opts.merge!(Net::SSH::Config.for(@options[:host]))
+        opts[:user] = @options[:user] || opts[:user] || Etc.getlogin
         opts[:keys] = [@options[:key]] if @options[:key]
         opts[:port] = @options[:port] if @options[:port]
         opts[:disable_sudo] = true unless @options[:sudo]

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.2.7
+1.2.8

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple Configuration Management Tool