specinfra 2.0.0.beta51 → 2.0.0.beta52

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 15b0502bc6480974e8876780da51b4276f69a1d1
+  data.tar.gz: a91ce8c69fda76480d00980822e18ab17e1c9afa
+SHA512:
+  metadata.gz: 94e622f6476db5f8feab99f22604e252be47257b4a07d6225595c7ba25aa0329a2e55a102ac65820b25361e46b9d7b950c5a4c37a2e4764585d833e57ff654fb
+  data.tar.gz: e1b0ae6459ac7245c272b205372159d106887b1b14eeff6bde943a096ed8b0b7466781935bb2c4664459dcf1ba4ced8999031da8e34abfb7c3424f1322922a83

data/lib/specinfra/command.rb

@@ -162,6 +162,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 '^#{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(/^(\S+)\s+(\S+).*?(\S+[0-9]+)(\s*)$/)
+	actual_attr = {
+	  :destination => $1,
+	  :gateway     => $2,
+	  :interface   => expected_attr[:interface] ? $3 : 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
@@ -144,10 +153,12 @@ module Specinfra
       ret.stdout.gsub!(/\r\n/, "\n")
 
       if os[:family] == 'openbsd'
-        # This code does not work with Ruby 1.8.7.
-        # So commented out.
-        # match = ret.stdout.match(/^(?<destination>\S+)\s+(?<gateway>\S+).*?(?<interface>\S+[0-9]+)(\s*)$/)
-        # match[attr]
+        match = ret.stdout.match(/^(\S+)\s+(\S+).*?(\S+[0-9]+)(\s*)$/)
+        if attr == :gateway
+          $2
+        elsif attr == :interface
+          $3
+        end
       else
         ret.stdout =~ /^(\S+)(?: via (\S+))? dev (\S+).+\n(?:default via (\S+))?/
         if attr == :gateway

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.0.0.beta51"
+  VERSION = "2.0.0.beta52"
 end

metadata

@@ -1,125 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: specinfra
-version: !ruby/object:Gem::Version 
-  hash: -3009863172
-  prerelease: 6
-  segments: 
-  - 2
-  - 0
-  - 0
-  - beta
-  - 51
-  version: 2.0.0.beta51
+version: !ruby/object:Gem::Version
+  version: 2.0.0.beta52
 platform: ruby
-authors: 
+authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-02 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-10-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-ssh
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-scp
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 73
-        segments: 
-        - 10
-        - 1
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.1.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-its
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Common layer for serverspec and itamae
-email: 
+email:
 - gosukenator@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .gitmodules
-- .travis.yml
+files:
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -247,6 +231,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
@@ -367,43 +352,31 @@ files:
 - spec/spec_helper.rb
 - specinfra.gemspec
 - wercker.yml
-has_rdoc: true
-homepage: ""
-licenses: 
+homepage: ''
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Common layer for serverspec and itamae
-test_files: 
+test_files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/ssh/build_command_spec.rb