specinfra 1.25.8 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0acb5a58e038703cb59c6026b75e13183c636553
-  data.tar.gz: adc9f8bc532b1cf0599fe19d4c90f10c83850066
+  metadata.gz: 38340f2ab0fa6f2bb429b18c11f7b66ab4684d8a
+  data.tar.gz: ae98d7b97ccc70c47666f67b12722e04cedc0f7c
 SHA512:
-  metadata.gz: 863994e02a42ad21c0da540918cfd01b895a424d5f48182ad9daf088880fcc31784bbaac92aa0968c9042a8b52a9945e188e02802495edce20971d2d7ca753f6
-  data.tar.gz: e2e83d05c726c6b7cfc84e60f9ad1f34b53b429955ddf9bf1a3b0be7784d376900dac5e4fda448c7ef8b785e19fe00e39410d8a2bed0b92bb394c619cfafac7d
+  metadata.gz: b32c5e713056475d8c5dfc51e5b13724fb14b0d08aa073edc7db798df425dd7251be359aae3130c2b10677362ff057451600efe9c3eb5b56a30bfdb5d8542dc5
+  data.tar.gz: 864c9350cdc8e6b2a9326af749126e9de92d937c3320c8e144a9d3c92f2c9e004fc8578127f0983a64a4f5e9cbe53719b9f054f3d965e0a58324132a348564f9

data/lib/specinfra/backend/ssh.rb

@@ -58,6 +58,7 @@ module SpecInfra
         exit_status = nil
         exit_signal = nil
         pass_prompt = SpecInfra.configuration.pass_prompt || /^\[sudo\] password for/
+        retry_prompt = /^Sorry, try again/
 
         ssh = SpecInfra.configuration.ssh
         ssh.open_channel do |channel|
@@ -69,7 +70,9 @@ module SpecInfra
           channel.exec("#{command}") do |ch, success|
             abort "FAILED: couldn't execute command (ssh.channel.exec)" if !success
             channel.on_data do |ch, data|
-              if data.match pass_prompt
+              if data.match retry_prompt
+                abort 'Wrong sudo password! Please confirm your password.'
+              elsif data.match pass_prompt
                 channel.send_data "#{SpecInfra.configuration.sudo_password}\n"
               else
                 stdout_data += data

data/lib/specinfra/command/base.rb

@@ -289,6 +289,10 @@ module SpecInfra
         raise NotImplementedError.new
       end
 
+      def check_ip6tables_rule(rule, table=nil, chain=nil)
+        raise NotImplementedError.new
+      end
+
       def check_zfs(zfs, property=nil, value=nil)
         raise NotImplementedError.new
       end

data/lib/specinfra/command/linux.rb

@@ -17,6 +17,18 @@ module SpecInfra
         cmd
       end
 
+      def check_ip6tables_rule(rule, table=nil, chain=nil)
+        cmd = "ip6tables"
+        cmd += " -t #{escape(table)}" if table
+        cmd += " -S"
+        cmd += " #{escape(chain)}" if chain
+        cmd += " | grep -- #{escape(rule)}"
+        cmd += " || ip6tables-save"
+        cmd += " -t #{escape(table)}" if table
+        cmd += " | grep -- #{escape(rule)}"
+        cmd
+      end
+
       def check_selinux(mode)
         cmd =  ""
         cmd += "test ! -f /etc/selinux/config || (" if mode == "disabled"

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.25.8"
+  VERSION = "1.26.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.25.8
+  version: 1.26.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler