specinfra 2.37.5 → 2.37.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26aae46d93a52fe9be0bf48a361b4fc7df7dac7d
-  data.tar.gz: 8d5d8091031b25961d6fa92ccc173be8e698bda9
+  metadata.gz: 36a656182853eec32ae07fd4664afd2c25ed6425
+  data.tar.gz: 4f42b1d1155f8617a6ab60d85ece08ffb3a05d6e
 SHA512:
-  metadata.gz: 4c4dc1b2806c1d9e4eb821cfebb64c25c9404bc2357f2db47eb60a15f82450828a00cd9e78ed828bd70ce43f7e18e87a9324cd1616b37fdac61a24e9a658ee76
-  data.tar.gz: b6152e6dc12d93169fd73c60e2d6ca037998b6fc33eeff9c28f86fc14426d76f17cacbf26d7334d4b4077c0f72f9715936f1d055480f594cf8c341800ebd5c8b
+  metadata.gz: 5838d02f668de7a7f1c025b2c77b04be3ae32297348412c6911fbd4439d38e3db815bd6e1c0030df9576894fc50fa02e24dfcd4616779511fcd4da9094fe3c10
+  data.tar.gz: 2f525eaf1bc2c90af280af07ec00fbc233c5466fd4a97e027773814c020889f9f31a3c8b497e748b9db8b1c4fbef1a90d588a06424eb5c322e89cd7619595120

data/lib/specinfra/command.rb

@@ -79,6 +79,7 @@ require 'specinfra/command/esxi/base/package'
 require 'specinfra/command/redhat'
 require 'specinfra/command/redhat/base'
 require 'specinfra/command/redhat/base/file'
+require 'specinfra/command/redhat/base/host'
 require 'specinfra/command/redhat/base/iptables'
 require 'specinfra/command/redhat/base/package'
 require 'specinfra/command/redhat/base/service'
@@ -90,6 +91,7 @@ require 'specinfra/command/redhat/v5/iptables'
 
 # RedHat V7 (inherit RedHat)
 require 'specinfra/command/redhat/v7'
+require 'specinfra/command/redhat/v7/host'
 require 'specinfra/command/redhat/v7/service'
 require 'specinfra/command/redhat/v7/port'
 

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

@@ -0,0 +1,2 @@
+class Specinfra::Command::Redhat::Base::Host < Specinfra::Command::Base::Host
+end

data/lib/specinfra/command/redhat/v7/host.rb

@@ -0,0 +1,15 @@
+class Specinfra::Command::Redhat::V7::Host < Specinfra::Command::Redhat::Base::Host
+  class << self
+    def check_is_reachable(host, port, proto, timeout)
+      if port.nil?
+        "ping -w #{escape(timeout)} -c 2 -n #{escape(host)}"
+      else
+        # RHEL7 comes with ncat which does no longer sport the -z option
+        # hence this kludge
+        "ncat -vvvv#{escape(proto[0].chr)} #{escape(host)} #{escape(port)} " +
+        "-w #{escape(timeout)} -i #{escape(timeout)} 2>&1 | " +
+        "grep -q SUCCESS"
+      end
+    end
+  end
+end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.37.5"
+  VERSION = "2.37.6"
 end

data/spec/command/redhat/package_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+property[:os] = nil
 set :os, { :family => 'redhat' }
 
 describe  get_command(:check_package_is_installed, 'httpd') do

data/spec/command/redhat7/host_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+property[:os] = nil
+set :os, :family => 'redhat', :release => '7'
+
+
+describe get_command(:check_host_is_reachable, 'example.jp', '53', 'udp', 2) do 
+  it { should eq "ncat -vvvvu example.jp 53 -w 2 -i 2 2>&1 | grep -q SUCCESS" } 
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.37.5
+  version: 2.37.6
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -325,6 +325,7 @@ files:
 - lib/specinfra/command/redhat.rb
 - lib/specinfra/command/redhat/base.rb
 - lib/specinfra/command/redhat/base/file.rb
+- lib/specinfra/command/redhat/base/host.rb
 - lib/specinfra/command/redhat/base/iptables.rb
 - lib/specinfra/command/redhat/base/package.rb
 - lib/specinfra/command/redhat/base/port.rb
@@ -333,6 +334,7 @@ files:
 - lib/specinfra/command/redhat/v5.rb
 - lib/specinfra/command/redhat/v5/iptables.rb
 - lib/specinfra/command/redhat/v7.rb
+- lib/specinfra/command/redhat/v7/host.rb
 - lib/specinfra/command/redhat/v7/port.rb
 - lib/specinfra/command/redhat/v7/service.rb
 - lib/specinfra/command/smartos.rb
@@ -467,9 +469,10 @@ files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
-- spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
+- spec/command/redhat7/host_spec.rb
+- spec/command/redhat7/interface_spec.rb
 - spec/command/redhat7/port_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb
@@ -552,9 +555,10 @@ test_files:
 - spec/command/module/systemd_spec.rb
 - spec/command/module/zfs_spec.rb
 - spec/command/openbsd/file_spec.rb
-- spec/command/redhat/interface_spec.rb
 - spec/command/redhat/package_spec.rb
 - spec/command/redhat/service_spec.rb
+- spec/command/redhat7/host_spec.rb
+- spec/command/redhat7/interface_spec.rb
 - spec/command/redhat7/port_spec.rb
 - spec/command/redhat7/service_spec.rb
 - spec/command/ubuntu/ppa_spec.rb