specinfra 2.71.2 → 2.71.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910bd1387e77159f6c75c7f4ab3f96b4b02434d2
-  data.tar.gz: 4507ac82b294370809a5bf4e0c0873e9b2145458
+  metadata.gz: a81bee062c4fecdd2fb6f378644ea7bc5d0a8ef3
+  data.tar.gz: f268f41467710403fba283d362da03658ce922e0
 SHA512:
-  metadata.gz: 525fd01d92ffe72fc5eb009d00936bd0e269aa77822698705d15b330b050d855b4539b1d8845037fec0eba1b59a56ee27afabe825ec57a675dec0de64574d55b
-  data.tar.gz: 4ee0713c3d72adae1e494cc49a30d28a1c3ea658a9196383cb19d8b30f659c052fe5cafa94f5ef7395d3b9fd25697cab443cf0ee45c23ba6e4307935b8b19e73
+  metadata.gz: 749cda56dd1345490109ac381e464b2e57eac2f7637ffa1aa6c270d2ad3c9c44b65c7aebd650f3a655c5e357e49319cedb0f1e7678df5c9cae36d397a5dac379
+  data.tar.gz: e4a59f70f760825313796d32a6e91283f8146c55a316e8f1b43ee6a39a9deabb989388b7e0cc551b86963279ebc414499d1afbe0a3d22121c4436f15c87ed591

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

@@ -1,7 +1,10 @@
 class Specinfra::Command::Base::RoutingTable < Specinfra::Command::Base
   class << self
     def check_has_entry(destination)
-      "ip route show #{destination} | grep #{destination}"
+      if destination == "default"
+        destination = "0.0.0.0/0"
+      end
+      "ip route show #{destination}"
     end
 
     alias :get_entry :check_has_entry

data/lib/specinfra/processor.rb

@@ -175,7 +175,7 @@ module Specinfra
           :interface   => expected_attr[:interface] ? $3 : nil
         }
       else
-        matches = ret.stdout.scan(/^(\S+)(?: via (\S+))? dev (\S+).+\n|^(\S+).+\n|\s+nexthop via (\S+)\s+dev (\S+).+/)
+        matches = ret.stdout.scan(/^(\S+)(?: via (\S+))? dev (\S+).+\n|^(\S+).*\n|\s+nexthop via (\S+)\s+dev (\S+).+/)
         if matches.length > 1
           # ECMP route
           destination = nil
@@ -183,9 +183,9 @@ module Specinfra
             if groups[3]
               destination = groups[3]
               next
-            else
-              next unless expected_attr[:interface] == groups[5]
             end
+            next if expected_attr[:gateway] && expected_attr[:gateway] != groups[4]
+            next if expected_attr[:interface] && expected_attr[:interface] != groups[5]
 
             actual_attr = {
               :destination => destination,

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.71.2"
+  VERSION = "2.71.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.71.2
+  version: 2.71.3
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp