vmfloaty 0.8.2 → 0.11.0

data/spec/vmfloaty/utils_spec.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 require 'commander/command'
 require_relative '../../lib/vmfloaty/utils'
 
 describe Utils do
-
-  describe "#standardize_hostnames" do
+  describe '#standardize_hostnames' do
     before :each do
-      @vmpooler_response_body ='{
+      @vmpooler_response_body = '{
          "ok": true,
          "domain": "delivery.mycompany.net",
          "ubuntu-1610-x86_64": {
@@ -28,79 +29,79 @@ describe Utils do
        }'
     end
 
-    it "formats a result from vmpooler into a hash of os to hostnames" do
+    it 'formats a result from vmpooler into a hash of os to hostnames' do
       result = Utils.standardize_hostnames(JSON.parse(@vmpooler_response_body))
-      expect(result).to eq('centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
-                           'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"])
+      expect(result).to eq('centos-7-x86_64'    => ['dlgietfmgeegry2.delivery.mycompany.net'],
+                           'ubuntu-1610-x86_64' => ['gdoy8q3nckuob0i.delivery.mycompany.net', 'ctnktsd0u11p9tm.delivery.mycompany.net'])
     end
 
-    it "formats a result from the nonstandard pooler into a hash of os to hostnames" do
+    it 'formats a result from the nonstandard pooler into a hash of os to hostnames' do
       result = Utils.standardize_hostnames(JSON.parse(@nonstandard_response_body))
-      expect(result).to eq('solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
+      expect(result).to eq('solaris-10-sparc'    => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
                            'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net'])
     end
   end
 
-  describe "#format_host_output" do
+  describe '#format_host_output' do
     before :each do
       @vmpooler_results = {
-        'centos-7-x86_64' => ["dlgietfmgeegry2.delivery.mycompany.net"],
-        'ubuntu-1610-x86_64' => ["gdoy8q3nckuob0i.delivery.mycompany.net", "ctnktsd0u11p9tm.delivery.mycompany.net"]
+        'centos-7-x86_64'    => ['dlgietfmgeegry2.delivery.mycompany.net'],
+        'ubuntu-1610-x86_64' => ['gdoy8q3nckuob0i.delivery.mycompany.net', 'ctnktsd0u11p9tm.delivery.mycompany.net'],
       }
       @nonstandard_results = {
-        'solaris-10-sparc' => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
-        'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net']
+        'solaris-10-sparc'    => ['sol10-10.delivery.mycompany.net', 'sol10-11.delivery.mycompany.net'],
+        'ubuntu-16.04-power8' => ['power8-ubuntu16.04-6.delivery.mycompany.net'],
       }
-      @vmpooler_output = <<-OUT.chomp
-- dlgietfmgeegry2.delivery.mycompany.net (centos-7-x86_64)
-- gdoy8q3nckuob0i.delivery.mycompany.net (ubuntu-1610-x86_64)
-- ctnktsd0u11p9tm.delivery.mycompany.net (ubuntu-1610-x86_64)
+      @vmpooler_output = <<~OUT.chomp
+        - dlgietfmgeegry2.delivery.mycompany.net (centos-7-x86_64)
+        - gdoy8q3nckuob0i.delivery.mycompany.net (ubuntu-1610-x86_64)
+        - ctnktsd0u11p9tm.delivery.mycompany.net (ubuntu-1610-x86_64)
       OUT
-      @nonstandard_output = <<-OUT.chomp
-- sol10-10.delivery.mycompany.net (solaris-10-sparc)
-- sol10-11.delivery.mycompany.net (solaris-10-sparc)
-- power8-ubuntu16.04-6.delivery.mycompany.net (ubuntu-16.04-power8)
+      @nonstandard_output = <<~OUT.chomp
+        - sol10-10.delivery.mycompany.net (solaris-10-sparc)
+        - sol10-11.delivery.mycompany.net (solaris-10-sparc)
+        - power8-ubuntu16.04-6.delivery.mycompany.net (ubuntu-16.04-power8)
       OUT
     end
-    it "formats a hostname hash from vmpooler into a list that includes the os" do
+    it 'formats a hostname hash from vmpooler into a list that includes the os' do
       expect(Utils.format_host_output(@vmpooler_results)).to eq(@vmpooler_output)
     end
 
-    it "formats a hostname hash from the nonstandard pooler into a list that includes the os" do
+    it 'formats a hostname hash from the nonstandard pooler into a list that includes the os' do
       expect(Utils.format_host_output(@nonstandard_results)).to eq(@nonstandard_output)
     end
   end
 
-  describe "#get_service_object" do
-    it "assumes vmpooler by default" do
+  describe '#get_service_object' do
+    it 'assumes vmpooler by default' do
       expect(Utils.get_service_object).to be Pooler
     end
 
-    it "uses nspooler when told explicitly" do
-      expect(Utils.get_service_object "nspooler").to be NonstandardPooler
+    it 'uses nspooler when told explicitly' do
+      expect(Utils.get_service_object('nspooler')).to be NonstandardPooler
     end
   end
 
-  describe "#get_service_config" do
+  describe '#get_service_config' do
     before :each do
       @default_config = {
-          "url" => "http://default.url",
-          "user" => "first.last.default",
-          "token" => "default-token",
+        'url'   => 'http://default.url',
+        'user'  => 'first.last.default',
+        'token' => 'default-token',
       }
       @services_config = {
-          "services" => {
-              "vm" => {
-                  "url" => "http://vmpooler.url",
-                  "user" => "first.last.vmpooler",
-                  "token" => "vmpooler-token"
-              },
-              "ns" => {
-                  "url" => "http://nspooler.url",
-                  "user" => "first.last.nspooler",
-                  "token" => "nspooler-token"
-              }
-          }
+        'services' => {
+          'vm' => {
+            'url'   => 'http://vmpooler.url',
+            'user'  => 'first.last.vmpooler',
+            'token' => 'vmpooler-token',
+          },
+          'ns' => {
+            'url'   => 'http://nspooler.url',
+            'user'  => 'first.last.nspooler',
+            'token' => 'nspooler-token',
+          },
+        },
       }
     end
 
@@ -110,70 +111,70 @@ describe Utils do
       expect(Utils.get_service_config(config, options)).to include @services_config['services']['vm']
     end
 
-    it "allows selection by configured service key" do
+    it 'allows selection by configured service key' do
       config = @default_config.merge @services_config
-      options = MockOptions.new({:service => "ns"})
+      options = MockOptions.new(:service => 'ns')
       expect(Utils.get_service_config(config, options)).to include @services_config['services']['ns']
     end
 
-    it "uses top-level service config values as defaults when configured service values are missing" do
+    it 'uses top-level service config values as defaults when configured service values are missing' do
       config = @default_config.merge @services_config
-      config["services"]['vm'].delete 'url'
-      options = MockOptions.new({:service => "vm"})
+      config['services']['vm'].delete 'url'
+      options = MockOptions.new(:service => 'vm')
       expect(Utils.get_service_config(config, options)['url']).to eq 'http://default.url'
     end
 
     it "raises an error if passed a service name that hasn't been configured" do
       config = @default_config.merge @services_config
-      options = MockOptions.new({:service => "none"})
+      options = MockOptions.new(:service => 'none')
       expect { Utils.get_service_config(config, options) }.to raise_error ArgumentError
     end
 
-    it "prioritizes values passed as command line options over configuration options" do
+    it 'prioritizes values passed as command line options over configuration options' do
       config = @default_config
-      options = MockOptions.new({:url => "http://alternate.url", :token => "alternate-token"})
-      expected = config.merge({"url" => "http://alternate.url", "token" => "alternate-token"})
+      options = MockOptions.new(:url => 'http://alternate.url', :token => 'alternate-token')
+      expected = config.merge('url' => 'http://alternate.url', 'token' => 'alternate-token')
       expect(Utils.get_service_config(config, options)).to include expected
     end
   end
 
-  describe "#generate_os_hash" do
+  describe '#generate_os_hash' do
     before :each do
-      @host_hash = {"centos"=>1, "debian"=>5, "windows"=>1}
+      @host_hash = { 'centos' => 1, 'debian' => 5, 'windows' => 1 }
     end
 
-    it "takes an array of os arguments and returns a formatted hash" do
-      host_arg = ["centos", "debian=5", "windows=1"]
+    it 'takes an array of os arguments and returns a formatted hash' do
+      host_arg = ['centos', 'debian=5', 'windows=1']
       expect(Utils.generate_os_hash(host_arg)).to eq @host_hash
     end
 
-    it "returns an empty hash if there are no arguments provided" do
+    it 'returns an empty hash if there are no arguments provided' do
       host_arg = []
       expect(Utils.generate_os_hash(host_arg)).to be_empty
     end
   end
 
   describe '#pretty_print_hosts' do
-    let(:url)               { 'http://pooler.example.com' }
+    let(:url) { 'http://pooler.example.com' }
 
     it 'prints a vmpooler output with host fqdn, template and duration info' do
       hostname = 'mcpy42eqjxli9g2'
       response_body = { hostname => {
-          'template' => 'ubuntu-1604-x86_64',
-          'lifetime' => 12,
-          'running'  => 9.66,
-          'state' => 'running',
-          'ip' => '127.0.0.1',
-          'domain'   => 'delivery.mycompany.net'
-      }}
-      output = "- mcpy42eqjxli9g2.delivery.mycompany.net (ubuntu-1604-x86_64, 9.66/12 hours)"
-
-      expect(Utils).to receive(:puts).with(output)
-
-      service = Service.new(MockOptions.new, {'url' => url})
+        'template' => 'ubuntu-1604-x86_64',
+        'lifetime' => 12,
+        'running'  => 9.66,
+        'state'    => 'running',
+        'ip'       => '127.0.0.1',
+        'domain'   => 'delivery.mycompany.net',
+      } }
+      output = '- mcpy42eqjxli9g2.delivery.mycompany.net (ubuntu-1604-x86_64, 9.66/12 hours)'
+
+      expect(STDOUT).to receive(:puts).with(output)
+
+      service = Service.new(MockOptions.new, 'url' => url)
       allow(service).to receive(:query)
-                            .with(nil, hostname)
-                            .and_return(response_body)
+        .with(nil, hostname)
+        .and_return(response_body)
 
       Utils.pretty_print_hosts(nil, service, hostname)
     end
@@ -181,46 +182,46 @@ describe Utils do
     it 'prints a vmpooler output with host fqdn, template, duration info, and tags when supplied' do
       hostname = 'aiydvzpg23r415q'
       response_body = { hostname => {
-          'template' => 'redhat-7-x86_64',
-          'lifetime' => 48,
-          'running'  => 7.67,
-          'state' => 'running',
-          'tags'     => {
-              'user' => 'bob',
-              'role' => 'agent'
-          },
-          'ip' => '127.0.0.1',
-          'domain' => 'delivery.mycompany.net'
-      }}
-      output = "- aiydvzpg23r415q.delivery.mycompany.net (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)"
-
-      expect(Utils).to receive(:puts).with(output)
-
-      service = Service.new(MockOptions.new, {'url' => url})
+        'template' => 'redhat-7-x86_64',
+        'lifetime' => 48,
+        'running'  => 7.67,
+        'state'    => 'running',
+        'tags'     => {
+          'user' => 'bob',
+          'role' => 'agent',
+        },
+        'ip'       => '127.0.0.1',
+        'domain'   => 'delivery.mycompany.net',
+      } }
+      output = '- aiydvzpg23r415q.delivery.mycompany.net (redhat-7-x86_64, 7.67/48 hours, user: bob, role: agent)'
+
+      expect(STDOUT).to receive(:puts).with(output)
+
+      service = Service.new(MockOptions.new, 'url' => url)
       allow(service).to receive(:query)
-                            .with(nil, hostname)
-                            .and_return(response_body)
+        .with(nil, hostname)
+        .and_return(response_body)
 
       Utils.pretty_print_hosts(nil, service, hostname)
     end
 
     it 'prints a nonstandard pooler output with host, template, and time remaining' do
-      hostname = "sol11-9.delivery.mycompany.net"
+      hostname = 'sol11-9.delivery.mycompany.net'
       response_body = { hostname => {
-          'fqdn' => hostname,
-          'os_triple' => 'solaris-11-sparc',
-          'reserved_by_user' => 'first.last',
-          'reserved_for_reason' => '',
-          'hours_left_on_reservation' => 35.89
-      }}
-      output = "- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining)"
+        'fqdn'                      => hostname,
+        'os_triple'                 => 'solaris-11-sparc',
+        'reserved_by_user'          => 'first.last',
+        'reserved_for_reason'       => '',
+        'hours_left_on_reservation' => 35.89,
+      } }
+      output = '- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining)'
 
-      expect(Utils).to receive(:puts).with(output)
+      expect(STDOUT).to receive(:puts).with(output)
 
-      service = Service.new(MockOptions.new, {'url' => url, 'type' => 'ns'})
+      service = Service.new(MockOptions.new, 'url' => url, 'type' => 'ns')
       allow(service).to receive(:query)
-                            .with(nil, hostname)
-                            .and_return(response_body)
+        .with(nil, hostname)
+        .and_return(response_body)
 
       Utils.pretty_print_hosts(nil, service, hostname)
     end
@@ -228,20 +229,20 @@ describe Utils do
     it 'prints a nonstandard pooler output with host, template, time remaining, and reason' do
       hostname = 'sol11-9.delivery.mycompany.net'
       response_body = { hostname => {
-          'fqdn' => hostname,
-          'os_triple' => 'solaris-11-sparc',
-          'reserved_by_user' => 'first.last',
-          'reserved_for_reason' => 'testing',
-          'hours_left_on_reservation' => 35.89
-      }}
-      output = "- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining, reason: testing)"
+        'fqdn'                      => hostname,
+        'os_triple'                 => 'solaris-11-sparc',
+        'reserved_by_user'          => 'first.last',
+        'reserved_for_reason'       => 'testing',
+        'hours_left_on_reservation' => 35.89,
+      } }
+      output = '- sol11-9.delivery.mycompany.net (solaris-11-sparc, 35.89h remaining, reason: testing)'
 
-      expect(Utils).to receive(:puts).with(output)
+      expect(STDOUT).to receive(:puts).with(output)
 
-      service = Service.new(MockOptions.new, {'url' => url, 'type' => 'ns'})
+      service = Service.new(MockOptions.new, 'url' => url, 'type' => 'ns')
       allow(service).to receive(:query)
-                            .with(nil, hostname)
-                            .and_return(response_body)
+        .with(nil, hostname)
+        .and_return(response_body)
 
       Utils.pretty_print_hosts(nil, service, hostname)
     end

data/spec/vmfloaty/vmfloaty_services_spec.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# All of the interfaces for the different services must be the
+# same, otherwise there will be errors when you change the caller
+# for the services from services.rb.
+#
+
+require_relative '../../lib/vmfloaty/pooler'
+require_relative '../../lib/vmfloaty/abs'
+require_relative '../../lib/vmfloaty/nonstandard_pooler'
+
+shared_examples 'a vmfloaty service' do
+  it { is_expected.to respond_to(:delete).with(5).arguments }
+  it { is_expected.to respond_to(:disk).with(5).arguments }
+  it { is_expected.to respond_to(:list).with(3).arguments }
+  it { is_expected.to respond_to(:list_active).with(4).arguments }
+  it { is_expected.to respond_to(:modify).with(5).arguments }
+  it { is_expected.to respond_to(:retrieve).with(6).arguments }
+  it { is_expected.to respond_to(:revert).with(5).arguments }
+  it { is_expected.to respond_to(:query).with(3).arguments }
+  it { is_expected.to respond_to(:snapshot).with(4).arguments }
+  it { is_expected.to respond_to(:status).with(2).arguments }
+  it { is_expected.to respond_to(:summary).with(2).arguments }
+end
+
+describe Pooler do
+  subject { Pooler }
+  it_behaves_like 'a vmfloaty service'
+end
+
+describe ABS do
+  subject { ABS }
+  it_behaves_like 'a vmfloaty service'
+end
+
+describe NonstandardPooler do
+  subject { NonstandardPooler }
+  it_behaves_like 'a vmfloaty service'
+end

metadata

@@ -1,60 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: vmfloaty
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Brian Cain
-autorequire: 
+- Puppet
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2020-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 4.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 4.4.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.17.0
 description: A helper tool for vmpooler to help you stay afloat
 email:
 - brianccain@gmail.com
+- dio-gems@puppet.com
 executables:
 - floaty
 extensions: []
@@ -65,10 +73,12 @@ files:
 - bin/floaty
 - extras/completions/floaty.bash
 - lib/vmfloaty.rb
+- lib/vmfloaty/abs.rb
 - lib/vmfloaty/auth.rb
 - lib/vmfloaty/conf.rb
 - lib/vmfloaty/errors.rb
 - lib/vmfloaty/http.rb
+- lib/vmfloaty/logger.rb
 - lib/vmfloaty/nonstandard_pooler.rb
 - lib/vmfloaty/pooler.rb
 - lib/vmfloaty/service.rb
@@ -76,16 +86,20 @@ files:
 - lib/vmfloaty/utils.rb
 - lib/vmfloaty/version.rb
 - spec/spec_helper.rb
+- spec/vmfloaty/abs/auth_spec.rb
+- spec/vmfloaty/abs_spec.rb
 - spec/vmfloaty/auth_spec.rb
 - spec/vmfloaty/nonstandard_pooler_spec.rb
 - spec/vmfloaty/pooler_spec.rb
 - spec/vmfloaty/service_spec.rb
+- spec/vmfloaty/ssh_spec.rb
 - spec/vmfloaty/utils_spec.rb
-homepage: https://github.com/briancain/vmfloaty
+- spec/vmfloaty/vmfloaty_services_spec.rb
+homepage: https://github.com/puppetlabs/vmfloaty
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,15 +114,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: CLI application to interface with vmpooler
 test_files:
 - spec/spec_helper.rb
-- spec/vmfloaty/auth_spec.rb
-- spec/vmfloaty/nonstandard_pooler_spec.rb
-- spec/vmfloaty/pooler_spec.rb
+- spec/vmfloaty/vmfloaty_services_spec.rb
 - spec/vmfloaty/service_spec.rb
+- spec/vmfloaty/abs/auth_spec.rb
+- spec/vmfloaty/nonstandard_pooler_spec.rb
+- spec/vmfloaty/ssh_spec.rb
 - spec/vmfloaty/utils_spec.rb
+- spec/vmfloaty/abs_spec.rb
+- spec/vmfloaty/auth_spec.rb
+- spec/vmfloaty/pooler_spec.rb