specinfra 2.82.19 → 2.82.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0977a93ebe817fca71a2a1d98a37e0bf9db280913e86fe6817ac87a84e804435'
-  data.tar.gz: 5a9c576204f65744b2c276bb9238bd2d7c15ee1111be3ff7aa7b4301035c5947
+  metadata.gz: 596a60daf7e5fa95bdc0a961afebd91b23e67f76047ce1df0aba7bb1e059e896
+  data.tar.gz: 4fc1cbf1cc54559eb1d9fd9149a9a6ec83403a6800171b3ffb44c4932ac81075
 SHA512:
-  metadata.gz: 712afed966c8dfc740ac94c0bf5c0c825a35fbd9b1e622ada62f46bcec34efcc0a8cb0b3fc370c7b2548af83ad888b883f30b2c8032df9558fd5b31c5fdc90fa
-  data.tar.gz: 826c184a2ab8e072bfcc1f371d8a34834cb016bf5a123f16a529ad363fd25fbee33d7aea45d852870cde28b2d0ffb3ef1effe0fe89c5123b7fef06a377f9d7c6
+  metadata.gz: c0691a838b1686c4159b41b4594a433cc57b6e530b85d34e4d7299241a9426451bcc31ddd9bbf90ce2b59177acd3eb2b9e2416d073a74c3a83b556be36c2fa4e
+  data.tar.gz: c46185b12504e1ef60c1a161a51902b01ef6a917c010b35cb5a83f64707522243fe498f6c2260e0f403f54730cf3972a412da2ec425d56e47042726f16dbf1c8

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/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/debian/base/port.rb

@@ -1,10 +1,11 @@
 class Specinfra::Command::Debian::Base::Port < Specinfra::Command::Linux::Base::Port
   class << self
     def create(os_info=nil)
-      if (os_info || os)[:release].to_i < 8
-        self
-      else
+      release = (os_info || os)[:release]
+      if ["testing", "unstable"].include?(release) || release.to_i >= 8
         Specinfra::Command::Debian::V8::Port
+      else
+        self
       end
     end
   end

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

@@ -1,10 +1,11 @@
 class Specinfra::Command::Debian::Base::Service < Specinfra::Command::Linux::Base::Service
   class << self
     def create(os_info=nil)
-      if (os_info || os)[:release].to_i < 8
-        self
-      else
+      release = (os_info || os)[:release]
+      if ["testing", "unstable"].include?(release) || release.to_i >= 8
         Specinfra::Command::Debian::V8::Service
+      else
+        self
       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/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.19"
+  VERSION = "2.82.24"
 end

data/spec/command/debiantesting/port_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'debian', :release => 'testing'
+
+describe get_command(:check_port_is_listening, '80') do
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
+end

data/spec/command/debiantesting/service_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'debian', :release => 'testing'
+
+describe get_command(:check_service_is_enabled, 'apache') do
+  it { should eq 'systemctl --quiet is-enabled apache||ls /etc/rc[S5].d/S??apache >/dev/null 2>/dev/null' }
+end

data/spec/command/debianunstable/port_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'debian', :release => 'unstable'
+
+describe get_command(:check_port_is_listening, '80') do
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
+end

data/spec/command/debianunstable/service_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'debian', :release => 'unstable'
+
+describe get_command(:check_service_is_enabled, 'apache') do
+  it { should eq 'systemctl --quiet is-enabled apache||ls /etc/rc[S5].d/S??apache >/dev/null 2>/dev/null' }
+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.24
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -537,6 +537,10 @@ files:
 - spec/command/debian8/port_spec.rb
 - spec/command/debian9/port_spec.rb
 - spec/command/debian9/service_spec.rb
+- spec/command/debiantesting/port_spec.rb
+- spec/command/debiantesting/service_spec.rb
+- spec/command/debianunstable/port_spec.rb
+- spec/command/debianunstable/service_spec.rb
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
@@ -674,6 +678,10 @@ test_files:
 - spec/command/debian8/port_spec.rb
 - spec/command/debian9/port_spec.rb
 - spec/command/debian9/service_spec.rb
+- spec/command/debiantesting/port_spec.rb
+- spec/command/debiantesting/service_spec.rb
+- spec/command/debianunstable/port_spec.rb
+- spec/command/debianunstable/service_spec.rb
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb