serverspec 2.41.5 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1fd50d20575e8df2a43fd77526b1f64cf2cd67
-  data.tar.gz: 059832ec274b1ec8c380533fb89e84a14ba9c5d6
+  metadata.gz: 2e7e6937d32bae901dced0203e3521b5bf78e7b5
+  data.tar.gz: 9f37164c1c0288c7759ca7a3541cf6474a3d16f2
 SHA512:
-  metadata.gz: 61dca279925253ed95fc21330613c21fd16b30acd669720cfdf6edbe851beb056f92246cb20081059ab804471d6f5f046984b1f897adb09e5113c0cc806acabd
-  data.tar.gz: 40b3ac40bbd38b6a71ced13930de75ce29290f225a63e65a018cb1643c506f4f75c2dd1c3ad1ae2a7270488586695255083e4b0e74dd2ac81ce2e7370cab12c2
+  metadata.gz: a11a4a768849ead513cc6b0b35423245a3d3861a6dab4d17f31fcd7e7b7c5f9cb0a8de43d73026969af98513b63e7acdb851491d3ed28f0602f96fc12f5610b9
+  data.tar.gz: ed280d208fe94358bc18163029868dd4f39a102eaaf2301cf1c992d9132ded79aa3f16c76488e4f3ad33e6f5e80a0db46830a745b3ddc8fea145802f6adbbab3

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/command.rb

@@ -18,9 +18,14 @@ module Serverspec::Type
       command_result.exit_status.to_i
     end
 
+    protected
+    def command
+      @name
+    end
+
     private
     def command_result()
-      @command_result ||= @runner.run_command(@name)
+      @command_result ||= @runner.run_command(command)
     end
   end
 end

data/lib/serverspec/type/group.rb

@@ -4,6 +4,10 @@ module Serverspec::Type
       @runner.check_group_exists(@name)
     end
 
+    def gid
+      @runner.get_group_gid(@name).stdout.to_i
+    end
+
     def has_gid?(gid)
       @runner.check_group_has_gid(@name, gid)
     end

data/lib/serverspec/type/user.rb

@@ -12,6 +12,10 @@ module Serverspec::Type
       @runner.check_user_belongs_to_primary_group(@name, group)
     end
 
+    def uid
+      @runner.get_user_uid(@name).stdout.to_i
+    end
+
     def has_uid?(uid)
       @runner.check_user_has_uid(@name, uid)
     end

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 dn unless dn.start_with?('/')
+      # normalize openssl < 1.1 to >= 1.1 output
+      dn[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.42.0"
 end

data/spec/type/base/group_spec.rb

@@ -9,3 +9,8 @@ end
 describe group('root') do
   it { should have_gid 0 }
 end
+
+describe group('root') do
+  its(:gid) { should == 0 }
+  its(:gid) { should < 10 }
+end

data/spec/type/base/user_spec.rb

@@ -18,6 +18,11 @@ describe user('root') do
   it { should have_uid 0 }
 end
 
+describe user('root') do
+  its(:uid) { should == 0 }
+  its(:uid) { should < 10 }
+end
+
 describe user('root') do
   it { should have_login_shell '/bin/bash' }
 end

data/spec/type/linux/x509_certificate_spec.rb

@@ -12,14 +12,24 @@ describe x509_certificate('test.pem') do
   it { should_not be_certificate }
 end
 
-describe x509_certificate('test.pem') do
-  let(:stdout) { sample_subj }
-  its(:subject) { should eq '/O=some/OU=thing' }
+describe x509_certificate('test-openssl-1.0.pem') do
+  let(:stdout) { sample_subj_openssl_1_0 }
+  its(:subject) { should eq 'O = some, OU = thing' }
 end
 
-describe x509_certificate('test.pem') do
-  let(:stdout) { sample_issuer }
-  its(:issuer) { should eq '/O=some/OU=issuer' }
+describe x509_certificate('test-openssl-1.1.pem') do
+  let(:stdout) { sample_subj_openssl_1_1 }
+  its(:subject) { should eq 'O = some, OU = thing' }
+end
+
+describe x509_certificate('test-openssl-1.0.pem') do
+  let(:stdout) { sample_issuer_openssl_1_0 }
+  its(:issuer) { should eq 'O = some, OU = issuer' }
+end
+
+describe x509_certificate('test-openssl-1.1.pem') do
+  let(:stdout) { sample_issuer_openssl_1_1 }
+  its(:issuer) { should eq 'O = some, OU = issuer' }
 end
 
 describe x509_certificate('test.pem') do
@@ -38,18 +48,30 @@ describe x509_certificate('test.pem') do
   its(:subject_alt_names) { should eq %w[DNS:*.example.com DNS:www.example.net IP:192.0.2.10] }
 end
 
-def sample_subj
+def sample_subj_openssl_1_0
   <<'EOS'
 subject= /O=some/OU=thing
 EOS
 end
 
-def sample_issuer
+def sample_subj_openssl_1_1
+  <<'EOS'
+subject=O = some, OU = thing
+EOS
+end
+
+def sample_issuer_openssl_1_0
   <<'EOS'
 issuer= /O=some/OU=issuer
 EOS
 end
 
+def sample_issuer_openssl_1_1
+  <<'EOS'
+issuer=O = some, OU = issuer
+EOS
+end
+
 def sample_validity
   <<'EOS'
 notBefore=Jul  1 11:11:00 2000 GMT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.41.5
+  version: 2.42.0
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2022-02-02 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,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.5.1
+signing_key:
 specification_version: 4
 summary: RSpec tests for your servers configured by Puppet, Chef, Itamae or anything
   else