vmfloaty 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32aeb5f5ad140e3f722d44e74fd408d4543544b6
-  data.tar.gz: 5eb1d4eefe202458d0992f5b76a16950665da699
+  metadata.gz: 1abf340baac66b75675a4ba1f77baa8b1d412a58
+  data.tar.gz: 906172ee41262e42f0166cf5ba8721bf97a170bd
 SHA512:
-  metadata.gz: b55dc19efe45545e1b3c9f30782af9392d7df29ffd1b329c7b604c6f46558cbdf444d9d42f699010ac404c1bd32588b0a3cad258f70b8e684d6a989a77526c20
-  data.tar.gz: 3ea84be6897b142f1ac7a6c045f3a322497848c3611867dafe438f9e6f4c35b3c9522361a526132929e9ede36665015b5aa4f2fda7d8c0d58c55e5b02cfd608e
+  metadata.gz: 173504ca54fad87fa3e9e42220f465880da532ab053ca5a8d88ac915ecff7d9fdb798407eec02c15102ddd88603da8e9554ee521bc88754f91654a8d15d0f8d2
+  data.tar.gz: 237a78285a88cfaef65eceb30b6a1dfc451594d21d82b2537d3e1589cfa1b5e725b6cce1596e9bb6d4686d1891c10f145c5cd8682c332f39ae82cafb0faea159

data/lib/vmfloaty.rb

@@ -10,7 +10,7 @@ class Vmfloaty
   include Commander::Methods
 
   def run
-    program :version, '0.2.3'
+    program :version, '0.2.4'
     program :description, 'A CLI helper tool for Puppet Labs vmpooler to help you stay afloat'
 
     config = read_config
@@ -33,7 +33,7 @@ class Vmfloaty
         os_types = args[0]
         no_token = options.notoken
 
-        unless no_token.nil?
+        if no_token
           response = Pooler.retrieve(verbose, os_types, token, url)
           puts response
           return
@@ -91,7 +91,7 @@ class Vmfloaty
       c.syntax = 'floaty modify [hostname]'
       c.summary = 'Modify a vms tags and TTL'
       c.description = ''
-      c.example 'description', 'command example'
+      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'
       c.option '--token STRING', String, 'Token for vmpooler'
@@ -102,7 +102,7 @@ class Vmfloaty
         url = options.url ||= config['url']
         hostname = args[0]
         lifetime = options.lifetime
-        tags = JSON.parse(options.tags)
+        tags = JSON.parse(options.tags) if options.tags
         token = options.token || config['token']
 
         res_body = Pooler.modify(verbose, url, hostname, token, lifetime, tags)
@@ -116,13 +116,15 @@ class Vmfloaty
       c.description = ''
       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 '--token STRING', String, 'Token for vmpooler'
       c.option '--url STRING', String, 'URL of vmpooler'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         hosts = args[0]
+        token = options.token || config['token']
         url = options.url ||= config['url']
 
-        Pooler.delete(verbose, url, hosts)
+        Pooler.delete(verbose, url, hosts, token)
       end
     end
 

data/lib/vmfloaty/http.rb

@@ -37,24 +37,4 @@ class Http
     return conn
   end
 
-  def self.get_conn_with_token(verbose, url, token)
-    if url.nil?
-      STDERR.puts "The url you provided was empty"
-      exit 1
-    end
-
-    if token.nil?
-      STDERR.puts "The token you provided was empty"
-      exit 1
-    end
-
-    conn = Faraday.new(:url => url, :ssl => {:verify => false}) do |faraday|
-      faraday.request :url_encoded
-      faraday.request :token_auth, token
-      faraday.response :logger if verbose
-      faraday.adapter Faraday.default_adapter
-    end
-
-    return conn
-  end
 end

data/lib/vmfloaty/pooler.rb

@@ -20,11 +20,9 @@ class Pooler
 
   def self.retrieve(verbose, os_type, token, url)
     os = os_type.gsub(',','+')
-    if token.nil?
-      conn = Http.get_conn(verbose, url)
-    else
-      conn = Http.get_conn_with_token(verbose, url, token)
-      conn.headers['X-AUTH-TOKEN']
+    conn = Http.get_conn(verbose, url)
+    if token
+      conn.headers['X-AUTH-TOKEN'] = token
     end
 
     response = conn.post "/vm/#{os}"
@@ -34,19 +32,26 @@ class Pooler
   end
 
   def self.modify(verbose, url, hostname, token, lifetime, tags)
-    modify_body = {'lifetime'=>lifetime, 'tags'=>tags}
-    conn = Http.get_conn_with_token(verbose, url, token)
-    conn.headers['X-AUTH-TOKEN']
+    modify_body = {}
+    if lifetime
+      modify_body['lifetime'] = lifetime
+    end
+    if tags
+      modify_body['tags'] = tags
+    end
+
+    conn = Http.get_conn(verbose, url)
+    conn.headers['X-AUTH-TOKEN'] = token
 
     response = conn.put do |req|
       req.url "/vm/#{hostname}"
+      req.body = modify_body
     end
     res_body = JSON.parse(response.body)
-
     res_body
   end
 
-  def self.delete(verbose, url, hostnames)
+  def self.delete(verbose, url, hostnames, token)
     if hostnames.nil?
       STDERR.puts "You did not provide any hosts to delete"
       exit 1
@@ -55,11 +60,19 @@ class Pooler
     hosts = hostnames.split(',')
     conn = Http.get_conn(verbose, url)
 
+    if token
+      conn.headers['X-AUTH-TOKEN'] = token
+    end
+
     hosts.each do |host|
       puts "Scheduling host #{host} for deletion"
       response = conn.delete "/vm/#{host}"
       res_body = JSON.parse(response.body)
-      puts res_body
+      if res_body['ok']
+        puts "Deletion for vm #{host} successfully scheduled"
+      else
+        STDERR.puts "There was a problem with your request for vm #{host}"
+      end
     end
   end
 
@@ -89,8 +102,8 @@ class Pooler
   end
 
   def self.snapshot(verbose, url, hostname, token)
-    conn = Http.get_conn_with_token(verbose, url, token)
-    conn.headers['X-AUTH-TOKEN']
+    conn = Http.get_conn(verbose, url)
+    conn.headers['X-AUTH-TOKEN'] = token
 
     response = conn.post "/vm/#{hostname}/snapshot"
     res_body = JSON.parse(response.body)
@@ -98,8 +111,8 @@ class Pooler
   end
 
   def self.revert(verbose, url, hostname, token, snapshot_sha)
-    conn = Http.get_conn_with_token(verbose, url, token)
-    conn.headers['X-AUTH-TOKEN']
+    conn = Http.get_conn(verbose, url)
+    conn.headers['X-AUTH-TOKEN'] = token
 
     response = conn.post "/vm/#{hostname}/snapshot/#{snapshot}"
     res_body = JSON.parse(response.body)

metadata

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