specinfra 2.42.1 → 2.42.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 211b97ff28d60bfeda6954c6e605af14e4cd12ec
-  data.tar.gz: 93c326f9dc28ff0c2698ca9f774d0f5717ea14db
+  metadata.gz: 4ea31c3d4e34d354e605356de9b60c1775c637e9
+  data.tar.gz: c3f7cd796806023a44a23d1deb6ab105aecb2377
 SHA512:
-  metadata.gz: 277f327b85a7fe633f67683b7b75c2528cb4c02cd17d747aa0d91cba93ef82c4057cf05c6fe1a642296f76effdc335c7e3d5a902006c8b9a2b8d134994056640
-  data.tar.gz: a380d86cc801f2e6a0a132b652ce652839ce2aabd0a001a0f5bc6d0de32dd58e9ea004c54ad9c6c2ee10295b3f6c7f2f4a5a39564132fd9042f65f09dc4ccdab
+  metadata.gz: 68ebe02f33132a5862ec46f503ab75748415ec423f7261e234e7901ad6481c77496ff550634cf0eedcd19fe68153d5727a3adafa7c0ea8cac582470682051259
+  data.tar.gz: 2c5c00f86f0020a6c69241aaa79cd5e37ce6d91887ad8eed33e8eda45f120f0cbba7ac0f3f81bb3122940cdef0370fab68b3f87e15ab32e6c9d1f22f3ccaa5c6

data/lib/specinfra/command.rb

@@ -144,10 +144,12 @@ require 'specinfra/command/darwin'
 require 'specinfra/command/darwin/base'
 require 'specinfra/command/darwin/base/file'
 require 'specinfra/command/darwin/base/host'
+require 'specinfra/command/darwin/base/interface'
 require 'specinfra/command/darwin/base/inventory'
 require 'specinfra/command/darwin/base/service'
 require 'specinfra/command/darwin/base/package'
 require 'specinfra/command/darwin/base/port'
+require 'specinfra/command/darwin/base/process'
 require 'specinfra/command/darwin/base/user'
 
 # Debian (inherit Linux)

data/lib/specinfra/command/darwin/base/host.rb

@@ -3,7 +3,7 @@ class Specinfra::Command::Darwin::Base::Host < Specinfra::Command::Base::Host
     def check_is_resolvable(name, type)
       if type == "dns"
         ## try to resolve either A or AAAA record; grep is used to return the appropriate exit code
