specinfra 2.82.20 → 2.82.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e920f9df3ca076025d9c92638e3999cc0ba4b0f40f5c83b09cf035f6cfadf13
-  data.tar.gz: b0c068c18c92efd330bf70deac78ecba681ccc9180f4cb68bcfa424086eee2a8
+  metadata.gz: a2c62c946f1a72ca71e07015962d3fc25ef5957e4cfd39fd8e75939139302ec9
+  data.tar.gz: df9c322631f5080aa1be9c7ccbb012f03f72ec54632762e82c87d6fbb42d7cab
 SHA512:
-  metadata.gz: 3d72663ebafa14bef5258048ae013fb6e7a48f99bd388149eab199c66a7be552dfb371bf0d7152dfcd6ad0f1a6a91dadb184423c5bd5629f418d284fe8dc1064
-  data.tar.gz: 4b269bc6079be199ab05e35d3c3fe72c02900f30accf53661ee61c01d9b9121a8668683858f94f55e33b63b47a925253c950de4bcac2bed8abfac1f262fcddc8
+  metadata.gz: 717afa09a1d5bf1bd271efb86d727b634e017d71cb8d9d269460a1190f41beaf91a7afaf8fb48951b582c173a8684e7af3986cf878cc17899512cfda1c07d560
+  data.tar.gz: 42f0389ffad21c2befc5485276bf09ec1d391db0ab8d63b2587a5f8a2f04c72f5a5627283c05f1e467575173447cbfc7bdf16be515e07a74a04b2f06facb64ba

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

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

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

@@ -1,7 +1,7 @@
 class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Package
   class << self
     def check_is_installed(package, version=nil)
-      escaped_package = escape(File.basename(package))
+      escaped_package = escape(::File.basename(package))
       if version
         cmd = %Q[brew info #{escaped_package} | grep -E "^$(brew --prefix)/Cellar/#{escaped_package}/#{escape(version)}"]
       else
@@ -13,7 +13,7 @@ class Specinfra::Command::Darwin::Base::Package < Specinfra::Command::Base::Pack
     alias :check_is_installed_by_homebrew :check_is_installed
 
     def check_is_installed_by_homebrew_cask(package, version=nil)
-      escaped_package = escape(File.basename(package))
+      escaped_package = escape(::File.basename(package))
       if version
         cmd = "brew cask info #{escaped_package} | grep -E '^/opt/homebrew-cask/Caskroom/#{escaped_package}/#{escape(version)}'"
       else

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

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.20"
+  VERSION = "2.82.25"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.20
+  version: 2.82.25
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-10 00:00:00.000000000 Z
+date: 2021-04-25 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