specinfra 2.90.1 → 2.92.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6192f34de8d2414c066911812cd4542641339486662cf67cdd02429ce627d1b
-  data.tar.gz: d6c662a4bb193a898b212af07665aa3f6c91b61f58bd7027873ac16b05837450
+  metadata.gz: 41eadf19553cecaad597ee42c1e22757cfcddc9ba88fcd0c7c24a2b95400d426
+  data.tar.gz: ddd53b0f9a6750c08bc23aeb3de8b46f4b00f63a74925a3cf85de7d44fd4a194
 SHA512:
-  metadata.gz: 268a137b4e34aeecfe587e98cc8fe9dc635d7342d5543f4848c6aa413d82a13015f59d6a12948a9260b41394d7b0c6be110bee1b81c29869b09f84ec8901d2fa
-  data.tar.gz: 801e515067828d8faa1dfcdd6df2d25ba87da81949b85353bd7bf43dd70bc96ef45c02ad74b59d2395d48ce9414eac933799264af0a5037605e7c17adba21a8f
+  metadata.gz: b2aa5d0488509975ad807a8397b9b37d949e1a5526fa67e68a40e557b4a8fd2d688006a78b4816664408799eee6b23108a8224ba0252d75a996ec39b5903826f
+  data.tar.gz: 1439700273209ecd261aeb17ed9a6992925d03ddd46f09aba71d85b1def93802dce9b5fa47ed96a7e34c568c5babbc578e1162699f5564271f95a35085ee05ce

data/lib/specinfra/backend/exec.rb

@@ -141,7 +141,7 @@ module Specinfra
       end
 
       def with_env
-        keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
+        keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE BUNDLER_SETUP
             RUBYOPT GEM_HOME GEM_PATH GEM_CACHE]
 
         keys.each { |key| ENV["_SPECINFRA_#{key}"] = ENV[key] ; ENV.delete(key) }

data/lib/specinfra/command/module/runit.rb

@@ -0,0 +1,11 @@
+module Specinfra
+  module Command
+    module Module
+      module Runit
+        include Specinfra::Command::Module::Service::Runit
+        extend  Specinfra::Command::Module::Service::Delegator
+        def_delegator_service_under :runit
+      end
+    end
+  end
+end

data/lib/specinfra/command/module/service/runit.rb

@@ -10,6 +10,30 @@ module Specinfra
           def check_is_enabled_under_runit(service)
             "test ! -f /etc/sv/#{escape(service)}/down"
           end
+
+          def enable_under_runit(service)
+            "ln -s /etc/sv/#{service} /var/service/"
+          end
+
+          def disable_under_runit(service)
+            "rm /var/service/#{service}"
+          end
+
+          def start_under_runit(service)
+            "sv up /var/service/#{service}"
+          end
+
+          def stop_under_runit(service)
+            "sv down /var/service/#{service}"
+          end
+
+          def restart_under_runit(service)
+            "sv restart /var/service/#{service}"
+          end
+
+          def reload_under_runit(service)
+            "sv reload /var/service/#{service}"
+          end
         end
       end
     end

data/lib/specinfra/command/voidlinux/base/package.rb

@@ -0,0 +1,21 @@
+class Specinfra::Command::Voidlinux::Base::Package < Specinfra::Command::Linux::Base::Package
+  class << self
+    def check_is_installed(package, version=nil)
+      "xbps-query -S #{escape(package)} | grep -q 'state: installed'"
+    end
+
+    alias :check_is_installed_by_xbps :check_is_installed
+
+    def get_version(package, opts=nil)
+      "xbps-query -S #{package} | sed -nE 's/^pkgver: #{package}-([^\)+])/\1/p'"
+    end
+
+    def install(package, version=nil, option='')
+      "xbps-install --yes #{package}"
+    end
+
+    def remove(package, option='')
+      "xbps-remove --yes #{option} #{package}"
+    end
+  end
+end

data/lib/specinfra/command/voidlinux/base/service.rb

@@ -0,0 +1,5 @@
+class Specinfra::Command::Voidlinux::Base::Service < Specinfra::Command::Linux::Base::Service
+  class << self
+    include Specinfra::Command::Module::Runit
+  end
+end

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

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

data/lib/specinfra/command/voidlinux.rb

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

data/lib/specinfra/command.rb

@@ -19,6 +19,7 @@ require 'specinfra/command/module/systemd'
 require 'specinfra/command/module/zfs'
 require 'specinfra/command/module/ss'
 require 'specinfra/command/module/openrc'
+require 'specinfra/command/module/runit'
 
 # Base
 require 'specinfra/command/base'
@@ -407,3 +408,9 @@ require 'specinfra/command/poky/base/interface'
 require 'specinfra/command/poky/base/inventory'
 require 'specinfra/command/poky/base/package'
 require 'specinfra/command/poky/base/service'
+
+# VoidLinux (inherit Linux)
+require 'specinfra/command/voidlinux'
+require 'specinfra/command/voidlinux/base'
+require 'specinfra/command/voidlinux/base/package'
+require 'specinfra/command/voidlinux/base/service'

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

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

data/lib/specinfra/helper/detect_os.rb

@@ -40,3 +40,4 @@ require 'specinfra/helper/detect_os/poky'
 require 'specinfra/helper/detect_os/redhat'
 require 'specinfra/helper/detect_os/solaris'
 require 'specinfra/helper/detect_os/suse'
+require 'specinfra/helper/detect_os/voidlinux'

data/lib/specinfra/version.rb

@@ -1,5 +1,5 @@
 module Specinfra
-  VERSION = "2.90.1"
+  VERSION = "2.92.0"
 
   def self.ruby_is_older_than?(*version)
     (RUBY_VERSION.split('.').map(&:to_i) <=> version) < 0

data/spec/backend/exec/env_spec.rb

@@ -6,7 +6,7 @@ describe Specinfra.backend.run_command('echo $LANG').stdout.strip do
   it { should eq 'C' }
 end
 
-describe do
+describe "override ENV with config(:env)" do
   before do
     set :backend, :exec
 
@@ -18,3 +18,11 @@ describe do
   it { expect(ENV['LANG']).to eq 'C' }
 end
 
+describe "clear env for BUNDLER" do
+  before do
+    set :backend, :exec
+
+    ENV['BUNDLER_SETUP'] = 'any-value'
+  end
+  it { expect(Specinfra.backend.run_command('printenv BUNDLER_SETUP').stdout).to eq '' }
+end

data/spec/command/module/service/runit_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Specinfra::Command::Module::Service::Runit do
+  class Specinfra::Command::Module::Service::Runit::Test < Specinfra::Command::Base
+    extend Specinfra::Command::Module::Service::Runit
+  end
+  let(:klass) { Specinfra::Command::Module::Service::Runit::Test }
+  it { expect(klass.check_is_enabled_under_runit('httpd')).to eq 'test ! -f /etc/sv/httpd/down' }
+  it { expect(klass.check_is_running_under_runit('httpd')).to eq "sv status httpd | grep -E '^run: '" }
+  it { expect(klass.enable_under_runit('httpd')).to  eq 'ln -s /etc/sv/httpd /var/service/' }
+  it { expect(klass.disable_under_runit('httpd')).to eq 'rm /var/service/httpd' }
+  it { expect(klass.start_under_runit('httpd')).to   eq 'sv up /var/service/httpd' }
+  it { expect(klass.stop_under_runit('httpd')).to    eq 'sv down /var/service/httpd' }
+  it { expect(klass.restart_under_runit('httpd')).to eq 'sv restart /var/service/httpd' }
+  it { expect(klass.reload_under_runit('httpd')).to  eq 'sv reload /var/service/httpd' }
+end

