serverspec-runner 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70b5b233f8c9286732eb6b0dbe0c478580d1fd0
-  data.tar.gz: 03b1894b0a1945a48ff0e272d0de75b3f8baf5f5
+  metadata.gz: 1bf822c5821bc96001f1be8e68b325950f87e438
+  data.tar.gz: 34c45441230429ed4735405ff7badc369b92be6c
 SHA512:
-  metadata.gz: 7438058249940f2ffc220affb76c2c621a8d6f6d444d6113f29ad9fd821e2993d12434d039afa461d42a0f659ff0920bda370b6b47e8f06b4933125101845d06
-  data.tar.gz: ae18469bc028a522c94df53b54c718b07ad3051fb3aeaad3aa48e846e6180d5794d35c3ce83e0909b855b89076cb6217609d78c9eabcfa5bcb94a50e9d9d96a0
+  metadata.gz: 7ad19aaab1b06c714abea5d86f36731de126d382cb937c2e7953760123c1f7e48b9d5d561f550b62e36631af4b3051ce26f5aaa7d8e46ca3e4a552dcd827fa5a
+  data.tar.gz: 4f53637233248264a55db855c87bdb90f34f58ad61fd22e02b308882b7aeeab6633290a5d8b51d6c654f258830c194f24f09f45c73a85a2deffa9f3ed5d2ecfd

data/Rakefile

@@ -18,8 +18,8 @@ namespace :spec do
   ENV['specroot'] = ENV['specroot'] || "."
   ENV['specpath'] = "#{ENV['specroot']}/spec"
 
-  ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/ssh_options.yml" || "#{File.dirname(__FILE__)}/ssh_options.yml"
-  ENV['ssh_options'] = "#{File.dirname(__FILE__)}/ssh_options.yml" unless File.exists?(ENV['ssh_options'])
+  ENV['ssh_options'] = ENV['ssh_options'] || "#{ENV['specroot']}/ssh_options_default.yml" || "#{File.dirname(__FILE__)}/ssh_options_default.yml"
+  ENV['ssh_options'] = "#{File.dirname(__FILE__)}/ssh_options_default.yml" unless File.exists?(ENV['ssh_options'])
   ssh_options = YAML.load_file(ENV['ssh_options'])
   ENV['result_csv'] = ENV['result_csv'] || './_serverspec_result.csv'
   csv_file = ENV['result_csv']
@@ -68,6 +68,8 @@ namespace :spec do
           ssh_host = host_alias
         end
 
+        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)
+
         tasks << "#{path}::#{host_alias}"
         platform[host_alias.to_sym] = ServerspecRunner::Detection.platform(ssh_host, ssh_options, platform[host_alias.to_sym])
         return ''

data/lib/serverspec-runner/version.rb

@@ -1,3 +1,3 @@
 module ServerspecRunner
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/spec_helper.rb

@@ -45,9 +45,8 @@ RSpec.configure do |c|
 
     c.host = ENV['TARGET_SSH_HOST']
     options = Net::SSH::Config.for(c.host, files=["~/.ssh/config"])
-
-    ssh_opts = YAML.load_file(property[:ssh_opts]) if File.exists?(property[:ssh_opts])
     ssh_opts ||= ssh_opts_default
+    property[:ssh_opts].each { |k, v| ssh_opts[k.to_sym] = v } if property[:ssh_opts]
     user    = options[:user] || ssh_opts[:user] || Etc.getlogin
     c.ssh   = Net::SSH.start(c.host, user, options.merge(ssh_opts))
     c.os    = backend.check_os

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec-runner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -118,7 +118,7 @@ files:
 - serverspec-runner.gemspec
 - spec/example/default.rb
 - spec/spec_helper.rb
-- ssh_options.yml
+- ssh_options_default.yml
 homepage: https://github.com/hiracy/serverspec-runner
 licenses:
 - MIT