serverspec 2.41.3 → 2.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb26e2d4cc304c82ee8478df2e7df998b62157b6
-  data.tar.gz: 4b27d9fca13ac961f28c7e2e88cb7335b0addb62
+  metadata.gz: c156dac47ae252c7876fed18522aa9c196b049c7
+  data.tar.gz: b9e362ca6c5007250f147561f5aec4cbfd76885b
 SHA512:
-  metadata.gz: f57de9c2728bcd8c52b39ad01eaf4946bea022a8695ea31a9e0074da7c36df7a33519bdbde23546f9b225e37db0b6a8f9f4430415d84525e1e6a9f0ed4b6bc23
-  data.tar.gz: 9bf5be62880f63c99d149f32f9654300d24749419ae68fd7fc11572e4d004a59edd09f32797fa8fddcda3481ecf3d0557880c3a5a6890054c9c876f462459407
+  metadata.gz: 302deda1271e22b0fc451bf7200c4dd8c6bc13626ecafefce5e324ce5c2186c1cefde07d89291def7ec876bb57b08718677eff32c57782f4f0296567faefae77
+  data.tar.gz: 9016eced88bd4a9302460c2dbe319f156f48b9b744db8d0542f4e7a89b5def248d48dc34633af84b29e6adb404d628cfce476558e3b6ecc6b7eb4ee8c1a14d92

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,11 +55,12 @@ 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:
-  - ruby -rfileutils -e 'FileUtils.rm_r(File.join(Gem.dir, "cache", "bundler")) if Dir.exists?(File.join(Gem.dir, "cache", "bundler"))'
+  - set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
+  - ruby -rfileutils -e 'FileUtils.rm_r(File.join(Gem.dir, "cache", "bundler")) if Dir.exist?(File.join(Gem.dir, "cache", "bundler"))'
   - bundle install --jobs 3 --retry 3
   - net user
   - net localgroup

data/lib/serverspec/setup.rb

@@ -127,7 +127,7 @@ describe port(80) do
 end
 EOF
 
-      if File.exists? "spec/#{@hostname}/sample_spec.rb"
+      if File.exist? "spec/#{@hostname}/sample_spec.rb"
         old_content = File.read("spec/#{@hostname}/sample_spec.rb")
         if old_content != content
           $stderr.puts "!! spec/#{@hostname}/sample_spec.rb already exists and differs from template"
@@ -141,7 +141,7 @@ EOF
     end
 
     def self.safe_mkdir(dir)
-      if File.exists? dir
+      if File.exist? dir
         unless File.directory? dir
           $stderr.puts "!! #{dir} already exists and is not a directory"
         end
@@ -153,7 +153,7 @@ EOF
 
     def self.safe_create_spec_helper
       content = ERB.new(spec_helper_template, nil, '-').result(binding)
-      if File.exists? 'spec/spec_helper.rb'
+      if File.exist? 'spec/spec_helper.rb'
         old_content = File.read('spec/spec_helper.rb')
         if old_content != content
           $stderr.puts "!! spec/spec_helper.rb already exists and differs from template"
@@ -196,7 +196,7 @@ namespace :spec do
   end
 end
       EOF
-      if File.exists? 'Rakefile'
+      if File.exist? 'Rakefile'
         old_content = File.read('Rakefile')
         if old_content != content
           $stderr.puts '!! Rakefile already exists and differs from template'
@@ -212,7 +212,7 @@ end
     def self.find_vagrantfile
       Pathname.new(Dir.pwd).ascend do |dir|
         path = File.expand_path('Vagrantfile', dir)
-        return path if File.exists?(path)
+        return path if File.exist?(path)
       end
       nil
     end
@@ -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
@@ -321,7 +334,7 @@ EOF
 --color
 --format documentation
       EOF
-      if File.exists? '.rspec'
+      if File.exist? '.rspec'
         old_content = File.read('.rspec')
         if old_content != content
           $stderr.puts '!! .rspec already exists and differs from template'

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

@@ -121,7 +121,13 @@ module Serverspec::Type
     end
 
     def content_as_yaml
-      @content_as_yaml = YAML.load(content) if @content_as_yaml.nil?
+      if @content_as_yaml.nil?
+        @content_as_yaml = if YAML.respond_to?(:unsafe_load)
+                             YAML.unsafe_load(content)
+                           else
+                             YAML.load(content)
+                           end
+      end
       @content_as_yaml
     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/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/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.3"
+  VERSION = "2.42.2"
 end

data/serverspec.gemspec

@@ -22,7 +22,11 @@ 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"
+
+  if RUBY_VERSION < "1.9"
+    spec.add_development_dependency "json", "~> 1.8"
+    spec.add_development_dependency "rake", "~> 10.1.1"
+  else
+    spec.add_development_dependency "rake"
+  end
 end

data/spec/type/base/file_spec.rb

@@ -369,18 +369,22 @@ describe file('example.yml') do
   let(:stdout) {<<EOF
 ---
 yaml:
-  title: 'this is a yaml'
+  title: &anchor 'this is a yaml'
   array:
     -
       title: 'array 1'
     -
       title: 'array 2'
+  date: 2023-02-03
+  Reuse anchor: *anchor
 EOF
   }
 
   its(:content_as_yaml) { should include('yaml') }
   its(:content_as_yaml) { should include('yaml' => include('title' => 'this is a yaml')) }
   its(:content_as_yaml) { should include('yaml' => include('array' => include('title' => 'array 2'))) }
+  its(:content_as_yaml) { should include('yaml' => include('date' => Date.new(2023, 2, 3))) }
+  its(:content_as_yaml) { should include('yaml' => include('Reuse anchor' => 'this is a yaml')) }
 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.3
+  version: 2.42.2
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,34 +66,20 @@ 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '0'
 description: RSpec tests for your servers configured by Puppet, Chef, Itamae or anything
   else
 email:
@@ -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,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