bash-completion on macos

Author: edestecd

manifests/vcsscm/git.pp

@@ -11,24 +11,33 @@
   $gitignore       = false,
 ) inherits software::params {
 
+  $provider = $facts['os']['name'] ? {
+    'Darwin'          => brew,
+    /(Debian|Ubuntu)/ => undef,
+    'windows'         => chocolatey,
+    default           => fail("The ${name} class is not supported on ${facts['os']['name']}."),
+  }
+
+  package { 'git':
+    ensure   => $ensure,
+    provider => $provider,
+  }
+
+  if $bash_completion and $facts['os']['name'] != 'windows' {
+    package { 'bash-completion':
+      ensure   => $ensure,
+      provider => $provider,
+    }
+  }
+
   case $facts['os']['name'] {
     'Debian', 'Ubuntu': {
-      package { 'git':
-        ensure => $ensure,
-      }
-
       if $gui {
         package { ['gitk', 'git-gui']:
           ensure => $ensure,
         }
       }
 
-      if $bash_completion {
-        package { 'bash-completion':
-          ensure => $ensure,
-        }
-      }
-
       if $bash_prompt {
 
         vcsrepo { '/opt/bash-git-prompt/':
@@ -128,15 +137,7 @@
         }
       }
     }
-    'windows': {
-      package { 'git':
-        ensure   => $ensure,
-        provider => chocolatey,
-      }
-    }
-    default: {
-      fail("The ${name} class is not supported on ${facts['os']['name']}.")
-    }
+    default: {}
   }
 
 }

spec/classes/vcsscm/git_spec.rb

@@ -10,11 +10,14 @@
       # rubocop:disable RSpec/RepeatedExample
       context 'with defaults' do
         if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_package('git').with_provider('brew') }
+          it { is_expected.not_to contain_package('bash-completion') }
         elsif facts[:os]['name'] == 'windows'
           it { is_expected.to compile.with_all_deps }
-          it { is_expected.to contain_package('git') }
-        else
+          it { is_expected.to contain_package('git').with_provider('chocolatey') }
+          it { is_expected.not_to contain_package('bash-completion') }
+        elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
           it { is_expected.not_to contain_package('gitk') }
@@ -36,7 +39,10 @@
         end
 
         if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_package('git').with_provider('brew') }
+          it { is_expected.not_to contain_package('gitk') }
+          it { is_expected.not_to contain_package('git-gui') }
         elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
@@ -54,7 +60,13 @@
         end
 
         if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_package('git').with_provider('brew') }
+          it { is_expected.to contain_package('bash-completion').with_provider('brew') }
+        elsif facts[:os]['name'] == 'windows'
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_package('git').with_provider('chocolatey') }
+          it { is_expected.not_to contain_package('bash-completion') }
         elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
@@ -75,9 +87,7 @@
           }
         end
 
-        if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
-        elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
+        if ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
           it {
@@ -103,9 +113,7 @@
           }
         end
 
-        if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
-        elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
+        if ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
           it { is_expected.not_to contain_file('/etc/gitconfig') }
@@ -133,9 +141,7 @@
           }
         end
 
-        if facts[:os]['name'] == 'Darwin'
-          it { is_expected.to compile.and_raise_error(%r{is not supported on Darwin.}) }
-        elsif ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
+        if ['Debian', 'Ubuntu'].include?(facts[:os]['name'])
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_package('git') }
           it {