cloudstack-cli 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f07e2763e1098aebc86ef957def19af52e6439
-  data.tar.gz: c7351b039d23832d297e18f4b3fad768f5dcf7f5
+  metadata.gz: 9333cd14a9e146a183cc06b9c08cdec221ab090c
+  data.tar.gz: ff4ad2339fe3ad8f8a05bf105e0a5b63ee875404
 SHA512:
-  metadata.gz: a043f85b78500aafed6ae9fed0e38629f18aa0a564ab832fe91f907576da8bcf91bfa8bb4aa47cf5c1399bf8c8b14af70537d03eb1d434693b308ae727275783
-  data.tar.gz: f100042e728db5621e03dd6defd85fa7e4e80f8875f0d2daaddd44874dce6f85c5f9a69bea09fe364b066ff3af4818ca131da047029e744c47c4b950ad739e32
+  metadata.gz: b71a5b0fc8600a26c0c1e52ddbdc8e93dd941227e837f8e3edabefed51a6fb52270449c7babe5e01a67dbff570908b4af9cda2eea2d43770b7d40a21743d366e
+  data.tar.gz: 840fe9f4f5fbfeb03030b73432ec632f8a81b0fd9f34b5a95ad5db25642c9b13b54cd401612445310e68649f9947bed91127487ecf493772263af8fa3e4a9c0b

data/Gemfile.lock

@@ -6,14 +6,14 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.4.2)
+    cloudstack-cli (1.5.0)
       cloudstack_client (~> 1.3)
       thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (11.1.1)
+    rake (11.1.2)
     thor (0.19.1)
 
 PLATFORMS

data/cloudstack-cli.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = %w(cs cloudstack-cli)
+  gem.executables   = %w(cloudstack-cli)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = %w(lib)
   gem.rdoc_options  = %w[--line-numbers --inline-source]

data/lib/cloudstack-cli/cli.rb

@@ -35,7 +35,7 @@ module CloudstackCli
     def completion
       shell_script = File.join(
         File.dirname(__FILE__), '..', '..',
-        'completions', "cs.#{options[:shell]}"
+        'completions', "cloudstack-cli.#{options[:shell]}"
       )
       unless File.file? shell_script
         say "Specified cloudstack-cli shell auto-completion rules for #{options[:shell]} not found.", :red

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

@@ -2,8 +2,8 @@ class SshKeyPair < CloudstackCli::Base
 
   desc "list", 'list ssh key pairs'
   option :listall, default: true
-  option :account
-  option :project
+  option :account, desc: "name of the account"
+  option :project, desc: "name of the project"
   option :format, default: "table",
     enum: %w(table json yaml)
   def list
@@ -29,8 +29,8 @@ class SshKeyPair < CloudstackCli::Base
   end
 
   desc 'create NAME', 'create ssh key pair'
-  option :account
-  option :project
+  option :account, desc: "name of the account"
+  option :project, desc: "name of the project"
   def create(name)
     resolve_account
     resolve_project
@@ -43,15 +43,16 @@ class SshKeyPair < CloudstackCli::Base
   end
 
   desc 'register NAME', 'register ssh key pair'
-  option :account
-  option :project
-  option :public_key, required: true, desc: "path to public_key file"
+  option :account, desc: "name of the account"
+  option :project, desc: "name of the project"
+  option :public_key, aliases: %w(-k), required: true, desc: "path to public_key file"
   def register(name)
     resolve_account
     resolve_project
     options[:name] = name
     if File.exist?(options[:public_key])
       public_key = IO.read(options[:public_key])
+      options[:public_key] = public_key
     else
       say("Can't open public key #{options[:public_key]}", :red)
       exit 1
@@ -59,16 +60,16 @@ class SshKeyPair < CloudstackCli::Base
     pair = client.register_ssh_key_pair(options)
     say "Name : #{pair['name']}"
     say "Fingerprint : #{pair['fingerprint']}"
-    say "Privatekey:"
-    say pair['privatekey']
+    say "Privatekey : #{pair['privatekey']}"
+    puts
   rescue => e
     say "Failed to register key: #{e.message}", :red
     exit 1
   end
 
   desc 'delete NAME', 'delete ssh key pair'
-  option :account
-  option :project
+  option :account, desc: "name of the account"
+  option :project, desc: "name of the project"
   option :force, aliases: '-f', desc: "delete without asking"
   def delete(name)
     resolve_account
@@ -84,4 +85,28 @@ class SshKeyPair < CloudstackCli::Base
     end
   end
 
+  desc 'reset_vm_keys', 'resets the SSH Key for virtual machine (the virtual machine must be in a "Stopped" state)'
+  option :keypair, aliases: %w(-k), desc: "name of keypair", required: true
+  option :virtual_machine, aliases: %w(-m), desc: "name of virtual machine", required: true
+  option :account, desc: "name of the account"
+  option :project, desc: "name of the project"
+  def reset_vm_keys
+    resolve_account
+    resolve_project
+
+    unless virtual_machine = client.list_virtual_machines({name: options[:virtual_machine], list_all: true}.merge options).first
+      puts "No virtual machine found."
+    else
+      unless virtual_machine['state'].downcase == "stopped"
+        say "ERROR: Virtual machine must be in stopped state.", :red
+        exit 1
+      end
+      unless options[:force] || yes?("Reset ssh key for VM #{options[:virtual_machine]}? (y/N)", :yellow)
+        exit
+      end
+      client.reset_ssh_key_for_virtual_machine(options.merge(id: virtual_machine['id']))
+      say "OK", :green
+    end
+  end
+
 end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,7 +56,6 @@ description: cloudstack-cli is a CloudStack API command line client written in R
 email:
 - nik.wolfgramm@gmail.com
 executables:
-- cs
 - cloudstack-cli
 extensions: []
 extra_rdoc_files: []
@@ -68,9 +67,8 @@ files:
 - README.md
 - Rakefile
 - bin/cloudstack-cli
-- bin/cs
 - cloudstack-cli.gemspec
-- completions/cs.bash
+- completions/cloudstack-cli.bash
 - lib/cloudstack-cli.rb
 - lib/cloudstack-cli/base.rb
 - lib/cloudstack-cli/cli.rb
@@ -134,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client

data/bin/cs

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'cloudstack-cli'
-
-CloudstackCli::Cli.start(ARGV)