specinfra 2.82.25 → 2.83.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a2c62c946f1a72ca71e07015962d3fc25ef5957e4cfd39fd8e75939139302ec9
-  data.tar.gz: df9c322631f5080aa1be9c7ccbb012f03f72ec54632762e82c87d6fbb42d7cab
+SHA1:
+  metadata.gz: d74b760931c73cff0e9828d546a7e63f658ec60a
+  data.tar.gz: f945ae61dd3f169436d89903db0ad45847684f63
 SHA512:
-  metadata.gz: 717afa09a1d5bf1bd271efb86d727b634e017d71cb8d9d269460a1190f41beaf91a7afaf8fb48951b582c173a8684e7af3986cf878cc17899512cfda1c07d560
-  data.tar.gz: 42f0389ffad21c2befc5485276bf09ec1d391db0ab8d63b2587a5f8a2f04c72f5a5627283c05f1e467575173447cbfc7bdf16be515e07a74a04b2f06facb64ba
+  metadata.gz: a5c308cdcf87bc332143697d3c6d8d5a47e221f1afef33e711ae0786958a71f3d20009d37d15591294465427e5a31b438ac7fb1494a868cc67895ceb50f1a3fe
+  data.tar.gz: cfc67a5a753304dfa7f38573c77b0f6124c4012d63cc57c81d862671fed9bda823a597de02cffa61042c8d6cb1d1ef4b2d609eb3828937bdfa9458886a7e638a

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.25"
+  VERSION = "2.83.0"
 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.25
+  version: 2.83.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -633,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