specinfra 2.83.1 → 2.85.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f98623e6d0a234bd7fe4efe0a86e0cdc270a415
-  data.tar.gz: 42c023dec145584e4bc648127adc088b88f2f727
+  metadata.gz: 5dcca0a6c67f3f9b47c2833d86186ef641f41483
+  data.tar.gz: b4fcb4bc6a28133ef0e581947a748fb8f4cf5218
 SHA512:
-  metadata.gz: 05045bced49f00191b843da8fc16339f4209d543c04ae652a886feabe0ec346179da570168e4f16e0ddbe2c4a8e743203c49bc8665ce7bed3e64148f17917f53
-  data.tar.gz: fbb932813642ede8d94a754bd5a631ed8fe404b6489c2acc3c3539212638a0fe8c9cd53320d6996e105e5bec92fae48ca9e4387c35f7178451551fcf2c9b461d
+  metadata.gz: 57fb67750b01a42c2967f2aa98e1759d18bf62c77ff6fc49a8887fd3a54e775d5b48db3b7d4c095871d9592130a52a453a7d1e3a003caa42e625842058acec93
+  data.tar.gz: 590f94b6646ef7d036d4481d6df2c5ead0f2545847bc1e1a852f41c66101767858669faedf32fa407735fec175ee7a14ed0180e0521a077155059990495e9324

data/lib/specinfra/backend/cmd.rb

@@ -70,7 +70,7 @@ module Specinfra
       end
 
       def find_powershell(dirs)
-        ( dirs.map { |dir| "#{ENV['WINDIR']}\\#{dir}\\WindowsPowerShell\\v1.0\\powershell.exe" } ).find { |exe| File.exists?(exe) } || 'powershell'
+        ( dirs.map { |dir| "#{ENV['WINDIR']}\\#{dir}\\WindowsPowerShell\\v1.0\\powershell.exe" } ).find { |exe| File.exist?(exe) } || 'powershell'
       end
 
     end

data/lib/specinfra/backend/docker.rb

@@ -17,7 +17,7 @@ module Specinfra
           @base_image = get_or_pull_image(image)
 
           create_and_start_container
-          ObjectSpace.define_finalizer(self, proc { cleanup_container })
+          ObjectSpace.define_finalizer(self, self.class.__send__(:finalizer_for, @container))
         elsif container = get_config(:docker_container)
           @container = ::Docker::Container.get(container)
         else
@@ -25,6 +25,25 @@ module Specinfra
         end
       end
 
+      class << self
+        protected
+
+        # Get a finalizer for given container.
+        #
+        # @param [::Docker::Container, nil] container
+        #
+        # @return [Proc]
+        def finalizer_for(container)
+          proc do
+            # noinspection RubyNilAnalysis
+            unless container.nil?
+              container.stop
+              container.delete
+            end
+          end
+        end
+      end
+
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
         run_pre_command(opts)
@@ -77,8 +96,7 @@ module Specinfra
       end
 
       def cleanup_container
-        @container.stop
-        @container.delete
+        self.class.__send__(:finalizer_for, @container).call
       end
 
       def current_image

data/lib/specinfra/command/amazon/v2022/package.rb

@@ -0,0 +1,31 @@
+class Specinfra::Command::Amazon::V2022::Package < Specinfra::Command::Linux::Base::Package
+  class << self
+    def check_is_installed(package, version=nil)
+      cmd = "rpm -q #{escape(package)}"
+      if version
+        full_package = "#{package}-#{version}"
+        cmd = "#{cmd} | grep -w -- #{Regexp.escape(full_package)}"
+      end
+      cmd
+    end
+
+    alias :check_is_installed_by_rpm :check_is_installed
+
+    def get_version(package, opts=nil)
+      "rpm -q --qf '%{VERSION}-%{RELEASE}' #{package}"
+    end
+
+    def install(package, version=nil, option='')
+      if version
+        full_package = "#{package}-#{version}"
+      else
+        full_package = package
+      end
+      cmd = "dnf -y #{option} install #{escape(full_package)}"
+    end
+
+    def remove(package, option='')
+      "dnf -y #{option} remove #{package}"
+    end
+  end
+end

