vmfloaty 0.7.5 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1023c46824f773496c553024460d07e0c0e43e96
-  data.tar.gz: f70276a66a33cbe1ca93e6c9b0e2b51edc5d8c19
+  metadata.gz: 03a25ef4cef2a9df0fce0fc18f91c696d56d3bfe
+  data.tar.gz: 1c449470e5469fd8bf415bd2e79b90bacc6fa69e
 SHA512:
-  metadata.gz: 9eb4fdb7fb89b3a4658d0157acc5d7dc421a1b956cebfb8dbfbe077a4f5455b06d935718537475f2b982c73659accd80d8c377700290c70ee08bb9e607a4f98a
-  data.tar.gz: e6743d018ebb1ea06fd7b92f9c72545094af00ed25e055d70a13e3feaaaefb7f16fd08aebadd85abbeefa204f035a6b8a938520cfaffbb5f652c5fff73f5dad1
+  metadata.gz: e790212f307e49a638dba038437c444be54765615bf6edb6d9f82f6285ea33afe1c91388d0451c7f8e316c77b56404a8ce19ae6b328f99718d6388cb9d4e10be
+  data.tar.gz: 207f58b4fb6317ebec9df825bdf3d966fba8adc8b1561b463b85168b44ab3ed1a3931228f46369aa6673154b860e8c5cd41f451494d8ebcd88586f6a279ab150

data/README.md

@@ -22,17 +22,17 @@ $ floaty --help
 
 ```
     delete   Schedules the deletion of a host or hosts
-    get      Gets a vm or vms based on the os flag
+    get      Gets a vm or vms based on the os argument
     help     Display global or [command] help documentation
-    list     Shows a list of available vms from the pooler
-    modify   Modify a vms tags and TTL
+    list     Shows a list of available vms from the pooler or vms obtained with a token
+    modify   Modify a vms tags, time to live, and disk space
     query    Get information about a given vm
     revert   Reverts a vm to a specified snapshot
     snapshot Takes a snapshot of a given vm
     ssh      Grabs a single vm and sshs into it
-    status   Prints the status of vmpooler
-    summary  Prints the summary of vmpooler
-    token    Retrieves or deletes a token
+    status   Prints the status of pools in vmpooler
+    summary  Prints a summary of vmpooler
+    token    Retrieves or deletes a token or checks token status
 
   GLOBAL OPTIONS:
 
@@ -59,7 +59,7 @@ This command will then ask you to log in. If successful, it will return a token
 Grabbing vms:
 
 ```
-floaty get centos-7-x86_64=2 debian-7-x86_64=1 windows-10=3 --token mytokenstring --url https://vmpooler.mycompany.net/api/v1
+floaty get centos-7-x86_64=2 debian-7-x86_64 windows-10=3 --token mytokenstring --url https://vmpooler.mycompany.net/api/v1
 ```
 
 ### vmfloaty dotfile

data/lib/vmfloaty.rb

@@ -22,21 +22,23 @@ class Vmfloaty
     config = Conf.read_config
 
     command :get do |c|
-      c.syntax = 'floaty get os_type1=x ox_type2=y ...'
-      c.summary = 'Gets a vm or vms based on the os flag'
-      c.description = ''
+      c.syntax = 'floaty get os_type0 os_type1=x ox_type2=y [options]'
+      c.summary = 'Gets a vm or vms based on the os argument'
+      c.description = 'A command to retrieve vms from vmpooler. Can either be a single vm, or multiple with the `=` syntax.'
       c.example 'Gets a few vms', 'floaty get centos=3 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 '--notoken', 'Makes a request without a token'
+      c.option '--force', 'Forces vmfloaty to get requested vms'
       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']
         no_token = options.notoken
+        force = options.force
 
         if args.empty?
           STDERR.puts "No operating systems provided to obtain. See `floaty get --help` for more information on how to get VMs."
@@ -45,6 +47,14 @@ class Vmfloaty
 
         os_types = Utils.generate_os_hash(args)
 
+        max_pool_request = 5
+        large_pool_requests = os_types.select{|k,v| v > max_pool_request}
+        if ! large_pool_requests.empty? and ! force
+          STDERR.puts "Requesting vms over #{max_pool_request} requires a --force flag."
+          STDERR.puts "Try again with `floaty get --force`"
+          exit 1
+        end
+
         unless os_types.empty?
           if no_token
             begin
@@ -98,8 +108,8 @@ class Vmfloaty
 
     command :list do |c|
       c.syntax = 'floaty list [options]'
-      c.summary = 'Shows a list of available vms from the pooler'
-      c.description = ''
+      c.summary = 'Shows a list of available vms from the pooler or vms obtained with a token'
+      c.description = 'List will either show all vm templates available in vmpooler, or with the --active flag it will list vms obtained with a vmpooler token.'
       c.example 'Filter the list on centos', 'floaty list centos --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--active', 'Prints information about active vms for a given token'
@@ -136,9 +146,9 @@ class Vmfloaty
     end
 
     command :query do |c|
-      c.syntax = 'floaty query [hostname] [options]'
+      c.syntax = 'floaty query hostname [options]'
       c.summary = 'Get information about a given vm'
-      c.description = ''
+      c.description = 'Given a hostname from vmpooler, vmfloaty with query vmpooler to get various details about the vm.'
       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'
@@ -153,9 +163,9 @@ class Vmfloaty
     end
 
     command :modify do |c|
-      c.syntax = 'floaty modify [hostname] [options]'
-      c.summary = 'Modify a vms tags, TTL, and disk space'
-      c.description = ''
+      c.syntax = 'floaty modify hostname [options]'
+      c.summary = 'Modify a vms tags, time to live, and disk space'
+      c.description = 'This command makes modifications to the virtual machines state in vmpooler. You can either append tags to the vm, increase how long it stays active for, or increase the amount of disk space.'
       c.example 'Modifies myhost1 to have a TTL of 12 hours and adds a custom tag', 'floaty modify myhost1 --lifetime 12 --url https://myurl --token mytokenstring --tags \'{"tag":"myvalue"}\''
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -277,9 +287,9 @@ class Vmfloaty
     end
 
     command :delete do |c|
-      c.syntax = 'floaty delete [hostname,...]'
+      c.syntax = 'floaty delete hostname,hostname2 [options]'
       c.summary = 'Schedules the deletion of a host or hosts'
-      c.description = ''
+      c.description = 'Given a comma separated list of hostnames, or --all for all vms, vmfloaty makes a request to vmpooler to schedule the deletion of those vms.'
       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 '--all', 'Deletes all vms acquired by a token'
@@ -352,9 +362,9 @@ class Vmfloaty
     end
 
     command :snapshot do |c|
-      c.syntax = 'floaty snapshot [hostname] [options]'
+      c.syntax = 'floaty snapshot hostname [options]'
       c.summary = 'Takes a snapshot of a given vm'
-      c.description = ''
+      c.description = 'Will request a snapshot be taken of the given hostname in vmpooler. This command is known to take a while depending on how much load is on vmpooler.'
       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'
@@ -378,9 +388,9 @@ class Vmfloaty
     end
 
     command :revert do |c|
-      c.syntax = 'floaty revert [hostname] [snapshot] [options]'
+      c.syntax = 'floaty revert hostname snapshot [options]'
       c.summary = 'Reverts a vm to a specified snapshot'
-      c.description = ''
+      c.description = 'Given a snapshot SHA, vmfloaty will request a revert to vmpooler to go back to a previous snapshot.'
       c.example 'Reverts to a snapshot for a given host', 'floaty revert myvm.example.com n4eb4kdtp7rwv4x158366vd9jhac8btq --url http://vmpooler.example.com --token a9znth9dn01t416hrguu56ze37t790bl'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -410,8 +420,8 @@ class Vmfloaty
 
     command :status do |c|
       c.syntax = 'floaty status [options]'
-      c.summary = 'Prints the status of vmpooler'
-      c.description = ''
+      c.summary = 'Prints the status of pools in vmpooler'
+      c.description = 'Makes a request to vmpooler to request the information about vm pools and how many are ready to be used, what pools are empty, etc.'
       c.example 'Gets the current vmpooler status', 'floaty status --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -436,8 +446,8 @@ class Vmfloaty
 
     command :summary do |c|
       c.syntax = 'floaty summary [options]'
-      c.summary = 'Prints the summary of vmpooler'
-      c.description = ''
+      c.summary = 'Prints a summary of vmpooler'
+      c.description = 'Gives a very detailed summary of information related to vmpooler.'
       c.example 'Gets the current day summary of vmpooler', 'floaty summary --url http://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -452,9 +462,9 @@ class Vmfloaty
     end
 
     command :token do |c|
-      c.syntax = 'floaty token [get | delete | status] [token]'
-      c.summary = 'Retrieves or deletes a token'
-      c.description = ''
+      c.syntax = 'floaty token <get delete status> [options]'
+      c.summary = 'Retrieves or deletes a token or checks token status'
+      c.description = 'This command is used to manage your vmpooler token. Through the various options, you are able to get a new token, delete an existing token, and request a tokens status.'
       c.example 'Gets a token from the pooler', 'floaty token get'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'
@@ -506,9 +516,9 @@ class Vmfloaty
     end
 
     command :ssh do |c|
-      c.syntax = 'floaty ssh os_type'
+      c.syntax = 'floaty ssh os_type [options]'
       c.summary = 'Grabs a single vm and sshs into it'
-      c.description = ''
+      c.description = 'This command simply will grab a vm template that was requested, and then ssh the user into the machine all at once.'
       c.example 'SSHs into a centos vm', 'floaty ssh centos7 --url https://vmpooler.example.com'
       c.option '--verbose', 'Enables verbose output'
       c.option '--url STRING', String, 'URL of vmpooler'

data/lib/vmfloaty/version.rb

@@ -1,6 +1,6 @@
 
 class Version
-  @version = '0.7.5'
+  @version = '0.7.7'
 
   def self.get
     @version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.7
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander