specinfra 2.67.5 → 2.67.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdc01368ef4596af153ff9a88d9616ffc67d4227
-  data.tar.gz: 267ad5f540834de598b5ddf9a312a558049ac277
+  metadata.gz: ab31c496f0f4b694ca5ca17e0d222dbfed9526d7
+  data.tar.gz: 4101eb155a5672c62d1db388322b1000c8ca4461
 SHA512:
-  metadata.gz: 7538babea1df2a390dcee9a35865d8c7f85357630363acae79f3af90a3dff79734cab10836188664d5d50ea2f05a07ff6641a9fef9543b93d90cecc2b0709765
-  data.tar.gz: 6a70a3a06f1a2d52430548092b911870420f10a9e5c88c7c7dcdad317d8f1d5d6217b70994df94cd767ec64118389725684bfaabe71f6429b64770db961cc4c4
+  metadata.gz: c569a210e20dbe05951f4290719f1ae2c057d1427e52e98eafc74166f6ff2a614980e46fa92203d9755b18438c2600928f001c085248cfb1b671281702e740c4
+  data.tar.gz: bcdc124ecd28ea1472a1ffd8e4ba9a03c5de836aad46d8a0d3edf359d408f75f87b521f51d02617f1353593932fb35f76ba064bb61e2d5617b88b1099e266ad2

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

@@ -1,9 +1,10 @@
 class Specinfra::Helper::DetectOs::Suse < Specinfra::Helper::DetectOs
   def detect
-    if run_command('ls /etc/SuSE-release').success?
-      line = run_command('cat /etc/SuSE-release').stdout
-      if line =~ /SUSE Linux Enterprise Server (\d+)/
-        release = $1
+    if run_command('ls /etc/os-release').success? and run_command('ls /etc/SuSe-release').success?
+      line = run_command('cat /etc/os-release').stdout
+      if line =~ /NAME=\"OpenSUSE"/
+        family = 'opensuse'
+      elsif line =~ /NAME=\"SLES"/
         family = 'sles'
       elsif line =~ /openSUSE (\d+\.\d+|\d+)/
         release = $1

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.67.5"
+  VERSION = "2.67.6"
 end

data/spec/helper/detect_os/suse_spec.rb

@@ -3,9 +3,18 @@ require 'specinfra/helper/detect_os/suse'
 
 describe Specinfra::Helper::DetectOs::Suse do
   suse = Specinfra::Helper::DetectOs::Suse.new(:exec)
-  it 'Should return opensuse 13 when openSUSE 13.2 is installed.' do
+  it 'Should return opensuse 42 when openSUSE 42.2 is installed.' do
     allow(suse).to receive(:run_command) {
-        CommandResult.new(:stdout => 'openSUSE 13.2 (x86_64)', :exit_status => 0)
+        CommandResult.new(:stdout => 'NAME=\"openSUSE Leap\"\nVERSION=\"42.2\"\nID=opensuse\nID_LIKE=\"suse\"\nVERSION_ID=\"42.2\"\nPRETTY_NAME=\"openSUSE Leap 42.2\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:leap:42.2\"\nBUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://www.opensuse.org/\"\n', :exit_status => 0)
+    }
+    expect(suse.detect).to include(
+      :family  => 'opensuse',
+      :release => '42.2'
+    )
+  end
+  it 'Should return opensuse 13.2 when openSUSE 13.2 is installed.' do
+    allow(suse).to receive(:run_command) {
+        CommandResult.new(:stdout => 'NAME=openSUSE\nVERSION=\"13.2 (Harlequin)\"\nVERSION_ID=\"13.2\"\nPRETTY_NAME=\"openSUSE 13.2 (Harlequin) (x86_64)\"\nID=opensuse\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:opensuse:opensuse:13.2\"\nBUG_REPORT_URL=\"https://bugs.opensuse.org\"\nHOME_URL=\"https://opensuse.org/\"\nID_LIKE=\"suse\"\n', :exit_status => 0)
     }
     expect(suse.detect).to include(
       :family  => 'opensuse',
@@ -14,7 +23,7 @@ describe Specinfra::Helper::DetectOs::Suse do
   end
   it 'Should return sles 12 when SUSE Linux Enterprise Server 12 is installed.' do
     allow(suse).to receive(:run_command) {
-      CommandResult.new(:stdout => 'SUSE Linux Enterprise Server 12', :exit_status => 0)
+      CommandResult.new(:stdout => 'NAME=\"SLES\"\nVERSION=\"12\"\nVERSION_ID=\"12\"\nPRETTY_NAME=\"SUSE Linux Enterprise Server 12\"\nID=\"sles\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:sles:12\"\n', :exit_status => 0)
     }
     expect(suse.detect).to include(
       :family  => 'sles',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.67.5
+  version: 2.67.6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp