specinfra 2.82.25 → 2.83.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: a2c62c946f1a72ca71e07015962d3fc25ef5957e4cfd39fd8e75939139302ec9
-  data.tar.gz: df9c322631f5080aa1be9c7ccbb012f03f72ec54632762e82c87d6fbb42d7cab
+SHA1:
+  metadata.gz: eb64f982a1db9c07f65e29062f40f76d2dbd06cc
+  data.tar.gz: 6e35fcccef10ee85f2798d5cd55dd35415a97007
 SHA512:
-  metadata.gz: 717afa09a1d5bf1bd271efb86d727b634e017d71cb8d9d269460a1190f41beaf91a7afaf8fb48951b582c173a8684e7af3986cf878cc17899512cfda1c07d560
-  data.tar.gz: 42f0389ffad21c2befc5485276bf09ec1d391db0ab8d63b2587a5f8a2f04c72f5a5627283c05f1e467575173447cbfc7bdf16be515e07a74a04b2f06facb64ba
+  metadata.gz: 667d26731d168fd905f3235f135bb7cf12098908b4114e3a7b2938518e5fb2e2574a12ae9f85006856a1ced27e708070d144f1e7ec299160482daadd9b91c247
+  data.tar.gz: cfe99453702b4169825605f8c98fba7bd7cbf35331df9fc142ee824acafb433a9c71800104e95446b8fa080b6797617bddf7d8629b1fb22fe24f78f9e48f36ae

data/lib/specinfra/command/darwin/base/inventory.rb

@@ -8,6 +8,10 @@ class Specinfra::Command::Darwin::Base::Inventory < Specinfra::Command::Base::In
       'false'
     end
 
+    def get_kernel
+      'false'
+    end
+
     def get_hostname
       'hostname -s'
     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.25"
+  VERSION = "2.83.2"
 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/host_inventory/darwin/kernel_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Specinfra::HostInventory::Kernel do
+  describe "get" do
+    let(:host_inventory) { Specinfra::HostInventory.instance }
+    let(:command_class) { Specinfra::Command::Darwin::Base }
+    let(:error_message) { "get_kernel is not implemented in #{command_class}" }
+    let(:kernel_inventory) { Specinfra::HostInventory::Kernel.new(host_inventory) }
+    let(:result) { kernel_inventory.get }
+    example "it includes the value of os_info[:arch] in the key 'machine'" do
+      expect(result).to include(
+        "machine" => host_inventory.backend.os_info[:arch]
+      )
+    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.25
+  version: 2.83.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-25 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -600,6 +600,7 @@ files:
 - spec/host_inventory/base/group_spec.rb
 - spec/host_inventory/base/user_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
+- spec/host_inventory/darwin/kernel_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb
 - spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
@@ -633,7 +634,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
@@ -741,6 +743,7 @@ test_files:
 - spec/host_inventory/base/group_spec.rb
 - spec/host_inventory/base/user_spec.rb
 - spec/host_inventory/darwin/filesystem_spec.rb
+- spec/host_inventory/darwin/kernel_spec.rb
 - spec/host_inventory/freebsd/filesystem_spec.rb
 - spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb