specinfra 2.93.0 → 2.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e321cef299b5304cbd2be799da02c91b6f8f27eb0e262874b6277641e54becf7
-  data.tar.gz: 520fa85f14e29cce1e7d902854eabbabbf7151db348432cd41ace8b0803ce8b7
+  metadata.gz: 3f6bf89ff57ca268d0d16053349b8159e7a0b2373db8deca0a11e46487f784dc
+  data.tar.gz: b085db7e0f46a09fe08620c3c46cb7ee889c241d1dd63b2dde5ea6f733a3dbb9
 SHA512:
-  metadata.gz: 4013fb3be50562a79f109b4e50caead9171b8d0cae3dbb966016c24c8c0148a940ea894ef62e961a12143765ed9dbb284899563b1639b68e254ad219962d241c
-  data.tar.gz: ca5897fa506bedeadb3ef834ca4353713a747688c2d91d5758b0b61d54b07429872fc31fbf6ba079bcd7bdcb088eae745c90bdf90e66c0308a10dfe11b85301d
+  metadata.gz: 7992f64477c89f097647475e0d85835e5a11e99c869f0c561aeb7542a2bd6d7385646a8ff131aefb2851d32296da8c6cd8e20029d1b80eadbbb977f9b19c76b4
+  data.tar.gz: 123e61ee049f8ec1cd853739bea854175441ddc29caacabcb223d7e3fd5c2fc372738f03e5dae870af85e0f95ead1d0186165b1a5ee3892616c0a1cdeb1be260

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

@@ -1,17 +1,36 @@
 class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
   def detect
     if (debian_version = run_command('cat /etc/debian_version')) && debian_version.success?
-      distro  = nil
-      release = nil
-      if (lsb_release = run_command("lsb_release -ir")) && lsb_release.success?
+      distro   = nil
+      release  = nil
+      codename = nil
+      if (lsb_release = run_command("lsb_release -irc")) && lsb_release.success?
         lsb_release.stdout.each_line do |line|
-          distro  = line.split(':').last.strip if line =~ /^Distributor ID:/
-          release = line.split(':').last.strip if line =~ /^Release:/
+          distro   = line.split(':').last.strip if line =~ /^Distributor ID:/
+          release  = line.split(':').last.strip if line =~ /^Release:/
+          codename = line.split(':').last.strip if line =~ /^Codename:/
         end
       elsif (lsb_release = run_command("cat /etc/lsb-release")) && lsb_release.success?
         lsb_release.stdout.each_line do |line|
-          distro  = line.split('=').last.strip if line =~ /^DISTRIB_ID=/
-          release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
+          distro   = line.split('=').last.strip if line =~ /^DISTRIB_ID=/
+          release  = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
+          codename = line.split('=').last.strip if line =~ /^DISTRIB_CODENAME=/
+        end
+      elsif (lsb_release = run_command("cat /etc/os-release")) && lsb_release.success?
+        lsb_release.stdout.each_line do |line|
+          distro   = line.split('=').last.delete('"').strip if line =~ /^ID=/
+          release  = line.split('=').last.delete('"').strip if line =~ /^VERSION_ID=/
+          codename = line.split('=').last.delete('"').strip if line =~ /^VERSION_CODENAME=/
+        end
+        # There is no codename notation until Debian Jessie
+        if codename.nil?
+          lsb_release.stdout.each_line do |line|
+            version = line.split('=').last.delete('"').strip if line =~ /^VERSION=/
+            # For debian releases
+            if m = /^[0-9]+ \((\w+)\)$/.match(version)
+              codename = m[1]
+            end
+          end
         end
       end
       distro ||= 'debian'
@@ -27,7 +46,7 @@ class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
                     nil
                   end
       end
-      { :family => distro.gsub(/[^[:alnum:]]/, '').downcase, :release => release }
+      { :family => distro.gsub(/[^[:alnum:]]/, '').downcase, :release => release, :codename => codename }
     end
   end
 end

data/lib/specinfra/host_inventory/platform_codename.rb

@@ -0,0 +1,9 @@
+module Specinfra
+  class HostInventory
+    class PlatformCodename < Base
+      def get
+        backend.os_info[:codename]
+      end
+    end
+  end
+end

data/lib/specinfra/host_inventory.rb

@@ -7,6 +7,7 @@ module Specinfra
       domain
       fqdn
       platform
+      platform_codename
       platform_version
       filesystem
       cpu

data/lib/specinfra/version.rb

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

data/spec/backend/exec/build_command_spec.rb

@@ -124,11 +124,11 @@ describe 'os' do
   context 'test ubuntu with lsb_release command' do
     before do
       allow(Specinfra.backend).to receive(:run_command) do |args|
-        if ['cat /etc/debian_version', 'lsb_release -ir'].include? args
+        if ['cat /etc/debian_version', 'lsb_release -irc'].include? args
           double(
             :run_command_response,
             :success? => true,
-            :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
+            :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\nCodename:\tprecise\n"
           )
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
@@ -140,7 +140,7 @@ describe 'os' do
     subject! { os }
     it do
       expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
-      should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'ubuntu', :release => '12.04', :codename => 'precise', :arch => 'x86_64' })
     end
   end
 
@@ -168,7 +168,7 @@ EOF
     subject! { os }
     it do
       expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
-      should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'ubuntu', :release => '12.04', :codename => 'precise', :arch => 'x86_64' })
     end
   end
 
@@ -187,7 +187,7 @@ EOF
     subject! { os }
     it do
       expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
-      should eq({:family => 'debian', :release => '8.5', :arch => 'x86_64' })
+      should eq({:family => 'debian', :release => '8.5', :codename => nil, :arch => 'x86_64' })
     end
   end
 end

data/spec/helper/detect_os/debian_spec.rb

@@ -4,79 +4,118 @@ require 'specinfra/helper/detect_os/debian'
 describe Specinfra::Helper::DetectOs::Debian do
   debian = Specinfra::Helper::DetectOs::Debian.new(Specinfra.backend)
 
+  it 'Should return debian 7 wheezy is installed.' do
+    allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
+      CommandResult.new(:stdout => "", :exit_status => 0)
+    }
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
+    allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "VERSION_ID=\"7\"\nVERSION=\"7 (wheezy)\"\nID=debian\n", :exit_status => 0)
+    }
+    expect(debian.detect).to include(
+      :family   => 'debian',
+      :release  => '7',
+      :codename => 'wheezy'
+    )
+  end
   it 'Should return debian 8.5 when jessie is installed.' do
     allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
       CommandResult.new(:stdout => "8.5\n", :exit_status => 0)
     }
-    allow(debian).to receive(:run_command).with('lsb_release -ir') {
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
       CommandResult.new(:stdout => "8.5\n", :exit_status => 1)
     }
     allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
       CommandResult.new(:stdout => "8.5\n", :exit_status => 1)
     }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "8.5\n", :exit_status => 1)
+    }
     expect(debian.detect).to include(
-      :family  => 'debian',
-      :release => '8.5'
+      :family   => 'debian',
+      :release  => '8.5',
+      :codename => nil
     )
   end
   it 'Should return ubuntu 16.10 when yakkety is installed.' do
     allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
       CommandResult.new(:stdout => "stretch/sid", :exit_status => 0)
     }
-    allow(debian).to receive(:run_command).with('lsb_release -ir') {
-      CommandResult.new(:stdout => "Distributor ID:Ubuntu\nRelease:16.10\n", :exit_status => 0)
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
+      CommandResult.new(:stdout => "Distributor ID:Ubuntu\nRelease:16.10\nCodename:yakkety\n", :exit_status => 0)
     }
     allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
       CommandResult.new(:stdout => "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=16.10\nDISTRIB_CODENAME=yakkety\nDISTRIB_DESCRIPTION=\"Ubuntu 16.10\"", :exit_status => 0)
     }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
     expect(debian.detect).to include(
-      :family  => 'ubuntu',
-      :release => '16.10'
+      :family   => 'ubuntu',
+      :release  => '16.10',
+      :codename => 'yakkety'
     )
   end
   it 'Should return ubuntu 16.04 when xenial is installed.' do
     allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
       CommandResult.new(:stdout => "stretch/sid", :exit_status => 0)
     }
-    allow(debian).to receive(:run_command).with('lsb_release -ir') {
-      CommandResult.new(:stdout => "Distributor ID:Ubuntu\nRelease:16.04\n", :exit_status => 0)
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
+      CommandResult.new(:stdout => "Distributor ID:Ubuntu\nRelease:16.04\nCodename:xenial\n", :exit_status => 0)
     }
     allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
       CommandResult.new(:stdout => "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=16.04\nDISTRIB_CODENAME=xenial\nDISTRIB_DESCRIPTION=\"Ubuntu 16.04.2 LTS\"", :exit_status => 0)
     }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
     expect(debian.detect).to include(
-      :family  => 'ubuntu',
-      :release => '16.04'
+      :family   => 'ubuntu',
+      :release  => '16.04',
+      :codename => 'xenial'
     )
   end
   it 'Should return ubuntu 16.04 when xenial is installed in docker.' do
     allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
       CommandResult.new(:stdout => "stretch/sid", :exit_status => 0)
     }
-    allow(debian).to receive(:run_command).with('lsb_release -ir') {
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
       CommandResult.new(:stdout => 'lsb-release is not installed in docker image by default', :exit_status => 1)
     }
     allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
       CommandResult.new(:stdout => "DISTRIB_ID=Ubuntu\nDISTRIB_RELEASE=16.04\nDISTRIB_CODENAME=xenial\nDISTRIB_DESCRIPTION=\"Ubuntu 16.04.2 LTS\"", :exit_status => 0)
     }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
     expect(debian.detect).to include(
-      :family  => 'ubuntu',
-      :release => '16.04'
+      :family   => 'ubuntu',
+      :release  => '16.04',
+      :codename => 'xenial'
     )
   end
   it 'Should return debian testing when lsb_release says release = n/a' do
     allow(debian).to receive(:run_command).with('cat /etc/debian_version') {
       CommandResult.new(:stdout => "bookworm/sid", :exit_status => 0)
     }
-    allow(debian).to receive(:run_command).with('lsb_release -ir') {
-      CommandResult.new(:stdout => "Distributor ID:	Debian\nRelease:	n/a\n", :exit_status => 0)
+    allow(debian).to receive(:run_command).with('lsb_release -irc') {
+      CommandResult.new(:stdout => "Distributor ID:	Debian\nRelease:\tn/a\nCodename:\ttrixie\n", :exit_status => 0)
     }
     allow(debian).to receive(:run_command).with('cat /etc/lsb-release') {
       CommandResult.new(:stdout => "", :exit_status => 1)
     }
+    allow(debian).to receive(:run_command).with('cat /etc/os-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
     expect(debian.detect).to include(
-      :family  => 'debian',
-      :release => 4294967295.0
+      :family   => 'debian',
+      :release  => 4294967295.0,
+      :codename => 'trixie'
     )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.93.0
+  version: 2.94.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -529,6 +529,7 @@ files:
 - lib/specinfra/host_inventory/mount.rb
 - lib/specinfra/host_inventory/ohai.rb
 - lib/specinfra/host_inventory/platform.rb
+- lib/specinfra/host_inventory/platform_codename.rb
 - lib/specinfra/host_inventory/platform_version.rb
 - lib/specinfra/host_inventory/user.rb
 - lib/specinfra/host_inventory/virtualization.rb