serverspec 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac29c488fa7b1d1346c1110303f0d9a99d17a46
-  data.tar.gz: e904dba7761bac6160e428dd54d9d3e8f7d61e63
+  metadata.gz: 81dfca1b27052f6fde88b707a39a88b9aa6b2f2d
+  data.tar.gz: 89eb5ad29b3113ef22451c013a5160797551f74b
 SHA512:
-  metadata.gz: d11501b36ff63604cf5e2508df4d64bdc5729ad277232f82f69f942ad24c843bbb0cef562a577962d5bb3b589c88dea15ad939eec9ad0de9cd80b48af378b09d
-  data.tar.gz: 7936003b36cb17bf752cfd6e359dfce04141599f9db85c9c1357498b899a138e6375c1ac82275847f127119f1445fd1eeacef6aa2719d1469c1e9162831aed1d
+  metadata.gz: 44674d6f99cacae928100c6abcb4101107721eb33ba53eea3b27c05d3d2889ed4cf37c3ceb383c4af163599b35f2e1bb4254b36a09fdc62d178e3a072100dce8
+  data.tar.gz: bd01d518d19c6f06a32c454aac243e9a70b562526e0da8102a992f3dbb95bae4119d00dc7659cf9b6e179c922f9dc8f1aaf6f862c8ec666d068b70a0439a85ab

data/lib/serverspec/backend/ssh.rb

@@ -19,9 +19,9 @@ module Serverspec
       def build_command(cmd)
         cmd = super(cmd)
         if RSpec.configuration.ssh.options[:user] != 'root'
-          cmd = "sudo #{cmd}"
-          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1sudo ")
-          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1sudo ")
+          cmd = "#{sudo} #{cmd}"
+          cmd.gsub!(/(\&\&\s*!?\(?\s*)/, "\\1#{sudo} ")
+          cmd.gsub!(/(\|\|\s*!?\(?\s*)/, "\\1#{sudo} ")
         end
         cmd
       end
@@ -31,7 +31,7 @@ module Serverspec
         user = RSpec.configuration.ssh.options[:user]
         pre_command = Serverspec.configuration.pre_command
         if pre_command && user != 'root'
-          cmd = "sudo #{cmd}"
+          cmd = "#{sudo} #{cmd}"
         end
         cmd
       end
@@ -75,6 +75,16 @@ module Serverspec
         ssh.loop
         { :stdout => stdout_data, :stderr => stderr_data, :exit_status => exit_status, :exit_signal => exit_signal }
       end
+
+      def sudo
+        sudo_path = Serverspec.configuration.sudo_path || RSpec.configuration.sudo_path
+        if sudo_path
+          "#{sudo_path}/sudo"
+        else
+          'sudo'
+        end
+      end
+
     end
   end
 end

data/lib/serverspec/commands/base.rb

@@ -248,6 +248,10 @@ module Serverspec
       def check_kernel_module_loaded(name)
         raise NotImplementedError.new
       end
+
+      def check_ipv4_address(interface, ip_address)
+        raise NotImplementedError.new
+      end
     end
   end
 end

data/lib/serverspec/commands/linux.rb

@@ -32,6 +32,17 @@ module Serverspec
       def get_interface_speed_of(name)
         "ethtool #{name} | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\\/s/,\"\\\\1\",\"\")}'"
       end
+
+      def check_ipv4_address(interface, ip_address)
+        ip_address = ip_address.dup
+        if ip_address =~ /\/\d+$/
+          ip_address << " "
+        else
+          ip_address << "/"
+        end
+        ip_address.gsub!(".", "\\.")
+        "ip addr show #{interface} | grep 'inet #{ip_address}'"
+      end
     end
   end
 end

data/lib/serverspec/configuration.rb

@@ -1,7 +1,7 @@
 module Serverspec
   module Configuration
     class << self
-      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr].freeze
+      VALID_OPTIONS_KEYS = [:path, :pre_command, :stdout, :stderr, :sudo_path].freeze
       attr_accessor(*VALID_OPTIONS_KEYS)
     
       def defaults

data/lib/serverspec/type/interface.rb

@@ -7,6 +7,10 @@ module Serverspec
         val = val.to_i if val.match(/^\d+$/)
         val
       end
+
+      def has_ipv4_address?(ip_address)
+        backend.check_ipv4_address(@name, ip_address)
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "0.7.7"
+  VERSION = "0.7.8"
 end

data/spec/backend/ssh/build_command_spec.rb

@@ -8,8 +8,9 @@ ssh = double
 describe 'build command with sudo' do
   before :each do
     RSpec.configure do |c|
-      ssh.stub(:options) { { :user => 'foo'  } }
+      ssh.stub(:options) { { :user => 'foo' } }
       c.ssh = ssh
+      c.sudo_path = nil
     end
   end
 
@@ -20,7 +21,7 @@ describe 'build command with sudo' do
 
   context 'command pattern 2' do
     subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
-      it { should eq 'sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
+    it { should eq 'sudo test ! -f /etc/selinux/config || (sudo getenforce | grep -i -- disabled && sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)' }
   end
 
   context 'command pattern 3' do
@@ -28,3 +29,39 @@ describe 'build command with sudo' do
     it { should eq "sudo dpkg -s apache2 && ! sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
   end
 end
+
+# Alternate path for sudo command:
+sudo_path = '/usr/local/bin'
+
+describe 'build command with sudo on alternate path' do
+  before :each do
+    RSpec.configure do |c|
+      ssh.stub(:options) { { :user => 'foo' } }
+      c.ssh = ssh
+      c.sudo_path = "#{sudo_path}"
+    end
+  end
+
+
+  context 'command pattern 1a' do
+    subject { backend.build_command('test -f /etc/passwd') }
+    it { should eq "#{sudo_path}/sudo test -f /etc/passwd" }
+  end
+
+  context 'command pattern 2a' do
+    subject { backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)') }
+    it { should eq "#{sudo_path}/sudo test ! -f /etc/selinux/config || (#{sudo_path}/sudo getenforce | grep -i -- disabled && #{sudo_path}/sudo grep -i -- ^SELINUX=disabled$ /etc/selinux/config)" }
+  end
+
+  context 'command pattern 3a' do
+    subject { backend.build_command("dpkg -s apache2 && ! dpkg -s apache2 | grep -E '^Status: .+ not-installed$'") }
+    it { should eq "#{sudo_path}/sudo dpkg -s apache2 && ! #{sudo_path}/sudo dpkg -s apache2 | grep -E '^Status: .+ not-installed$'" }
+  end
+
+  after :each do
+    RSpec.configure do |c|
+      c.sudo_path = nil
+    end
+  end
+
+end

data/spec/debian/interface_spec.rb

@@ -8,6 +8,16 @@ describe interface('eth0') do
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }

data/spec/gentoo/interface_spec.rb

@@ -8,6 +8,16 @@ describe interface('eth0') do
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }

data/spec/redhat/interface_spec.rb

@@ -8,6 +8,16 @@ describe interface('eth0') do
   its(:command) { should eq "ethtool eth0 | grep Speed | gawk '{print gensub(/Speed: ([0-9]+)Mb\\/s/,\"\\\\1\",\"\")}'" }
 end
 
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/'" }
+end
+
+describe interface('eth0') do
+  it { should have_ipv4_address("192.168.10.10/24") }
+  its(:command) { should eq "ip addr show eth0 | grep 'inet 192\\.168\\.10\\.10/24 '" }
+end
+
 describe interface('invalid-interface') do
   let(:stdout) { '1000' }
   its(:speed) { should_not eq 100 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-10 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh