ec2-host 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15fd593235c24ad34c3f26a1a201de288121c09
-  data.tar.gz: 035d0489d27be80ceb7593d0f0d8a55e39d9681f
+  metadata.gz: 1a1249847be80c2f1fcf6c5a857b510a5c1a3687
+  data.tar.gz: a1e32094a8f8ba1b0b36798533227c80154e9137
 SHA512:
-  metadata.gz: fd11b4bc9543b4b3145ae46197f83c836cd1126b0a312592d3a457d3b7d30282d951b70a80fbb63ea601d171ed72750f38a3a560cd42e80cfcd52cf5ecee3762
-  data.tar.gz: cb3682963b997aea698c19702a861a93e6a79146820ef014234b5d3eef9f00c2bb375154c34d39ae5132c580ba71585b0581055a0fb20eab9a4cdb5f31ee8e4f
+  metadata.gz: 2d87051be62134563c27c0f94e41a8791b7a0b42a58541cefbd9f3226518ea4edbdb256591e1f2ed3e7c557a319fc3ba16de06eebb609cc96bca798995368c59
+  data.tar.gz: 4943af6805767f3f7019ffc8d074661f67e692ad403fbaea58f57f54f62760f80f054f020e898a2570495f0bb5b76d504bede6fd35b2670b2e2169a6d0dbe1d5

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.6.0 (2017/05/20)
+
+Fixes:
+
+* Fix to support multile roles and roleNs with command line arguments as
+  * ec2-host --role foo:a,bar:b
+  * ec2-host --role1 foo,bar --role2 a,b
+
 # 0.5.9 (2017/04/24)
 
 Fixes:

data/lib/ec2/host/host_data.rb

@@ -208,14 +208,18 @@ class EC2
       def role_match?(condition)
         # usage is an alias of role
         if role = (condition[:role] || condition[:usage])
-          parts = role.first.split(Config.role_tag_delimiter, Config.role_max_depth)
+          role.any? do |r|
+            parts = r.split(Config.role_tag_delimiter, Config.role_max_depth)
+            next true if parts.compact.empty? # no role conditions
+            roles.find {|role| role.match?(*parts) }
+          end
         else
           parts = 1.upto(Config.role_max_depth).map do |i|
-            (condition["role#{i}".to_sym] || condition["usage#{i}".to_sym] || []).first
+            condition["role#{i}".to_sym] || condition["usage#{i}".to_sym]
           end
+          return true if parts.compact.empty? # no role conditions
+          roles.find {|role| role.match?(*parts) }
         end
-        return true if parts.compact.empty? # no role conditions
-        roles.find {|role| role.match?(*parts) }
       end
 
       def instance_match?(condition)

data/lib/ec2/host/role_data.rb

@@ -54,10 +54,18 @@ class EC2
       #     RoleData.new('admin', 'jenkins', 'slave').match?(nil, 'jenkins') #=> true
       #     RoleData.new('admin', 'jenkins', 'slave').match?(nil, nil, 'slave') #=> true
       #
+      #     RoleData.new('foo', 'a').match?(['foo', 'bar']) #=> true
+      #     RoleData.new('bar', 'a').match?(['foo', 'bar']) #=> true
+      #
+      #     RoleData.new('foo', 'a').match?(['foo', 'bar'], ['a', 'b']) #=> true
+      #     RoleData.new('foo', 'a').match?(['foo', 'bar'], ['a', 'b']) #=> true
+      #     RoleData.new('bar', 'b').match?(['foo', 'bar'], ['a', 'b']) #=> true
+      #     RoleData.new('bar', 'b').match?(['foo', 'bar'], ['a', 'b']) #=> true
+      #
       # @param [Array] role_parts such as ["admin", "jenkins", "slave"]
       def match?(*role_parts)
         indexes = role_parts.map.with_index {|part, i| part ? i : nil }.compact
-        @role_parts.values_at(*indexes) == role_parts.values_at(*indexes)
+        indexes.all? {|i| Array(role_parts[i]).include?(@role_parts[i]) }
       end
 
       # Equality

data/lib/ec2/host/version.rb

@@ -1,5 +1,5 @@
 class EC2
   class Host
-    VERSION = '0.5.9'
+    VERSION = '0.6.0'
   end
 end

data/spec/host_data_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe EC2::Host::HostData do
+  describe '#role_match?' do
+    def host_with_role(role)
+      EC2::Host::HostData.new(Object.new).tap do |data|
+        roles = [EC2::Host::RoleData.build(role)]
+        data.instance_variable_set(:@roles, roles)
+      end
+    end
+
+    context 'with role' do
+      it do
+        expect(host_with_role('admin:jenkins:slave').send(:role_match?, role: ['admin'])).to be_truthy
+        expect(host_with_role('admin:jenkins:slave').send(:role_match?, role: ['admin:jenkins'])).to be_truthy
+        expect(host_with_role('admin:jenkins:slave').send(:role_match?, role: ['admin:jenkins:slave'])).to be_truthy
+
+        expect(host_with_role('foo:a').send(:role_match?, role: ['foo:a', 'bar:b'])).to be_truthy
+        expect(host_with_role('bar:a').send(:role_match?, role: ['foo:a', 'bar:b'])).to be_falsey
+        expect(host_with_role('foo:b').send(:role_match?, role: ['foo:a', 'bar:b'])).to be_falsey
+        expect(host_with_role('bar:b').send(:role_match?, role: ['foo:a', 'bar:b'])).to be_truthy
+      end
+    end
+
+    context 'with roleN' do
+      it do
+        expect(host_with_role('foo:a').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('bar:a').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('baz:a').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_falsey
+        expect(host_with_role('foo:b').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('bar:b').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('baz:b').send(:role_match?, role1: ['foo', 'bar'], role2: ['a', 'b'])).to be_falsey
+
+        expect(host_with_role('foo:a').send(:role_match?, role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('foo:b').send(:role_match?, role2: ['a', 'b'])).to be_truthy
+        expect(host_with_role('foo:c').send(:role_match?, role2: ['a', 'b'])).to be_falsey
+      end
+    end
+  end
+end

data/spec/role_data_spec.rb

@@ -29,12 +29,40 @@ describe EC2::Host::RoleData do
   end
 
   describe '#match?' do
-    let(:subject) { EC2::Host::RoleData.build('web:test') }
-    it do
-      expect(subject.match?('web')).to be_truthy
-      expect(subject.match?('web', 'test')).to be_truthy
-      expect(subject.match?('web', 'test', 'wrong')).to be_falsey
-      expect(subject.match?('web', 'wrong')).to be_falsey
+    context 'with single match' do
+      let(:subject) { EC2::Host::RoleData.build('admin:jenkins:slave') }
+
+      it do
+        expect(subject.match?('admin')).to be_truthy
+        expect(subject.match?('admin', 'jenkins')).to be_truthy
+        expect(subject.match?('admin', 'jenkins', 'slave')).to be_truthy
+        expect(subject.match?(nil, 'jenkins')).to be_truthy
+        expect(subject.match?(nil, nil, 'slave')).to be_truthy
+
+        expect(subject.match?('wrong')).to be_falsey
+        expect(subject.match?('admin', 'wrong')).to be_falsey
+        expect(subject.match?('admin', 'jenkins', 'wrong')).to be_falsey
+        expect(subject.match?(nil, 'wrong')).to be_falsey
+        expect(subject.match?(nil, nil, 'wrong')).to be_falsey
+      end
+    end
+
+
+    context 'with array match' do
+      it do
+        expect(EC2::Host::RoleData.build('foo:a').match?(['foo', 'bar'])).to be_truthy
+        expect(EC2::Host::RoleData.build('bar:a').match?(['foo', 'bar'])).to be_truthy
+        expect(EC2::Host::RoleData.build('baz:a').match?(['foo', 'bar'])).to be_falsey
+
+        expect(EC2::Host::RoleData.build('foo:a').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(EC2::Host::RoleData.build('bar:a').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(EC2::Host::RoleData.build('baz:a').match?(['foo', 'bar'], ['a', 'b'])).to be_falsey
+        expect(EC2::Host::RoleData.build('foo:b').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(EC2::Host::RoleData.build('bar:b').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(EC2::Host::RoleData.build('baz:b').match?(['foo', 'bar'], ['a', 'b'])).to be_falsey
+
+        expect(EC2::Host::RoleData.build('foo:a').match?(nil, ['a', 'b'])).to be_truthy
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -218,6 +218,7 @@ files:
 - lib/ec2/host/role_data.rb
 - lib/ec2/host/string_util.rb
 - lib/ec2/host/version.rb
+- spec/host_data_spec.rb
 - spec/host_spec.rb
 - spec/role_data_spec.rb
 - spec/spec_helper.rb
@@ -247,6 +248,7 @@ signing_key:
 specification_version: 4
 summary: Search hosts on AWS EC2
 test_files:
+- spec/host_data_spec.rb
 - spec/host_spec.rb
 - spec/role_data_spec.rb
 - spec/spec_helper.rb