serverspec_launcher 0.4.9 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdd1ccfc539aa3b580cb28399ee1322753e604f28ad7d3b9ab4fa237c5a32612
-  data.tar.gz: ca9a9e7cfcab88d7959fdf000ff9bcdd4a077bbcc3a5fd371ac0aa8db7230b42
+  metadata.gz: ee03f601729e8ef4678692d8cfcf9033fb72c22d159fc0aeb0a41219339df6a0
+  data.tar.gz: edf72d1787bcbd329703eeeeb2ef11ace64cbf0b3daa3877f8e6a069ba4e1cbd
 SHA512:
-  metadata.gz: e73fe3407caabc0974ff75a4a5a37d1467ad75d680d581f1958fbc66b17e82ffe5f16a4ba344d53c5c36cbcb40f55b52e0b2b1e9ca79cbcba1804edfd3412a5c
-  data.tar.gz: b1adc6b0cd912d4b634bfb125ee73b51edbf7ff91a2f5140b63806e160ed02d993102da1379760b3e150f69cf8f74e21db61ee583843955eeeb5f79d2c3ff5fb
+  metadata.gz: 6bb842357b8afb35e6cd5bf2293e71e2c0c09c191205a5d149098bfb0f387118e6235b6b9a429a00d5c59a98051c6eeac42fecc1d7d3268e6ffa973255b56d02
+  data.tar.gz: 5f0ccbf495abcbd05c1a76433fb5da718c2896cfdcf2cfbb4a1c53b34d321b8250a15be2f70c74fb31eb323bef1cb115c6cdd877b6b40693cf7e0878cdcb2d04

data/.gitignore

@@ -9,4 +9,7 @@
 /tmp/
 
 .idea/
-reports/
+reports/
+
+spec/resources/*.rsa
+spec/resources/*.rsa.pub

data/Rakefile

@@ -30,6 +30,7 @@ end
 
 task :start_ssh_container do
   ENV['TARGET_HOST'] = '172.18.0.22'
+  `ssh-keygen -f spec/resources/ssh.rsa -t rsa -N ""` unless File.exists? 'spec/resources/ssh.rsa'
   start_ssh_container
 end
 
@@ -39,4 +40,5 @@ end
 
 
 Rake::Task['serverspec:inspec-agent-example:all'].enhance ['post_task_cleanup', 'start_ssh_container']
+Rake::Task['serverspec:inspec-ssh-example:all'].enhance ['post_task_cleanup', 'start_ssh_container']
 Rake::Task['serverspec:inspec-password-example:all'].enhance ['post_task_cleanup', 'start_ssh_container']

data/lib/serverspec_launcher/helpers/properties_loader.rb

@@ -11,7 +11,7 @@ class PropertiesLoader
     @raw_properties =  if properties.is_a? Hash
       properties.deep_symbolize_keys
     elsif properties.is_a? String
-      YAML.safe_load( expand_env_vars(properties)).deep_symbolize_keys 
+      YAML.safe_load(expand_env_vars(properties)).deep_symbolize_keys
     else
       str = File.read('properties.yml')
       YAML.safe_load(expand_env_vars(str)).deep_symbolize_keys
@@ -20,11 +20,14 @@ class PropertiesLoader
 
   def expand_env_vars(text)
     text.gsub /\${([^}]+)}/ do
-      ENV[$1]
+      data = $1.split(/:[-=]/)
+      var_name = data[0]
+      var_default = data[1]
+      ENV[var_name] || var_default
     end
   end
 
   def properties
     @properties ||= @raw_properties
   end
-end
+end

data/lib/serverspec_launcher/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ServerspecLauncher
-  VERSION = '0.4.9'
+  VERSION = '0.5.2'
 end

data/properties.yml

@@ -36,6 +36,18 @@ targets:
     attach_to:
       - test_network
 
+  inspec-ssh-example:
+    backend: inspec
+    control: spec/integration/inspec_spec.rb
+    ssh_port: 22
+    user: root
+    hosts:
+      - 172.18.0.22
+    auth_method: ssh-keys
+    keyfile: spec/resources/ssh.rsa
+    attach_to:
+      - test_network
+
   inspec-password-example:
     backend: inspec
     control: spec/integration/inspec_spec.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec_launcher
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.2
 platform: ruby
 authors:
 - Andrew Wardrobe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler