specinfra 2.82.19 → 2.82.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0977a93ebe817fca71a2a1d98a37e0bf9db280913e86fe6817ac87a84e804435'
-  data.tar.gz: 5a9c576204f65744b2c276bb9238bd2d7c15ee1111be3ff7aa7b4301035c5947
+  metadata.gz: 6e920f9df3ca076025d9c92638e3999cc0ba4b0f40f5c83b09cf035f6cfadf13
+  data.tar.gz: b0c068c18c92efd330bf70deac78ecba681ccc9180f4cb68bcfa424086eee2a8
 SHA512:
-  metadata.gz: 712afed966c8dfc740ac94c0bf5c0c825a35fbd9b1e622ada62f46bcec34efcc0a8cb0b3fc370c7b2548af83ad888b883f30b2c8032df9558fd5b31c5fdc90fa
-  data.tar.gz: 826c184a2ab8e072bfcc1f371d8a34834cb016bf5a123f16a529ad363fd25fbee33d7aea45d852870cde28b2d0ffb3ef1effe0fe89c5123b7fef06a377f9d7c6
+  metadata.gz: 3d72663ebafa14bef5258048ae013fb6e7a48f99bd388149eab199c66a7be552dfb371bf0d7152dfcd6ad0f1a6a91dadb184423c5bd5629f418d284fe8dc1064
+  data.tar.gz: 4b269bc6079be199ab05e35d3c3fe72c02900f30accf53661ee61c01d9b9121a8668683858f94f55e33b63b47a925253c950de4bcac2bed8abfac1f262fcddc8

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

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

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

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.19"
+  VERSION = "2.82.20"
 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.19
+  version: 2.82.20
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp