scooter 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834cba9e4a59e400a64b5c7585e423bca3034f80
-  data.tar.gz: a57f5e7ccbafde3b5410223ed9a6029680ff8a2e
+  metadata.gz: 475a579ee226f7cc2aac1e40e35e70ab4fa4f8bf
+  data.tar.gz: 89fcedd1365b092db6007a29ecde1527999540f1
 SHA512:
-  metadata.gz: 2dbfb2824a973408b8f1a8596fcd061c8c54fd3f33828cf5b14860452c25a8e7f8c24a1471494c06328739da16060be217166fefea238d5dd92ebe19b2291c17
-  data.tar.gz: beb65d6fd82d9b0a5c8953e2f9d2cc1c12d58643b18ea0b7e690e1cd28ff52f20661442bd6121492d8a0902295b4941840c0ba05d34a4017c04839c0f0148310
+  metadata.gz: 6671df80d51349d177624a2fb321b29df6b2a5d31839b349c9b402a7aad448e9a573d854f4f123d7273b833e6aa73eece55e9a174853f84fc8f50721b767e3d4
+  data.tar.gz: 98c0f4c448e52a201110711b2c49aed9658205d28959a49ad6059fef579398a3968ee5e773aca6f5f623c6dc1677d88990f07d07cbb1deb83b2fd84564ed1f48

data/lib/scooter/httpdispatchers/consoledispatcher.rb

@@ -76,14 +76,14 @@ module Scooter
       # not a certificate dispatcher, but representing an LDAP or local user. If
       # credentials are supplied during initialization, then this overrides the
       # parent class and only acquires a ca_cert.
-      def acquire_ssl_components(host=self.host)
+      def configure_private_key_and_cert_with_puppet(host=self.host)
         if credentials == nil
           super(host)
         else
           if !host.is_a?(Unix::Host)
             raise 'Can only acquire SSL certs if the host is a Unix::Host'
           end
-          acquire_ca_cert(host)
+          configure_cacert_with_puppet(host)
         end
       end
 

data/lib/scooter/version.rb

@@ -1,5 +1,5 @@
 module Scooter
   module Version
-    STRING = '4.3.0'
+    STRING = '4.3.1'
   end
 end

data/spec/scooter/httpdispatchers/consoledispatcher_spec.rb

@@ -9,22 +9,20 @@ module Scooter
     let(:username) {'Ziggy'}
     let(:password) {'Stardust'}
     let(:mock_page) {double('mock_page')}
+    let(:logger) { double('logger')}
 
     subject { HttpDispatchers::ConsoleDispatcher.new(host, credentials) }
 
     context 'with a beaker host passed in' do
-      let(:logger) { double('logger')}
       unixhost = { roles:     ['test_role'],
                    'platform' => 'debian-7-x86_64' }
       let(:host) { Beaker::Host.create('test.com', unixhost, {:logger => logger}) }
       before do
-        allow_any_instance_of(Beaker::Http::FaradayBeakerLogger).to receive(:info) { true }
-        allow_any_instance_of(Beaker::Http::FaradayBeakerLogger).to receive(:debug) { true }
-        expect(OpenSSL::PKey).to receive(:read).and_return('Pkey')
-        expect(OpenSSL::X509::Certificate).to receive(:new).and_return('client_cert')
-        allow_any_instance_of(HttpDispatchers::HttpDispatcher).to receive(:get_host_cert) {'host cert'}
-        allow_any_instance_of(HttpDispatchers::HttpDispatcher).to receive(:get_host_private_key) {'key file'}
-        allow_any_instance_of(HttpDispatchers::HttpDispatcher).to receive(:get_host_cacert) {'cert file'}
+        allow(logger).to receive(:info) {true}
+        allow(logger).to receive(:debug) {true}
+        expect(OpenSSL::PKey).not_to receive(:read)
+        expect(OpenSSL::X509::Certificate).not_to receive(:new)
+        allow_any_instance_of(HttpDispatchers::ConsoleDispatcher).to receive(:configure_cacert_with_puppet).and_return('cacert')
         expect(subject).to be_kind_of(HttpDispatchers::ConsoleDispatcher)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scooter
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2019-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler