specinfra 2.82.14 → 2.82.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 149c1e2722e441af453f1eca0da8bc9f6e639097
-  data.tar.gz: b7eb2635ebfaf3b7119e1103da9ed96861abd956
+SHA256:
+  metadata.gz: '0977a93ebe817fca71a2a1d98a37e0bf9db280913e86fe6817ac87a84e804435'
+  data.tar.gz: 5a9c576204f65744b2c276bb9238bd2d7c15ee1111be3ff7aa7b4301035c5947
 SHA512:
-  metadata.gz: 30dc8b7ac56e049c1e29a71fe7f473ce14c58e4387a61b0b8c5c9206862c09a2a30838ee8d5131c0c8865f37ec955c987d8687a54710c41410736a48c1b0d1fc
-  data.tar.gz: 3e28985de56c4995daa461278ffaea599c80e6e443f410039971e61410029eaa7c4679d0dbb84cfb82b64a2d95a58999f02423d1804bca885aa290026abe9ff0
+  metadata.gz: 712afed966c8dfc740ac94c0bf5c0c825a35fbd9b1e622ada62f46bcec34efcc0a8cb0b3fc370c7b2548af83ad888b883f30b2c8032df9558fd5b31c5fdc90fa
+  data.tar.gz: 826c184a2ab8e072bfcc1f371d8a34834cb016bf5a123f16a529ad363fd25fbee33d7aea45d852870cde28b2d0ffb3ef1effe0fe89c5123b7fef06a377f9d7c6

data/lib/specinfra/backend/powershell/support/find_installed_gem.ps1

@@ -0,0 +1,20 @@
+function FindInstalledGem
+{
+  param($gemName, $gemVersion)
+
+  $nameVer = $(Invoke-Expression "gem list --local" | Select-String "$gemName").Line
+  if ($nameVer.StartsWith($gemName)) {
+    if ($gemVersion) {
+      if ($nameVer.EndsWith("$gemVersion)")) {
+        $true
+      } else {
+        $false
+      }
+    } else {
+      $true
+    }
+  } else {
+    $false
+  }
+}
+

data/lib/specinfra/backend/powershell/support/is_port_listening.ps1

@@ -5,9 +5,10 @@ function IsPortListening
   $networkIPs = (Get-WmiObject Win32_NetworkAdapterConfiguration | ? {$_.IPEnabled}) | %{ $_.IPAddress[0] }
   [array] $networkIPs += "0.0.0.0"
   [array] $networkIPs += "127.0.0.1"
+  [array] $networkIPs += "[::1]"
   foreach ($ipaddress in $networkIPs)
   {
-    $matchExpression = ("$ipaddress" + ":" + $portNumber)
+    $matchExpression = ("$ipaddress" + ":" + $portNumber + ".*LISTENING")
     if ($protocol) { $matchExpression = ($protocol.toUpper() + "\s+$matchExpression") }
     if ($netstatOutput -match $matchExpression) { return $true }
   }

data/lib/specinfra/backend/ssh.rb

@@ -73,10 +73,16 @@ module Specinfra
       end
 
       def create_ssh
+        options = get_config(:ssh_options)
+
+        if !Net::SSH::VALID_OPTIONS.include?(:strict_host_key_checking)
+          options.delete(:strict_host_key_checking)
+        end
+
         Net::SSH.start(
           get_config(:host),
-          get_config(:ssh_options)[:user],
-          get_config(:ssh_options)
+          options[:user],
+          options
         )
       end
 

data/lib/specinfra/command/base/user.rb

@@ -1,17 +1,15 @@
 class Specinfra::Command::Base::User < Specinfra::Command::Base
   class << self
     def check_exists(user)
-      "getent passwd #{escape(user)}"
+      "id #{escape(user)}"
     end
 
     def check_belongs_to_group(user, group)
-      "groups #{escape(user)} | grep -- #{escape(group)}"
+      "id #{escape(user)} | sed 's/ context=.*//g' | cut -f 4 -d '=' | grep -- #{escape(group)}"
     end
 
     def check_belongs_to_primary_group(user, group)
-      pgid = "getent passwd #{escape(user)} | cut -f 4 -d ':'"
-      ggid = "getent group #{escape(group)} | cut -f 3 -d ':'"
-      %Q|test "#{escape(pgid)}" -eq "#{escape(ggid)}"|
+      "id -gn #{escape(user)}| grep ^#{escape(group)}$"
     end
 
     def check_is_system_user(user)
@@ -23,8 +21,8 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
     end
 
     def check_has_uid(user, uid)
-      auid = "getent passwd #{escape(user)} | cut -f 3 -d ':'"
-      %Q| test "#{escape(uid)}" -eq "#{escape(auid)}"|
+      regexp = "^uid=#{uid}("
+      "id #{escape(user)} | grep -- #{escape(regexp)}"
     end
 
     def check_has_home_directory(user, path_to_home)
@@ -49,11 +47,11 @@ class Specinfra::Command::Base::User < Specinfra::Command::Base
     end
 
     def get_uid(user)
-      "getent passwd #{escape(user)} | cut -f 3 -d ':'"
+      "id -u #{escape(user)}"
     end
 
     def get_gid(user)
-      "getent passwd #{escape(user)} | cut -f 4 -d ':'"
+      "id -g #{escape(user)}"
     end
 
     def get_home_directory(user)

data/lib/specinfra/command/darwin/base/file.rb

@@ -34,6 +34,10 @@ class Specinfra::Command::Darwin::Base::File < Specinfra::Command::Base::File
     def get_mode(file)
       "stat -f%Lp #{escape(file)}"
     end
+ 
+    def get_size(file)
+      "stat -f %z #{escape(file)}"
+    end
 
     def get_owner_user(file)
       "stat -f %Su #{escape(file)}"

data/lib/specinfra/command/windows/base/package.rb

@@ -7,5 +7,13 @@ class Specinfra::Command::Windows::Base::Package < Specinfra::Command::Windows::
         exec "(FindInstalledApplication -appName '#{package}' #{version_selection}) -eq $true"
       end
     end
+
+    def check_is_installed_by_gem(name, version=nil, gem_binary="gem")
+      version_selection = version.nil? ? "" : "-gemVersion '#{version}'"
+      Backend::PowerShell::Command.new do
+        using 'find_installed_gem.ps1'
+        exec "(FindInstalledGem -gemName '#{name}' #{version_selection}) -eq $true"
+      end
+    end
   end
 end

data/lib/specinfra/host_inventory/virtualization.rb

@@ -32,7 +32,7 @@ module Specinfra
 
       def parse_system_product_name(ret)
         product_name = case ret
-          when /.*VMware Virtual Platform/
+          when /.*(VMware Virtual Platform|VMware7,1)/
             'vmware'
           when /.*VirtualBox/
             'vbox'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.14"
+  VERSION = "2.82.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.14
+  version: 2.82.19
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -135,6 +135,7 @@ files:
 - lib/specinfra/backend/powershell/support/find_group.ps1
 - lib/specinfra/backend/powershell/support/find_iis_component.ps1
 - lib/specinfra/backend/powershell/support/find_installed_application.ps1
+- lib/specinfra/backend/powershell/support/find_installed_gem.ps1
 - lib/specinfra/backend/powershell/support/find_installed_hot_fix.ps1
 - lib/specinfra/backend/powershell/support/find_scheduled_task.ps1
 - lib/specinfra/backend/powershell/support/find_service.ps1
@@ -613,7 +614,7 @@ homepage: https://github.com/mizzy/specinfra
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -628,9 +629,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: Common layer for serverspec and itamae
 test_files: