specinfra 2.82.23 → 2.83.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 2bb01e92f4048c67284e481792e819aa154976574ebecc5d0f08a3f619553dc7
-  data.tar.gz: 4df996d6652f4cfaacef45d6ff7a35e0fec0d64951b0767a286325890ec837df
+SHA1:
+  metadata.gz: 7f98623e6d0a234bd7fe4efe0a86e0cdc270a415
+  data.tar.gz: 42c023dec145584e4bc648127adc088b88f2f727
 SHA512:
-  metadata.gz: f7b2e74dd455b7ce505871a08bf73b9b01a485233c20eaa2272c0b84dc76baf117fe60174e398081e76ff8701b40ddfb857b18b0c78ca79c563e6fff91cdf576
-  data.tar.gz: 4a977f26975443d83927b4e06fb9265f1c251c4f62922f12f4530fabb6d2a8ced02a583ca3b85dfc0cbacdb0849f2b29b22a25a7256397971a3f70ce92dac148
+  metadata.gz: 05045bced49f00191b843da8fc16339f4209d543c04ae652a886feabe0ec346179da570168e4f16e0ddbe2c4a8e743203c49bc8665ce7bed3e64148f17917f53
+  data.tar.gz: fbb932813642ede8d94a754bd5a631ed8fe404b6489c2acc3c3539212638a0fe8c9cd53320d6996e105e5bec92fae48ca9e4387c35f7178451551fcf2c9b461d

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/command/freebsd/base/service.rb

@@ -3,8 +3,8 @@ class Specinfra::Command::Freebsd::Base::Service < Specinfra::Command::Base::Ser
     def check_is_enabled(service, level=3)
       "service #{escape(service)} enabled"
     end
-    def check_is_running_under_init(service)
-      "service #{escape(service)} status | grep -E 'as (pid [0-9]+)'"
+    def check_is_running(service)
+      "service #{escape(service)} onestatus"
     end
   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.23"
+  VERSION = "2.83.1"
 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/freebsd/service_spec.rb

@@ -5,67 +5,96 @@ describe 'command/freebsd/service works correctly' do
     property[:os] = nil
   end
 
-  context 'freebsd-base' do
-    before do
-      set :os, :family => 'freebsd'
-    end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+  describe 'check_service_is_enabled' do
+    context 'freebsd-base' do
+      before do
+        set :os, :family => 'freebsd'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+      end
     end
-  end
 
-  context 'freebsd-6' do
-    before do
-      set :os, :family => 'freebsd', :release => '6'
-    end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    context 'freebsd-6' do
+      before do
+        set :os, :family => 'freebsd', :release => '6'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+      end
     end
-  end
 
-  context 'freebsd-7' do
-    before do
-      set :os, :family => 'freebsd', :release => '7'
-    end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+    context 'freebsd-7' do
+      before do
+        set :os, :family => 'freebsd', :release => '7'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+      end
     end
-  end
 
-  context 'freebsd-8' do
-    before do
-      set :os, :family => 'freebsd', :release => '8'
+    context 'freebsd-8' do
+      before do
+        set :os, :family => 'freebsd', :release => '8'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+      end
     end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+
+    context 'freebsd-9' do
+      before do
+        set :os, :family => 'freebsd', :release => '9'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+      end
     end
-  end
 
-  context 'freebsd-9' do
-    before do
-      set :os, :family => 'freebsd', :release => '9'
+    context 'freebsd-10' do
+      before do
+        set :os, :family => 'freebsd', :release => '10'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+      end
     end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service -e | grep -- /httpd$' }
+
+    context 'freebsd-11' do
+      before do
+        set :os, :family => 'freebsd', :release => '11'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+      end
     end
-  end
 
-  context 'freebsd-10' do
-    before do
-      set :os, :family => 'freebsd', :release => '10'
+    context 'freebsd-12' do
+      before do
+        set :os, :family => 'freebsd', :release => '12'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+      end
     end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+
+    context 'freebsd-13' do
+      before do
+        set :os, :family => 'freebsd', :release => '13'
+      end
+      describe 'get_command(:check_service_is_enabled, "httpd")' do
+        it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+      end
     end
   end
 
-  context 'freebsd-11' do
+  describe 'check_service_is_running' do
     before do
-      set :os, :family => 'freebsd', :release => '11'
+      set :os, :family => 'freebsd'
     end
-    describe 'get_command(:check_service_is_enabled, "httpd")' do
-      it { expect(get_command(:check_service_is_enabled, 'httpd')).to eq 'service httpd enabled' }
+
+    describe 'get_command(:check_service_is_running, "foobar")' do
+      it { expect(get_command(:check_service_is_running, 'foobar')).to eq 'service foobar onestatus' }
     end
   end
 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.23
+  version: 2.83.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-10-26 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