specinfra 2.82.16 → 2.82.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 081c5fe3e3d544ed5e60bab131c08253c686a159
-  data.tar.gz: 410cef0c65354b9e3de79aa4fd1a496650067512
+SHA256:
+  metadata.gz: 1aa21aa7df9050070d308c73b13bd884d6978abe7880a58a0bca2155341ca09b
+  data.tar.gz: 72235c0a17560c82dd765849b015d4bbaa80695d00ed6a66d5f596bca74cc15e
 SHA512:
-  metadata.gz: 851092951f6e2c01b78ac3dc11ca74263fd7f3257966c9e44ec9d75398ea1b78bdd489274f584f4c687b5008ed94529151fdc854580c5626a27068d11f432bd2
-  data.tar.gz: c3bd863bd7b130e33c3e3e3a68650347c9cf4b6459fea435a2b6fa90f8b12b1d92ac00dc73f22bb4f3d024ec1839f4b3154aa2aea5602cfc789ec45400bcc9e8
+  metadata.gz: 9dcca7817a96c799461e76fd7ff45c392b3d5f46bb60b992cbea4ff5b22b7610a9b9027a2383ed16c4a1bff2c5deed89b16f0dcf3d242ea638161ef98be07593
+  data.tar.gz: dcd61ecca8e3b92998e4e86079e849768939200a43034281d3557480516514886057ab914dd6e5c86da5d589f3aba5d309e2336117167b228a1cedb9ca190ffc

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/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/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.16"
+  VERSION = "2.82.21"
 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.16
+  version: 2.82.21
 platform: ruby
 authors:
 - Gosuke Miyashita
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-10-11 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: