specinfra 2.82.19 → 2.82.20

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '0977a93ebe817fca71a2a1d98a37e0bf9db280913e86fe6817ac87a84e804435'
4
- data.tar.gz: 5a9c576204f65744b2c276bb9238bd2d7c15ee1111be3ff7aa7b4301035c5947
3
+ metadata.gz: 6e920f9df3ca076025d9c92638e3999cc0ba4b0f40f5c83b09cf035f6cfadf13
4
+ data.tar.gz: b0c068c18c92efd330bf70deac78ecba681ccc9180f4cb68bcfa424086eee2a8
5
5
  SHA512:
6
- metadata.gz: 712afed966c8dfc740ac94c0bf5c0c825a35fbd9b1e622ada62f46bcec34efcc0a8cb0b3fc370c7b2548af83ad888b883f30b2c8032df9558fd5b31c5fdc90fa
7
- data.tar.gz: 826c184a2ab8e072bfcc1f371d8a34834cb016bf5a123f16a529ad363fd25fbee33d7aea45d852870cde28b2d0ffb3ef1effe0fe89c5123b7fef06a377f9d7c6
6
+ metadata.gz: 3d72663ebafa14bef5258048ae013fb6e7a48f99bd388149eab199c66a7be552dfb371bf0d7152dfcd6ad0f1a6a91dadb184423c5bd5629f418d284fe8dc1064
7
+ data.tar.gz: 4b269bc6079be199ab05e35d3c3fe72c02900f30accf53661ee61c01d9b9121a8668683858f94f55e33b63b47a925253c950de4bcac2bed8abfac1f262fcddc8
@@ -2,10 +2,11 @@ function FindInstalledGem
2
2
  {
3
3
  param($gemName, $gemVersion)
4
4
 
5
- $nameVer = $(Invoke-Expression "gem list --local" | Select-String "$gemName").Line
5
+ $nameVer = $(Invoke-Expression "gem list --local" | Select-String "^$gemName").Line
6
6
  if ($nameVer.StartsWith($gemName)) {
7
7
  if ($gemVersion) {
8
- if ($nameVer.EndsWith("$gemVersion)")) {
8
+ $versions = ($nameVer -split { $_ -eq "(" -or $_ -eq ")"})[1].split(" ")
9
+ if ($versions.Contains($gemVersion)) {
9
10
  $true
10
11
  } else {
11
12
  $false
@@ -22,7 +22,15 @@ module Specinfra
22
22
  if local_address == '0.0.0.0'
23
23
  [ '\*' , '0\.0\.0\.0' ]
24
24
  else
25
- [ local_address ]
25
+ [ fix_format_if_ipv6(local_address) ]
26
+ end
27
+ end
28
+
29
+ def fix_format_if_ipv6(local_address)
30
+ if local_address =~ /.*:.*/
31
+ "\\[#{local_address}\\]"
32
+ else
33
+ local_address
26
34
  end
27
35
  end
28
36
 
@@ -1,3 +1,3 @@
1
1
  module Specinfra
2
- VERSION = "2.82.19"
2
+ VERSION = "2.82.20"
3
3
  end
@@ -14,15 +14,15 @@ describe Specinfra::Command::Module::Ss do
14
14
 
15
15
  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\\ ' }
16
16
  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\\ ' }
17
- 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\\ ' }
17
+ it { expect(klass.check_is_listening('80', options={:local_address => '::', :protocol => 'tcp6'})).to eq 'ss -tnl6 | grep -E -- \ \\\\\\[::\\\\\\]:80\ ' }
18
18
  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\\ ' }
19
- 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\\ ' }
19
+ it { expect(klass.check_is_listening('80', options={:local_address => '::', :protocol => 'udp6'})).to eq 'ss -unl6 | grep -E -- \ \\\\\\[::\\\\\\]:80\ ' }
20
20
 
21
21
  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\ ' }
22
- 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\ ' }
23
- 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\ ' }
22
+ 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\ ' }
23
+ 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\ ' }
24
24
  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\ ' }
25
- 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\ ' }
25
+ 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\ ' }
26
26
 
27
27
  it { expect{klass.check_is_listening('80', options={:protocol => 'bad_proto'})}.to raise_error(ArgumentError, 'Unknown protocol [bad_proto]') }
28
28
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: specinfra
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.82.19
4
+ version: 2.82.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gosuke Miyashita
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-24 00:00:00.000000000 Z
11
+ date: 2020-10-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-scp