aly 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34fd1e28efaddb6086f9733f1d9ba642899d7b8401b75b91c3a3ec8328e6d4d7
-  data.tar.gz: 43c4a862eb3068239a508dc08ad79e6842c315cbe6ea104a958cc7063fed7964
+  metadata.gz: add2aa880577ff73d3a010623270ad00ebd51f3997378d040725eb239dd0b043
+  data.tar.gz: 8af5de2402336f2655b33ddaaa0bea2a9e0144176e8da9d230237b090fbf9d31
 SHA512:
-  metadata.gz: 8217b6478e6291f5608be558d9356dad8baa71faea68b75f670c0e2b6e3f2a4cac5a378d81ea79b12259c6e46deceffdf16c11ffa053f4dc3f72013b5a5a60f3
-  data.tar.gz: e3a63a7c64d1a923e74e26f188a2b7f5729472125c6a9f3d1d5378ce9179429a0bd3406187c339e3b8c55dcfac4f3c0691dd2d6bc50c96ef14bde70e01b2a873
+  metadata.gz: 9808a86bbaffb9470c73b74a1789ca05bd205886a919b0d2c11fe91ced18f55c3550ca8855e8c69f7d73fdfcc2fe87c75796cfd1677cf7afd0daef5d9200ab64
+  data.tar.gz: 04ab0a3be23ac8b4caa7a5d537bdb26270e04b731224a059c283354806801f6369175f18ce4ea96ad9afee8f9493a8c112685855f1f458528155fbba696aaaa4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aly (0.1.0)
+    aly (0.1.1)
       terminal-table (~> 1.8.0)
       thor (~> 0.20.0)
 

data/lib/aly/app.rb

@@ -27,9 +27,9 @@ module Aly
         item['PublicIP'] = item['PublicIpAddress']['IpAddress'].join(', ') if item['PublicIP'] == ''
       end
 
-      if query = args.first
+      if query = args.first&.split(',')
         selected = selected.select do |item|
-          item.values_at('InstanceId', 'InstanceName', 'PrivateIP', 'PublicIP').compact.any? { |e| e.include?(query) }
+          item.values_at('InstanceId', 'InstanceName', 'PrivateIP', 'PublicIP').compact.any? { |e| query.any? { |q| e.include?(q) } }
         end
       end
 
@@ -52,9 +52,9 @@ module Aly
       raw_out = exec('vpc', 'DescribeEipAddresses', '--PageSize=100')
       selected = raw_out['EipAddresses']['EipAddress']
 
-      if query = args.first
+      if query = args.first&.split(',')
         selected = selected.select do |item|
-          item.values_at('AllocationId', 'InstanceId', 'InstanceType', 'IpAddress').compact.any? { |e| e.include?(query) }
+          item.values_at('AllocationId', 'InstanceId', 'InstanceType', 'IpAddress').compact.any? { |e| query.any? { |q| e.include?(q) } }
         end
       end
 
@@ -99,9 +99,9 @@ module Aly
         lb['Listeners'] = listeners[lb['LoadBalancerId']] || []
       end
 
-      if query = args.first
+      if query = args.first&.split(',')
         selected = selected.select do |lb|
-          lb.values_at('LoadBalancerId', 'LoadBalancerName', 'Address').compact.any? { |e| e.include?(query) }
+          lb.values_at('LoadBalancerId', 'LoadBalancerName', 'Address').compact.any? { |e| query.any? { |q| e.include?(q) } }
         end
       end
 

data/lib/aly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aly
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aly
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Liu Xiang