specinfra 2.0.0.beta49 → 2.0.0.beta50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57c43910f7e3383297771e203b9487ac3832ce66
-  data.tar.gz: b3c1c7ca91123663db49c35409ac0a7a25349c8a
+  metadata.gz: 84744a7a631801a67ee1cb4357dc3b19be41c06f
+  data.tar.gz: 85a4c8ca8abdb1de2c532bbfc6a54d4aa994e3df
 SHA512:
-  metadata.gz: 30552786b192a05a2b4ce8c21959561c62e238d3e05f42150373a82788a9b2dccd14732e590ca551b78a5a9dfee0795cb8abc9f9a4ced8cd00819edc203343ab
-  data.tar.gz: 534f203f6b2fc78ac298a5169b95490aa4af0c5489e1ba060c8ba786f2d30ba6d0929dfff0e1cf47d311b05715e191d59f3d5bdd73144ff5171dedf6e972143e
+  metadata.gz: 5ebe9832eb880d67db5c597465cae89c4b1aec7251af8e119153d20eeca7ee300796fe9faf8b8e29fc9c91fc8239508ccc9a15e813e9c958eeabb5a844057240
+  data.tar.gz: 5c37468b41ed148f2512fc065b6f91125de428751ad5020fd51ba220ab4dd2869ab5e7535fb322f3d57d4af46c38dacd2a6b201cceb19ac386d620a2b789eb33

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

@@ -1,7 +1,7 @@
 class Specinfra::Command::Openbsd::Base::RoutingTable < Specinfra::Command::Base::RoutingTable
   class << self
     def check_has_entry(destination)
-      "route -n show -gateway | egrep '(^default|#{destination})' | head -1"
+      "route -n show -gateway | egrep '^#{destination}' | head -1"
     end
 
     alias :get_entry :check_has_entry

data/lib/specinfra/processor.rb

@@ -124,7 +124,7 @@ module Specinfra
       ret.stdout.gsub!(/\r\n/, "\n")
 
       if os[:family] == 'openbsd'
-        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)$/)
+        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
 	actual_attr = {
 	  :destination => match[:destination],
 	  :gateway     => match[:gateway],
@@ -144,5 +144,25 @@ module Specinfra
       end
       true
     end
+
+    def self.get_default_gateway(attr)
+      cmd = Specinfra.command.get(:get_routing_table_entry, 'default')
+      ret = Specinfra.backend.run_command(cmd)
+      return false if ret.failure?
+
+      ret.stdout.gsub!(/\r\n/, "\n")
+
+      if os[:family] == 'openbsd'
+        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
+	match[attr]
+      else
+        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
+	if attr == :gateway
+	  $2 ? $2 : $4
+	elsif attr == :interface
+	  $3
+	end
+      end
+    end
   end
 end

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta49"
+  VERSION = "2.0.0.beta50"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta49
+  version: 2.0.0.beta50
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh