specinfra 2.0.0.beta48 → 2.0.0.beta49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 577fd3b2ff3d56cf563cae10864298009865e6d4
-  data.tar.gz: 9492bf5c9b869f970fe038cf922d51f29ff8df23
+  metadata.gz: 57c43910f7e3383297771e203b9487ac3832ce66
+  data.tar.gz: b3c1c7ca91123663db49c35409ac0a7a25349c8a
 SHA512:
-  metadata.gz: 2c39424a9216178cc408ec808164e122846646761f36aaf3b5f09d7e978758667c8429da2a50f285c0e5e721af5f1bfd23a409e6673bf9ec4cdb4948c0ee4ebb
-  data.tar.gz: 59806cff36f20271f23f12f027f57ecf8905e220db0ef80347c82abad76a7dd3e24a93596f92fb939d7739e91d91d9ffe199edf50bc386b9dc9f66d7e0c20814
+  metadata.gz: 30552786b192a05a2b4ce8c21959561c62e238d3e05f42150373a82788a9b2dccd14732e590ca551b78a5a9dfee0795cb8abc9f9a4ced8cd00819edc203343ab
+  data.tar.gz: 534f203f6b2fc78ac298a5169b95490aa4af0c5489e1ba060c8ba786f2d30ba6d0929dfff0e1cf47d311b05715e191d59f3d5bdd73144ff5171dedf6e972143e

data/lib/specinfra/command.rb

@@ -160,6 +160,7 @@ require 'specinfra/command/openbsd/base/interface'
 require 'specinfra/command/openbsd/base/mail_alias'
 require 'specinfra/command/openbsd/base/package'
 require 'specinfra/command/openbsd/base/port'
+require 'specinfra/command/openbsd/base/routing_table'
 require 'specinfra/command/openbsd/base/service'
 require 'specinfra/command/openbsd/base/user'
 

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

@@ -0,0 +1,9 @@
+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"
+    end
+
+    alias :get_entry :check_has_entry
+  end
+end

data/lib/specinfra/processor.rb

@@ -123,12 +123,21 @@ module Specinfra
 
       ret.stdout.gsub!(/\r\n/, "\n")
 
-      ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
-      actual_attr = {
-        :destination => $1,
-        :gateway     => $2 ? $2 : $4,
-        :interface   => expected_attr[:interface] ? $3 : nil
-      }
+      if os[:family] == 'openbsd'
+        match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)$/)
+	actual_attr = {
+	  :destination => match[:destination],
+	  :gateway     => match[:gateway],
+	  :interface   => expected_attr[:interface] ? match[:interface] : nil
+	}
+      else
+        ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
+        actual_attr = {
+          :destination => $1,
+          :gateway     => $2 ? $2 : $4,
+          :interface   => expected_attr[:interface] ? $3 : nil
+        }
+      end
 
       expected_attr.each do |key, val|
         return false if actual_attr[key] != val

data/lib/specinfra/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta48
+  version: 2.0.0.beta49
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -229,6 +229,7 @@ files:
 - lib/specinfra/command/openbsd/base/mail_alias.rb
 - lib/specinfra/command/openbsd/base/package.rb
 - lib/specinfra/command/openbsd/base/port.rb
+- lib/specinfra/command/openbsd/base/routing_table.rb
 - lib/specinfra/command/openbsd/base/service.rb
 - lib/specinfra/command/openbsd/base/user.rb
 - lib/specinfra/command/opensuse.rb