awspec 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb8a9241d1820e45eb6a89efa5c3155741ba7bd
-  data.tar.gz: 015e4dd1c035b7f8bc3eab7dc8f43956ebe16ba7
+  metadata.gz: 079365d4a013ed8f6ef32f280e5698831094b170
+  data.tar.gz: f6bf2551315170c4d5fe7fe4823387067ac60c50
 SHA512:
-  metadata.gz: 320d0f037df7d383fc57aa5eb15d2f875ae46ef65097f59da389001997fbe1850a3623ce914b9d543e055e6b3cdf91078e39ba027a21fd6c9c733736c73016eb
-  data.tar.gz: 9cb8d832d86e157c4ffb23f29ed3d6437a2e110bac0f520c733647f07524036d1bd0141ca960abe3378aa272fabac0474d783363b64a1a227b79328391815a05
+  metadata.gz: d6237ae37aa33e1decc7ff2fe2ddb1cb86ed3ade49d9f158a6609e7ffd23740057af858c8fc88d0d2ccff9c0f4164edeba650dd5bf14dee9a4649c8b33c244f4
+  data.tar.gz: 6cba16c1621ba3617c6280cfbc6d00322efbb5b6667c1d5a594b93795ed09831b544db40085c10bf183ab8ea10912f9d1a670ebbff2731745f5ae02023ee6993

data/lib/awspec/generator/spec/security_group.rb

@@ -28,7 +28,13 @@ module Awspec::Generator
               linespecs.push('its(:' + inout + ') { should be_opened }')
               next
             end
-            port = permission.from_port
+
+            if permission.from_port == permission.to_port
+              port = permission.from_port
+            else
+              port = "'" + permission.from_port.to_s + '-' + permission.to_port.to_s + "'"
+            end
+
             protocol = permission.ip_protocol
             permission.ip_ranges.each do |ip_range|
               target = ip_range.cidr_ip

data/lib/awspec/stub/security_group.rb

@@ -32,6 +32,17 @@ Aws.config[:ec2] = {
                   group_name: 'group-name-sg'
                 }
               ]
+            },
+            {
+              from_port: 50_000,
+              to_port: 50_009,
+              ip_protocol: 'tcp',
+              ip_ranges: [
+                {
+                  cidr_ip: '123.456.789.012/32'
+                }
+              ],
+              user_id_group_pairs: []
             }
           ],
           ip_permissions_egress: [

data/lib/awspec/type/security_group.rb

@@ -23,7 +23,7 @@ module Awspec::Type
         next true unless port
         next true unless permission[:from_port]
         next true unless permission[:to_port]
-        next false unless port.between?(permission[:from_port], permission[:to_port])
+        next false unless port_between?(port, permission[:from_port], permission[:to_port])
         next false if protocol && permission[:ip_protocol] != protocol
         next true unless cidr
         ret = permission[:ip_ranges].select do |ip_range|
@@ -47,7 +47,7 @@ module Awspec::Type
         next true unless port
         next true unless permission[:from_port]
         next true unless permission[:to_port]
-        next false unless port.between?(permission[:from_port], permission[:to_port])
+        next false unless port_between?(port, permission[:from_port], permission[:to_port])
         next false if protocol && permission[:ip_protocol] != protocol
         next true unless cidr
         ret = permission[:ip_ranges].select do |ip_range|
@@ -85,5 +85,17 @@ module Awspec::Type
       @resource[:ip_permissions_egress].count
     end
     alias_method :outbound_permissions_count, :ip_permissions_egress_count
+
+    private
+
+    def port_between?(port, from_port, to_port)
+      if port.is_a?(String) && port.include?('-')
+        f, t = port.split('-')
+        false unless from_port == f.to_i && to_port == t.to_i
+      else
+        false unless port.between?(from_port, to_port)
+      end
+      true
+    end
   end
 end

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec