itamae 1.2.7 → 1.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: acf3cb88e28148f0437e3457e52a6307ab21adf6
4
- data.tar.gz: 8790859af544e3df7269ea58a42c0710eca16b12
3
+ metadata.gz: 8815e26260fcdb26ad53e3dfef5d0fffb1282244
4
+ data.tar.gz: 0db4ddf34079e91eab44ea5a39338e9591e92d8b
5
5
  SHA512:
6
- metadata.gz: 3ce64e72722ba79059f0b376a1342ee716c098d4da9f52b7afe7c148107c1dea9512bc1b61409ba0317058ae3f7471c95c67b18db0d4d6e3d17766ab426bac64
7
- data.tar.gz: d9dfa06f07755285ff7208eb618f5585bdafb378863b0aec21b1d9f7f07f8b7d855e94b8a6397d67b0967dcb0b8aca90e6ba43e7310b386c5c16f4c1a981eaa7
6
+ metadata.gz: 5479683a14d33546ef79cec19304e37bc9b1b1bd69a95ca72c2e29f7cbb4131ec6482646c5934aa34208dbc064f143bc392cac5593635822bd192c1f4ff35a60
7
+ data.tar.gz: 16b612e907f4c981e42b9964d322423413244ba55ac53777cf71f171b0da590c249031cb6c67b2d7e65c56592061810b31edb1a15e9618451bf4e35d51137fa6
@@ -1,8 +1,14 @@
1
+ ## v1.2.8
2
+
3
+ Improvements
4
+
5
+ - [Load ~/.ssh/config (by @maruware)](https://github.com/itamae-kitchen/itamae/pull/115)
6
+
1
7
  ## v1.2.7
2
8
 
3
9
  Bugfixes
4
10
 
5
- - Backend::Docker#finalize should be public.
11
+ - Backend::Docker#finalize should be public. (by @mizzy)
6
12
 
7
13
  ## v1.2.6
8
14
 
data/README.md CHANGED
@@ -17,41 +17,13 @@ Simple and lightweight configuration management tool inspired by Chef.
17
17
  $ gem install itamae
18
18
  ```
19
19
 
20
- ## Basic Usage
20
+ ## Getting Started
21
21
 
22
- ### Run locally
23
-
24
- ```
25
- $ sudo itamae local -j example/node.json recipe.rb
26
- ```
27
-
28
- ### Run via SSH
29
-
30
- ```
31
- $ itamae ssh -j example/node.json -h 192.168.10.10 -p 22 -u user -i /path/to/private_key recipe.rb
32
- ```
33
-
34
- #### Vagrant Integration
35
-
36
- ```
37
- $ itamae ssh -h vagrant_vm_name --vagrant recipe.rb
38
- ```
39
-
40
- ## Recipes
41
-
42
- You can write recipes like Chef's one.
43
-
44
- ```ruby
45
- package "dstat" do
46
- action :install
47
- end
48
- ```
49
-
50
- Further example is here: [spec/integration/recipes/default.rb](spec/integration/recipes/default.rb)
22
+ https://github.com/itamae-kitchen/itamae/wiki/Getting-Started
51
23
 
52
24
  ## Documentations
53
25
 
54
- - https://github.com/itamae-kitchen/itamae/wiki
26
+ https://github.com/itamae-kitchen/itamae/wiki
55
27
 
56
28
  ## Run tests
57
29
 
@@ -1,6 +1,7 @@
1
1
  require 'specinfra/core'
2
2
  require 'singleton'
3
3
  require 'io/console'
4
+ require 'net/ssh'
4
5
 
5
6
  Specinfra::Configuration.error_on_missing_backend_type = true
6
7
 
@@ -152,7 +153,10 @@ module Itamae
152
153
  opts = {}
153
154
 
154
155
  opts[:host_name] = @options[:host]
155
- opts[:user] = @options[:user] || Etc.getlogin
156
+
157
+ # from ssh-config
158
+ opts.merge!(Net::SSH::Config.for(@options[:host]))
159
+ opts[:user] = @options[:user] || opts[:user] || Etc.getlogin
156
160
  opts[:keys] = [@options[:key]] if @options[:key]
157
161
  opts[:port] = @options[:port] if @options[:port]
158
162
  opts[:disable_sudo] = true unless @options[:sudo]
@@ -1 +1 @@
1
- 1.2.7
1
+ 1.2.8
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: itamae
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.7
4
+ version: 1.2.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ryota Arai
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-29 00:00:00.000000000 Z
11
+ date: 2015-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
262
262
  version: '0'
263
263
  requirements: []
264
264
  rubyforge_project:
265
- rubygems_version: 2.2.2
265
+ rubygems_version: 2.4.5
266
266
  signing_key:
267
267
  specification_version: 4
268
268
  summary: Simple Configuration Management Tool