specinfra 2.91.0 → 2.93.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97394d4373eb3883902aa11db2af73d48f90fd12fcce2f232a6f343c8909b41b
-  data.tar.gz: a0c5cdead4225a5e8d35989a07ac009414835ff215d98bf47e5da0c2404f3caf
+  metadata.gz: e321cef299b5304cbd2be799da02c91b6f8f27eb0e262874b6277641e54becf7
+  data.tar.gz: 520fa85f14e29cce1e7d902854eabbabbf7151db348432cd41ace8b0803ce8b7
 SHA512:
-  metadata.gz: cee153ac43581df36767f934669cee337c5320c7dac025bb16bb538fddacee7a79877a4e95875087cb48f43de04c2accae6efcf3333f16b167ae5e386acdbf78
-  data.tar.gz: 3b9d90ccc47adb67253d09b4f8cb5c20b9610e0871981818222f862844008f33f625f8d8322b8c03ded7583b2d2bda33e5264c29830bfa9af06d44f942de335e
+  metadata.gz: 4013fb3be50562a79f109b4e50caead9171b8d0cae3dbb966016c24c8c0148a940ea894ef62e961a12143765ed9dbb284899563b1639b68e254ad219962d241c
+  data.tar.gz: ca5897fa506bedeadb3ef834ca4353713a747688c2d91d5758b0b61d54b07429872fc31fbf6ba079bcd7bdcb088eae745c90bdf90e66c0308a10dfe11b85301d

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/helper/detect_os/debian.rb

@@ -13,13 +13,20 @@ class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
           distro  = line.split('=').last.strip if line =~ /^DISTRIB_ID=/
           release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
         end
-      else
-        if debian_version.stdout.chomp =~ /^[[:digit:]]+\.[[:digit:]]+$/
-          release = debian_version.stdout.chomp
-        end
       end
       distro ||= 'debian'
-      release ||= nil
+      # lsb-release not available or reported no version number:
+      if release.nil? || release == 'n/a'
+        release = case debian_version.stdout.chomp
+                  when /^[[:digit:]]+\.[[:digit:]]+$/
+                    debian_version.stdout.chomp
+                  when %r{^\w+/sid$}
+                    # a number larger than any normal Debian version ever:
+                    2**32 - 1.0
+                  else
+                    nil
+                  end
+      end
       { :family => distro.gsub(/[^[:alnum:]]/, '').downcase, :release => release }
     end
   end

data/lib/specinfra/version.rb

@@ -1,5 +1,5 @@
 module Specinfra
-  VERSION = "2.91.0"
+  VERSION = "2.93.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/helper/detect_os/debian_spec.rb

@@ -64,4 +64,19 @@ describe Specinfra::Helper::DetectOs::Debian do
       :release => '16.04'
     )
   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('cat /etc/lsb-release') {
+      CommandResult.new(:stdout => "", :exit_status => 1)
+    }
+    expect(debian.detect).to include(
+      :family  => 'debian',
+      :release => 4294967295.0
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.91.0
+  version: 2.93.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64