data/lib/specinfra/command/amazon/v2022/port.rb

@@ -0,0 +1,5 @@
+class Specinfra::Command::Amazon::V2022::Port < Specinfra::Command::Amazon::Base::Port
+  class << self
+    include Specinfra::Command::Module::Ss
+  end
+end

data/lib/specinfra/command/amazon/v2022/service.rb

@@ -0,0 +1,5 @@
+class Specinfra::Command::Amazon::V2022::Service < Specinfra::Command::Amazon::Base::Service
+  class << self
+    include Specinfra::Command::Module::Systemd
+  end
+end

data/lib/specinfra/command/amazon/v2022/yumrepo.rb

@@ -0,0 +1,11 @@
+class Specinfra::Command::Amazon::V2022::Yumrepo < Specinfra::Command::Redhat::Base::Yumrepo
+  class << self
+    def check_exists(repository)
+      "dnf repolist all | grep -qsE \"^[\\!\\*]?#{escape(repository)}\(\\s\|$\|\\/)\""
+    end
+
+    def check_is_enabled(repository)
+      "dnf repolist enabled | grep -qs \"^[\\!\\*]\\?#{escape(repository)}\""
+    end
+  end
+end

data/lib/specinfra/command/amazon/v2022.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Amazon::V2022 < Specinfra::Command::Redhat::Base
+end

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

@@ -0,0 +1,31 @@
+class Specinfra::Command::Guix::Base::Service < Specinfra::Command::Linux::Base::Service
+  class << self
+    def check_is_enabled(service, level=nil)
+      "herd status #{escape(service)} | grep 'It is enabled.'"
+    end
+
+    def check_is_running(service)
+      "herd status #{escape(service)} | grep 'It is started.'"
+    end
+
+    def enable(service)
+      "herd enable #{escape(service)}"
+    end
+
+    def disable(service)
+      "herd disable #{escape(service)}"
+    end
+
+    def start(service)
+      "herd start #{escape(service)}"
+    end
+
+    def stop(service)
+      "herd stop #{escape(service)}"
+    end
+
+    def restart(service)
+      "herd restart #{escape(service)}"
+    end
+  end
+end

data/lib/specinfra/command/guix/base.rb

@@ -0,0 +1,2 @@
+class Specinfra::Command::Guix::Base < Specinfra::Command::Linux::Base
+end

data/lib/specinfra/command/guix.rb

@@ -0,0 +1 @@
+class Specinfra::Command::Guix; 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/command.rb

@@ -127,6 +127,13 @@ require 'specinfra/command/amazon/v2'
 require 'specinfra/command/amazon/v2/service'
 require 'specinfra/command/amazon/v2/port'
 
+# Amazon Linux V2022 (inherit RedHat)
+require 'specinfra/command/amazon/v2022'
+require 'specinfra/command/amazon/v2022/package'
+require 'specinfra/command/amazon/v2022/port'
+require 'specinfra/command/amazon/v2022/service'
+require 'specinfra/command/amazon/v2022/yumrepo'
+
 # AIX (inherit Base)
 require 'specinfra/command/aix'
 require 'specinfra/command/aix/base'
@@ -228,6 +235,11 @@ require 'specinfra/command/gentoo/base'
 require 'specinfra/command/gentoo/base/package'
 require 'specinfra/command/gentoo/base/service'
 
+# Guix (inherit Linux)
+require 'specinfra/command/guix'
+require 'specinfra/command/guix/base'
+require 'specinfra/command/guix/base/service'
+
 # Plamo (inherit Linux)
 require 'specinfra/command/plamo'
 require 'specinfra/command/plamo/base'

