cloudstack-cli 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abbccb8fdb7cb7d93fb79f33f58f53469e0763fd
-  data.tar.gz: 6e4e7df9e6d4f4cbe5e6d79ffa0497426801d0c5
+  metadata.gz: fb18633b9ea89df8bc15123d54b7cad8c90a434a
+  data.tar.gz: ebebedd48f0edb2272944ffd8d8f903a441279be
 SHA512:
-  metadata.gz: 48faa2904edaeb89a5dc81c7068b851ab1b99e241bdc2c836f30ac1dfaccdce608212cd6cc258fe3675dd8bb5fa58a3e3159b34d7649cfc2fd082423af724b22
-  data.tar.gz: 3ee41e41a2ab280d2dce91ad2f57eeeb16b362428729b98e47522f514cf743eb72fdbe5e2bd82d2d1c7b5999cfca0b3e9f5fb6807e79d72575b737d936bd3f5e
+  metadata.gz: 3f744fdfe0acd813349be7a8da81c20b1d3a981c2ce6d4c63add9a3c27a4d11d927d05536d4ee06ce83af987005586dc63f398cf3730c34697c9e952fc7d3ac3
+  data.tar.gz: 87185f60b63cb39b2781bcbf8d69bdf784db0b26edf4114f0a2d936b5e986f166b2fb7bab2ee718fa3ffd8771137e9851626ced918b0eef59c100d89b63d52fa

data/.gitignore

@@ -1,7 +1,4 @@
 .DS_Store
-results.html
-config/cloudstack.yml
 pkg
-html
 *.gem
 .bundle

data/Gemfile

@@ -1,6 +1,10 @@
 source 'https://rubygems.org'
 
-gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git'
+group :development do
+  gem 'cloudstack_client',
+    path:    '../cloudstack_client/',
+    branch: 'master'
+end
 
 # Specify your gem's dependencies in cloudstack-cli.gemspec
 gemspec

data/Gemfile.lock

@@ -1,20 +1,21 @@
-GIT
-  remote: git@github.com:niwo/cloudstack_client.git
-  revision: b388af01e7403f65fc1ad5cd4c905a1f005afea3
-  specs:
-    cloudstack_client (1.0.0.rc1)
-
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.0.0.rc1)
-      cloudstack_client (~> 1.0.0.rc1)
+    cloudstack-cli (1.0.0.rc2)
+      cloudstack_client (~> 1.0.2)
       thor (~> 0.19.1)
 
+PATH
+  remote: ../cloudstack_client/
+  specs:
+    cloudstack_client (1.0.2)
+      msgpack (~> 0.5.11)
+
 GEM
   remote: https://rubygems.org/
   specs:
     json (1.8.2)
+    msgpack (0.5.11)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)

data/cloudstack-cli.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.4')
 
   gem.add_dependency('thor', '~> 0.19.1')
-  gem.add_dependency('cloudstack_client', '~> 1.0.0.rc1')
+  gem.add_dependency('cloudstack_client', '~> 1.0.2')
 end

data/lib/cloudstack-cli/base.rb

@@ -10,11 +10,25 @@ module CloudstackCli
 
     attr_reader :config
 
+    # rescue error globally
+    def self.start(given_args=ARGV, config={})
+      super
+    rescue => e
+      error_class = e.class.name.split('::')
+      if error_class.size == 2 && error_class.first == "CloudstackClient"
+        puts "\e[31mERROR\e[0m: #{error_class.last} - #{e.message}"
+        puts e.backtrace if ARGV.include? "--debug"
+      else
+        raise
+      end
+    end
+
     # catch control-c and exit
-    trap("SIGINT") {
-      puts " bye"
+    trap("SIGINT") do
+      puts
+      puts "bye.."
       exit!
-    }
+    end
 
     # exit with return code 1 in case of a error
     def self.exit_on_failure?

data/lib/cloudstack-cli/cli.rb

@@ -23,7 +23,6 @@ module CloudstackCli
       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])
@@ -46,128 +45,52 @@ module CloudstackCli
     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
 
-    desc "environment SUBCOMMAND ...ARGS", "Manage cloudstack-cli environments"
-    subcommand :environment, Environment
-    map 'env' => :environment
-
-    desc "zone SUBCOMMAND ...ARGS", "Manage zones"
-    subcommand :zone, Zone
+    # Require and describe subcommands
+    Dir[File.dirname(__FILE__) + '/commands/*.rb'].each do |command_path|
+      require command_path
 
-    desc "pod SUBCOMMAND ...ARGS", "List pods"
-    subcommand :pod, Pod
+      command = File.basename(command_path, ".rb")
+      class_names = command.split('_').collect(&:capitalize)
 
-    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 "#{command} SUBCOMMAND ...ARGS",
+        "#{class_names.join(' ')} commands"
+      subcommand command,
+        Object.const_get(class_names.join)
+    end
 
-    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

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

@@ -22,25 +22,29 @@ class Environment < CloudstackCli::Base
     config = {}
     unless options[:url]
       say "Add a new environment...", :green
-      say "Environment name: #{env}" if env
+      if env
+        say "Environment name: #{env}"
+      else
+        env = ask("Environment name:", :magenta)
+      end
       say "What's the URL of your Cloudstack API?", :yellow
       say "Example: https://my-cloudstack-service/client/api/", :green
       config[:url] = ask("URL:", :magenta)
     end
-    
+
     unless options[:api_key]
       config[:api_key] = ask("API Key:", :magenta)
     end
-    
+
     unless options[:secret_key]
       config[:secret_key] = ask("Secret Key:", :magenta)
     end
-    
+
     if env
       config = {env => config}
       config[:default] = env if options[:default]
     end
-    
+
     if File.exists? options[:config_file]
       old_config = parse_config_file
       if !env || old_config.has_key?(env)
@@ -72,10 +76,10 @@ class Environment < CloudstackCli::Base
       if config.keys.select { |key| !key.is_a? Symbol}.size == 0
         exit unless yes?("Do you really want to delete environment #{env}? [y/N]", :yellow)
         File.delete(options[:config_file])
-        say "OK.", :green    
+        say "OK.", :green
         exit
       end
-    elsif config.delete(env)  
+    elsif config.delete(env)
     else
       say "Environment #{env} does not exist.", :red
       exit 1
@@ -89,7 +93,7 @@ class Environment < CloudstackCli::Base
   desc "default [ENV]", "show or set the default environment"
   def default(env = nil)
     config = parse_config_file
-    
+
     unless env
       default_env = config[:default] || '-'
       say "The current default environment is \"#{default_env}\""
@@ -137,4 +141,4 @@ class Environment < CloudstackCli::Base
 
   end
 
-end
+end

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

@@ -0,0 +1,27 @@
+class InfrastructureStack < CloudstackCli::Base
+
+  desc "create STACKFILE", "create a infrastructure stack"
+  def create(stackfile)
+    puts stack = parse_file(stackfile)
+    say "Create '#{stack["name"]}' infrastructure stack...", :green
+
+    create_domains(stack['domains'])
+
+    say "Finished.", :green
+  end
+
+  desc "destroy STACKFILE", "destroy a infrastructure stack"
+  def destroy(stackfile)
+
+  end
+
+  no_commands do
+    def create_domains(domains)
+      domains.each do |domain|
+        puts domain
+      end
+    end
+
+  end
+
+end

data/lib/cloudstack-cli/option_resolver.rb

@@ -99,7 +99,10 @@ module CloudstackCli
 
     def resolve_iso(options = options)
       if options[:iso]
-        unless iso = client.list_isos(name: options[:iso]).first
+        unless iso = client.list_isos(
+            name: options[:iso],
+            project_id: options[:project_id]
+          ).first
           say "Error: Iso '#{args[:iso]}' is invalid.", :red
           exit 1
         end
@@ -115,7 +118,11 @@ module CloudstackCli
 
     def resolve_template(options = options)
       if options[:template]
-        if template = client.list_templates(name: options[:template], template_filter: "all").first
+        if template = client.list_templates(
+            name: options[:template],
+            template_filter: "executable",
+            project_id: options[:project_id]
+          ).first
           options[:template_id] = template['id']
         else
           say "Error: Template #{options[:template]} not found.", :red

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

data/test/infrastructure_stack.yaml

@@ -0,0 +1,36 @@
+name:  Test Infrastructure Stack
+description: "Web Application Stack"
+version: "1.0"
+domains:
+  - name: Testdomain
+    network_domain: test.io
+  - name: Subdomain
+    network_domain: sub.test.io
+    parent_domain: Testdomain
+accounts:
+  -
+  -
+users:
+  -
+  -
+projects:
+  -
+  -
+compute_offerings:
+  -
+  -
+network_offerings:
+  -
+  -
+networks:
+  -
+  -
+port_rules:
+  -
+  -
+load_balancing_rules:
+  -
+  -
+resource_limits:
+  -
+  -

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.2
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -98,6 +98,7 @@ files:
 - lib/cloudstack-cli/commands/domain.rb
 - lib/cloudstack-cli/commands/environment.rb
 - lib/cloudstack-cli/commands/host.rb
+- lib/cloudstack-cli/commands/infrastructure_stack.rb
 - lib/cloudstack-cli/commands/ip_address.rb
 - lib/cloudstack-cli/commands/iso.rb
 - lib/cloudstack-cli/commands/job.rb
@@ -111,7 +112,7 @@ files:
 - lib/cloudstack-cli/commands/resource_limit.rb
 - lib/cloudstack-cli/commands/router.rb
 - lib/cloudstack-cli/commands/snapshot.rb
-- lib/cloudstack-cli/commands/ssh_key_pairs.rb
+- lib/cloudstack-cli/commands/ssh_key_pair.rb
 - lib/cloudstack-cli/commands/stack.rb
 - lib/cloudstack-cli/commands/storage_pool.rb
 - lib/cloudstack-cli/commands/system_vm.rb
@@ -123,6 +124,7 @@ files:
 - lib/cloudstack-cli/helper.rb
 - lib/cloudstack-cli/option_resolver.rb
 - lib/cloudstack-cli/version.rb
+- test/infrastructure_stack.yaml
 - test/stack_example.json
 - test/stack_example.yml
 homepage: http://github.com/niwo/cloudstack-cli
@@ -152,5 +154,6 @@ signing_key:
 specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
+- test/infrastructure_stack.yaml
 - test/stack_example.json
 - test/stack_example.yml