cloudstack-cli 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af33fbc2eb5c099bbb2492f3ffc94dbdb0207790
-  data.tar.gz: 79ff5405d147afc75c35f2831e5c2bebe698716e
+  metadata.gz: 99141439bf28aa5016f37c7f0c177724c60a26c6
+  data.tar.gz: 1241704a4a4737469786b5e1f7a7d90deba16c54
 SHA512:
-  metadata.gz: fdc510c21f629586df1a7053d680f97506ed852fd2651071160c8574f1fb0b8dd31dd54d0ba78d92ad640d2c993f6e19cd56b93ca790a544e97dbaf2a153940b
-  data.tar.gz: ec560b06fb8d6570da88d66f611e34a4c483254bd89c18a1b6a1ad85db05fc3e75ba6f997134d484a3f8d475c8b0e2f12e0e44bacbddce9ea0a1167d2b3d00e1
+  metadata.gz: 073ac88981b9a4a0e8b355f5a476881d084a41838e04a8261dcf86993e8650874571706419ef68d64e1c7f2959a17e87a772fde3debef4dc172befec62f89190
+  data.tar.gz: a9de0b7fa807eafd2164fd1d4c6ca222cde76d8a0cea41ca8ce639a0fd49407e21b5d5ce227cd992b0a920f2173711296d829d2386f160e054e84567d7797718

data/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.2.3)
+    cloudstack-cli (1.2.5)
       cloudstack_client (~> 1.2)
       multi_json (~> 1.11)
       thor (~> 0.19)

data/lib/cloudstack-cli/base.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "cloudstack-cli/thor_patch"
 require "yaml"
 require "open-uri"
 
@@ -35,6 +36,16 @@ module CloudstackCli
       true
     end
 
+    # fix for subcommand help issues
+    # see https://github.com/erikhuda/thor/issues/261
+    # def self.banner(command, namespace = nil, subcommand = false)
+    #   "#{basename} #{subcommand_prefix} #{command.usage}"
+    # end
+    #
+    # def self.subcommand_prefix
+    #   self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
+    # end
+
     no_commands do
       def client
         @config ||= load_configuration

data/lib/cloudstack-cli/commands/virtual_machine.rb

@@ -133,7 +133,7 @@ class VirtualMachine < CloudstackCli::Base
       unless virtual_machine = client.list_virtual_machines(options.merge(name: name, listall: true)).first
         say "Virtual machine #{name} not found.", :red
       else
-        ask = "Destroy #{name} (#{virtual machine['state']})? [y/N]:"
+        ask = "Destroy #{name} (#{virtual_machine['state']})? [y/N]:"
         if options[:force] || yes?(ask, :yellow)
           say "destroying #{name} "
           client.destroy_virtual_machine(

data/lib/cloudstack-cli/option_resolver.rb

@@ -108,7 +108,6 @@ module CloudstackCli
           exit 1
         end
         unless options[:disk_offering_id]
-          puts options
           say "Error: a disk offering is required when using iso.", :red
           exit 1
         end

data/lib/cloudstack-cli/thor_patch.rb

@@ -0,0 +1,26 @@
+# Fixes thor help for subcommands
+# https://github.com/erikhuda/thor/pull/330
+
+class Thor
+  class << self
+    attr_accessor :parent_class
+
+    def basename2(subcommand = false)
+      bn  = parent_class && parent_class.basename2
+      bn2 = basename
+      ns  = self.namespace.split(':').last
+      bn ? (subcommand ? bn : "#{bn} #{ns}") : bn2
+    end
+
+    def banner(command, namespace = nil, subcommand = false)
+      "#{basename2(subcommand)} #{command.formatted_usage(self, $thor_runner, subcommand)}"
+    end
+
+    alias :old_subcommand :subcommand
+
+    def subcommand(subcommand, subcommand_class)
+      subcommand_class.parent_class = self
+      old_subcommand(subcommand, subcommand_class)
+    end
+  end
+end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -122,6 +122,7 @@ files:
 - lib/cloudstack-cli/commands/zone.rb
 - lib/cloudstack-cli/helper.rb
 - lib/cloudstack-cli/option_resolver.rb
+- lib/cloudstack-cli/thor_patch.rb
 - lib/cloudstack-cli/version.rb
 - test/infrastructure_stack.yaml
 - test/stack_example.json