specinfra 2.82.17 → 2.82.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4140ff67c6bbcbf8a39f69318942ebaa596d1e86
-  data.tar.gz: 728c324fd0b36d219c2d1d51af5daa74f6901db9
+SHA256:
+  metadata.gz: de49bdd9fd6857b6cf500325aacc404eaf0c9eac696ff6b4a72d3b22aa5adf14
+  data.tar.gz: 5f047ed2ddc78b139f15fc29531b8ae52fdf184c87abd3011e35280d8fcf851b
 SHA512:
-  metadata.gz: 26c567c8c1a184ef52addfe2fd0d1b62e266445ce03ad5509a7539de359cc5229f56b2cf1e44235976e2eecc02fecc18068e72c5a885387dd9479e25b8fa9306
-  data.tar.gz: b85480d49c615c2a5bf66774d83adb6d5ecfd6f3383dda435a093908627f29a210ea51ff2e394ab4ff4927de8fe7851a4177febd5c13a3ec043acf9752a280e3
+  metadata.gz: 7cc5c36ee688c840f61f65e6e2b5776393cd539df7bc505eca2ce533bfb9eb01ee739bfcecae8a17bb710f3384a35c983a3f8194f4edf5acfdbe4566dee01cd6
+  data.tar.gz: 761f275ff8a9e0fa09b6b9dc28984bdcb2b0263e29c2254112b3814e9c1dd2750f8a9b997665846964928614bb997adb4f1469dfc35ba6dd114777f22bc15214

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

@@ -0,0 +1,21 @@
+function FindInstalledGem
+{
+  param($gemName, $gemVersion)
+
+  $nameVer = $(Invoke-Expression "gem list --local" | Select-String "^$gemName").Line
+  if ($nameVer.StartsWith($gemName)) {
+    if ($gemVersion) {
+      $versions = ($nameVer -split { $_ -eq "(" -or $_ -eq ")"})[1].split(" ")
+      if ($versions.Contains($gemVersion)) {
+        $true
+      } else {
+        $false
+      }
+    } else {
+      $true
+    }
+  } else {
+    $false
+  }
+}
+

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

@@ -6,9 +6,10 @@ function IsPortListening
   [array] $networkIPs += "0.0.0.0"
   [array] $networkIPs += "127.0.0.1"
   [array] $networkIPs += "[::1]"
+  [array] $networkIPs += "[::]"
   foreach ($ipaddress in $networkIPs)
   {
-    $matchExpression = ("$ipaddress" + ":" + $portNumber + ".*LISTENING")
+    $matchExpression = ("$ipaddress" + ":" + $portNumber + ".*(LISTENING|\*:\*)")
     if ($protocol) { $matchExpression = ($protocol.toUpper() + "\s+$matchExpression") }
     if ($netstatOutput -match $matchExpression) { return $true }
   }

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

@@ -4,8 +4,16 @@ class Specinfra::Command::Darwin::Base::Service < Specinfra::Command::Base::Serv
       "launchctl list | grep #{escape(service)}"
     end
 
+    def check_is_enabled_under_homebrew(service)
+      "brew services list | grep #{escape(service)}"
+    end
+
     def check_is_running(service)
       "launchctl list | grep #{escape(service)} | grep -E '^[0-9]+'"
     end
+
+    def check_is_running_under_homebrew(service)
+      "brew services list | grep #{escape(service)} | grep 'started'"
+    end
   end
 end

data/lib/specinfra/command/module/ss.rb

@@ -22,7 +22,15 @@ module Specinfra
           if local_address == '0.0.0.0'
             [ '\*' , '0\.0\.0\.0' ]
           else
-            [ local_address ]
+            [ fix_format_if_ipv6(local_address) ]
+          end
+        end
+
+        def fix_format_if_ipv6(local_address)
+          if local_address =~ /.*:.*/
+            "\\[#{local_address}\\]"
+          else
+            local_address
           end
         end
 

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.17"
+  VERSION = "2.82.22"
 end

data/spec/command/module/ss_spec.rb

@@ -14,15 +14,15 @@ describe Specinfra::Command::Module::Ss do
 
   it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0'})).to eq 'ss -tunl | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
   it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '::', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ \\\\\\[::\\\\\\]:80\ ' }
   it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp'})).to eq 'ss -unl4 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '0.0.0.0', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ \\\\\*:80\ \\|\\ 0\\\\.0\\\\.0\\\\.0:80\\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '::', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ \\\\\\[::\\\\\\]:80\ ' }
 
   it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4'})).to eq 'ss -tunl | grep -E -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'tcp'})).to eq 'ss -tnl4 | grep -E -- \\ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '2001:db8:dead:beef::1', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ \\\\\\[2001:db8:dead:beef::1\\\\\\]:80\ ' }
   it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp'})).to eq 'ss -unl4 | grep -E -- \ 1.2.3.4:80\ ' }
-  it { expect(klass.check_is_listening('80', options={:local_address => '1.2.3.4', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ 1.2.3.4:80\ ' }
+  it { expect(klass.check_is_listening('80', options={:local_address => '2001:db8:dead:beef::1', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ \\\\\\[2001:db8:dead:beef::1\\\\\\]:80\ ' }
 
   it { expect{klass.check_is_listening('80', options={:protocol => 'bad_proto'})}.to raise_error(ArgumentError, 'Unknown protocol [bad_proto]') }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.17
+  version: 2.82.22
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-10-23 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.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Common layer for serverspec and itamae
 test_files: