specinfra 2.61.2 → 2.61.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5805a64cf8944bc938e1425381d72f172db920fb
-  data.tar.gz: 01c6e1e910245aca3ccd79abf4b65fae2690dd90
+  metadata.gz: 595aec10abe3600660b94d07bcb78c93c78cb5bb
+  data.tar.gz: 1e15b54261cc640db4ae9a7264d6e5994b1ad645
 SHA512:
-  metadata.gz: 3769030e60dcf4e38c28102452e06f59a65bb2b08a912d718e2d8f383de7f0981ae0c638b829e51383f46ad0d9df8cc652621a2b9289be22c19d32ba35d584dc
-  data.tar.gz: 5f1bfccf76414dd3a03641c0d5afc8d6a9fbd04303241094b2b4ef3e3bab02e5c48d70f62b0b47d81c5f3c718a3582c811040105591b834447ff0c0b1ce5433c
+  metadata.gz: 27ccf2fc50f00579d4726bfdabefb06a55e078b1b97a16cf11fb45611f32500b33eee892332eeabf2ae615bd8fb830042e2aa16a2e16b89bab815bc089047b78
+  data.tar.gz: a9190a888cce763b2863ee597e9dcaf0c2f8b21db57ccaf3a7e6f083cc1d82f0fe9c79cee3bf19a8179403a1e7417a18af694c17b2bdd55400a32f273aa73d49

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

@@ -1,21 +1,21 @@
 class Specinfra::Helper::DetectOs::Debian < Specinfra::Helper::DetectOs
   def detect
-    if run_command('ls /etc/debian_version').success?
+    if (debian_version = run_command('cat /etc/debian_version')) && debian_version.success?
       distro  = nil
       release = nil
-      lsb_release = run_command("lsb_release -ir")
-      if lsb_release.success?
+      if (lsb_release = run_command("lsb_release -ir")) && 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:/
         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=/
+        end
       else
-        lsb_release = run_command("cat /etc/lsb-release")
-        if 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=/
-          end
+        if debian_version.stdout.chomp =~ /^[[:digit:]]+\.[[:digit:]]+$/
+          release = debian_version.stdout.chomp
         end
       end
       distro ||= 'debian'

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.61.2"
+  VERSION = "2.61.3"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -118,7 +118,7 @@ describe 'os' do
   context 'test ubuntu with lsb_release command' do
     before do
       allow(Specinfra.backend).to receive(:run_command) do |args|
-        if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
+        if ['cat /etc/debian_version', 'lsb_release -ir'].include? args
           double(
             :run_command_response,
             :success? => true,
@@ -141,7 +141,7 @@ describe 'os' do
   context 'test ubuntu with /etc/lsb-release' do
     before do
       allow(Specinfra.backend).to receive(:run_command) do |args|
-        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
+        if ['cat /etc/debian_version', 'cat /etc/lsb-release'].include? args
           double(
             :run_command_response,
             :success? => true,
@@ -169,8 +169,8 @@ EOF
   context 'test debian (no lsb_release or lsb-release)' do
     before do
       allow(Specinfra.backend).to receive(:run_command) do |args|
-        if args == 'ls /etc/debian_version'
-          double :run_command_response, :success? => true, :stdout => nil
+        if args == 'cat /etc/debian_version'
+          double :run_command_response, :success? => true, :stdout => "8.5\n"
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
@@ -181,7 +181,7 @@ EOF
     subject! { os }
     it do
       expect(Specinfra.backend).to have_received(:run_command).at_least(1).times
-      should eq({:family => 'debian', :release => nil, :arch => 'x86_64' })
+      should eq({:family => 'debian', :release => '8.5', :arch => 'x86_64' })
     end
   end
 end

data/spec/helper/detect_os/debian_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'specinfra/helper/detect_os/debian'
+
+describe Specinfra::Helper::DetectOs::Debian do
+  darwin = Specinfra::Helper::DetectOs::Debian.new(Specinfra.backend)
+
+  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)
+    }
+    expect(darwin.detect).to include(
+      :family  => 'debian',
+      :release => '8.5'
+    )
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.61.2
+  version: 2.61.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -569,6 +569,7 @@ files:
 - spec/configuration_spec.rb
 - spec/helper/detect_os/aix_spec.rb
 - spec/helper/detect_os/darwin_spec.rb
+- spec/helper/detect_os/debian_spec.rb
 - spec/helper/detect_os/eos_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/detect_os/freebsd_spec.rb
@@ -686,6 +687,7 @@ test_files:
 - spec/configuration_spec.rb
 - spec/helper/detect_os/aix_spec.rb
 - spec/helper/detect_os/darwin_spec.rb
+- spec/helper/detect_os/debian_spec.rb
 - spec/helper/detect_os/eos_spec.rb
 - spec/helper/detect_os/esxi_spec.rb
 - spec/helper/detect_os/freebsd_spec.rb