specinfra 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15732552ecb38106eeeaddf39492ea2612181a8d
-  data.tar.gz: 0014a3d0dead5a721dfca1944c8627de316b12de
+  metadata.gz: f67f6404a72167028cc78c1347bd67da39f57205
+  data.tar.gz: d6fe99bbcc3f6b80d18319bb85b472ee0dd37abf
 SHA512:
-  metadata.gz: 330a3e39284e1c610adbda642acb90fb1b35898ad3c64cfb7aef284a2ac9c2a2d7660681bb1f134935c5fd3ab1bb51e74942aa971afa45103fe82ed67f6d07b6
-  data.tar.gz: 587aff1fff9c7d78ee72aa34d30cc5f0b919fab6ec82d0f2e0678f6e8fbf203f1383854b67159e319b8d1a807a0bb493769996dc70b049cabb09d80154dfbec3
+  metadata.gz: d73b47ee671274ed47e26b7d1a4b1dad79a7dd701fdc0af0fee4ba067425d30fd8608c29b7412884cd53b583733fc0d111545ed2cfd7021613bfd090a2b53a90
+  data.tar.gz: 647c9fbd5a46351fc3ff195d21ddc9f9dde50b5e6631429ec4c71aa46ee16711aa2a932af0a0dd7578a3f1fa7a2ee83313de7d030b32931f770341e23f09dc3a

data/lib/specinfra/backend/exec.rb

@@ -181,6 +181,7 @@ module SpecInfra
 
       def check_os
         return SpecInfra.configuration.os if SpecInfra.configuration.os
+        arch = run_command('uname -m').stdout.strip
         # Fedora also has an /etc/redhat-release so the Fedora check must
         # come before the RedHat check
         if run_command('ls /etc/fedora-release').success?
@@ -194,19 +195,20 @@ module SpecInfra
           if line =~ /release (\d[\d.]*)/
             release = $1
           end
+
           if release =~ /7./
-            { :family => 'RedHat7', :release => release }
+            { :family => 'RedHat7', :release => release, :arch => arch }
           else
-            { :family => 'RedHat', :release => release }
+            { :family => 'RedHat', :release => release, :arch => arch }
           end
         elsif run_command('ls /etc/system-release').success?
-          { :family => 'RedHat', :release => nil } # Amazon Linux
+          { :family => 'RedHat', :release => nil, :arch => arch } # Amazon Linux
         elsif run_command('ls /etc/SuSE-release').success?
           line = run_command('cat /etc/SuSE-release').stdout
           if line =~ /SUSE Linux Enterprise Server (\d+)/
             release = $1
           end
-          { :family => 'SuSE', :release => release }
+          { :family => 'SuSE', :release => release, :arch => arch }
         elsif run_command('ls /etc/debian_version').success?
           lsb_release = run_command("lsb_release -ir")
           if lsb_release.success?
@@ -225,37 +227,37 @@ module SpecInfra
           end
           distro ||= 'Debian'
           release ||= nil
-          { :family => distro.strip, :release => release }
+          { :family => distro.strip, :release => release, :arch => arch }
         elsif run_command('ls /etc/gentoo-release').success?
-          { :family => 'Gentoo', :release => nil }
+          { :family => 'Gentoo', :release => nil, :arch => arch }
         elsif run_command('ls /usr/lib/setup/Plamo-*').success?
-          { :family => 'Plamo', :release => nil }
+          { :family => 'Plamo', :release => nil, :arch => arch }
         elsif run_command('uname -s').stdout =~ /AIX/i
-          { :family => 'AIX', :release => nil }
-        elsif (os = run_command('uname -sr').stdout) && os =~ /SunOS/i
-          if os =~ /5.10/
-            { :family => 'Solaris10', :release => nil }
+          { :family => 'AIX', :release => nil, :arch => arch }
+        elsif ( uname = run_command('uname -sr').stdout) && uname =~ /SunOS/i
+          if uname =~ /5.10/
+            { :family => 'Solaris10', :release => nil, :arch => arch }
           elsif run_command('grep -q "Oracle Solaris 11" /etc/release').success?
-            { :family => 'Solaris11', :release => nil }
+            { :family => 'Solaris11', :release => nil, :arch => arch }
           elsif run_command('grep -q SmartOS /etc/release').success?
-            { :family => 'SmartOS', :release => nil }
+            { :family => 'SmartOS', :release => nil, :arch => arch }
           else
-            { :family => 'Solaris', :release => nil }
+            { :family => 'Solaris', :release => nil, :arch => arch }
           end
         elsif run_command('uname -s').stdout =~ /Darwin/i
           { :family => 'Darwin', :release => nil }
-        elsif (os = run_command('uname -sr').stdout) && os =~ /FreeBSD/i
-          if os =~ /10./
-            { :family => 'FreeBSD10', :release => nil }
+        elsif ( uname = run_command('uname -sr').stdout ) && uname =~ /FreeBSD/i
+          if uname =~ /10./
+            { :family => 'FreeBSD10', :release => nil, :arch => arch }
           else
-            { :family => 'FreeBSD', :release => nil }
+            { :family => 'FreeBSD', :release => nil, :arch => arch }
           end
         elsif run_command('uname -sr').stdout =~ /Arch/i
-          { :family => 'Arch', :release => nil }
+          { :family => 'Arch', :release => nil, :arch => arch }
         elsif run_command('uname -s').stdout =~ /OpenBSD/i
-          { :family => 'OpenBSD', :release => nil }
+          { :family => 'OpenBSD', :release => nil, :arch => arch }
         else
-          { :family => 'Base', :release => nil }
+          { :family => 'Base', :release => nil, :arch => arch }
         end
       end
 

data/lib/specinfra/configuration.rb

@@ -19,6 +19,15 @@ module SpecInfra
         VALID_OPTIONS_KEYS.inject({}) { |o, k| o.merge!(k => send(k)) }
       end
 
+      # Define os method explicitly to avoid stack level
+      # too deep caused by Helpet::DetectOS#os
+      def os
+        if @os.nil? && defined?(RSpec) && RSpec.configuration.respond_to?(:os)
+          @os = RSpec.configuration.os
+        end
+        @os
+      end
+
       def method_missing(meth, val=nil)
         key = meth.to_s
         key.gsub!(/=$/, '')

data/lib/specinfra/helper/detect_os.rb

@@ -2,17 +2,24 @@ module SpecInfra
   module Helper
     module DetectOS
       def commands
+        self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new
+      end
+
+      def os
         property[:os_by_host] = {} if ! property[:os_by_host]
         host = SpecInfra.configuration.ssh ? SpecInfra.configuration.ssh.host : 'localhost'
 
         if property[:os_by_host][host]
-          os = property[:os_by_host][host]
+          os_by_host = property[:os_by_host][host]
         else
           # Set command object explicitly to avoid `stack too deep`
-          os = backend(SpecInfra::Command::Base.new).check_os
-          property[:os_by_host][host] = os
+          raise "crash me" if caller.length > 500
+          os_by_host = backend(SpecInfra::Command::Base.new).check_os
+
+          property[:os_by_host][host] = os_by_host
         end
-        self.class.const_get('SpecInfra').const_get('Command').const_get(os[:family]).new
+
+        os_by_host
       end
     end
   end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -35,56 +35,61 @@ 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
+          double(
+            :run_command_response,
+            :success? => true,
+            :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
+          )
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          mock_failure_response
+          double :run_command_response, :success? => false
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04'})
+      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
     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
+      backend.should_receive(:run_command).at_least(1).times do |args|
+        if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
+          double(
+            :run_command_response,
+            :success? => true,
+            :stdout => <<-EOF
+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
+EOF
+          )
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          mock_failure_response
+          double :run_command_response, :success? => false
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04'})
+      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
     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
+        if args == 'ls /etc/debian_version'
+          double :run_command_response, :success? => true
+        elsif args == 'uname -m'
+          double :run_command_response, :success? => true, :stdout => "x86_64\n"
+        else
+          double :run_command_response, :success? => false
+        end
       end
-      should eq({:family => 'Debian', :release => nil})
+      should eq({:family => 'Debian', :release => nil, :arch => 'x86_64' })
     end
   end
 end

data/spec/configuration_spec.rb

@@ -7,3 +7,8 @@ end
 describe RSpec.configuration.path do
   it { should eq SpecInfra.configuration.path }
 end
+
+SpecInfra.configuration.os = 'foo'
+describe SpecInfra.configuration.os do
+  it { should eq 'foo' }
+end

metadata

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