serverspec 2.41.2 → 2.41.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c941f9662228e3a5559d24136fbcef3d55749f67
-  data.tar.gz: e9b5ee466f27938b18e248c44691f96c8b1392c3
+SHA256:
+  metadata.gz: 6e4825adcbf2c79093752621578ea9a307a0a58330742d0a1b8843016ac1b0fb
+  data.tar.gz: c1fbaa08a9df4cc5b6c76a69d7a2b06b37442af4a49319d30e81f791f68e1c31
 SHA512:
-  metadata.gz: c7689e8ddf58d519952d1de70c16dae49ba14d22c1d5a563d55b00892159a8acf393051637b084bb1b5fd33a0a59121b7bffeccb49f90e48f729d725c61c7fa0
-  data.tar.gz: fed08fa17cd1c0c8ac91bbebe0c15ab367e2c1b04be168242e063765ece538cc629fe4d2bd073af12a11e67c4004f5ba8dc8d96d6b85bde5ea8d4424bafce50e
+  metadata.gz: 87475efc90b46f44b6ecf14ad44deb16ba64818b9b45abd45b36d089f87f6f4cefa8e0f4674a6035c3b6ca9b07cd8422902f861d85bf6ed6a235d10d0b824d56
+  data.tar.gz: 6772e53f96bd63d7eec0ea4c876e00273bf3169604d25684ae9396361c55e2f92f30e797b2f2bfd11c54508f6bc3651928896703f32aa9302a707f14c30989d9

data/.github/stale.yml

@@ -0,0 +1,18 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+

data/.travis.yml

@@ -1,19 +1,23 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.1
   - 2.2.4
-  - 2.3.0
+  - 2.3.6
+  - 2.4.3
+  - 2.5.0
 
 before_install:
-  - gem update bundler
+  - travis_retry gem update --system 2.7.8
+  - travis_retry gem install bundler -v 1.17.3
+  - travis_retry gem uninstall -i /home/travis/.rvm/gems/ruby-2.3.7@global bundler || echo
 
 script:
   - bundle exec rake spec
 
+dist: trusty
 sudo: false
 cache: bundler
 notifications:

data/WINDOWS_SUPPORT.md

@@ -26,8 +26,21 @@ user = <username>
 pass = <password>
 endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
 
-winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-winrm.set_timeout 300 # 5 minutes max timeout for any operation
+if Gem::Version.new(WinRM::VERSION) < Gem::Version.new('2')
+  winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+  winrm.set_timeout 300 # 5 minutes max timeout for any operation
+else
+  opts = {
+    user: user,
+    password: pass,
+    endpoint: endpoint,
+    operation_timeout: 300,
+    no_ssl_peer_verification: false,
+  }
+
+  winrm = ::WinRM::Connection.new(opts)
+end
+
 Specinfra.configuration.winrm = winrm
 ```
 

data/appveyor.yml

@@ -14,6 +14,9 @@ environment:
     - ruby_version: "21"
     - ruby_version: "22"
     - ruby_version: "23"
+    - ruby_version: "24"
+    - ruby_version: "25"
+    - ruby_version: "26"
 
 matrix:
   allow_failures:
@@ -32,6 +35,12 @@ cache:
   - C:\Ruby22\bin                  -> appveyor.yml
   - C:\Ruby23\lib\ruby\gems\2.2.0  -> appveyor.yml
   - C:\Ruby23\bin                  -> appveyor.yml
+  - C:\Ruby24\lib\ruby\gems\2.4.0  -> appveyor.yml
+  - C:\Ruby24\bin                  -> appveyor.yml
+  - C:\Ruby25\lib\ruby\gems\2.5.0  -> appveyor.yml
+  - C:\Ruby25\bin                  -> appveyor.yml
+  - C:\Ruby26\lib\ruby\gems\2.6.0  -> appveyor.yml
+  - C:\Ruby26\bin
 
 install:
   - git submodule update --init --recursive
@@ -46,10 +55,11 @@ install:
   - ruby --version
   - gem --version
   - appveyor DownloadFile -Url %bundler_url% -FileName bundler.gem
-  - gem install --local bundler.gem --no-ri --no-rdoc ## appveyor often stops `gem install bundler`..?
+  - gem install --local bundler.gem --no-document --force ## appveyor often stops `gem install bundler`..?
   - 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/matcher/be_installed.rb

@@ -1,9 +1,9 @@
 RSpec::Matchers.define :be_installed do
-  match do |name|
+  match do |subject|
     if subject.class.name == 'Serverspec::Type::SelinuxModule'
-      name.installed?(@version)
+      subject.installed?(@version)
     else
-      name.installed?(@provider, @version)
+      subject.installed?(@provider, @version)
     end
   end
 

data/lib/serverspec/setup.rb

@@ -308,8 +308,21 @@ user = <username>
 pass = <password>
 endpoint = "http://#{ENV['TARGET_HOST']}:5985/wsman"
 
-winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
-winrm.set_timeout 300 # 5 minutes max timeout for any operation
+if Gem::Version.new(WinRM::VERSION) < Gem::Version.new('2')
+  winrm = ::WinRM::WinRMWebService.new(endpoint, :ssl, :user => user, :pass => pass, :basic_auth_only => true)
+  winrm.set_timeout 300 # 5 minutes max timeout for any operation
+else
+  opts = {
+    user: user,
+    password: pass,
+    endpoint: endpoint,
+    operation_timeout: 300,
+    no_ssl_peer_verification: false,
+  }
+
+  winrm = ::WinRM::Connection.new(opts)
+end
+
 Specinfra.configuration.winrm = winrm
 <% end -%>
 EOF

data/lib/serverspec/type/service.rb

@@ -1,7 +1,8 @@
 module Serverspec::Type
   class Service < Base
     def enabled?(level, under=nil)
-      check_method = "check_service_is_enabled" + (under ? "_#{under}" : '')
+      under = under ? "_under_#{under.gsub(/^under_/, '')}" : ''
+      check_method = "check_service_is_enabled#{under}"
 
       if level
         @runner.send(check_method.to_sym, @name, level)

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.2"
+  VERSION = "2.41.7"
 end

data/serverspec.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rspec-its"
   spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "specinfra", "~> 2.72"
-  spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency("json", "~> 1.8") if RUBY_VERSION < "1.9"
   spec.add_development_dependency "rake", "~> 10.1.1"
 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.2
+  version: 2.41.7
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.72'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +89,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/stale.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
@@ -319,7 +306,7 @@ homepage: http://serverspec.org/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -334,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