specinfra 2.52.0 → 2.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f646ff170ce099769c7f7d017c64f9539f8e2b26
-  data.tar.gz: 12363501f793feb74be015aca6d9b544ecaae1a7
+  metadata.gz: b02d08de2e1a388e5dd42aa9ff31b33baa4f2ce2
+  data.tar.gz: 00fb96fe4dab29973dea33064f9c388917e3f7b9
 SHA512:
-  metadata.gz: dae91ce7ac68a39d01832a207f6fb3a6e57b1bfb7b9e53c6936be485c432d2cf67e6e7a0058839b8ccfc8f516a94a5af2ae55b0abb5b2bd458107ded52a44b38
-  data.tar.gz: c6ad4d292a0b14c6f66e206605163167d166798dcb66dfde82a10c4a5627cce6670befed1511cfbda185fe3c1b07b712b49473d29ba6999c46affd4a14cd2054
+  metadata.gz: 778e52d2d12eb06670a45da2ef3400021e733507e45cc4a316df84b7f46bbe9d71ecb164f63bf1e4be29450891d1d1850a6c1c6e5db5df97eac56d44d53ebe4b
+  data.tar.gz: 146a3c424c10225a18e8b828a0b12dbfc82a43269af8eb8871435deaff35dc423142d44376b782a394bacb556731bff074ee453c673d0dbe0fa98285d71e3c3d

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

@@ -32,6 +32,15 @@ class Specinfra::Command::Darwin::Base::Interface < Specinfra::Command::Base::In
       "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
     end
 
+    def get_ipv4_address(interface)
+      "ifconfig #{interface} inet | grep inet | awk '{print $2}'"
+    end
+
+    def get_ipv6_address(interface)
+      # Awk refuses to print '/' even with using escapes or hex so workaround with sed employed here.
+      "ifconfig #{interface} inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit"
+    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.

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

@@ -1,4 +1,4 @@
-class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::Interface 
+class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::Interface
   class << self
     def check_exists(name)
       "ifconfig #{name}"
@@ -8,7 +8,7 @@ class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::I
       ip_address = ip_address.dup
       if ip_address =~ /\/\d+$/
         # remove the prefix - better would be to calculate the netmask
-        ip_address.gsub!(/\/\d+$/, "") 
+        ip_address.gsub!(/\/\d+$/, "")
       end
       ip_address << " "
       ip_address.gsub!(".", "\\.")
@@ -20,18 +20,27 @@ class Specinfra::Command::Freebsd::Base::Interface < Specinfra::Command::Base::I
       (ip_address, prefixlen) = ip_address.split(/\//)
       ip_address.downcase!
       if ip_address =~ /^fe80::/i
-        # link local needs the scope (interface) appended 
+        # link local needs the scope (interface) appended
         ip_address << "%#{interface}"
-      end 
-      unless prefixlen.to_s.empty? 
-        # append prefixlen 
+      end
+      unless prefixlen.to_s.empty?
+        # append prefixlen
         ip_address << " prefixlen #{prefixlen}"
-      else 
+      else
         ip_address << " "
       end
       "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
     end
 
+    def get_ipv4_address(interface)
+      "ifconfig #{interface} inet | grep inet | awk '{print $2}'"
+    end
+
+    def get_ipv6_address(interface)
+      # Awk refuses to print '/' even with using escapes or hex so workaround with sed employed here.
+      "ifconfig #{interface} inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit"
+    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.

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

@@ -34,9 +34,16 @@ class Specinfra::Command::Linux::Base::Interface < Specinfra::Command::Base::Int
       "ip -6 addr show #{interface} | grep 'inet6 #{ip_address}'"
     end
 
+    def get_ipv4_address(interface)
+      "ip -4 addr show #{interface} | grep #{interface}$ | awk '{print $2}'"
+    end
+
+    def get_ipv6_address(interface)
+      "ip -6 addr show #{interface} | grep inet6 | awk '{print $2}'"
+    end
+
     def get_link_state(name)
       "cat /sys/class/net/#{name}/operstate"
     end
   end
 end
-

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

@@ -1,4 +1,4 @@
-class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::Interface 
+class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::Interface
   class << self
     def check_exists(name)
       "ifconfig #{name}"
@@ -12,7 +12,7 @@ class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::I
       ip_address = ip_address.dup
       if ip_address =~ /\/\d+$/
         # remove the prefix - better would be to calculate the netmask
-        ip_address.gsub!(/\/\d+$/, "") 
+        ip_address.gsub!(/\/\d+$/, "")
       end
       ip_address << " "
       ip_address.gsub!(".", "\\.")
@@ -24,22 +24,31 @@ class Specinfra::Command::Openbsd::Base::Interface < Specinfra::Command::Base::I
       (ip_address, prefixlen) = ip_address.split(/\//)
       ip_address.downcase!
       if ip_address =~ /^fe80::/i
-        # link local needs the scope (interface) appended 
+        # link local needs the scope (interface) appended
         ip_address << "%#{interface}"
-      end 
-      unless prefixlen.to_s.empty? 
-        # append prefixlen 
+      end
+      unless prefixlen.to_s.empty?
+        # append prefixlen
         ip_address << " prefixlen #{prefixlen}"
-      else 
+      else
         ip_address << " "
       end
       "ifconfig #{interface} inet6 | grep 'inet6 #{ip_address}'"
     end
 
+    def get_ipv4_address(interface)
+      "ifconfig #{interface} inet | grep inet | awk '{print $2}'"
+    end
+
+    def get_ipv6_address(interface)
+      # Awk refuses to print '/' even with using escapes or hex so workaround with sed employed here.
+      "ifconfig #{interface} inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit"
+    end
+
     def get_link_state(interface)
       # Checks if interfaces is administratively up by parsing the options.
       # L1 check via status. Virtual interfaces like tapX missing the status will report up.
-      # Emulates operstate in linux with exception of the unknown status. 
+      # Emulates operstate in linux with exception of the unknown status.
       %Q{ifconfig #{interface} 2>&1 | awk -v s=down -F '[:<>,]' } +
       %Q{'NR == 1 && $3 == "UP" { s="up" }; /status:/ && $2 != " active" { s="down" }; END{ print s }'}
     end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.52.0"
+  VERSION = "2.53.0"
 end

data/spec/command/darwin/interface_spec.rb

@@ -32,7 +32,14 @@ describe get_command(:check_interface_has_ipv4_address, 'en0', '192.168.0.123/24
   it { should eq "ifconfig en0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
 end
 
+describe get_command(:get_interface_ipv4_address, 'en0') do
+  it { should eq "ifconfig en0 inet | grep inet | awk '{print $2}'" }
+end
+
+describe get_command(:get_interface_ipv6_address, 'en0') do
+  it { should eq "ifconfig en0 inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit" }
+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/freebsd/interface_spec.rb

@@ -27,6 +27,14 @@ describe get_command(:check_interface_has_ipv4_address, 'vtnet0', '192.168.0.123
   it { should eq "ifconfig vtnet0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
 end
 
+describe get_command(:get_interface_ipv4_address, 'vtnet0') do
+  it { should eq "ifconfig vtnet0 inet | grep inet | awk '{print $2}'" }
+end
+
+describe get_command(:get_interface_ipv6_address, 'vtnet0') do
+  it { should eq "ifconfig vtnet0 inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit" }
+end
+
 describe get_command(:get_interface_link_state, 'vtnet0') do
   it { should eq %Q{ifconfig -u vtnet0 2>&1 | awk -v s=up '/status:/ && $2 != "active" { s="down" }; END {print s}'} }
 end

data/spec/command/linux/interface_spec.rb

@@ -19,6 +19,14 @@ describe get_command(:check_interface_has_ipv4_address, 'eth0', '192.168.0.123/2
   it { should eq "ip -4 addr show eth0 | grep 'inet 192\\.168\\.0\\.123/24 '" }
 end
 
+describe get_command(:get_interface_ipv4_address, 'eth0') do
+  it { should eq "ip -4 addr show eth0 | grep eth0$ | awk '{print $2}'" }
+end
+
+describe get_command(:get_interface_ipv6_address, 'eth0') do
+  it { should eq "ip -6 addr show eth0 | grep inet6 | awk '{print $2}'" }
+end
+
 describe get_command(:get_interface_link_state, 'eth0') do
   it { should eq "cat /sys/class/net/eth0/operstate" }
 end

data/spec/command/openbsd/interface_spec.rb

@@ -4,7 +4,7 @@ property[:os] = nil
 set :os, :family => 'openbsd'
 
 describe get_command(:get_interface_speed_of, 'vio0') do
-  it { should eq "ifconfig vio0 | grep 'media\:' | perl -pe 's|.*media\:.*\\((.*?)\\)|\\1|'" } 
+  it { should eq "ifconfig vio0 | grep 'media\:' | perl -pe 's|.*media\:.*\\((.*?)\\)|\\1|'" }
 end
 
 describe get_command(:check_interface_has_ipv6_address, 'vio0', '2001:0db8:bd05:01d2:288a:1fc0:0001:10ee') do
@@ -31,8 +31,16 @@ describe get_command(:check_interface_has_ipv4_address, 'vio0', '192.168.0.123/2
   it { should eq "ifconfig vio0 inet | grep 'inet 192\\.168\\.0\\.123 '" }
 end
 
+describe get_command(:get_interface_ipv4_address, 'vio0') do
+  it { should eq "ifconfig vio0 inet | grep inet | awk '{print $2}'" }
+end
+
+describe get_command(:get_interface_ipv6_address, 'vio0') do
+  it { should eq "ifconfig vio0 inet6 | grep inet6 | awk '{print $2$3$4}' | sed 's/prefixlen/\//'; exit" }
+end
+
 describe get_command(:get_interface_link_state, 'vio0') do
   it do should eq %Q{ifconfig vio0 2>&1 | awk -v s=down -F '[:<>,]' } +
                   %Q{'NR == 1 && $3 == "UP" { s="up" }; /status:/ && $2 != " active" { s="down" }; END{ print s }'}
-  end 
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.52.0
+  version: 2.53.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp