vmfloaty 0.8.2 → 0.9.0

data/lib/vmfloaty/auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'json'
 require 'vmfloaty/http'
@@ -7,46 +9,36 @@ class Auth
   def self.get_token(verbose, url, user, password)
     conn = Http.get_conn_with_auth(verbose, url, user, password)
 
-    resp = conn.post "token"
+    resp = conn.post 'token'
 
     res_body = JSON.parse(resp.body)
-    if res_body["ok"]
-      return res_body["token"]
-    else
-      raise TokenError, "HTTP #{resp.status}: There was a problem requesting a token:\n#{res_body}"
-    end
+    return res_body['token'] if res_body['ok']
+
+    raise TokenError, "HTTP #{resp.status}: There was a problem requesting a token:\n#{res_body}"
   end
 
   def self.delete_token(verbose, url, user, password, token)
-    if token.nil?
-      raise TokenError, 'You did not provide a token'
-    end
+    raise TokenError, 'You did not provide a token' if token.nil?
 
     conn = Http.get_conn_with_auth(verbose, url, user, password)
 
     response = conn.delete "token/#{token}"
     res_body = JSON.parse(response.body)
-    if res_body["ok"]
-      return res_body
-    else
-      raise TokenError, "HTTP #{response.status}: There was a problem deleting a token:\n#{res_body}"
-    end
+    return res_body if res_body['ok']
+
+    raise TokenError, "HTTP #{response.status}: There was a problem deleting a token:\n#{res_body}"
   end
 
   def self.token_status(verbose, url, token)
-    if token.nil?
-      raise TokenError, 'You did not provide a token'
-    end
+    raise TokenError, 'You did not provide a token' if token.nil?
 
     conn = Http.get_conn(verbose, url)
 
     response = conn.get "token/#{token}"
     res_body = JSON.parse(response.body)
 
-    if res_body["ok"]
-      return res_body
-    else
-      raise TokenError, "HTTP #{response.status}: There was a problem getting the status of a token:\n#{res_body}"
-    end
+    return res_body if res_body['ok']
+
+    raise TokenError, "HTTP #{response.status}: There was a problem getting the status of a token:\n#{res_body}"
   end
 end

data/lib/vmfloaty/conf.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 class Conf
-
   def self.read_config
     conf = {}
     begin
       conf = YAML.load_file("#{Dir.home}/.vmfloaty.yml")
-    rescue
+    rescue StandardError
       STDERR.puts "WARNING: There was no config file at #{Dir.home}/.vmfloaty.yml"
     end
     conf

data/lib/vmfloaty/errors.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 class AuthError < StandardError
-  def initialize(msg="Could not authenticate to pooler")
+  def initialize(msg = 'Could not authenticate to pooler')
     super
   end
 end
 
 class TokenError < StandardError
-  def initialize(msg="Could not do operation with token provided")
+  def initialize(msg = 'Could not do operation with token provided')
     super
   end
 end
 
 class MissingParamError < StandardError
-  def initialize(msg="Argument provided to function is missing")
+  def initialize(msg = 'Argument provided to function is missing')
     super
   end
 end
 
 class ModifyError < StandardError
-  def initialize(msg="Could not modify VM")
+  def initialize(msg = 'Could not modify VM')
     super
   end
 end

data/lib/vmfloaty/http.rb

@@ -1,60 +1,49 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'uri'
 
 class Http
-  def self.is_url(url)
+  def self.url?(url)
     # This method exists because it seems like Farady
     # has no handling around if a user gives us a URI
     # with no protocol on the beginning of the URL
 
     uri = URI.parse(url)
 
-    if uri.kind_of?(URI::HTTP) or uri.kind_of?(URI::HTTPS)
-      return true
-    end
+    return true if uri.is_a?(URI::HTTP) || uri.is_a?(URI::HTTPS)
 
-    return false
+    false
   end
 
   def self.get_conn(verbose, url)
-    if url.nil?
-      raise "Did not provide a url to connect to"
-    end
+    raise 'Did not provide a url to connect to' if url.nil?
 
-    unless is_url(url)
-      url = "https://#{url}"
-    end
+    url = "https://#{url}" unless url?(url)
 
-    conn = Faraday.new(:url => url, :ssl => {:verify => false}) do |faraday|
+    conn = Faraday.new(:url => url, :ssl => { :verify => false }) do |faraday|
       faraday.request :url_encoded
       faraday.response :logger if verbose
       faraday.adapter Faraday.default_adapter
     end
 
-    return conn
+    conn
   end
 
   def self.get_conn_with_auth(verbose, url, user, password)
-    if url.nil?
-      raise "Did not provide a url to connect to"
-    end
+    raise 'Did not provide a url to connect to' if url.nil?
 
-    if user.nil?
-      raise "You did not provide a user to authenticate with"
-    end
+    raise 'You did not provide a user to authenticate with' if user.nil?
 
-    unless is_url(url)
-      url = "https://#{url}"
-    end
+    url = "https://#{url}" unless url?(url)
 
-    conn = Faraday.new(:url => url, :ssl => {:verify => false}) do |faraday|
+    conn = Faraday.new(:url => url, :ssl => { :verify => false }) do |faraday|
       faraday.request :url_encoded
       faraday.request :basic_auth, user, password
       faraday.response :logger if verbose
       faraday.adapter Faraday.default_adapter
     end
 
-    return conn
+    conn
   end
-
 end

data/lib/vmfloaty/nonstandard_pooler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'vmfloaty/errors'
 require 'vmfloaty/http'
 require 'faraday'
@@ -15,27 +17,17 @@ class NonstandardPooler
     os_filter ? os_list.select { |i| i[/#{os_filter}/] } : os_list
   end
 
-  def self.list_active(verbose, url, token)
+  def self.list_active(verbose, url, token, _user)
     status = Auth.token_status(verbose, url, token)
     status['reserved_hosts'] || []
   end
 
-  def self.retrieve(verbose, os_type, token, url)
+  def self.retrieve(verbose, os_type, token, url, _user, _options)
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token if token
 
-    os_string = ''
-    os_type.each do |os, num|
-      num.times do |_i|
-        os_string << os + '+'
-      end
-    end
-
-    os_string = os_string.chomp('+')
-
-    if os_string.empty?
-      raise MissingParamError, 'No operating systems provided to obtain.'
-    end
+    os_string = os_type.map { |os, num| Array(os) * num }.flatten.join('+')
+    raise MissingParamError, 'No operating systems provided to obtain.' if os_string.empty?
 
     response = conn.post "host/#{os_string}"
 
@@ -51,14 +43,10 @@ class NonstandardPooler
   end
 
   def self.modify(verbose, url, hostname, token, modify_hash)
-    if token.nil?
-      raise TokenError, 'Token provided was nil; Request cannot be made to modify VM'
-    end
+    raise TokenError, 'Token provided was nil; Request cannot be made to modify VM' if token.nil?
 
-    modify_hash.each do |key, value|
-      unless [:reason, :reserved_for_reason].include? key
-        raise ModifyError, "Configured service type does not support modification of #{key}"
-      end
+    modify_hash.each do |key, _value|
+      raise ModifyError, "Configured service type does not support modification of #{key}" unless %i[reason reserved_for_reason].include? key
     end
 
     if modify_hash[:reason]
@@ -77,22 +65,20 @@ class NonstandardPooler
     response.body.empty? ? {} : JSON.parse(response.body)
   end
 
-  def self.disk(verbose, url, hostname, token, disk)
+  def self.disk(_verbose, _url, _hostname, _token, _disk)
     raise ModifyError, 'Configured service type does not support modification of disk space'
   end
 
-  def self.snapshot(verbose, url, hostname, token)
+  def self.snapshot(_verbose, _url, _hostname, _token)
     raise ModifyError, 'Configured service type does not support snapshots'
   end
 
-  def self.revert(verbose, url, hostname, token, snapshot_sha)
+  def self.revert(_verbose, _url, _hostname, _token, _snapshot_sha)
     raise ModifyError, 'Configured service type does not support snapshots'
   end
 
   def self.delete(verbose, url, hosts, token)
-    if token.nil?
-      raise TokenError, 'Token provided was nil; Request cannot be made to delete VM'
-    end
+    raise TokenError, 'Token provided was nil; Request cannot be made to delete VM' if token.nil?
 
     conn = Http.get_conn(verbose, url)
 
@@ -100,9 +86,7 @@ class NonstandardPooler
 
     response_body = {}
 
-    unless hosts.is_a? Array
-      hosts = hosts.split(',')
-    end
+    hosts = hosts.split(',') unless hosts.is_a? Array
     hosts.each do |host|
       response = conn.delete "host/#{host}"
       res_body = JSON.parse(response.body)

data/lib/vmfloaty/pooler.rb

@@ -1,60 +1,48 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'vmfloaty/http'
 require 'json'
 require 'vmfloaty/errors'
 
 class Pooler
-  def self.list(verbose, url, os_filter=nil)
+  def self.list(verbose, url, os_filter = nil)
     conn = Http.get_conn(verbose, url)
 
     response = conn.get 'vm'
     response_body = JSON.parse(response.body)
 
-    if os_filter
-      hosts = response_body.select { |i| i[/#{os_filter}/] }
-    else
-      hosts = response_body
-    end
+    hosts = if os_filter
+              response_body.select { |i| i[/#{os_filter}/] }
+            else
+              response_body
+            end
 
     hosts
   end
 
-  def self.list_active(verbose, url, token)
+  def self.list_active(verbose, url, token, _user)
     status = Auth.token_status(verbose, url, token)
     vms = []
-    if status[token] && status[token]['vms']
-      vms = status[token]['vms']['running']
-    end
+    vms = status[token]['vms']['running'] if status[token] && status[token]['vms']
     vms
   end
 
-  def self.retrieve(verbose, os_type, token, url)
+  def self.retrieve(verbose, os_type, token, url, _user, _options)
     # NOTE:
     #   Developers can use `Utils.generate_os_hash` to
     #   generate the os_type param.
     conn = Http.get_conn(verbose, url)
-    if token
-      conn.headers['X-AUTH-TOKEN'] = token
-    end
-
-    os_string = ""
-    os_type.each do |os,num|
-      num.times do |i|
-        os_string << os+"+"
-      end
-    end
-
-    os_string = os_string.chomp("+")
+    conn.headers['X-AUTH-TOKEN'] = token if token
 
-    if os_string.size == 0
-      raise MissingParamError, "No operating systems provided to obtain."
-    end
+    os_string = os_type.map { |os, num| Array(os) * num }.flatten.join('+')
+    raise MissingParamError, 'No operating systems provided to obtain.' if os_string.empty?
 
     response = conn.post "vm/#{os_string}"
 
     res_body = JSON.parse(response.body)
 
-    if res_body["ok"]
+    if res_body['ok']
       res_body
     elsif response.status == 401
       raise AuthError, "HTTP #{response.status}: The token provided could not authenticate to the pooler.\n#{res_body}"
@@ -64,14 +52,10 @@ class Pooler
   end
 
   def self.modify(verbose, url, hostname, token, modify_hash)
-    if token.nil?
-      raise TokenError, "Token provided was nil. Request cannot be made to modify vm"
-    end
+    raise TokenError, 'Token provided was nil. Request cannot be made to modify vm' if token.nil?
 
     modify_hash.keys.each do |key|
-      unless [:tags, :lifetime, :disk].include? key
-        raise ModifyError, "Configured service type does not support modification of #{key}."
-      end
+      raise ModifyError, "Configured service type does not support modification of #{key}." unless %i[tags lifetime disk].include? key
     end
 
     conn = Http.get_conn(verbose, url)
@@ -88,13 +72,18 @@ class Pooler
     end
 
     res_body = JSON.parse(response.body)
-    res_body
+
+    if res_body['ok']
+      res_body
+    elsif response.status == 401
+      raise AuthError, "HTTP #{response.status}: The token provided could not authenticate to the pooler.\n#{res_body}"
+    else
+      raise ModifyError, "HTTP #{response.status}: Failed to modify VMs from the pooler vm/#{hostname}. #{res_body}"
+    end
   end
 
   def self.disk(verbose, url, hostname, token, disk)
-    if token.nil?
-      raise TokenError, "Token provided was nil. Request cannot be made to modify vm"
-    end
+    raise TokenError, 'Token provided was nil. Request cannot be made to modify vm' if token.nil?
 
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token
@@ -106,15 +95,11 @@ class Pooler
   end
 
   def self.delete(verbose, url, hosts, token)
-    if token.nil?
-      raise TokenError, "Token provided was nil. Request cannot be made to delete vm"
-    end
+    raise TokenError, 'Token provided was nil. Request cannot be made to delete vm' if token.nil?
 
     conn = Http.get_conn(verbose, url)
 
-    if token
-      conn.headers['X-AUTH-TOKEN'] = token
-    end
+    conn.headers['X-AUTH-TOKEN'] = token if token
 
     response_body = {}
 
@@ -153,9 +138,7 @@ class Pooler
   end
 
   def self.snapshot(verbose, url, hostname, token)
-    if token.nil?
-      raise TokenError, "Token provided was nil. Request cannot be made to snapshot vm"
-    end
+    raise TokenError, 'Token provided was nil. Request cannot be made to snapshot vm' if token.nil?
 
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token
@@ -166,16 +149,12 @@ class Pooler
   end
 
   def self.revert(verbose, url, hostname, token, snapshot_sha)
-    if token.nil?
-      raise TokenError, "Token provided was nil. Request cannot be made to revert vm"
-    end
+    raise TokenError, 'Token provided was nil. Request cannot be made to revert vm' if token.nil?
 
     conn = Http.get_conn(verbose, url)
     conn.headers['X-AUTH-TOKEN'] = token
 
-    if snapshot_sha.nil?
-      raise "Snapshot SHA provided was nil, could not revert #{hostname}"
-    end
+    raise "Snapshot SHA provided was nil, could not revert #{hostname}" if snapshot_sha.nil?
 
     response = conn.post "vm/#{hostname}/snapshot/#{snapshot_sha}"
     res_body = JSON.parse(response.body)

data/lib/vmfloaty/service.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'commander/user_interaction'
 require 'commander/command'
 require 'vmfloaty/utils'
 require 'vmfloaty/ssh'
 
 class Service
-
   attr_reader :config
 
   def initialize(options, config_hash = {})
@@ -13,14 +14,18 @@ class Service
     @service_object = Utils.get_service_object @config['type']
   end
 
-  def method_missing(m, *args, &block)
-    if @service_object.respond_to? m
-      @service_object.send(m, *args, &block)
+  def method_missing(method_name, *args, &block)
+    if @service_object.respond_to?(method_name)
+      @service_object.send(method_name, *args, &block)
     else
       super
     end
   end
 
+  def respond_to_missing?(method_name, *)
+    @service_object.respond_to?(method_name) || super
+  end
+
   def url
     @config['url']
   end
@@ -31,7 +36,7 @@ class Service
 
   def user
     unless @config['user']
-      puts "Enter your pooler service username:"
+      puts "Enter your #{@config['url']} service username:"
       @config['user'] = STDIN.gets.chomp
     end
     @config['user']
@@ -39,7 +44,7 @@ class Service
 
   def token
     unless @config['token']
-      puts "No token found. Retrieving a token..."
+      puts 'No token found. Retrieving a token...'
       @config['token'] = get_new_token(nil)
     end
     @config['token']
@@ -47,13 +52,13 @@ class Service
 
   def get_new_token(verbose)
     username = user
-    pass = Commander::UI::password "Enter your pooler service password:", '*'
+    pass = Commander::UI.password "Enter your #{@config['url']} service password:", '*'
     Auth.get_token(verbose, url, username, pass)
   end
 
   def delete_token(verbose, token_value = @config['token'])
     username = user
-    pass = Commander::UI::password "Enter your pooler service password:", '*'
+    pass = Commander::UI.password "Enter your #{@config['url']} service password:", '*'
     Auth.delete_token(verbose, url, username, pass, token_value)
   end
 
@@ -67,13 +72,13 @@ class Service
   end
 
   def list_active(verbose)
-    @service_object.list_active verbose, url, token
+    @service_object.list_active verbose, url, token, user
   end
 
   def retrieve(verbose, os_types, use_token = true)
     puts 'Requesting a vm without a token...' unless use_token
     token_value = use_token ? token : nil
-    @service_object.retrieve verbose, os_types, token_value, url
+    @service_object.retrieve verbose, os_types, token_value, url, user, @config
   end
 
   def ssh(verbose, host_os, use_token = true)
@@ -91,9 +96,9 @@ class Service
 
   def pretty_print_running(verbose, hostnames = [])
     if hostnames.empty?
-      puts "You have no running VMs."
+      puts 'You have no running VMs.'
     else
-      puts "Running VMs:"
+      puts 'Running VMs:'
       @service_object.pretty_print_hosts(verbose, hostnames, url)
     end
   end
@@ -107,7 +112,7 @@ class Service
   end
 
   def delete(verbose, hosts)
-    @service_object.delete verbose, url, hosts, token
+    @service_object.delete verbose, url, hosts, token, user
   end
 
   def status(verbose)
@@ -129,5 +134,4 @@ class Service
   def disk(verbose, hostname, disk)
     @service_object.disk(verbose, url, hostname, token, disk)
   end
-
-end
+end