vmfloaty 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f317f9021a11ed75b8ce717b1778f2c6b5e4a2e
-  data.tar.gz: 3208d383b455eccf81ac2ed608607d64c27b3b9a
+  metadata.gz: 32aeb5f5ad140e3f722d44e74fd408d4543544b6
+  data.tar.gz: 5eb1d4eefe202458d0992f5b76a16950665da699
 SHA512:
-  metadata.gz: 4c3e96f49b4df71c1c89e6ae8079fbc58b5a463727e77754fc411987dce76b0f52f213a79485a63040840a71b5f5f87ba200a8ec26f1b217c890aeb8c7e3d0a8
-  data.tar.gz: ffb649bcf0c4d5105619597798690693c79f606c052edca9084408311f1a2477c0981254876696e592392f4657ea72e2b6aa21127dbf84ef6188361620b00fef
+  metadata.gz: b55dc19efe45545e1b3c9f30782af9392d7df29ffd1b329c7b604c6f46558cbdf444d9d42f699010ac404c1bd32588b0a3cad258f70b8e684d6a989a77526c20
+  data.tar.gz: 3ea84be6897b142f1ac7a6c045f3a322497848c3611867dafe438f9e6f4c35b3c9522361a526132929e9ede36665015b5aa4f2fda7d8c0d58c55e5b02cfd608e

data/README.md

@@ -45,7 +45,7 @@ gem install vmfloaty
 If you do not wish to continuely specify various config options with the cli, you can have a dotfile in your home directory for some defaults. For example:
 
 ```yaml
-#file at /Users/me/.vmpooler.yml
+#file at /Users/me/.vmfloaty.yml
 url: 'http://vmpooler.mycompany.net'
 user: 'brian'
 ```

data/lib/vmfloaty.rb

@@ -10,28 +10,27 @@ class Vmfloaty
   include Commander::Methods
 
   def run
-    program :version, '0.2.1'
+    program :version, '0.2.3'
     program :description, 'A CLI helper tool for Puppet Labs vmpooler to help you stay afloat'
 
     config = read_config
 
     command :get do |c|
-      c.syntax = 'floaty get [options]'
+      c.syntax = 'floaty get [hostname,...]'
       c.summary = 'Gets a vm or vms based on the os flag'
       c.description = ''
-      c.example 'Gets 3 vms', 'floaty get --user brian --url http://vmpooler.example.com --os centos,centos,debian'
+      c.example 'Gets 3 vms', 'floaty get centos,centos,debian --user brian --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--user STRING', String, 'User to authenticate with'
       c.option '--url STRING', String, 'URL of vmpooler'
       c.option '--token STRING', String, 'Token for vmpooler'
-      c.option '--os STRING', String, 'Operating systems to retrieve'
       c.option '--notoken', 'Makes a request without a token'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         token = options.token || config['token']
         user = options.user ||= config['user']
         url = options.url ||= config['url']
-        os_types = options.os
+        os_types = args[0]
         no_token = options.notoken
 
         unless no_token.nil?
@@ -55,16 +54,15 @@ class Vmfloaty
     end
 
     command :list do |c|
-      c.syntax = 'floaty list [options]'
+      c.syntax = 'floaty list [hostname]'
       c.summary = 'Shows a list of available vms from the pooler'
       c.description = ''
-      c.example 'Filter the list on centos', 'floaty list --filter centos --url http://vmpooler.example.com'
+      c.example 'Filter the list on centos', 'floaty list centos --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
-      c.option '--filter STRING', String, 'A filter to apply to the list'
       c.option '--url STRING', String, 'URL of vmpooler'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
-        filter = options.filter
+        filter = args[0]
         url = options.url ||= config['url']
 
         os_list = Pooler.list(verbose, url, filter)
@@ -76,14 +74,13 @@ class Vmfloaty
       c.syntax = 'floaty query [options]'
       c.summary = 'Get information about a given vm'
       c.description = ''
-      c.example 'Get information about a sample host', 'floaty query --url http://vmpooler.example.com --host myvmhost.example.com'
+      c.example 'Get information about a sample host', 'floaty query hostname --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
-      c.option '--host STRING', String, 'Hostname to query'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
-        hostname = options.host
+        hostname = args[0]
 
         query = Pooler.query(verbose, url, hostname)
         puts query
@@ -91,22 +88,21 @@ class Vmfloaty
     end
 
     command :modify do |c|
-      c.syntax = 'floaty modify [options]'
+      c.syntax = 'floaty modify [hostname]'
       c.summary = 'Modify a vms tags and TTL'
       c.description = ''
       c.example 'description', 'command example'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
       c.option '--token STRING', String, 'Token for vmpooler'
-      c.option '--host STRING', String, 'Hostname to modify'
       c.option '--lifetime INT', Integer, 'VM TTL (Integer, in hours)'
-      c.option '--tags HASH', Hash, 'free-form VM tagging'
+      c.option '--tags STRING', String, 'free-form VM tagging (json)'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
-        hostname = options.host
+        hostname = args[0]
         lifetime = options.lifetime
-        tags = options.tags
+        tags = JSON.parse(options.tags)
         token = options.token || config['token']
 
         res_body = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
@@ -115,16 +111,15 @@ class Vmfloaty
     end
 
     command :delete do |c|
-      c.syntax = 'floaty delete [options]'
+      c.syntax = 'floaty delete [hostname,...]'
       c.summary = 'Schedules the deletion of a host or hosts'
       c.description = ''
-      c.example 'Schedules the deletion of a host or hosts', 'floaty delete --hosts myhost1,myhost2 --url http://vmpooler.example.com'
+      c.example 'Schedules the deletion of a host or hosts', 'floaty delete myhost1,myhost2 --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
-      c.option '--hosts STRING', String, 'Hostname(s) to delete'
       c.option '--url STRING', String, 'URL of vmpooler'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
-        hosts = options.hosts
+        hosts = args[0]
         url = options.url ||= config['url']
 
         Pooler.delete(verbose, url, hosts)
@@ -135,15 +130,14 @@ class Vmfloaty
       c.syntax = 'floaty snapshot [options]'
       c.summary = 'Takes a snapshot of a given vm'
       c.description = ''
-      c.example 'Takes a snapshot for a given host', 'floaty snapshot --url http://vmpooler.example.com --host myvm.example.com --token a9znth9dn01t416hrguu56ze37t790bl'
+      c.example 'Takes a snapshot for a given host', 'floaty snapshot myvm.example.com --url http://vmpooler.example.com --token a9znth9dn01t416hrguu56ze37t790bl'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
-      c.option '--host STRING', String, 'Hostname to modify'
       c.option '--token STRING', String, 'Token for vmpooler'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
-        hostname = options.host
+        hostname = args[0]
         token = options.token ||= config['token']
 
         res_body = Pooler.snapshot(verbose, url, hostname, token)
@@ -155,16 +149,15 @@ class Vmfloaty
       c.syntax = 'floaty revert [options]'
       c.summary = 'Reverts a vm to a specified snapshot'
       c.description = ''
-      c.example 'Reverts to a snapshot for a given host', 'floaty revert --url http://vmpooler.example.com --host myvm.example.com --token a9znth9dn01t416hrguu56ze37t790bl --snapshot n4eb4kdtp7rwv4x158366vd9jhac8btq'
+      c.example 'Reverts to a snapshot for a given host', 'floaty revert myvm.example.com --url http://vmpooler.example.com --token a9znth9dn01t416hrguu56ze37t790bl --snapshot n4eb4kdtp7rwv4x158366vd9jhac8btq'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
-      c.option '--host STRING', String, 'Hostname to modify'
       c.option '--token STRING', String, 'Token for vmpooler'
       c.option '--snapshot STRING', String, 'SHA of snapshot'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         url = options.url ||= config['url']
-        hostname = options.host
+        hostname = args[0]
         token = options.token || config['token']
         snapshot_sha = options.snapshot
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander