specinfra 2.82.22 → 2.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: de49bdd9fd6857b6cf500325aacc404eaf0c9eac696ff6b4a72d3b22aa5adf14
-  data.tar.gz: 5f047ed2ddc78b139f15fc29531b8ae52fdf184c87abd3011e35280d8fcf851b
+SHA1:
+  metadata.gz: d74b760931c73cff0e9828d546a7e63f658ec60a
+  data.tar.gz: f945ae61dd3f169436d89903db0ad45847684f63
 SHA512:
-  metadata.gz: 7cc5c36ee688c840f61f65e6e2b5776393cd539df7bc505eca2ce533bfb9eb01ee739bfcecae8a17bb710f3384a35c983a3f8194f4edf5acfdbe4566dee01cd6
-  data.tar.gz: 761f275ff8a9e0fa09b6b9dc28984bdcb2b0263e29c2254112b3814e9c1dd2750f8a9b997665846964928614bb997adb4f1469dfc35ba6dd114777f22bc15214
+  metadata.gz: a5c308cdcf87bc332143697d3c6d8d5a47e221f1afef33e711ae0786958a71f3d20009d37d15591294465427e5a31b438ac7fb1494a868cc67895ceb50f1a3fe
+  data.tar.gz: cfc67a5a753304dfa7f38573c77b0f6124c4012d63cc57c81d862671fed9bda823a597de02cffa61042c8d6cb1d1ef4b2d609eb3828937bdfa9458886a7e638a

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

@@ -10,7 +10,7 @@ module Specinfra
       return false if ret.stdout =~ /stop(ped)?\/waiting/
 
       # If the service is not registered, check by ps command
-      if ret.exit_status == 1
+      if ret.exit_status == 1 && !Specinfra.configuration.no_service_process_fallback
         cmd = Specinfra.command.get(:check_process_is_running, service)
         ret = Specinfra.backend.run_command(cmd)
       end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.82.22"
+  VERSION = "2.83.0"
 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/processor_spec.rb

@@ -60,4 +60,53 @@ describe Specinfra::Processor do
       end
     end
   end
+
+  describe 'check_service_is_running' do
+    let(:service_command) { Specinfra.command.get(:check_service_is_running, 'service_name') }
+    let(:process_command) { Specinfra.command.get(:check_process_is_running, 'service_name') }
+
+    context 'default settings' do
+      it 'does not fall back to process checking if service checking succeeds' do
+        allow(Specinfra.backend).to receive(:run_command).with(service_command) { CommandResult.new :exit_status => 0 }
+
+        expect(Specinfra::Processor.check_service_is_running('service_name')).to eq(true)
+      end
+
+      context 'when service checking fails' do
+        it 'falls back to checking by process and returns true if that succeeds' do
+          allow(Specinfra.backend).to receive(:run_command).with(service_command) { CommandResult.new :exit_status => 1 }
+
+          expect(Specinfra.backend).to receive(:run_command).with(process_command) { CommandResult.new :exit_status => 0 }
+
+          expect(Specinfra::Processor.check_service_is_running('service_name')).to eq(true)
+        end
+
+        it 'falls back to checking by process and returns false if that fails' do
+          allow(Specinfra.backend).to receive(:run_command).with(service_command) { CommandResult.new :exit_status => 1 }
+
+          expect(Specinfra.backend).to receive(:run_command).with(process_command) { CommandResult.new :exit_status => 1 }
+
+          expect(Specinfra::Processor.check_service_is_running('service_name')).to eq(false)
+        end
+      end
+    end
+
+    context 'no_service_process_fallback set to true' do
+      it 'does not fall back to checking processes if service checking succeeds' do
+        Specinfra.configuration.no_service_process_fallback(true)
+
+        allow(Specinfra.backend).to receive(:run_command).with(service_command) { CommandResult.new :exit_status => 0 }
+
+        expect(Specinfra::Processor.check_service_is_running('service_name')).to eq(true)
+      end
+
+      it 'does not fall back to checking processes if service checking fails' do
+        Specinfra.configuration.no_service_process_fallback(true)
+
+        allow(Specinfra.backend).to receive(:run_command).with(service_command) { CommandResult.new :exit_status => 1 }
+
+        expect(Specinfra::Processor.check_service_is_running('service_name')).to eq(false)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.82.22
+  version: 2.83.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-10-21 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
@@ -629,7 +633,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project:
+rubygems_version: 2.5.1
 signing_key:
 specification_version: 4
 summary: Common layer for serverspec and itamae
@@ -674,6 +679,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