Refactor tests and cleanup logic

Signed-off-by: Jared Quick <jquick@chef.io>

Author: jquick

lib/train/plugins/base_connection.rb

@@ -72,12 +72,12 @@ def platform
     # @param command [String] command string to execute
     # @return [CommandResult] contains the result of running the command
     def run_command_via_connection(_command)
-      fail Train::ClientError, "#{self.class} does not implement #run_command_via_connection()"
+      fail NotImplementedError, "#{self.class} does not implement #run_command_via_connection()"
     end
 
     # run command with optional caching
     def run_command(command)
-      return @cacher.run_command(command) if @cacher.cache_enabled[:command] == true
+      return @cacher.run_command(command) if @cacher.cache_enabled?(:command)
 
       run_command_via_connection(command)
     end
@@ -88,12 +88,12 @@ def run_command(command)
     # @param [String] path which is being inspected
     # @return [FileCommon] file object that allows for interaction
     def file_via_connection(_path, *_args)
-      fail Train::ClientError, "#{self.class} does not implement #file_via_connection(...)"
+      fail NotImplementedError, "#{self.class} does not implement #file_via_connection(...)"
     end
 
     # file with optional caching
     def file(path, *args)
-      return @cacher.file(path, *args) if @cacher.cache_enabled[:file] == true
+      return @cacher.file(path, *args) if @cacher.cache_enabled?(:file)
 
       file_via_connection(path, *args)
     end
@@ -103,7 +103,7 @@ def file(path, *args)
     #
     # @return [LoginCommand] array of command line tokens
     def login_command
-      fail Train::ClientError, "#{self.class} does not implement #login_command()"
+      fail NotImplementedError, "#{self.class} does not implement #login_command()"
     end
 
     # Block and return only when the remote host is prepared and ready to

lib/train/plugins/cache_connection.rb

@@ -18,28 +18,24 @@ def initialize(connection)
       }
 
       @cache_enabled.each_key do |type|
-        @cache[type] = {}
+        clear_cache(type)
       end
     end
 
+    def cache_enabled?(type)
+      @cache_enabled[type.to_sym]
+    end
+
     def clear_cache(type)
       @cache[type.to_sym] = {}
     end
 
     def file(path)
-      if @cache[:file].key?(path)
-        @cache[:file][path]
-      else
-        @cache[:file][path] = @connection.file_via_connection(path)
-      end
+      @cache[:file][path] ||= @connection.file_via_connection(path)
     end
 
     def run_command(cmd)
-      if @cache[:command].key?(cmd)
-        @cache[:command][cmd]
-      else
-        @cache[:command][cmd] = @connection.run_command_via_connection(cmd)
-      end
+      @cache[:command][cmd] ||= @connection.run_command_via_connection(cmd)
     end
   end
 end

test/unit/plugins/cache_connection_test.rb

@@ -16,7 +16,9 @@
     it 'default connection cache settings' do
       cacher = connection.instance_variable_get(:@cacher)
       cacher.cache_enabled[:file].must_equal true
+      cacher.cache_enabled?(:file).must_equal true
       cacher.cache_enabled[:command].must_equal false
+      cacher.cache_enabled?(:command).must_equal false
     end
   end
 

test/unit/plugins/connection_test.rb

@@ -10,28 +10,28 @@
       connection.close # wont raise
     end
 
-    it 'provides a run_command method' do
-      proc { connection.run_command('') }.must_raise Train::ClientError
+    it 'raises an exception for run_command' do
+      proc { connection.run_command('') }.must_raise NotImplementedError
     end
 
-    it 'provides a run_command_via_connection method' do
-      proc { connection.run_command_via_connection('') }.must_raise Train::ClientError
+    it 'raises an exception for run_command_via_connection' do
+      proc { connection.run_command_via_connection('') }.must_raise NotImplementedError
     end
 
-    it 'provides an os method' do
-      proc { connection.os }.must_raise Train::ClientError
+    it 'raises an exception for os method' do
+      proc { connection.os }.must_raise NotImplementedError
     end
 
-    it 'provides a file method' do
-      proc { connection.file('') }.must_raise Train::ClientError
+    it 'raises an exception for file method' do
+      proc { connection.file('') }.must_raise NotImplementedError
     end
 
-    it 'provides a file_via_connection method' do
-      proc { connection.file_via_connection('') }.must_raise Train::ClientError
+    it 'raises an exception for file_via_connection method' do
+      proc { connection.file_via_connection('') }.must_raise NotImplementedError
     end
 
-    it 'provides a login command method' do
-      proc { connection.login_command }.must_raise Train::ClientError
+    it 'raises an exception for login command method' do
+      proc { connection.login_command }.must_raise NotImplementedError
     end
 
     it 'can wait until ready' do

test/unit/transports/local_test.rb

@@ -43,6 +43,16 @@ def initialize
     connection.login_command.must_be_nil
   end
 
+  it 'provides a run_command_via_connection method' do
+    methods = connection.class.instance_methods(false)
+    methods.include?(:run_command_via_connection).must_equal true
+  end
+
+  it 'provides a file_via_connection method' do
+    methods = connection.class.instance_methods(false)
+    methods.include?(:file_via_connection).must_equal true
+  end
+
   describe 'when running a local command' do
     let(:cmd_runner) { Minitest::Mock.new }
 

test/unit/transports/mock_test.rb

@@ -19,6 +19,16 @@
     connection.uri.must_equal 'mock://'
   end
 
+  it 'provides a run_command_via_connection method' do
+    methods = connection.class.instance_methods(false)
+    methods.include?(:run_command_via_connection).must_equal true
+  end
+
+  it 'provides a file_via_connection method' do
+    methods = connection.class.instance_methods(false)
+    methods.include?(:file_via_connection).must_equal true
+  end
+
   describe 'when running a mocked command' do
     let(:mock_cmd) {  }
 

test/unit/transports/ssh_test.rb

@@ -58,6 +58,16 @@
     let(:ssh) { cls.new(conf) }
     let(:connection) { ssh.connection }
 
+    it 'provides a run_command_via_connection method' do
+      methods = connection.class.instance_methods(false)
+      methods.include?(:run_command_via_connection).must_equal true
+    end
+
+    it 'provides a file_via_connection method' do
+      methods = connection.class.instance_methods(false)
+      methods.include?(:file_via_connection).must_equal true
+    end
+
     it 'gets the connection' do
       connection.must_be_kind_of Train::Transports::SSH::Connection
     end