data/spec/command/voidlinux/package_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+require 'spec_helper'
+
+set :os, { :family => 'voidlinux' }
+
+describe  get_command(:check_package_is_installed, 'httpd') do
+  it { should eq "xbps-query -S httpd | grep -q 'state: installed'" }
+end

data/spec/command/voidlinux/service_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'voidlinux'
+
+describe get_command(:enable_service, 'nginx') do
+  it { should eq 'ln -s /etc/sv/nginx /var/service/' }
+end
+
+describe get_command(:disable_service, 'nginx') do
+  it { should eq 'rm /var/service/nginx' }
+end
+
+describe get_command(:start_service, 'nginx') do
+  it { should eq 'sv up /var/service/nginx' }
+end
+
+describe get_command(:stop_service, 'nginx') do
+  it { should eq 'sv down /var/service/nginx' }
+end
+
+describe get_command(:restart_service, 'nginx') do
+  it { should eq 'sv restart /var/service/nginx' }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.90.1
+  version: 2.92.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-08 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -334,6 +334,7 @@ files:
 - lib/specinfra/command/linuxmint/base.rb
 - lib/specinfra/command/module.rb
 - lib/specinfra/command/module/openrc.rb
+- lib/specinfra/command/module/runit.rb
 - lib/specinfra/command/module/service/daemontools.rb
 - lib/specinfra/command/module/service/delegator.rb
 - lib/specinfra/command/module/service/god.rb
@@ -450,6 +451,10 @@ files:
 - lib/specinfra/command/ubuntu/v15/service.rb
 - lib/specinfra/command/ubuntu/v18.rb
 - lib/specinfra/command/ubuntu/v18/port.rb
+- lib/specinfra/command/voidlinux.rb
+- lib/specinfra/command/voidlinux/base.rb
+- lib/specinfra/command/voidlinux/base/package.rb
+- lib/specinfra/command/voidlinux/base/service.rb
 - lib/specinfra/command/vyos.rb
 - lib/specinfra/command/vyos/base.rb
 - lib/specinfra/command/windows.rb
@@ -501,6 +506,7 @@ files:
 - lib/specinfra/helper/detect_os/redhat.rb
 - lib/specinfra/helper/detect_os/solaris.rb
 - lib/specinfra/helper/detect_os/suse.rb
+- lib/specinfra/helper/detect_os/voidlinux.rb
 - lib/specinfra/helper/docker.rb
 - lib/specinfra/helper/host_inventory.rb
 - lib/specinfra/helper/lxc.rb
@@ -595,6 +601,7 @@ files:
 - spec/command/linux/selinux_spec.rb
 - spec/command/module/service/daemontools_spec.rb
 - spec/command/module/service/init_spec.rb
+- spec/command/module/service/runit_spec.rb
 - spec/command/module/service/systemd_spec.rb
 - spec/command/module/ss_spec.rb
 - spec/command/module/systemd_spec.rb
@@ -618,6 +625,8 @@ files:
 - spec/command/sles15/service_spec.rb
 - spec/command/solaris11/user_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
+- spec/command/voidlinux/package_spec.rb
+- spec/command/voidlinux/service_spec.rb
 - spec/command/windows/registry_key_spec.rb
 - spec/command/windows/service_spec.rb
 - spec/configuration_spec.rb
@@ -746,6 +755,7 @@ test_files:
 - spec/command/linux/selinux_spec.rb
 - spec/command/module/service/daemontools_spec.rb
 - spec/command/module/service/init_spec.rb
+- spec/command/module/service/runit_spec.rb
 - spec/command/module/service/systemd_spec.rb
 - spec/command/module/ss_spec.rb
 - spec/command/module/systemd_spec.rb
@@ -769,6 +779,8 @@ test_files:
 - spec/command/sles15/service_spec.rb
 - spec/command/solaris11/user_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
+- spec/command/voidlinux/package_spec.rb
+- spec/command/voidlinux/service_spec.rb
 - spec/command/windows/registry_key_spec.rb
 - spec/command/windows/service_spec.rb
 - spec/configuration_spec.rb