vmfloaty 1.2.0 → 1.6.0

data/lib/vmfloaty/utils.rb

@@ -39,7 +39,10 @@ class Utils
     #   "engine"=>"vmpooler"
     # }
 
-    raise ArgumentError, "Bad GET response passed to format_hosts: #{response_body.to_json}" unless response_body.delete('ok')
+    unless response_body.delete('ok')
+      raise ArgumentError,
+            "Bad GET response passed to format_hosts: #{response_body.to_json}"
+    end
 
     # vmpooler reports the domain separately from the hostname
     domain = response_body.delete('domain')
@@ -50,7 +53,7 @@ class Utils
     abs_job_id = response_body.delete('job_id')
     result['job_id'] = abs_job_id unless abs_job_id.nil?
 
-    filtered_response_body = response_body.reject { |key, _| key == 'request_id' || key == 'ready' }
+    filtered_response_body = response_body.reject { |key, _| %w[request_id ready].include?(key) }
     filtered_response_body.each do |os, value|
       hostnames = Array(value['hostname'])
       hostnames.map! { |host| "#{host}.#{domain}" } if domain
@@ -106,7 +109,7 @@ class Utils
   def self.pretty_print_hosts(verbose, service, hostnames = [], print_to_stderr = false, indent = 0)
     output_target = print_to_stderr ? $stderr : $stdout
 
-    fetched_data = self.get_host_data(verbose, service, hostnames)
+    fetched_data = get_host_data(verbose, service, hostnames)
     fetched_data.each do |hostname, host_data|
       case service.type
       when 'ABS'
@@ -116,13 +119,14 @@ class Utils
 
         output_target.puts "- [JobID:#{host_data['request']['job']['id']}] <#{host_data['state']}>"
         host_data['allocated_resources'].each do |allocated_resources, _i|
-          if (allocated_resources['engine'] == "vmpooler" || allocated_resources['engine'] == 'ondemand') && service.config["vmpooler_fallback"]
+          if (allocated_resources['engine'] == 'vmpooler' || allocated_resources['engine'] == 'ondemand') && service.config['vmpooler_fallback']
             vmpooler_service = service.clone
             vmpooler_service.silent = true
             vmpooler_service.maybe_use_vmpooler
-            self.pretty_print_hosts(verbose, vmpooler_service, allocated_resources['hostname'].split('.')[0], print_to_stderr, indent+2)
+            pretty_print_hosts(verbose, vmpooler_service, allocated_resources['hostname'].split('.')[0],
+                               print_to_stderr, indent + 2)
           else
-            #TODO we could add more specific metadata for the other services, nspooler and aws
+            # TODO: we could add more specific metadata for the other services, nspooler and aws
             output_target.puts "  - #{allocated_resources['hostname']} (#{allocated_resources['type']})"
           end
         end
@@ -130,12 +134,17 @@ class Utils
         tag_pairs = []
         tag_pairs = host_data['tags'].map { |key, value| "#{key}: #{value}" } unless host_data['tags'].nil?
         duration = "#{host_data['running']}/#{host_data['lifetime']} hours"
-        metadata = [host_data['template'], duration, *tag_pairs]
-        output_target.puts "- #{hostname}.#{host_data['domain']} (#{metadata.join(', ')})".gsub(/^/, ' ' * indent)
+        metadata = [host_data['state'], host_data['template'], duration, *tag_pairs]
+        message = "- #{hostname}.#{host_data['domain']} (#{metadata.join(', ')})".gsub(/^/, ' ' * indent)
+        if host_data['state'] && host_data['state'] == 'destroyed'
+          output_target.puts "- DESTROYED #{hostname}.#{host_data['domain']}".gsub(/^/, ' ' * indent)
+        else
+          output_target.puts message
+        end
       when 'NonstandardPooler'
         line = "- #{host_data['fqdn']} (#{host_data['os_triple']}"
         line += ", #{host_data['hours_left_on_reservation']}h remaining"
-        line += ", reason: #{host_data['reserved_for_reason']}" unless host_data['reserved_for_reason'].empty?
+        line += ", reason: #{host_data['reserved_for_reason']}" unless  host_data['reserved_for_reason'].nil? || host_data['reserved_for_reason'].empty?
         line += ')'
         output_target.puts line
       else
@@ -148,30 +157,26 @@ class Utils
     result = {}
     hostnames = [hostnames] unless hostnames.is_a? Array
     hostnames.each do |hostname|
-      begin
-        response = service.query(verbose, hostname)
-        host_data = response[hostname]
-        if block_given?
-          yield host_data result
+      response = service.query(verbose, hostname)
+      host_data = response[hostname]
+      if block_given?
+        yield host_data result
+      else
+        case service.type
+        when 'ABS'
+          # For ABS, 'hostname' variable is the jobID
+          result[hostname] = host_data if host_data['state'] == 'allocated' || host_data['state'] == 'filled'
+        when 'Pooler'
+          result[hostname] = host_data
+        when 'NonstandardPooler'
+          result[hostname] = host_data
         else
-          case service.type
-          when 'ABS'
-            # For ABS, 'hostname' variable is the jobID
-            if host_data['state'] == 'allocated' || host_data['state'] == 'filled'
-              result[hostname] = host_data
-            end
-          when 'Pooler'
-            result[hostname] = host_data
-          when 'NonstandardPooler'
-            result[hostname] = host_data
-          else
-            raise "Invalid service type #{service.type}"
-          end
+          raise "Invalid service type #{service.type}"
         end
-      rescue StandardError => e
-        FloatyLogger.error("Something went wrong while trying to gather information on #{hostname}:")
-        FloatyLogger.error(e)
       end
+    rescue StandardError => e
+      FloatyLogger.error("Something went wrong while trying to gather information on #{hostname}:")
+      FloatyLogger.error(e)
     end
     result
   end
@@ -187,18 +192,16 @@ class Utils
 
       width = pools.keys.map(&:length).max
       pools.each do |name, pool|
-        begin
-          max = pool['max']
-          ready = pool['ready']
-          pending = pool['pending']
-          missing = max - ready - pending
-          char = 'o'
-          puts "#{name.ljust(width)} #{(char * ready).green}#{(char * pending).yellow}#{(char * missing).red}"
-        rescue StandardError => e
-          FloatyLogger.error "#{name.ljust(width)} #{e.red}"
-        end
+        max = pool['max']
+        ready = pool['ready']
+        pending = pool['pending']
+        missing = max - ready - pending
+        char = 'o'
+        puts "#{name.ljust(width)} #{(char * ready).green}#{(char * pending).yellow}#{(char * missing).red}"
+      rescue StandardError => e
+        FloatyLogger.error "#{name.ljust(width)} #{e.red}"
       end
-      puts message.colorize(status_response['status']['ok'] ? :default : :red)
+      puts message
     when 'NonstandardPooler'
       pools = status_response
       pools.delete 'ok'
@@ -206,16 +209,14 @@ class Utils
 
       width = pools.keys.map(&:length).max
       pools.each do |name, pool|
-        begin
-          max = pool['total_hosts']
-          ready = pool['available_hosts']
-          pending = pool['pending'] || 0 # not available for nspooler
-          missing = max - ready - pending
-          char = 'o'
-          puts "#{name.ljust(width)} #{(char * ready).green}#{(char * pending).yellow}#{(char * missing).red}"
-        rescue StandardError => e
-          FloatyLogger.error "#{name.ljust(width)} #{e.red}"
-        end
+        max = pool['total_hosts']
+        ready = pool['available_hosts']
+        pending = pool['pending'] || 0 # not available for nspooler
+        missing = max - ready - pending
+        char = 'o'
+        puts "#{name.ljust(width)} #{(char * ready).green}#{(char * pending).yellow}#{(char * missing).red}"
+      rescue StandardError => e
+        FloatyLogger.error "#{name.ljust(width)} #{e.red}"
       end
     when 'ABS'
       FloatyLogger.error 'ABS Not OK' unless status_response
@@ -251,11 +252,11 @@ class Utils
   def self.get_service_config(config, options)
     # The top-level url, user, and token values in the config file are treated as defaults
     service_config = {
-      'url'   => config['url'],
-      'user'  => config['user'],
+      'url' => config['url'],
+      'user' => config['user'],
       'token' => config['token'],
       'vmpooler_fallback' => config['vmpooler_fallback'],
-      'type'  => config['type'] || 'vmpooler',
+      'type' => config['type'] || 'vmpooler'
     }
 
     if config['services']
@@ -266,7 +267,10 @@ class Utils
         service_config.merge! values
       else
         # If the user provided a service name at the command line, use that service if posible, or fail
-        raise ArgumentError, "Could not find a configured service named '#{options.service}' in ~/.vmfloaty.yml" unless config['services'][options.service]
+        unless config['services'][options.service]
+          raise ArgumentError,
+                "Could not find a configured service named '#{options.service}' in ~/.vmfloaty.yml"
+        end
 
         # If the service is configured but some values are missing, use the top-level defaults to fill them in
         service_config.merge! config['services'][options.service]
@@ -290,22 +294,22 @@ class Utils
     config = Conf.read_config
     # The top-level url, user, and token values in the config file are treated as defaults
     service_config = {
-        'url'   => config['url'],
-        'user'  => config['user'],
-        'token' => config['token'],
-        'type'  => 'vmpooler',
+      'url' => config['url'],
+      'user' => config['user'],
+      'token' => config['token'],
+      'type' => 'vmpooler'
     }
 
     # at a minimum, the url needs to be configured
     if config['services'] && config['services'][vmpooler_fallback] && config['services'][vmpooler_fallback]['url']
       # If the service is configured but some values are missing, use the top-level defaults to fill them in
       service_config.merge! config['services'][vmpooler_fallback]
+    elsif vmpooler_fallback.nil?
+      raise ArgumentError,
+            "The abs service should have a key named 'vmpooler_fallback' in ~/.vmfloaty.yml with a value that points to a vmpooler service name use this format:\nservices:\n  myabs:\n    url: 'http://abs.com'\n    user: 'superman'\n    token: 'kryptonite'\n    vmpooler_fallback: 'myvmpooler'\n  myvmpooler:\n    url: 'http://vmpooler.com'\n    user: 'superman'\n    token: 'kryptonite'"
     else
-      if vmpooler_fallback.nil?
-        raise ArgumentError, "The abs service should have a key named 'vmpooler_fallback' in ~/.vmfloaty.yml with a value that points to a vmpooler service name use this format:\nservices:\n  myabs:\n    url: 'http://abs.com'\n    user: 'superman'\n    token: 'kryptonite'\n    vmpooler_fallback: 'myvmpooler'\n  myvmpooler:\n    url: 'http://vmpooler.com'\n    user: 'superman'\n    token: 'kryptonite'"
-      else
-        raise ArgumentError, "Could not find a configured service named '#{vmpooler_fallback}' in ~/.vmfloaty.yml use this format:\nservices:\n  #{vmpooler_fallback}:\n    url: 'http://vmpooler.com'\n    user: 'superman'\n    token: 'kryptonite'"
-      end
+      raise ArgumentError,
+            "Could not find a configured service named '#{vmpooler_fallback}' in ~/.vmfloaty.yml use this format:\nservices:\n  #{vmpooler_fallback}:\n    url: 'http://vmpooler.com'\n    user: 'superman'\n    token: 'kryptonite'"
     end
 
     service_config

data/lib/vmfloaty/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 class Vmfloaty
-  VERSION = '1.2.0'
+  VERSION = '1.6.0'
 end
-

data/lib/vmfloaty.rb

@@ -2,7 +2,6 @@
 
 require 'rubygems'
 require 'commander'
-require 'colorize'
 require 'json'
 require 'pp'
 require 'uri'
@@ -20,7 +19,8 @@ class Vmfloaty
 
   def run # rubocop:disable Metrics/AbcSize
     program :version, Vmfloaty::VERSION
-    program :description, "A CLI helper tool for Puppet's vmpooler to help you stay afloat.\n\nConfiguration may be placed in a ~/.vmfloaty.yml file."
+    program :description,
+            "A CLI helper tool for Puppet's vmpooler to help you stay afloat.\n\nConfiguration may be placed in a ~/.vmfloaty.yml file."
 
     config = Conf.read_config
 
@@ -43,9 +43,7 @@ class Vmfloaty
       c.option '--loglevel STRING', String, 'the log level to use (debug, info, error)'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
-        if options.loglevel
-          FloatyLogger.setlevel = options.loglevel
-        end
+        FloatyLogger.setlevel = options.loglevel if options.loglevel
         service = Service.new(options, config)
         use_token = !options.notoken
         force = options.force
@@ -100,21 +98,19 @@ class Vmfloaty
       c.option '--loglevel STRING', String, 'the log level to use (debug, info, error)'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
-        if options.loglevel
-          FloatyLogger.setlevel = options.loglevel
-        end
+        FloatyLogger.setlevel = options.loglevel if options.loglevel
 
         service = Service.new(options, config)
         filter = args[0]
 
         if options.active
           # list active vms
-          if service.type == "ABS"
-            # this is actually job_ids
-            running_vms = service.list_active_job_ids(verbose, service.url, service.user)
-          else
-            running_vms = service.list_active(verbose)
-          end
+          running_vms = if service.type == 'ABS'
+                          # this is actually job_ids
+                          service.list_active_job_ids(verbose, service.url, service.user)
+                        else
+                          service.list_active(verbose)
+                        end
           host = URI.parse(service.url).host
           if running_vms.empty?
             if options.json
@@ -122,17 +118,15 @@ class Vmfloaty
             else
               FloatyLogger.info "You have no running VMs on #{host}"
             end
-          else
-            if options.json
-              puts Utils.get_host_data(verbose, service, running_vms).to_json
-            elsif options.hostnameonly
-              Utils.get_host_data(verbose, service, running_vms).each do |hostname, host_data|
-                Utils.print_fqdn_for_host(service, hostname, host_data)
-              end
-            else
-              puts "Your VMs on #{host}:"
-              Utils.pretty_print_hosts(verbose, service, running_vms)
+          elsif options.json
+            puts Utils.get_host_data(verbose, service, running_vms).to_json
+          elsif options.hostnameonly
+            Utils.get_host_data(verbose, service, running_vms).each do |hostname, host_data|
+              Utils.print_fqdn_for_host(service, hostname, host_data)
             end
+          else
+            puts "Your VMs on #{host}:"
+            Utils.pretty_print_hosts(verbose, service, running_vms)
           end
         else
           # list available vms from pooler
@@ -164,7 +158,8 @@ class Vmfloaty
       c.syntax = 'floaty modify hostname [options]'
       c.summary = 'Modify a VM\'s tags, time to live, disk space, or reservation reason'
       c.description = 'This command makes modifications to the virtual machines state in the pooler service. 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.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 '--service STRING', String, 'Configured pooler service name'
       c.option '--url STRING', String, 'URL of pooler service'
@@ -185,18 +180,18 @@ class Vmfloaty
           exit 1
         end
         running_vms =
-            if modify_all
-              service.list_active(verbose)
-            else
-              hostname.split(',')
-            end
+          if modify_all
+            service.list_active(verbose)
+          else
+            hostname.split(',')
+          end
 
         tags = options.tags ? JSON.parse(options.tags) : nil
         modify_hash = {
-          :lifetime => options.lifetime,
-          :disk     => options.disk,
-          :tags     => tags,
-          :reason   => options.reason,
+          lifetime: options.lifetime,
+          disk: options.disk,
+          tags: tags,
+          reason: options.reason
         }
         modify_hash.delete_if { |_, value| value.nil? }
 
@@ -204,12 +199,10 @@ class Vmfloaty
           ok = true
           modified_hash = {}
           running_vms.each do |vm|
-            begin
-              modified_hash[vm] = service.modify(verbose, vm, modify_hash)
-            rescue ModifyError => e
-              FloatyLogger.error e
-              ok = false
-            end
+            modified_hash[vm] = service.modify(verbose, vm, modify_hash)
+          rescue ModifyError => e
+            FloatyLogger.error e
+            ok = false
           end
           if ok
             if modify_all
@@ -241,9 +234,7 @@ class Vmfloaty
       c.option '--loglevel STRING', String, 'the log level to use (debug, info, error)'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
-        if options.loglevel
-          FloatyLogger.setlevel = options.loglevel
-        end
+        FloatyLogger.setlevel = options.loglevel if options.loglevel
 
         service = Service.new(options, config)
         hostnames = args[0]
@@ -254,17 +245,17 @@ class Vmfloaty
         successes = []
 
         if delete_all
-          if service.type == "ABS"
-            # this is actually job_ids
-            running_vms = service.list_active_job_ids(verbose, service.url, service.user)
-          else
-            running_vms = service.list_active(verbose)
-          end
+          running_vms = if service.type == 'ABS'
+                          # this is actually job_ids
+                          service.list_active_job_ids(verbose, service.url, service.user)
+                        else
+                          service.list_active(verbose)
+                        end
           if running_vms.empty?
             if options.json
               puts {}.to_json
             else
-              FloatyLogger.info "You have no running VMs."
+              FloatyLogger.info 'You have no running VMs.'
             end
           else
             confirmed = true
@@ -328,7 +319,8 @@ class Vmfloaty
       c.syntax = 'floaty snapshot hostname [options]'
       c.summary = 'Takes a snapshot of a given vm'
       c.description = 'Will request a snapshot be taken of the given hostname in the pooler service. This command is known to take a while depending on how much load is on the pooler service.'
-      c.example 'Takes a snapshot for a given host', 'floaty snapshot myvm.example.com --url http://vmpooler.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 '--service STRING', String, 'Configured pooler service name'
       c.option '--url STRING', String, 'URL of pooler service'
@@ -354,7 +346,8 @@ class Vmfloaty
       c.syntax = 'floaty revert hostname snapshot [options]'
       c.summary = 'Reverts a vm to a specified snapshot'
       c.description = 'Given a snapshot SHA, vmfloaty will request a revert to the pooler service 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.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 '--service STRING', String, 'Configured pooler service name'
       c.option '--url STRING', String, 'URL of pooler service'
@@ -366,7 +359,9 @@ class Vmfloaty
         hostname = args[0]
         snapshot_sha = args[1] || options.snapshot
 
-        FloatyLogger.info "Two snapshot arguments were given....using snapshot #{snapshot_sha}" if args[1] && options.snapshot
+        if args[1] && options.snapshot
+          FloatyLogger.info "Two snapshot arguments were given....using snapshot #{snapshot_sha}"
+        end
 
         begin
           revert_req = service.revert(verbose, hostname, snapshot_sha)
@@ -391,9 +386,7 @@ class Vmfloaty
       c.option '--loglevel STRING', String, 'the log level to use (debug, info, error)'
       c.action do |_, options|
         verbose = options.verbose || config['verbose']
-        if options.loglevel
-          FloatyLogger.setlevel = options.loglevel
-        end
+        FloatyLogger.setlevel = options.loglevel if options.loglevel
         service = Service.new(options, config)
         if options.json
           pp service.status(verbose)
@@ -475,6 +468,8 @@ class Vmfloaty
       c.option '--user STRING', String, 'User to authenticate with'
       c.option '--token STRING', String, 'Token for pooler service'
       c.option '--notoken', 'Makes a request without a token'
+      c.option '--priority STRING', 'Priority for supported backends(ABS) (High(1), Medium(2), Low(3))'
+      c.option '--ondemand', 'Requested vms are provisioned upon receival of the request, tracked by a request ID'
       c.action do |args, options|
         verbose = options.verbose || config['verbose']
         service = Service.new(options, config)
@@ -527,7 +522,7 @@ class Vmfloaty
       c.example 'Print a list of the valid service types', 'floaty service types'
       c.example 'Print a sample config file with multiple services', 'floaty service examples'
       c.example 'list vms from the service named "nspooler-prod"', 'floaty list --service nspooler-prod'
-      c.action do |args, options|
+      c.action do |args, _options|
         action = args.first
 
         example_config = Utils.strip_heredoc(<<-CONFIG)

data/spec/spec_helper.rb

@@ -1,12 +1,21 @@
 # frozen_string_literal: true
 
 require 'simplecov'
-require 'coveralls'
+require 'simplecov-lcov'
+require 'base64'
+
+SimpleCov::Formatter::LcovFormatter.config do |c|
+  c.report_with_single_file = true
+  c.single_report_path = 'coverage/lcov.info'
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::LcovFormatter
+  ]
+)
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
 SimpleCov.start do
   add_filter %r{^/spec/}
 end
@@ -26,3 +35,19 @@ RSpec.configure do |config|
   config.tty = true
   config.formatter = :documentation
 end
+
+def get_headers(username: nil, password: nil, token: nil, content_type: nil, content_length: nil)
+  headers = {
+    'Accept'          => '*/*',
+    'Accept-Encoding' => /gzip/,
+    'User-Agent'      => /Faraday/,
+  }
+  if username && password
+    auth = Base64.encode64("#{username}:#{password}").chomp
+    headers['Authorization'] = "Basic #{auth}"
+  end
+  headers['X-Auth-Token'] = token if token
+  headers['Content-Type'] = content_type if content_type
+  headers['Content-Length'] = content_length.to_s if content_length
+  headers
+end

data/spec/vmfloaty/abs/auth_spec.rb

@@ -3,7 +3,11 @@
 require 'spec_helper'
 require_relative '../../../lib/vmfloaty/auth'
 
+user = 'first.last'
+pass = 'password'
+
 describe Pooler do
+
   before :each do
     @abs_url = 'https://abs.example.com/api/v2'
   end
@@ -15,18 +19,20 @@ describe Pooler do
     end
 
     it 'returns a token from abs' do
-      stub_request(:post, 'https://first.last:password@abs.example.com/api/v2/token')
-        .to_return(:status => 200, :body => @get_token_response, :headers => {})
+      stub_request(:post, 'https://abs.example.com/api/v2/token')
+        .with(headers: get_headers(username: user, password: pass, content_length: 0))
+        .to_return(status: 200, body: @get_token_response, headers: {})
 
-      token = Auth.get_token(false, @abs_url, 'first.last', 'password')
+      token = Auth.get_token(false, @abs_url, user, pass)
       expect(token).to eq @token
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:post, 'https://first.last:password@abs.example.com/api/v2/token')
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+      stub_request(:post, 'https://abs.example.com/api/v2/token')
+        .with(headers: get_headers(username: user, password: pass, content_length: 0))
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
-      expect { Auth.get_token(false, @abs_url, 'first.last', 'password') }.to raise_error(TokenError)
+      expect { Auth.get_token(false, @abs_url, user, pass) }.to raise_error(TokenError)
     end
   end
 
@@ -37,21 +43,24 @@ describe Pooler do
     end
 
     it 'deletes the specified token' do
-      stub_request(:delete, 'https://first.last:password@abs.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .to_return(:status => 200, :body => @delete_token_response, :headers => {})
+      stub_request(:delete, 'https://abs.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(headers: get_headers(username: user, password: pass))
+        .to_return(status: 200, body: @delete_token_response, headers: {})
 
-      expect(Auth.delete_token(false, @abs_url, 'first.last', 'password', @token)).to eq JSON.parse(@delete_token_response)
+      expect(Auth.delete_token(false, @abs_url, user, pass,
+                              @token)).to eq JSON.parse(@delete_token_response)
     end
 
     it 'raises a token error if something goes wrong' do
-      stub_request(:delete, 'https://first.last:password@abs.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+      stub_request(:delete, 'https://abs.example.com/api/v2/token/utpg2i2xswor6h8ttjhu3d47z53yy47y')
+        .with(headers: get_headers(username: user, password: pass))
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
-      expect { Auth.delete_token(false, @abs_url, 'first.last', 'password', @token) }.to raise_error(TokenError)
+      expect { Auth.delete_token(false, @abs_url, user, pass, @token) }.to raise_error(TokenError)
     end
 
     it 'raises a token error if no token provided' do
-      expect { Auth.delete_token(false, @abs_url, 'first.last', 'password', nil) }.to raise_error(TokenError)
+      expect { Auth.delete_token(false, @abs_url, user, pass, nil) }.to raise_error(TokenError)
     end
   end
 
@@ -63,16 +72,16 @@ describe Pooler do
 
     it 'checks the status of a token' do
       stub_request(:get, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
-        .to_return(:status => 200, :body => @token_status_response, :headers => {})
+        .with(headers: get_headers)
+        .to_return(status: 200, body: @token_status_response, headers: {})
 
       expect(Auth.token_status(false, @abs_url, @token)).to eq JSON.parse(@token_status_response)
     end
 
     it 'raises a token error if something goes wrong' do
       stub_request(:get, "#{@abs_url}/token/utpg2i2xswor6h8ttjhu3d47z53yy47y")
-        .with(:headers => { 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3' })
-        .to_return(:status => 500, :body => '{"ok":false}', :headers => {})
+        .with(headers: get_headers)
+        .to_return(status: 500, body: '{"ok":false}', headers: {})
 
       expect { Auth.token_status(false, @abs_url, @token) }.to raise_error(TokenError)
     end