serverspec 2.41.5 → 2.41.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c1fd50d20575e8df2a43fd77526b1f64cf2cd67
-  data.tar.gz: 059832ec274b1ec8c380533fb89e84a14ba9c5d6
+SHA256:
+  metadata.gz: c055c97caf2f1a49b8a9636f73ecfe4b9b63ee7c03fbee33e61bc4a3bf3c03b3
+  data.tar.gz: aabdb043508a030010e43e5da1a6d575a75de901c3c1e830e3afb2bf96aa6fdd
 SHA512:
-  metadata.gz: 61dca279925253ed95fc21330613c21fd16b30acd669720cfdf6edbe851beb056f92246cb20081059ab804471d6f5f046984b1f897adb09e5113c0cc806acabd
-  data.tar.gz: 40b3ac40bbd38b6a71ced13930de75ce29290f225a63e65a018cb1643c506f4f75c2dd1c3ad1ae2a7270488586695255083e4b0e74dd2ac81ce2e7370cab12c2
+  metadata.gz: 2aca68fe8c54039f3a5187c20d69700dcbbf6fba3a57555c89cd13203bb8f2bc7c42fdb990252bf178b6402e894fa3fde552f9c7c5cb20f2e58c2f32be45ff7f
+  data.tar.gz: 2d2f0baa539f472927d5287d5b26f6d22395f183718305dd1a123b77538c815a94362e794b363d8413c28f9d9e13de0f9cbdcc03c223959ecf9220767d3b39c4

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.1
@@ -18,6 +17,7 @@ before_install:
 script:
   - bundle exec rake spec
 
+dist: trusty
 sudo: false
 cache: bundler
 notifications:

data/appveyor.yml

@@ -59,6 +59,7 @@ install:
   - ps: $PSVersionTable
 
 build_script:
+  - set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
   - ruby -rfileutils -e 'FileUtils.rm_r(File.join(Gem.dir, "cache", "bundler")) if Dir.exists?(File.join(Gem.dir, "cache", "bundler"))'
   - bundle install --jobs 3 --retry 3
   - net user

data/lib/serverspec/type/x509_certificate.rb

@@ -7,11 +7,11 @@ module Serverspec::Type
     end
 
     def subject
-      run_openssl_command_with("-subject -noout").stdout.chomp.gsub(/^subject= */,'')
+      normalize_dn(run_openssl_command_with("-subject -noout").stdout.chomp.gsub(/^subject= */,''))
     end
 
     def issuer
-      run_openssl_command_with("-issuer -noout").stdout.chomp.gsub(/^issuer= */,'')
+      normalize_dn(run_openssl_command_with("-issuer -noout").stdout.chomp.gsub(/^issuer= */,''))
     end
 
     def email
@@ -81,5 +81,12 @@ module Serverspec::Type
         res.merge({ kv_arr[0].to_sym => time })
       end
     end
+
+    # Normalize output between openssl versions.
+    def normalize_dn(dn)
+      return subject unless subject.start_with?('/')
+      # normalize openssl >= 1.1 to < 1.1 output
+      subject[1..-1].split('/').join(', ').gsub('=', ' = ')
+    end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.41.5"
+  VERSION = "2.41.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.41.5
+  version: 2.41.6
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -306,7 +306,7 @@ homepage: http://serverspec.org/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -321,9 +321,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: RSpec tests for your servers configured by Puppet, Chef, Itamae or anything
   else