specinfra 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b5eb5cdd5654ade31e57548e585ca3f90622a72
-  data.tar.gz: 4f5fb42d69cd7e1f52a69408f424771eb54b226f
+  metadata.gz: e5c2b978aecc51f4b3eeb4606557d80a3f78539d
+  data.tar.gz: 911aa8bac641318bcdee6fb1708c00ffb2e729b8
 SHA512:
-  metadata.gz: aed5b95b5bcb33e7c17cba8e8fb2c953142e86b63eeed6ee7eb93afa47c510c146b88948ec0e5d0591202767253d4e0f177dd1e49997e7dd002c843e83841f17
-  data.tar.gz: 3dd99383ec435fcb3bc65749a09b8d603c58693bb817997891b792de2fdad7c8111998749765a1eb32609fbd974ded943658277b4766a2d8da685796ac826406
+  metadata.gz: b034ba312e05484ca2585d3312e6ed0a1e305120f634cc331630b67cd964f5b7791ac7c31e1cffe0f48ab100d8a51c3d2909b70d14733acb13bf851ddddf77b6
+  data.tar.gz: 50735443098590029652c18dce3b20e6ebb251acfd27320d9853bcfc8274d6ba0344d0bb507440c8af84a7625658028eee612b1774932d4355f0c12c1b369d50

data/lib/specinfra/backend/exec.rb

@@ -196,19 +196,24 @@ module SpecInfra
           end
           { :family => 'SuSE', :release => release }
         elsif run_command('ls /etc/debian_version').success?
-          lsb_release = run_command("lsb_release -i")
+          lsb_release = run_command("lsb_release -ir")
           if lsb_release.success?
-            distro = $' if lsb_release.stdout =~ /:/
+            if lsb_release.stdout =~ /:/
+              distro = lsb_release.stdout.split("\n").first.split(':').last
+              release = lsb_release.stdout.split("\n").last.split(':').last.strip
+            end
           else
             lsb_release = run_command("cat /etc/lsb-release")
             if lsb_release.success?
               lsb_release.stdout.each_line do |line|
-                distro = $' if line =~ /^DISTRIB_ID=/
+                distro = line.split('=').last if line =~ /^DISTRIB_ID=/
+                release = line.split('=').last.strip if line =~ /^DISTRIB_RELEASE=/
               end
             end
           end
           distro ||= 'Debian'
-          { :family => distro.strip, :release => nil }
+          release ||= nil
+          { :family => distro.strip, :release => release }
         elsif run_command('ls /etc/gentoo-release').success?
           { :family => 'Gentoo', :release => nil }
         elsif run_command('ls /usr/lib/setup/Plamo-*').success?

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -30,3 +30,61 @@ describe 'build command with path' do
     end
   end
 end
+
+describe 'check_os' do
+  context 'test ubuntu with lsb_release command' do
+    subject { backend.check_os }
+    it do
+      mock_success_response = double(
+        :run_command_response,
+        :success? => true,
+        :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
+      )
+      mock_failure_response = double :run_command_response, :success? => false
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
+          mock_success_response
+        else
+          mock_failure_response
+        end
+      end
+      should eq({:family => 'Ubuntu', :release => '12.04'})
+    end
+  end
+
+  context 'test ubuntu with /etc/lsb-release' do
+    subject { backend.check_os }
+    it do
+      mock_success_response = double(
+        :run_command_response,
+        :success? => true,
+        :stdout => %Q(DISTRIB_ID=Ubuntu
+DISTRIB_RELEASE=12.04
+DISTRIB_CODENAME=precise
+DISTRIB_DESCRIPTION="Ubuntu 12.04.2 LTS"
+)
+      )
+      mock_failure_response = double :run_command_response, :success? => false
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
+          mock_success_response
+        else
+          mock_failure_response
+        end
+      end
+      should eq({:family => 'Ubuntu', :release => '12.04'})
+    end
+  end
+
+  context 'test debian (no lsb_release or lsb-release)' do
+    subject { backend.check_os }
+    it do
+      mock_success_response = double :run_command_response, :success? => true
+      mock_failure_response = double :run_command_response, :success? => false
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        args == 'ls /etc/debian_version' ? mock_success_response : mock_failure_response
+      end
+      should eq({:family => 'Debian', :release => nil})
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler