serverspec-runner 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95214931bd6fe3c15da86173962af41207536632933cf17b34b4de732e2c92e1
-  data.tar.gz: 9d37ddc59b12c92a0e11952898aab65fd7fe9ebadcf7d4b9b9084610cc435ae6
+  metadata.gz: a08a31c047d65c820512c61b00f67c56bdac4942ff0d1c37bb36ca135f7d78a1
+  data.tar.gz: bafdd894d11c29fa2d5cd0f45c981a743d4b5bf2cf5804d3be91ec49659e3820
 SHA512:
-  metadata.gz: 1bdfe0bcc4ec3cdf22081217c055644f44511943a723f832b256d8940bc0d52faf68dbb327c65f6237b35774e2cfa30bac869c42f8b982bf9b9a77f9a78ed9fb
-  data.tar.gz: d8c155efdb66b9561c91128bf7ec4c2ab7fc53b995fb9db3ce6b940ae1dcfc99808dca7bd0b773ff2174f80bfaee6f76578a01677ece8c39c370c2433348b7d8
+  metadata.gz: c7d020eaed672cf410490394a0717fe191a3d4fd07bf6780e4edea880a7233a88e71c8d7630d3a56ba61e8648014ee1c20bbf48d34605ea8fff5f9d74dd7597b
+  data.tar.gz: 4298f5d485cb3274348324aa6f977a21c7be884db3ba331a7ff441b50a669be165df67a585327e0d4b742abc36140046f73d9705c9d464934f9cd0a1962e3a50

data/Rakefile

@@ -38,16 +38,18 @@ namespace :spec do
   ENV['scenario'] = File.expand_path(ENV['scenario'] || "./scenario.yml")
   ENV['inventory'] = File.expand_path(ENV['inventory']) if ENV['inventory']
 
-  def init_specpath(path)
+  def init_specpath(path, only_activate)
 
     abs_path = File::expand_path(path)
 
-    begin
-      print "want to create spec-tree to #{abs_path}? (y/n): "
-      ans = STDIN.gets.strip
-      exit 0 unless (ans == 'y' || ans == 'yes')
-    rescue Exception
-      exit 0
+    unless only_activate
+      begin
+        print "want to create spec-tree to #{abs_path}? (y/n): "
+        ans = STDIN.gets.strip
+        exit 0 unless (ans == 'y' || ans == 'yes')
+      rescue Exception
+        exit 0
+      end
     end
 
     FileUtils.mkdir_p("#{path}/lib")
@@ -145,7 +147,10 @@ namespace :spec do
   end
 
   if !Dir.exists?(ENV['specpath'])
-    init_specpath(ENV['specroot'])
+    init_specpath(ENV['specroot'], false)
+    exit 0
+  elsif ENV['activate_specroot']
+    init_specpath(ENV['specroot'], true)
     exit 0
   end
 

data/bin/serverspec-runner

@@ -21,6 +21,7 @@ opts = GetoptLong.new(
   ["--pattern",           "-P", GetoptLong::REQUIRED_ARGUMENT],
   ["--exclude-pattern",   "-E", GetoptLong::REQUIRED_ARGUMENT],
   ["--ignore-error-exit", "-I", GetoptLong::NO_ARGUMENT],
+  ["--activate-specroot", "-a", GetoptLong::NO_ARGUMENT],
   ["--version",           "-v", GetoptLong::NO_ARGUMENT],
   ["--help",              "-h", GetoptLong::NO_ARGUMENT],
   ["--raketask",          "-1", GetoptLong::REQUIRED_ARGUMENT],
@@ -50,6 +51,8 @@ opts.each do |opt, arg|
     ENV['exclude_pattern'] = arg
   when '--ignore-error-exit'
     ENV['ignore_error_exit'] = 'true'
+  when '--activate-specroot'
+    ENV['activate_specroot'] = 'true'
   when '--tmpdir'
     ENV['tmpdir'] = arg
   when '--raketask'
@@ -71,6 +74,7 @@ opts.each do |opt, arg|
     puts "-p, --parallel                                 execute tasks in parallel"
     puts "-P, --pattern                                  execute pattern in spec directory"
     puts "-I, --ignore-error-exit                        exit with 0 even on error"
+    puts "-a, --activate-specroot                        activate existed spec root only(--specroot is required)"
     puts "-1, --raketask          RAKE_TASK_NAME         execute specified rake task only(ex: spec:test::anyhost-01)"
     puts "-v, --version                                  show version"
     puts "-h, --help                                     show help"

data/lib/serverspec-runner/ansible/inventory.rb

@@ -7,7 +7,11 @@ module Inventory
         if gk == 'hosts'
           if gv.kind_of?(Hash)
             gv.each do |hk, hv|
-              platform[hk] = convert_ssh_opt(v['vars']).merge(convert_ssh_opt(hv))
+              platform[hk.to_sym] = unless hv.nil?
+                               convert_ssh_opt(v['vars']).merge(convert_ssh_opt(hv))
+                             else
+                               convert_ssh_opt(v['vars'])
+                             end
             end
           elsif gv.kind_of?(Array)
             gv.each do |h|

data/lib/serverspec-runner/version.rb

@@ -1,3 +1,3 @@
 module ServerspecRunner
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec-runner
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec