Wrapped up the config provider and tests

Author: tejaycar

.kitchen.yml

@@ -11,7 +11,6 @@ platforms:
 
 suites:
 - name: default
-  run_list: 
+  run_list:
   - recipe[minitest-handler]
   - recipe[ssh_test]
-  attributes: {}

.rubocop.yml

@@ -16,3 +16,5 @@ MethodLength:
   Severity: refactor
 SingleSpaceBeforeFirstArg:
   Enabled: false
+Documentation:
+  Enabled: false

attributes/default.rb

@@ -1,2 +1,2 @@
 default['ssh']['known_hosts_path'] = '/etc/ssh/ssh_known_hosts'
-default['ssh']['config_path'] = '/etc/ssh/ssh_config'
+default['ssh']['config_path'] = '/etc/ssh/ssh_config'

libraries/ssh_config_helpers.rb

@@ -4,13 +4,8 @@
 class Chef
   module SSH
     module ConfigHelpers
-
       def default_or_user_path(username = nil)
-        if username
-          user_dir(username)
-        else
-          ssh_path = node['ssh']['config_path']
-        end
+        username ? "#{user_dir(username)}/.ssh/config" : node['ssh']['config_path']
       end
 
       def default?(path)
@@ -38,13 +33,13 @@ def parse_file(path)
       def to_config(existing_entries)
         existing_entries.map do |name, options|
           if options
-            body = options.map{ |key, value| "  #{key} #{value}" }.join("\n")
+            body = options.map { |key, value| "  #{key} #{value}" }.join("\n")
           else
             body = ''
           end
-          [ "Host #{name}", body ].join("\n")
+          ["Host #{name}", body].join("\n")
         end.join("\n\n") + "\n"
       end
     end
   end
-end
+end

libraries/ssh_helpers.rb

@@ -2,7 +2,6 @@ class Chef
   module SSH
     module Helpers
       require 'etc'
-
       def user_dir(username)
         pwent = pwent_for(username)
         pwent.dir
@@ -14,4 +13,3 @@ def pwent_for(uid)
     end
   end
 end
-

metadata.rb

@@ -1,7 +1,7 @@
-name             "ssh"
-maintainer       "Mark Olson"
-maintainer_email "theothermarkolson@gmail.com"
-license          "Apache 2.0"
-description      "LWRPs for managing SSH known_hosts and config files"
+name             'ssh'
+maintainer       'Tejay Cardon'
+maintainer_email 'tejay.cardon@gmail.com'
+license          'Apache 2.0'
+description      'LWRPs for managing SSH known_hosts and config files'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.6.6"
+version          '0.10.0'

providers/config.rb

@@ -30,23 +30,20 @@ def whyrun_supported?
 end
 
 def create_directory
-  directory "Creating #{::File.dirname(@path)} for #{@user}" do
-    owner     @user
-    group     @group if @group
-    mode      default?(@path) ? 00755 : 00700
-    path      ::File.dirname(@path)
-    recursive true
-  end
+  d = directory ::File.dirname(@path)
+  d.owner     @user
+  d.group     @group if @group
+  d.mode      default?(@path) ? 00755 : 00700
+  d.path      ::File.dirname(@path)
+  d.recursive true
 end
 
 def create_file
-  existing_entries = @existing_entries
-  file @path do
-    user    @user if @user
-    group   @group if @group
-    mode    default?(@path) ? 00644 : 00600
-    content "# Created by Chef for #{node.name}\n\n#{to_config(existing_entries)}"
-  end
+  f = file @path
+  f.owner   @user if @user
+  f.group   @group if @group
+  f.mode    default?(@path) ? 00644 : 00600
+  f.content "# Created by Chef for #{node.name}\n\n#{to_config(@existing_entries)}"
 end
 
 def load_current_resource
@@ -58,4 +55,3 @@ def load_current_resource
   @current_resource = Chef::Resource::SshConfig.new(@new_resource.name)
   @current_resource.exists = @existing_entries.key? @new_resource.name
 end
-

recipes/default.rb

@@ -4,4 +4,4 @@
 
 package 'ssh' do
   action :install
-end
+end

spec/providers/config_spec.rb spec/provider_tests/config_spec.rbspec/providers/config_spec.rb renamed to spec/provider_tests/config_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-describe "ssh_config resource" do
+describe 'ssh_config resource' do
 
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(:step_into => :ssh_config)
     runner.converge('ssh_test::config')
   end
 
   let(:default_config) { '/etc/ssh/ssh_config' }
-  let(:vagrant_config) { '/home/vagrant' }
+  let(:vagrant_config) { '/home/vagrant/.ssh/config' }
 
   let(:test_user) { 'someone' }
   let(:test_group) { 'other_group' }
-  let(:test_config) { '/some/random/path' }
+  let(:test_config) { '/some/random/path/config' }
 
   let(:partial_start) do
     content = []
@@ -54,7 +54,7 @@
 
   let(:test_end) do
     content = []
-    content << 'Host github.com'
+    content << 'Host test.io'
     content << '  User testuser'
     content << '  DummyKey I was allowed'
     content << ''
@@ -77,6 +77,7 @@
     allow(IO).to receive(:foreach)
     allow(IO).to partial_start.reduce(receive(:foreach).with(vagrant_config), :and_yield)
     allow(IO).to partial_start.reduce(receive(:foreach).with(default_config), :and_yield)
+    allow(IO).to partial_start.reduce(receive(:foreach).with(test_config), :and_yield)
 
     allow(Etc).to receive(:getpwnam)
     allow(Etc).to receive(:getpwnam).with('vagrant').and_return(
@@ -162,4 +163,56 @@
       break if found_one
     end
   end
+
+  it 'can create user ssh configs' do
+    expect(chef_run).to create_file(vagrant_config).with(
+      :owner => 'vagrant',
+      :group => 200,
+      :mode => 00600
+    ).with_content(
+      (common_end + github_and_partial_end).join("\n")
+    )
+  end
+
+  it 'can create the global ssh config' do
+    expect(chef_run).to create_file(default_config).with(
+      :owner => 'root',
+      :group => 0,
+      :mode => 00644
+    ).with_content(
+      (common_end + github_and_partial_end).join("\n")
+    )
+  end
+
+  it 'creates the /etc/ssh directory if it is missing' do
+    expect(chef_run).to create_directory(::File.dirname(default_config)).with(
+      :owner => 'root',
+      :group => 0,
+      :mode => 00755
+    )
+  end
+
+  it "creates vagrant's ~/.ssh/config file" do
+    expect(chef_run).to create_directory(::File.dirname(vagrant_config)).with(
+      :owner => 'vagrant',
+      :group => 200,
+      :mode => 00700
+    )
+  end
+
+  context 'when non-default attributes are used' do
+    it 'can handle a custom path' do
+      expect(chef_run).to render_file(test_config).with_content(
+        (common_end + test_and_partial_end).join("\n")
+      )
+    end
+
+    it 'can handle a custom owner and group for the config file' do
+      expect(chef_run).to create_file(test_config).with(
+        :owner => test_user,
+        :group => test_group,
+        :mode => 00600
+      )
+    end
+  end
 end