data/lib/specinfra/helper/detect_os/guix.rb

@@ -0,0 +1,10 @@
+class Specinfra::Helper::DetectOs::Guix < Specinfra::Helper::DetectOs
+  def detect
+    if run_command('ls /etc/os-release').success?
+      line = run_command('cat /etc/os-release').stdout
+      if line =~ /ID=guix/
+        { :family => 'guix', :release => nil }
+      end
+    end
+  end
+end

data/lib/specinfra/helper/detect_os.rb

@@ -31,6 +31,7 @@ require 'specinfra/helper/detect_os/esxi'
 require 'specinfra/helper/detect_os/eos'
 require 'specinfra/helper/detect_os/freebsd'
 require 'specinfra/helper/detect_os/gentoo'
+require 'specinfra/helper/detect_os/guix'
 require 'specinfra/helper/detect_os/nixos'
 require 'specinfra/helper/detect_os/openbsd'
 require 'specinfra/helper/detect_os/photon'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.83.1"
+  VERSION = "2.85.0"
 end

data/spec/command/amazon2022/package_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'amazon', :release => '2022'
+
+describe  get_command(:check_package_is_installed, 'telnet') do
+  it { should eq 'rpm -q telnet' }
+end
+
+describe  get_command(:check_package_is_installed, 'telnet', '0.17-48.el6.x86_64') do
+  it { should eq 'rpm -q telnet | grep -w -- telnet\\-0\\.17\\-48\\.el6\\.x86_64' }
+end
+
+describe  get_command(:check_package_is_installed, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should not work' do
+    should eq 'rpm -q linux-headers-\\$\\(uname\\ -r\\)'
+  end
+end
+
+describe get_command(:install_package, 'telnet') do
+  it { should eq "dnf -y  install telnet" }
+end
+
+describe get_command(:install_package, 'telnet', '0.17-48.el6.x86_64') do
+  it { should eq "dnf -y  install telnet-0.17-48.el6.x86_64" }
+end
+
+describe get_command(:install_package, 'linux-headers-$(uname -r)') do
+  it 'should be escaped (that is, command substitution should no work)' do
+    should eq "dnf -y  install linux-headers-\\$\\(uname\\ -r\\)"
+  end
+end

data/spec/command/amazon2022/port_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'amazon', :release => '2022'
+
+describe get_command(:check_port_is_listening, '80') do
+  it { should eq 'ss -tunl | grep -E -- :80\ ' }
+end

data/spec/command/amazon2022/service_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'amazon', :release => '2022'
+
+describe get_command(:enable_service, 'httpd') do
+  it { should eq 'systemctl enable httpd' }
+end
+
+describe get_command(:disable_service, 'httpd') do
+  it { should eq 'systemctl disable httpd' }
+end
+
+describe get_command(:start_service, 'httpd') do
+  it { should eq 'systemctl start httpd' }
+end
+
+describe get_command(:stop_service, 'httpd') do
+  it { should eq 'systemctl stop httpd' }
+end
+
+describe get_command(:restart_service, 'httpd') do
+  it { should eq 'systemctl restart httpd' }
+end
+
+describe get_command(:reload_service, 'httpd') do
+  it { should eq 'systemctl reload httpd' }
+end
+
+describe get_command(:enable_service, 'sshd.socket') do
+  it { should eq 'systemctl enable sshd.socket' }
+end

data/spec/command/amazon2022/yumrepo_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'amazon', :release => '2022'
+
+describe get_command(:check_yumrepo_exists, 'epel') do
+  it { should eq "dnf repolist all | grep -qsE \"^[\\!\\*]?epel\(\\s\|$\|\\/)\"" }
+end
+
+describe get_command(:check_yumrepo_is_enabled, 'epel') do
+  it { should eq "dnf repolist enabled | grep -qs \"^[\\!\\*]\\?epel\"" }
+end

data/spec/command/guix/service_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'guix'
+
+describe get_command(:enable_service, 'nginx') do
+  it { should eq 'herd enable nginx' }
+end
+
+describe get_command(:disable_service, 'nginx') do
+  it { should eq 'herd disable nginx' }
+end
+
+describe get_command(:start_service, 'nginx') do
+  it { should eq 'herd start nginx' }
+end
+
+describe get_command(:stop_service, 'nginx') do
+  it { should eq 'herd stop nginx' }
+end
+
+describe get_command(:restart_service, 'nginx') do
+  it { should eq 'herd restart nginx' }
+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/helper/detect_os/guix_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'specinfra/helper/detect_os/guix'
+
+describe Specinfra::Helper::DetectOs::Guix do
+  guix = Specinfra::Helper::DetectOs::Guix.new(:exec)
+  it 'Should return guix when Guix is installed.' do
+    allow(guix).to receive(:run_command) {
+      CommandResult.new(:stdout => "NAME=\"Guix System\" \nID=guix\nPRETTY_NAME=\"Guix System\" \nLOGO=guix-icon\nHOME_URL=\"https://guix.gnu.org\" \nDOCUMENTATION_URL=\"https://guix.gnu.org/en/manual\" \nSUPPORT_URL=\"https://guix.gnu.org/en/help\" \nBUG_REPORT_URL=\"https://lists.gnu.org/mailman/listinfo/bug-guix\"", :exit_status => 0)
+    }
+    expect(guix.detect).to include(
+      :family => 'guix',
+      :release => nil
+    )
+  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/host_inventory/guix/filesystem_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+## Output from 'df -k'
+str = <<-EOH
+Filesystem     1K-blocks      Used Available Use% Mounted on
+none             4015168         0   4015168   0% /dev
+/dev/sda3      235797392 184584640  39162064  83% /
+/dev/sda1         523248      3640    519608   1% /boot/efi
+tmpfs            4025296      1052   4024244   1% /dev/shm
+none             4025292        44   4025248   1% /run/systemd
+none             4025292         0   4025292   0% /run/user
+cgroup           4025292         0   4025292   0% /sys/fs/cgroup
+none             4025292         0   4025292   0% /var/cache/fontconfig
+none             4025292       684   4024608   1% /var/lib/gdm
+tmpfs             805056        44    805012   1% /run/user/1000
+EOH
+
+describe Specinfra::HostInventory::Filesystem do
+  let(:host_inventory) { nil }
+  describe 'Example of Guix' do
+    ret = Specinfra::HostInventory::Filesystem.new(host_inventory).parse(str)
+    example "/dev/sda3" do
+      expect(ret["/dev/sda3"]).to include(
+        "kb_available" => "39162064",
+        "kb_size"      => "235797392",
+        "mount"        => "/",
+        "percent_used" => "83%",
+        "kb_used"      => "184584640"
+      )
+    end
+    example "/dev/sda1" do
+      expect(ret["/dev/sda1"]).to include(
+        "kb_available" => "519608",
+        "kb_size"      => "523248",
+        "mount"        => "/boot/efi",
+        "percent_used" => "1%",
+        "kb_used"      => "3640"
+      )
+    end
+    example "cgroup" do
+      expect(ret["cgroup"]).to include(
+        "kb_available" => "4025292",
+        "kb_size"      => "4025292",
+        "mount"        => "/sys/fs/cgroup",
+        "percent_used" => "0%",
+        "kb_used"      => "0"
+      )
+    end
+  end 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.83.1
+  version: 2.85.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2023-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -170,6 +170,11 @@ files:
 - lib/specinfra/command/amazon/v2.rb
 - lib/specinfra/command/amazon/v2/port.rb
 - lib/specinfra/command/amazon/v2/service.rb
+- lib/specinfra/command/amazon/v2022.rb
+- lib/specinfra/command/amazon/v2022/package.rb
+- lib/specinfra/command/amazon/v2022/port.rb
+- lib/specinfra/command/amazon/v2022/service.rb
+- lib/specinfra/command/amazon/v2022/yumrepo.rb
 - lib/specinfra/command/arch.rb
 - lib/specinfra/command/arch/base.rb
 - lib/specinfra/command/arch/base/package.rb
@@ -285,6 +290,9 @@ files:
 - lib/specinfra/command/gentoo/base.rb
 - lib/specinfra/command/gentoo/base/package.rb
 - lib/specinfra/command/gentoo/base/service.rb
+- lib/specinfra/command/guix.rb
+- lib/specinfra/command/guix/base.rb
+- lib/specinfra/command/guix/base/service.rb
 - lib/specinfra/command/linux.rb
 - lib/specinfra/command/linux/base.rb
 - lib/specinfra/command/linux/base/bond.rb
@@ -463,6 +471,7 @@ files:
 - lib/specinfra/helper/detect_os/esxi.rb
 - lib/specinfra/helper/detect_os/freebsd.rb
 - lib/specinfra/helper/detect_os/gentoo.rb
+- lib/specinfra/helper/detect_os/guix.rb
 - lib/specinfra/helper/detect_os/nixos.rb
 - lib/specinfra/helper/detect_os/openbsd.rb
 - lib/specinfra/helper/detect_os/photon.rb
@@ -513,6 +522,10 @@ files:
 - spec/command/amazon/service_spec.rb
 - spec/command/amazon2/port_spec.rb
 - spec/command/amazon2/service_spec.rb
+- spec/command/amazon2022/package_spec.rb
+- spec/command/amazon2022/port_spec.rb
+- spec/command/amazon2022/service_spec.rb
+- spec/command/amazon2022/yumrepo_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
 - spec/command/base/host_spec.rb
@@ -548,6 +561,7 @@ files:
 - spec/command/freebsd/interface_spec.rb
 - spec/command/freebsd/package_spec.rb
 - spec/command/freebsd/service_spec.rb
+- spec/command/guix/service_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -591,6 +605,7 @@ files:
 - spec/helper/detect_os/eos_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/detect_os/freebsd_spec.rb
+- spec/helper/detect_os/guix_spec.rb
 - spec/helper/detect_os/openbsd_spec.rb
 - spec/helper/detect_os/suse_spec.rb
 - spec/helper/os_spec.rb
@@ -600,7 +615,9 @@ 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/guix/filesystem_spec.rb
 - spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb
@@ -655,6 +672,10 @@ test_files:
 - spec/command/amazon/service_spec.rb
 - spec/command/amazon2/port_spec.rb
 - spec/command/amazon2/service_spec.rb
+- spec/command/amazon2022/package_spec.rb
+- spec/command/amazon2022/port_spec.rb
+- spec/command/amazon2022/service_spec.rb
+- spec/command/amazon2022/yumrepo_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
 - spec/command/base/host_spec.rb
@@ -690,6 +711,7 @@ test_files:
 - spec/command/freebsd/interface_spec.rb
 - spec/command/freebsd/package_spec.rb
 - spec/command/freebsd/service_spec.rb
+- spec/command/guix/service_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
 - spec/command/linux/file_spec.rb
@@ -733,6 +755,7 @@ test_files:
 - spec/helper/detect_os/eos_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/detect_os/freebsd_spec.rb
+- spec/helper/detect_os/guix_spec.rb
 - spec/helper/detect_os/openbsd_spec.rb
 - spec/helper/detect_os/suse_spec.rb
 - spec/helper/os_spec.rb
@@ -742,7 +765,9 @@ 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/guix/filesystem_spec.rb
 - spec/host_inventory/linux/block_device_spec.rb
 - spec/host_inventory/linux/cpu_spec.rb
 - spec/host_inventory/linux/filesystem_spec.rb