lib/cloudstack-cli/cli.rb in cloudstack-cli-1.0.0.rc1 vs lib/cloudstack-cli/cli.rb in cloudstack-cli-1.0.0.rc2

@@ -21,11 +21,10 @@
     desc "version", "Print cloudstack-cli version number"
     def version
       say "cloudstack-cli version #{CloudstackCli::VERSION}"
       say " (cloudstack_client version #{CloudstackClient::VERSION})"
     end
-    map %w(-v --version) => :version
 
     desc "setup", "Initial configuration of Cloudstack connection settings"
     def setup(env = options[:environment])
       invoke "environment:add", [env],
         :config_file => options[:config_file]
@@ -44,130 +43,54 @@
       end
       puts File.read shell_script
     end
 
     desc "command COMMAND [arg1=val1 arg2=val2...]", "Run a custom api command"
-    option :format, default: 'json',
+    option :format, default: 'yaml',
       enum: %w(json yaml), desc: "output format"
     option :pretty_print, default: true, type: :boolean,
       desc: "pretty print json output"
     def command(command, *args)
-      params = {'command' => command}
+      params = { 'command' => command }
       args.each do |arg|
         arg = arg.split('=')
         params[arg[0]] = arg[1]
       end
+
+      unless client.api.commands.has_key? command
+        say "ERROR: ", :red
+        say "Unknown API command '#{command}'."
+        exit!
+      end
+
+      unless client.api.all_required_params?(command, params)
+        raise CloudstackClient::ParameterError, client.api.missing_params_msg(command)
+      end
+
       data = client.send_request(params)
-      output = if options[:format] == 'json'
-        options[:pretty_print] ? JSON.pretty_generate(data) : data.to_json
+      if options[:format] == 'json'
+        puts options[:pretty_print] ? JSON.pretty_generate(data) : data.to_json
       else
-        data.to_yaml
+        puts data.to_yaml
       end
-      puts output
     end
 
-    # require subcommands
-    Dir[File.dirname(__FILE__) + '/commands/*.rb'].each do |command|
-      require command
-    end
+    # Require and describe subcommands
+    Dir[File.dirname(__FILE__) + '/commands/*.rb'].each do |command_path|
+      require command_path
 
-    desc "environment SUBCOMMAND ...ARGS", "Manage cloudstack-cli environments"
-    subcommand :environment, Environment
-    map 'env' => :environment
+      command = File.basename(command_path, ".rb")
+      class_names = command.split('_').collect(&:capitalize)
 
-    desc "zone SUBCOMMAND ...ARGS", "Manage zones"
-    subcommand :zone, Zone
+      desc "#{command} SUBCOMMAND ...ARGS",
+        "#{class_names.join(' ')} commands"
+      subcommand command,
+        Object.const_get(class_names.join)
+    end
 
-    desc "pod SUBCOMMAND ...ARGS", "List pods"
-    subcommand :pod, Pod
-
-    desc "cluster SUBCOMMAND ...ARGS", "List clusters"
-    subcommand :cluster, Cluster
-
-    desc "host SUBCOMMAND ...ARGS", "List hosts"
-    subcommand :host, Host
-
-    desc "project SUBCOMMAND ...ARGS", "Manage servers"
-    subcommand :project, Project
-
-    desc "virtual_machine SUBCOMMAND ...ARGS", "Manage virtual machines"
-    subcommand :virtual_machine, VirtualMachine
+    # Additional command maps (aliases)
+    map %w(-v --version) => :version
+    map 'env' => :environment
     map 'vm' => :virtual_machine
     map 'server' => :virtual_machine
-
-    desc "compute_offer SUBCOMMAND ...ARGS", "Manage offerings"
-    subcommand :compute_offer, ComputeOffer
-
-    desc "disk_offer SUBCOMMAND ...ARGS", "Manage disk offerings"
-    subcommand :disk_offering, DiskOffer
-
-    desc "network SUBCOMMAND ...ARGS", "Manage networks"
-    subcommand :network, Network
-    map 'networks' => 'network'
-
-    desc "physical_network SUBCOMMAND ...ARGS", "Manage physical networks"
-    subcommand :physical_network, PhysicalNetwork
-
-    desc "load_balancer SUBCOMMAND ...ARGS", "Manage load balancing rules"
-    subcommand :load_balancer, LoadBalancer
-
-    desc "template SUBCOMMAND ...ARGS", "Manage templates"
-    subcommand :template, Template
-
-    desc "iso SUBCOMMAND ...ARGS", "Manage iso's"
-    subcommand :iso, Iso
-
-    desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
-    subcommand :router, Router
-
-    desc "system_vm SUBCOMMAND ...ARGS", "Manage system vms"
-    subcommand :system_vm, SystemVm
-
-    desc "volume SUBCOMMAND ...ARGS", "Manage volumes"
-    subcommand :volume, Volume
-
-    desc "snapshot SUBCOMMAND ...ARGS", "Manage snapshots"
-    subcommand :snapshot, Snapshot
-
-    desc "stack SUBCOMMAND ...ARGS", "Manage stacks"
-    subcommand :stack, Stack
-
-    desc "account SUBCOMMAND ...ARGS", "Manage accounts"
-    subcommand :account, Account
-
-    desc "user SUBCOMMAND ...ARGS", "Manage users"
-    subcommand :user, User
-
-    desc "domain SUBCOMMAND ...ARGS", "Manage domains"
-    subcommand :domain, Domain
-
-    desc "ip_address SUBCOMMAND ...ARGS", "Manage ip addresses"
-    subcommand :ip_address, IpAddress
-
-    desc "capacity SUBCOMMAND ...ARGS", "Lists all the system wide capacities"
-    subcommand :capacity, Capacity
-
-    desc "port_rule SUBCOMMAND ...ARGS", "Manage portforwarding rules"
-    subcommand :port_rule, PortRule
-
-    desc "job SUBCOMMAND ...ARGS", "Display async jobs"
-    subcommand :job, Job
-
-    desc "ssh_key_pair SUBCOMMAND ...ARGS", "Manage ssh key pairs"
-    subcommand :ssh_key_pair, SshKeyPair
-
-    desc "storage_pool SUBCOMMAND ...ARGS", "Manage storage pools"
-    subcommand :storage_pool, StoragePool
-
-    desc "region SUBCOMMAND ...ARGS", "Manage regions"
-    subcommand :region, Region
-
-    desc "affinity_group SUBCOMMAND ...ARGS", "Manage affinity_groups"
-    subcommand :affinity_group, AffinityGroup
-
-    desc "configuration SUBCOMMAND ...ARGS", "List cloudstack configuration values"
-    subcommand :configuration, Configuration
-
-    desc "resource_limit SUBCOMMAND ...ARGS", "Show cloudstack resource limits"
-    subcommand :resource_limit, ResourceLimit
   end
 end