serverspec 2.0.0.beta7 → 2.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86276d22b163697d65c60b346e9b6e6b0ff9e5cb
-  data.tar.gz: 58808a070ee544fe9a86a7a3f50c52a35149ebcc
+  metadata.gz: 22d2a873870ecdddc00919f06be8c80c0a3d4f41
+  data.tar.gz: f2c1d92a9211eeda7a2f080dca4fc8a5eabf03c8
 SHA512:
-  metadata.gz: cf3996aefa9f11b279130f27ea47b27673d47e0ae25d9929b9e3103294c59c645a91911d1e3e099250db39925c39402109cb39ca5fb9593a623acd97e556a8a1
-  data.tar.gz: 1f91b85d4ea7f6bc52d54afbc13244b689bb97ac93d7ada9544b980181b64bacb0cabfa2879e8773c0f2b1cd216dffbd5cbc8ad89b8c972c7ceae40363697f67
+  metadata.gz: f4f893ae50ce59810c2f2ebde4a94f4a0d95e5d25601702b64b6d39b0511e5d85d751968a005d1f0e3c5608f1e60f0eccdee4fb744011b9ff87df36de451166c
+  data.tar.gz: d0698d14a569d5b855b5237ae41a8c8f307b066b13b907ba1f0f74c2af25d307e49ed6966c900ffb315ccc25a4b2e74094317cdd724ed6af928d548d5fc1da6c

data/lib/serverspec/matchers/be_listening.rb

@@ -1,9 +1,13 @@
 RSpec::Matchers.define :be_listening do
   match do |port|
-    port.listening?(@with)
+    port.listening? @with, @local_address
   end
 
   chain :with do |with|
-    @with = with 
+    @with = with
+  end
+
+  chain :on do |local_address|
+    @local_address = local_address
   end
 end

data/lib/serverspec/type/port.rb

@@ -1,18 +1,42 @@
+require 'resolv'
+
 module Serverspec
   module Type
     class Port < Base
-      def listening?(protocol)
-        if protocol
-          protocol = protocol.to_s.downcase
-          unless ["udp", "tcp", "tcp6", "udp6"].include?(protocol)
-            raise ArgumentError.new("`be_listening` matcher doesn't support #{protocol}")
-          end
+      def protocols
+        %w(udp tcp tcp6 udp6)
+      end
+
+      def options
+        @options ||= {}
+      end
+
+      def protocol_matcher(protocol)
+        protocol = protocol.to_s.downcase
+        if protocols.include?(protocol)
+          options[:protocol] = protocol
+        else
+          raise ArgumentError.new("`be_listening` matcher doesn't support #{protocol}")
+        end
+      end
 
-          @runner.check_listening_with_protocol(@name, protocol)
+      def local_address_matcher(local_address)
+        if valid_ip_address?(local_address)
+          options[:local_address] = local_address
         else
-          @runner.check_listening(@name)
+          raise ArgumentError.new("`be_listening` matcher requires valid IPv4 or IPv6 address")
         end
       end
+
+      def listening?(protocol, local_address)
+        protocol_matcher(protocol) if protocol
+        local_address_matcher(local_address) if local_address
+        @runner.check_listening(@name, options)
+      end
+
+      def valid_ip_address?(ip_address)
+        !!(ip_address =~ Resolv::IPv4::Regex) || !!(ip_address =~ Resolv::IPv6::Regex)
+      end
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.0.0.beta7"
+  VERSION = "2.0.0.beta8"
 end

data/spec/type/port_spec.rb

@@ -2,26 +2,32 @@ require 'spec_helper'
 
 include Specinfra::Helper::RedHat
 
-describe port(80) do
-  it { should be_listening }
-end
+describe Serverspec::Type::Port do
+  describe port(80) do
+    it { should be_listening }
 
-describe port('invalid') do
-  it { should_not be_listening }
-end
+    it('protocol: tcp') { should be_listening.with('tcp') }
 
-describe port(80) do
-  it { should be_listening.with("tcp") }
-end
+    it 'invalid protocol raises error' do
+      expect {
+        should be_listening.with('not implemented')
+      }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
+    end
 
-describe port(123) do
-  it { should be_listening.with("udp") }
-end
+    it('on: 127.0.0.1') do
+      should be_listening.on('127.0.0.1')
+    end
+
+    it 'invalid local address raises error' do
+      expect{ should be_listening.on('') }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe port('invalid') do
+    it { should_not be_listening }
+  end
 
-describe port(80) do
-  it { 
-    expect {
-      should be_listening.with('not implemented')
-    }.to raise_error(ArgumentError, %r/\A`be_listening` matcher doesn\'t support/)
-  }
+  describe port(123) do
+    it { should be_listening.with("udp") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Gosuke Miyashita