specinfra 2.41.1 → 2.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7690b0b34b3029498e2a37c3fca96d59124f30ea
-  data.tar.gz: 5f61ef5c50888e88ec4d746264688089ca80f238
+  metadata.gz: aa5a4e0dbe8336562680e6edd462840713fd926c
+  data.tar.gz: 10341d7185fc49e9e711e4921db8f8189b35c0b9
 SHA512:
-  metadata.gz: 6b98a9801f5fcdb46f9fbe49cacd9c3fbc967ccdc5156e542678c0fd3334cd37dddfb118a1e10aca745329a3cbc5b2c9224412494e4324d3516bed5390bdd3b6
-  data.tar.gz: b1e0b990a47a296b1e2d67639c58183837303cbc24ecd5f88ef63c048b936aa41ed2c1ace43af871539c667a6ab4fc9565beee3c8d112ed5315b4321c71ff0c0
+  metadata.gz: 916bd11416a36f4cdef5c0157f7dd22d97a019479243509368d386334edb49b5911102b6bd4cafee5a98eb293f53fa478e47427e715f42295140b09d789473d2
+  data.tar.gz: 821b8f9cf6c7b44dc5d1f73fcc85c9d9cc42dc03dd0e9a5da6da81a8007d82ca5327c82bb5a78bdac08c87550219056591c56a9e23fc6e9b4e23750f8051f8d4

data/lib/specinfra/command.rb

@@ -234,6 +234,7 @@ require 'specinfra/command/openbsd/base/bond'
 require 'specinfra/command/openbsd/base/bridge'
 require 'specinfra/command/openbsd/base/file'
 require 'specinfra/command/openbsd/base/fstab'
+require 'specinfra/command/openbsd/base/host'
 require 'specinfra/command/openbsd/base/interface'
 require 'specinfra/command/openbsd/base/inventory'
 require 'specinfra/command/openbsd/base/mail_alias'

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

@@ -14,12 +14,23 @@ class Specinfra::Command::Base::Host < Specinfra::Command::Base
       if port.nil?
         "ping -w #{escape(timeout)} -c 2 -n #{escape(host)}"
       else
-        "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
+        "nc -w #{escape(timeout)} -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)}"
       end
     end
 
+    # getent hosts on a dualstack machine will most likely 
+    # return the ipv6 address to ensure one can more cleary
+    # define the outcome the ipv{4,6}_address are used. 
     def get_ipaddress(name)
       "getent hosts #{escape(name)} | awk '{print $1}'"
     end
+    def get_ipv4_address(name)
+      # Will return multiple values pick the first and exit
+      "getent ahostsv4 #{escape(name)} | awk '{print $1; exit}'"
+    end
+    def get_ipv6_address(name)
+      # Will return multiple values pick the first and exit
+      "getent ahostsv6 #{escape(name)} | awk '{print $1; exit}'"
+    end
   end
 end

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

@@ -7,5 +7,18 @@ class Specinfra::Command::Freebsd::Base::Host < Specinfra::Command::Base::Host
         "nc -vvvvz#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} -w #{escape(timeout)}"
       end
     end
+    def get_ipaddress(name)
+      # getent hosts will return both the ipv6 and ipv4 record.
+      # this will only pick the first one. (Linux behavior)
+      "getent hosts #{escape(name)} | awk '{print $1; exit}'"
+    end
+    def get_ipv4_address(name)
+      # May return multiple values pick the one matching ipv4
+      "getent hosts #{escape(name)} | awk '$1 ~ /^[0-9.]+$/ {print $1}'"
+    end
+    def get_ipv6_address(name)
+      # May return multiple values pick the one matching ipv6
+      "getent hosts #{escape(name)} | awk 'tolower($1) ~ /^[0-9a-f:]+$/ {print $1}'"
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+class Specinfra::Command::Openbsd::Base::Host < Specinfra::Command::Base::Host
+  class << self
+    def get_ipaddress(name)
+      # getent hosts will return both the ipv6 and ipv4 record.
+      # this will only pick the first one. (Linux behavior)
+      "getent hosts #{escape(name)} | awk '{print $1; exit}'"
+    end
+    def get_ipv4_address(name)
+      # May return multiple values pick the one matching ipv4
+      "getent hosts #{escape(name)} | awk '$1 ~ /^[0-9.]+$/ {print $1}'"
+    end
+    def get_ipv6_address(name)
+      # May return multiple values pick the one matching ipv6
+      "getent hosts #{escape(name)} | awk 'tolower($1) ~ /^[0-9a-f:]+$/ {print $1}'"
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.41.1"
+  VERSION = "2.42.0"
 end

