serverspec-runner 0.1.1 → 0.1.2
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 +4 -4
- data/Rakefile +4 -2
- data/lib/serverspec-runner/version.rb +1 -1
- data/spec/spec_helper.rb +1 -2
- data/{ssh_options.yml → ssh_options_default.yml} +0 -0
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1bf822c5821bc96001f1be8e68b325950f87e438
|
|
4
|
+
data.tar.gz: 34c45441230429ed4735405ff7badc369b92be6c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7ad19aaab1b06c714abea5d86f36731de126d382cb937c2e7953760123c1f7e48b9d5d561f550b62e36631af4b3051ce26f5aaa7d8e46ca3e4a552dcd827fa5a
|
|
7
|
+
data.tar.gz: 4f53637233248264a55db855c87bdb90f34f58ad61fd22e02b308882b7aeeab6633290a5d8b51d6c654f258830c194f24f09f45c73a85a2deffa9f3ed5d2ecfd
|
data/Rakefile
CHANGED
|
@@ -18,8 +18,8 @@ namespace :spec do
|
|
|
18
18
|
ENV['specroot'] = ENV['specroot'] || "."
|
|
19
19
|
ENV['specpath'] = "#{ENV['specroot']}/spec"
|
|
20
20
|
|
|
21
|
-
ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/
|
|
22
|
-
ENV['ssh_options'] = "#{File.dirname(__FILE__)}/
|
|
21
|
+
ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/ssh_options_default.yml" || "#{File.dirname(__FILE__)}/ssh_options_default.yml"
|
|
22
|
+
ENV['ssh_options'] = "#{File.dirname(__FILE__)}/ssh_options_default.yml" unless File.exists?(ENV['ssh_options'])
|
|
23
23
|
ssh_options = YAML.load_file(ENV['ssh_options'])
|
|
24
24
|
ENV['result_csv'] = ENV['result_csv'] || './_serverspec_result.csv'
|
|
25
25
|
csv_file = ENV['result_csv']
|
|
@@ -68,6 +68,8 @@ namespace :spec do
|
|
|
68
68
|
ssh_host = host_alias
|
|
69
69
|
end
|
|
70
70
|
|
|
71
|
+
platform[host_alias.to_sym][:ssh_opts].each { |k, v| ssh_options[k.to_sym] = v } if platform[host_alias.to_sym].include?(:ssh_opts)
|
|
72
|
+
|
|
71
73
|
tasks << "#{path}::#{host_alias}"
|
|
72
74
|
platform[host_alias.to_sym] = ServerspecRunner::Detection.platform(ssh_host, ssh_options, platform[host_alias.to_sym])
|
|
73
75
|
return ''
|
data/spec/spec_helper.rb
CHANGED
|
@@ -45,9 +45,8 @@ RSpec.configure do |c|
|
|
|
45
45
|
|
|
46
46
|
c.host = ENV['TARGET_SSH_HOST']
|
|
47
47
|
options = Net::SSH::Config.for(c.host, files=["~/.ssh/config"])
|
|
48
|
-
|
|
49
|
-
ssh_opts = YAML.load_file(property[:ssh_opts]) if File.exists?(property[:ssh_opts])
|
|
50
48
|
ssh_opts ||= ssh_opts_default
|
|
49
|
+
property[:ssh_opts].each { |k, v| ssh_opts[k.to_sym] = v } if property[:ssh_opts]
|
|
51
50
|
user = options[:user] || ssh_opts[:user] || Etc.getlogin
|
|
52
51
|
c.ssh = Net::SSH.start(c.host, user, options.merge(ssh_opts))
|
|
53
52
|
c.os = backend.check_os
|
|
File without changes
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: serverspec-runner
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- hiracy
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-09-28 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: serverspec
|
|
@@ -118,7 +118,7 @@ files:
|
|
|
118
118
|
- serverspec-runner.gemspec
|
|
119
119
|
- spec/example/default.rb
|
|
120
120
|
- spec/spec_helper.rb
|
|
121
|
-
-
|
|
121
|
+
- ssh_options_default.yml
|
|
122
122
|
homepage: https://github.com/hiracy/serverspec-runner
|
|
123
123
|
licenses:
|
|
124
124
|
- MIT
|