gce-host 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9058278fe6965657e42e0852b083ecc42ab3b43
-  data.tar.gz: 7d6687397b875e5e477e94c45d4db37c1b1417d2
+  metadata.gz: dad933feea005e321f009794fda85a7d5dd0c711
+  data.tar.gz: 24e9a937f5b92063ed03b739cd15de197b5f0b82
 SHA512:
-  metadata.gz: 1dac786e7a247fa314955ed1a452e201e57696cf3ed0a0f8d07e8ba18e207392ddcb7a80736f1aadaae98d14231ad3e8838757d2fe809e703969e736044663fe
-  data.tar.gz: 57ed8dc3ed59addae4be3745bb671fb7fec1b17248b50af71efe8bb8ec46e1e86e7dff9ad0b065ac51a3275468b288723d109fb24dee3e24a7db3f3f87373eaf
+  metadata.gz: df810097c230bacf4a0f5704673fab22886e372973ddc080d4f971bd8571309045525ab7754a64c033832cbc1d88ef897d4c79e30e84e77da52d2028ad0e7819
+  data.tar.gz: fce1c754372461a56cb6de061c0c60d8057c7358fe4c88233fb84c4147ff9f9db9bddf72229cae796828111307708c7b56904638996375be736b0ed9f19aadc4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.4.4 (2017/05/20)
+
+Fixes:
+
+* Fix to support multile roles and roleNs with command line arguments as
+  * gce-host --role foo:a,bar:b
+  * gce-host --role1 foo,bar --role2 a,b
+
 # 0.4.3 (2017/01/20)
 
 Enhancements:

data/lib/gce/host/host_data.rb

@@ -175,13 +175,18 @@ class GCE
       def role_match?(condition)
         # usage is an alias of role
         if role = (condition[:role] || condition[:usage])
-          parts = role.first.split(Config.role_value_delimiter, Config.role_max_depth)
+          role.any? do |r|
+            parts = r.split(Config.role_value_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
-        roles.find {|role| role.match?(*parts) }
       end
 
       def status_match?(condition)

data/lib/gce/host/role_data.rb

@@ -53,11 +53,19 @@ class GCE
       #     RoleData.new('admin', 'jenkins', 'slave').match?('admin', 'jenkins', 'master') #=> false
       #     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/gce/host/version.rb

@@ -1,5 +1,5 @@
 class GCE
   class Host
-    VERSION = '0.4.3'
+    VERSION = '0.4.4'
   end
 end

data/spec/host_data_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe GCE::Host::HostData do
+  describe '#role_match?' do
+    def host_with_role(role)
+      GCE::Host::HostData.new(Object.new).tap do |data|
+        roles = [GCE::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,39 @@ describe GCE::Host::RoleData do
   end
 
   describe '#match?' do
-    let(:subject) { GCE::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) { GCE::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(GCE::Host::RoleData.build('foo:a').match?(['foo', 'bar'])).to be_truthy
+        expect(GCE::Host::RoleData.build('bar:a').match?(['foo', 'bar'])).to be_truthy
+        expect(GCE::Host::RoleData.build('baz:a').match?(['foo', 'bar'])).to be_falsey
+
+        expect(GCE::Host::RoleData.build('foo:a').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(GCE::Host::RoleData.build('bar:a').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(GCE::Host::RoleData.build('baz:a').match?(['foo', 'bar'], ['a', 'b'])).to be_falsey
+        expect(GCE::Host::RoleData.build('foo:b').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(GCE::Host::RoleData.build('bar:b').match?(['foo', 'bar'], ['a', 'b'])).to be_truthy
+        expect(GCE::Host::RoleData.build('baz:b').match?(['foo', 'bar'], ['a', 'b'])).to be_falsey
+
+        expect(GCE::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: gce-host
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -207,6 +207,7 @@ files:
 - lib/gce/host/string_util.rb
 - lib/gce/host/version.rb
 - spec/gce_client_spec.rb
+- spec/host_data_spec.rb
 - spec/host_spec.rb
 - spec/role_data_spec.rb
 - spec/spec_helper.rb
@@ -231,13 +232,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Search hosts on GCP GCE
 test_files:
 - spec/gce_client_spec.rb
+- spec/host_data_spec.rb
 - spec/host_spec.rb
 - spec/role_data_spec.rb
 - spec/spec_helper.rb
-has_rdoc: