specinfra 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62817ce531572a444a7ddb053f70273d9edc65b4
-  data.tar.gz: 76782c7e4aa98e1773fa93183fd51811bd125095
+  metadata.gz: ece2d3ebcdaf4b350c4d6cf055ee97ccde8a463e
+  data.tar.gz: ffd5b3944a6b80825c223e5bf7ea4243e8df1edd
 SHA512:
-  metadata.gz: b331580ad78a8975549f9d76c5a5dd16505f3fc18ca43d7376a644d11c169d33a9cd2a1dfea4a320fbcf83fd95f37a34af698a104fb667734c51806454bfaf01
-  data.tar.gz: 33405e454fbe91cddf69b16f151e346787a13448c1404de05b920cacf017c878588a2fe9b63fcbd9780a5e5a49048cb83900e0d5b4d15da6d5ead8b7bf02c5f0
+  metadata.gz: 2d9eb88d5b685a3022ff87d6da4abbe1ba99ab975efa02aff393e5aca05ef9c55f13bd941297f72af3ab3e85f8598e9765b3bb0d43b7935fd2b5f3cf68f2c86a
+  data.tar.gz: a2b43107e2d7e6e5b974852aeba201db255e0ead9700f13a83ea7660c5fa3721dc7524a49c6033a594ae9c4cb73131009c294ccf1984e8fae283dea7e203dc74

data/lib/specinfra/backend/exec.rb

@@ -191,7 +191,18 @@ module SpecInfra
         elsif run_command('ls /etc/system-release')[:exit_status] == 0
           { :family => 'RedHat', :release => nil } # Amazon Linux
         elsif run_command('ls /etc/debian_version')[:exit_status] == 0
-          distro = run_command("lsb_release -i | grep 'Distributor ID:' | awk '{print $3}'")[:stdout]
+          lsb_release = run_command("lsb_release -i")
+          if lsb_release[:exit_status] == 0
+            distro = $' if lsb_release[:stdout] =~ /:/
+          else
+            lsb_release = run_command("cat /etc/lsb-release")
+            if lsb_release[:exit_status] == 0
+              lsb_release[:stdout].each_line do |line|
+                distro = $' if line =~ /^DISTRIB_ID=/
+              end
+            end
+          end
+          distro ||= 'Debian'
           { :family => distro.strip, :release => nil }
         elsif run_command('ls /etc/gentoo-release')[:exit_status] == 0
           { :family => 'Gentoo', :release => nil }

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler