specinfra 2.83.3 → 2.84.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6705583dbf8312d537307218cb9c75cf28bbb9d6
-  data.tar.gz: 2fe5613db13e84c37cbce47471cb273907f9cb6c
+  metadata.gz: 8409581baad2004ebb1c11e01d99598c39d5b5b4
+  data.tar.gz: b5febfb1b4f1130c379811b680669132ea5ea556
 SHA512:
-  metadata.gz: 94f87c4bbbe61fc61e69d53a81f4b63273c056a9652ad3b86615f466c33c893608a7c7c5ef4df9fdd47747d2a6a5b913bb12d45b1a6c3cab08f8359c8e5ad698
-  data.tar.gz: 9a28cb42d8c790052039a52b91cb13910addadb0881d8784525e1257ef8f4fe41ae17d2b03de1bbf66381fcac0cd681b3bd9ee85e5ac0cfa281d9cc272590307
+  metadata.gz: 9292019070312c7ce37faad96381f175be5c56f7ec733d2776ab265ed75ada52f6f6c859b06fbc564def43c0f7bfd7633fe0bc5ee41ece8dd2acb6c75e92fc12
+  data.tar.gz: d950653eb89b474c57b183a390e3d2f218915c8077b6da4ee592e32aeec83b031978cfa041365d51697fe27249f1db8121ac2e9c2fca86560bd680000e15166e

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.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'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.83.3"
+  VERSION = "2.84.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.83.3
+  version: 2.84.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-12-29 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
@@ -513,6 +518,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
@@ -656,6 +665,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