aly 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db212d7233b62974d4d2b74909f00090561d6dbe874950e580d92d84be67b5f
-  data.tar.gz: de5bdb35a47c607db653a5befb8f55a82f53dbaca1c28646c00b54be263dd52d
+  metadata.gz: 6f4b613a0c93e9ea9f7a8bf871be047d304cd0bca3b74cf0087dd1a108669cab
+  data.tar.gz: 7e903e4afbe0b1b634c83182efa9717de20a393a35685aaf18699ec565aee72e
 SHA512:
-  metadata.gz: b95c2203787b28ff2abeb5cfe2b54015619c6289a21ef631b8dc8c6c6dbb599600fa9a1113afb99300d6262c8452d41b81e82d117c9a88f98b4fe80ccd67cfd1
-  data.tar.gz: 3d2178da37d57a8c90a585640e6ed60aa9cafff01c449165c10929fc8c0c362a00b06fbb5c2708c02ef931e565a3368955fc3c3bcaa900f66bc15b21e50dbd20
+  metadata.gz: d05f179882ed0090b7e2ab180c91c9ed01bbb101c3a9d169fc9b9ddf6ce1ade2892f8b01b27eaa3d342ddaadb60e797d06e45e91952e20861a498b46c3b72936
+  data.tar.gz: 2502e19639d64471221a0693854a5a9bc67e2821284d94ce707dd04d3bb1ea3d0d1a423736ce0538379935ad99b4b27d2bf4a32330d7a56ca6a52666c8d619f2

data/Gemfile.lock

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

data/aly.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = "A simple wrapper for aliyun cli"
   spec.homepage      = "https://github.com/lululau/aly"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/lib/aly/app.rb

@@ -35,7 +35,20 @@ module Aly
         end
       end
 
-      if options['detail']
+      if options['full']
+        selected = selected.map do |row|
+          {
+            Id: row['InstanceId'],
+            Name: row['InstanceName'],
+            PrivateIP: row['PrivateIP'],
+            PublicIP: row['PublicIP'],
+            CPU: row['Cpu'],
+            RAM: "#{row['Memory'] / 1024.0} GB",
+            WEB: "https://ecs.console.aliyun.com/#/server/#{row['InstanceId']}/monitor?regionId=#{row['RegionId']}"
+          }
+        end
+        puts selected.table&.to_s
+      elsif options['detail']
         puts JSON.pretty_generate(selected)
       else
         selected = selected.map do |row|
@@ -104,7 +117,8 @@ module Aly
                 Name: lb['LoadBalancerName'],
                 Address: lb['Address'],
                 Eip: lb['Eip'],
-                Listeners: listeners.size
+                Listeners: listeners.size,
+                WEB: "https://slb.console.aliyun.com/slb/#{lb['RegionId']}/slbs/#{lb['LoadBalancerId']}/listeners"
               }].table.to_s.gsub(/^/, '    '))
         puts
 
@@ -405,25 +419,22 @@ module Aly
       puts listener_rules.table.to_s.gsub(/^/, '    ')
       puts
 
-      if options['acl']
-        acl_ids = listeners.flat_map { |listener| listener['AclIds'] || [] }.uniq
-        unless acl_ids.empty?
-          alc_entries = acl_ids.flat_map do |acl_id|
-            attr = exec('slb', 'DescribeAccessControlListAttribute', "--AclId=#{acl_id}", **options)
-            (attr.dig('AclEntrys', 'AclEntry') || []).each_with_index.map do |e, idx|
-              {
-                AclId: (idx.zero? ? attr['AclId'] : ''),
-                AclName: (idx.zero? ? attr['AclName'] : ''),
-                AclEntryIP: e['AclEntryIP'],
-                AclEntryComment: e['AclEntryComment']
-              }
-            end + [nil]
-          end
-          puts '    Access Control Lists:'
-          puts alc_entries[0..-2].table.to_s.gsub(/^/, '    ')
-          puts
+      acl_ids = listeners.flat_map { |listener| listener['AclIds'] || [] }.uniq
+      unless acl_ids.empty?
+        alc_entries = acl_ids.flat_map do |acl_id|
+          attr = exec('slb', 'DescribeAccessControlListAttribute', "--AclId=#{acl_id}", **options)
+          (attr.dig('AclEntrys', 'AclEntry') || []).each_with_index.map do |e, idx|
+            {
+              AclId: (idx.zero? ? attr['AclId'] : ''),
+              AclName: (idx.zero? ? attr['AclName'] : ''),
+              AclEntryIP: e['AclEntryIP'],
+              AclEntryComment: e['AclEntryComment']
+            }
+          end + [nil]
         end
-
+        puts '    Access Control Lists:'
+        puts alc_entries[0..-2].table.to_s.gsub(/^/, '    ')
+        puts
       end
     end
 

data/lib/aly/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Liu Xiang
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="