-        %Q{dig +short +time=1 -q #{escape(name)} a #{escape(name)} aaaa | grep -qie '^[0-9a-f:.]*$'}
+        %Q{dig +search +short +time=1 -q #{escape(name)} a #{escape(name)} aaaa | grep -qie '^[0-9a-f:.]*$'}
       elsif type == "hosts"
         "sed 's/#.*$//' /etc/hosts | grep -w -- #{escape(name)}"
       else

data/lib/specinfra/command/darwin/base/interface.rb

@@ -0,0 +1,42 @@
+class Specinfra::Command::Darwin::Base::Interface < Specinfra::Command::Base::Interface
+  class << self
+    def check_exists(name)
+      "ifconfig #{name}"
+    end
+
+    def check_has_ipv4_address(interface, ip_address)
+      ip_address = ip_address.dup
+      if ip_address =~ /\/\d+$/
+        # remove the prefix - better would be to calculate the netmask
+        ip_address.gsub!(/\/\d+$/, "")
+      end
+      ip_address << " "
+      ip_address.gsub!(".", "\\.")
+      "ifconfig #{interface} inet | grep 'inet #{ip_address}'"
+    end
+
+    def check_has_ipv6_address(interface, ip_address)
+      ip_address = ip_address.dup
+      (ip_address, prefixlen) = ip_address.split(/\//)
+      ip_address.downcase!
+      if ip_address =~ /^fe80::/i
+        # link local needs the scope (interface) appended
+        ip_address << "%#{interface}"
+      end
+      unless prefixlen.to_s.empty?
+        # append prefixlen
+        ip_address << " prefixlen #{prefixlen}"
+      else
+        ip_address << " "
+      end
+      "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
+    end
+
+    def get_link_state(interface)
+      # Checks if interfaces is administratively up with the -u arg.
+      # L1 check via status. Virtual interfaces like tapX missing the status will report up.
+      # Emulates operstate in linux with exception of the unknown status.
+      %Q{ifconfig -u #{interface} 2>&1 | awk -v s=up '/status:/ && $2 != "active" { s="down" }; END {print s}'}
+    end
+  end
+end

data/lib/specinfra/command/darwin/base/process.rb

@@ -0,0 +1,7 @@
+class Specinfra::Command::Darwin::Base::Process < Specinfra::Command::Base::Process
+  class << self
+    def get(process, opts)
+      "ps -A -c -o #{opts[:format]},command | grep -E -m 1 ^\\ *[0-9]+\\ +#{escape(process)}$ | awk '{print $1}'"
+    end
+  end
+end

data/lib/specinfra/command/ubuntu/base/ppa.rb

@@ -1,11 +1,11 @@
 class Specinfra::Command::Ubuntu::Base::Ppa < Specinfra::Command::Debian::Base::Ppa
   class << self
     def check_exists(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "deb +[\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "deb +[\\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     def check_is_enabled(package)
-      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +[\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
+      %Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +[\\"']?http://ppa.launchpad.net/#{to_apt_line_uri(package)}"}
     end
 
     private

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.42.1"
+  VERSION = "2.42.2"
 end

data/spec/backend/exec/build_command_spec.rb

@@ -12,6 +12,10 @@ describe Specinfra::Backend::Exec do
       it 'should escape special chars' do
         expect(Specinfra.backend.build_command('test ! -f /etc/selinux/config || (getenforce | grep -i -- disabled && grep -i -- ^SELINUX=disabled$ /etc/selinux/config)')).to eq '/bin/sh -c test\ \!\ -f\ /etc/selinux/config\ \|\|\ \(getenforce\ \|\ grep\ -i\ --\ disabled\ \&\&\ grep\ -i\ --\ \^SELINUX\=disabled\$\ /etc/selinux/config\)'
       end
+
+      it 'should escape quotes' do
+        expect(Specinfra.backend.build_command(%Q{find /etc/apt/ -name \*.list | xargs grep -o -E "^deb +[\\"']?http://ppa.launchpad.net/gluster/glusterfs-3.7"})).to eq('/bin/sh -c find\ /etc/apt/\ -name\ \*.list\ \|\ xargs\ grep\ -o\ -E\ \"\^deb\ \+\[\\\\\"\\\'\]\?http://ppa.launchpad.net/gluster/glusterfs-3.7\"')
+      end
     end
 
     context 'with custom shell' do

data/spec/command/darwin/host_spec.rb

@@ -4,7 +4,7 @@ property[:os] = nil
 set :os, :family => 'darwin'
 
 describe get_command(:check_host_is_resolvable, 'pink.unicorn.com', 'dns') do 
-  it { should eq "dig +short +time=1 -q pink.unicorn.com a pink.unicorn.com aaaa | grep -qie '^[0-9a-f:.]*$'" } 
+  it { should eq "dig +search +short +time=1 -q pink.unicorn.com a pink.unicorn.com aaaa | grep -qie '^[0-9a-f:.]*$'" } 
 end
 
 describe get_command(:check_host_is_resolvable, 'pink.unicorn.com', 'hosts') do 

data/spec/command/darwin/interface_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'darwin'
+
+
+describe get_command(:check_interface_exists, 'en0') do
+  it { should eq "ifconfig en0" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'en0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') do
+  it { should eq "ifconfig en0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee '" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'en0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee/64') do
+  it { should eq "ifconfig en0 inet6 | grep 'inet6 2001:0db8:bd05:01d2:288a:1fc0:0001:10ee prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'en0', 'fe80::5054:ff:fe01:10ee/64') do
+  it { should eq "ifconfig en0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%en0 prefixlen 64'" }
+end
+
+describe get_command(:check_interface_has_ipv6_address, 'en0', 'fe80::5054:ff:fe01:10ee') do
+  it { should eq "ifconfig en0 inet6 | grep 'inet6 fe80::5054:ff:fe01:10ee%en0 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'en0', '192.168.0.123') do
+  it { should eq "ifconfig en0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
+end
+
+describe get_command(:check_interface_has_ipv4_address, 'en0', '192.168.0.123/24') do
+  it { should eq "ifconfig en0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
+end
+
+describe get_command(:get_interface_link_state, 'en0') do
+  it { should eq %Q{ifconfig -u en0 2>&1 | awk -v s=up '/status:/ && $2 != "active" { s="down" }; END {print s}'} }
+end
+

data/spec/command/darwin/process_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+set :os, { :family => 'darwin' }
+
+describe get_command(:get_process, 'Google Chrome', :format => 'pid=') do
+  it { should eq "ps -A -c -o pid=,command | grep -E -m 1 ^\\ *[0-9]+\\ +Google\\ Chrome$ | awk '{print $1}'" }
+end

data/spec/command/ubuntu/ppa_spec.rb

@@ -4,9 +4,9 @@ property[:os] = nil
 set :os, :family => 'ubuntu'
 
 describe get_command(:check_ppa_exists, 'nginx/stable') do
-  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "deb +["']?http://ppa.launchpad.net/nginx/stable") }
+  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "deb +[\\\"']?http://ppa.launchpad.net/nginx/stable") }
 end
 
 describe get_command(:check_ppa_is_enabled, 'nginx/stable') do
-  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "^deb +["']?http://ppa.launchpad.net/nginx/stable") }
+  it { should eq %(find /etc/apt/ -name *.list | xargs grep -o -E "^deb +[\\\"']?http://ppa.launchpad.net/nginx/stable") }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.42.1
+  version: 2.42.2
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -229,9 +229,11 @@ files:
 - lib/specinfra/command/darwin/base.rb
 - lib/specinfra/command/darwin/base/file.rb
 - lib/specinfra/command/darwin/base/host.rb
+- lib/specinfra/command/darwin/base/interface.rb
 - lib/specinfra/command/darwin/base/inventory.rb
 - lib/specinfra/command/darwin/base/package.rb
 - lib/specinfra/command/darwin/base/port.rb
+- lib/specinfra/command/darwin/base/process.rb
 - lib/specinfra/command/darwin/base/service.rb
 - lib/specinfra/command/darwin/base/user.rb
 - lib/specinfra/command/debian.rb
@@ -467,6 +469,8 @@ files:
 - spec/command/base/user_spec.rb
 - spec/command/darwin/file_spec.rb
 - spec/command/darwin/host_spec.rb
+- spec/command/darwin/interface_spec.rb
+- spec/command/darwin/process_spec.rb
 - spec/command/darwin/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/esxi/package_spec.rb
@@ -565,6 +569,8 @@ test_files:
 - spec/command/base/user_spec.rb
 - spec/command/darwin/file_spec.rb
 - spec/command/darwin/host_spec.rb
+- spec/command/darwin/interface_spec.rb
+- spec/command/darwin/process_spec.rb
 - spec/command/darwin/user_spec.rb
 - spec/command/debian/service_spec.rb
 - spec/command/esxi/package_spec.rb
@@ -620,4 +626,3 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
-has_rdoc: