specinfra 2.82.18 → 2.82.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd4b036255cf5aafd4a11a9e48572fb9a37dd3b3eb1164b0709c7c2cf9fbd845
-  data.tar.gz: e1d9485748df7c5f3795fcb33b897b061406accaa6586d701b325d3dd1c358aa
+  metadata.gz: 2bb01e92f4048c67284e481792e819aa154976574ebecc5d0f08a3f619553dc7
+  data.tar.gz: 4df996d6652f4cfaacef45d6ff7a35e0fec0d64951b0767a286325890ec837df
 SHA512:
-  metadata.gz: cd4efcf6f4a73749f41ec0e9a53376809ee9db4965524ccc3f0eefc5f7ab952c0644ea85df1124524b193a80e8c9d23461c497929d3864f0198c9aa28914c03d
-  data.tar.gz: 87069e6caf693b955ee1fffb46d5fd6d2172895ca6d7bd40283f67aa397ada2a2b503e2885cca720cd7f1026ec4f77706ffcb28bb59870ac9928c8ece35a9c17
+  metadata.gz: f7b2e74dd455b7ce505871a08bf73b9b01a485233c20eaa2272c0b84dc76baf117fe60174e398081e76ff8701b40ddfb857b18b0c78ca79c563e6fff91cdf576
+  data.tar.gz: 4a977f26975443d83927b4e06fb9265f1c251c4f62922f12f4530fabb6d2a8ced02a583ca3b85dfc0cbacdb0849f2b29b22a25a7256397971a3f70ce92dac148

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

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.18"
+  VERSION = "2.82.23"
 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.18
+  version: 2.82.23
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2021-01-13 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