specinfra 2.83.0 → 2.83.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74b760931c73cff0e9828d546a7e63f658ec60a
-  data.tar.gz: f945ae61dd3f169436d89903db0ad45847684f63
+  metadata.gz: 6705583dbf8312d537307218cb9c75cf28bbb9d6
+  data.tar.gz: 2fe5613db13e84c37cbce47471cb273907f9cb6c
 SHA512:
-  metadata.gz: a5c308cdcf87bc332143697d3c6d8d5a47e221f1afef33e711ae0786958a71f3d20009d37d15591294465427e5a31b438ac7fb1494a868cc67895ceb50f1a3fe
-  data.tar.gz: cfc67a5a753304dfa7f38573c77b0f6124c4012d63cc57c81d862671fed9bda823a597de02cffa61042c8d6cb1d1ef4b2d609eb3828937bdfa9458886a7e638a
+  metadata.gz: 94f87c4bbbe61fc61e69d53a81f4b63273c056a9652ad3b86615f466c33c893608a7c7c5ef4df9fdd47747d2a6a5b913bb12d45b1a6c3cab08f8359c8e5ad698
+  data.tar.gz: 9a28cb42d8c790052039a52b91cb13910addadb0881d8784525e1257ef8f4fe41ae17d2b03de1bbf66381fcac0cd681b3bd9ee85e5ac0cfa281d9cc272590307

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/command/linux/base/inventory.rb

@@ -30,7 +30,7 @@ class Specinfra::Command::Linux::Base::Inventory < Specinfra::Command::Base::Inv
 
     def get_block_device
       block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
-      "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done"
+      %Q[bash -c 'for f in $(ls #{block_device_dirs}); do echo -e "${f}\t$(cat ${f})"; done']
     end
 
     def get_system_product_name

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.83.0"
+  VERSION = "2.83.3"
 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/command/linux/inventory_spec.rb

@@ -16,5 +16,5 @@ end
 
 describe get_command(:get_inventory_block_device) do
   block_device_dirs = '/sys/block/*/{size,removable,device/{model,rev,state,timeout,vendor},queue/rotational}'
-  it { should eq "for f in $(ls #{block_device_dirs}); do echo -e \"${f}\t$(cat ${f})\"; done" }
+  it { should eq %Q[bash -c 'for f in $(ls #{block_device_dirs}); do echo -e "${f}\t$(cat ${f})"; done'] }
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.83.0
+  version: 2.83.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2022-07-26 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
@@ -742,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