data/spec/command/base/host_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+set :os, { :family => nil }
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', nil, 'tcp', 10) do 
+  it { should eq "ping -w 10 -c 2 -n pink.unicorn.com" } 
+end
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', '53', 'udp', 2) do 
+  it { should eq "nc -w 2 -vvvvzu pink.unicorn.com 53" } 
+end
+
+describe get_command(:get_host_ipaddress, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '{print $1}'" }
+end
+
+describe get_command(:get_host_ipv4_address, 'pink.unicorn.com') do 
+  it { should eq "getent ahostsv4 pink.unicorn.com | awk '{print $1; exit}'" } 
+end 
+
+describe get_command(:get_host_ipv6_address, 'pink.unicorn.com') do 
+  it { should eq "getent ahostsv6 pink.unicorn.com | awk '{print $1; exit}'" } 
+end 

data/spec/command/freebsd/host_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'freebsd'
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', nil, 'tcp', 10) do 
+  it { should eq "ping -t 10 -c 2 -n pink.unicorn.com"} 
+end
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', 53, 'udp', 66) do 
+  it { should eq "nc -vvvvzu pink.unicorn.com 53 -w 66" } 
+end
+
+describe get_command(:get_host_ipaddress, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '{print $1; exit}'" }
+end
+
+describe get_command(:get_host_ipv4_address, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '$1 ~ /^[0-9.]+$/ {print $1}'" }
+end 
+
+describe get_command(:get_host_ipv6_address, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk 'tolower($1) ~ /^[0-9a-f:]+$/ {print $1}'" }
+end 

data/spec/command/openbsd/host_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'openbsd'
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', nil, 'tcp', 10) do 
+  it { should eq "ping -w 10 -c 2 -n pink.unicorn.com"} 
+end
+
+describe get_command(:check_host_is_reachable, 'pink.unicorn.com', 53, 'udp', 66) do 
+  it { should eq "nc -w 66 -vvvvzu pink.unicorn.com 53" } 
+end
+
+describe get_command(:get_host_ipaddress, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '{print $1; exit}'" }
+end
+
+describe get_command(:get_host_ipv4_address, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '$1 ~ /^[0-9.]+$/ {print $1}'" }
+end 
+
+describe get_command(:get_host_ipv6_address, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk 'tolower($1) ~ /^[0-9a-f:]+$/ {print $1}'" }
+end 

data/spec/command/redhat7/host_spec.rb

@@ -11,3 +11,15 @@ end
 describe get_command(:check_host_is_reachable, 'example.jp', '80', 'tcp', 3) do 
   it { should eq "ncat -vvvvt example.jp 80 -w 3 -i 3 2>&1 | grep -q SUCCESS" } 
 end
+
+describe get_command(:get_host_ipaddress, 'pink.unicorn.com') do 
+  it { should eq "getent hosts pink.unicorn.com | awk '{print $1}'" }
+end
+
+describe get_command(:get_host_ipv4_address, 'pink.unicorn.com') do 
+  it { should eq "getent ahostsv4 pink.unicorn.com | awk '{print $1; exit}'" } 
+end 
+
+describe get_command(:get_host_ipv6_address, 'pink.unicorn.com') do 
+  it { should eq "getent ahostsv6 pink.unicorn.com | awk '{print $1; exit}'" } 
+end 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.41.1
+  version: 2.42.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -310,6 +310,7 @@ files:
 - lib/specinfra/command/openbsd/base/bridge.rb
 - lib/specinfra/command/openbsd/base/file.rb
 - lib/specinfra/command/openbsd/base/fstab.rb
+- lib/specinfra/command/openbsd/base/host.rb
 - lib/specinfra/command/openbsd/base/interface.rb
 - lib/specinfra/command/openbsd/base/inventory.rb
 - lib/specinfra/command/openbsd/base/mail_alias.rb
@@ -458,6 +459,7 @@ files:
 - spec/command/amazon/service_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
+- spec/command/base/host_spec.rb
 - spec/command/base/localhost_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb
@@ -467,6 +469,7 @@ files:
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
@@ -483,6 +486,7 @@ files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
+- spec/command/openbsd/host_spec.rb
 - spec/command/openbsd/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
@@ -550,6 +554,7 @@ test_files:
 - spec/command/amazon/service_spec.rb
 - spec/command/base/file_spec.rb
 - spec/command/base/group_spec.rb
+- spec/command/base/host_spec.rb
 - spec/command/base/localhost_spec.rb
 - spec/command/base/package_spec.rb
 - spec/command/base/user_spec.rb
@@ -559,6 +564,7 @@ test_files:
 - spec/command/esxi/package_spec.rb
 - spec/command/factory_spec.rb
 - spec/command/freebsd/file_spec.rb
+- spec/command/freebsd/host_spec.rb
 - spec/command/freebsd/interface_spec.rb
 - spec/command/linux/bond_spec.rb
 - spec/command/linux/bridge_spec.rb
@@ -575,6 +581,7 @@ test_files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
+- spec/command/openbsd/host_spec.rb
 - spec/command/openbsd/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
@@ -605,4 +612,3 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
-has_rdoc: