Merge pull request #12 from jantman/aur-package-switch

Aur package switch

CHANGELOG

@@ -1,3 +1,6 @@
+2017-07-09 release 0.2.2
+- Update for AUR package changes: bcwc-pcie-dkms -> bcwc-pcie-git and bcwc-firmware -> facetimehd-firmware
+
 2017-01-08 release 0.2.1
 - updated README with note that bluetooth now works
 - many changes to testing (TravisCI, spec, beaker acceptance) and use new versions of dependencies (thanks to petems)

README.md

@@ -75,7 +75,7 @@ Unit tests should be run automatically by TravisCI. To run them locally, use ``b
 
 ### Acceptance Tests
 
-Acceptance tests are done with [beaker](https://github.com/puppetlabs/beaker) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec). They currently use the "2016.12.01" version of the [ogarcia/archlinux-x64 Vagrant box](https://atlas.hashicorp.com/ogarcia/boxes/archlinux-x64/) for VirtualBox.
+Acceptance tests are done with [beaker](https://github.com/puppetlabs/beaker) and [beaker-rspec](https://github.com/puppetlabs/beaker-rspec). They currently use the "2017.07.01" version of the [ogarcia/archlinux-x64 Vagrant box](https://atlas.hashicorp.com/ogarcia/boxes/archlinux-x64/) for VirtualBox.
 
 1. Use whatever ruby version is specified in ``.ruby-version``
 2. ``bundle install --path vendor``

manifests/mac_keyboard.pp

@@ -27,8 +27,8 @@
     owner  => 'root',
     group  => 'root',
     mode   => '0755',
-  } ->
-  file { '/etc/systemd/system/kdm.service.d/kbd_backlight.conf':
+  }
+  -> file { '/etc/systemd/system/kdm.service.d/kbd_backlight.conf':
     ensure => present,
     owner  => 'root',
     group  => 'root',

manifests/touchpad.pp

@@ -22,8 +22,7 @@
   package {'xf86-input-synaptics':
     ensure => present,
   }
-  ->
-  file { '/etc/X11/xorg.conf.d/00-touchpad.conf':
+  -> file { '/etc/X11/xorg.conf.d/00-touchpad.conf':
     ensure  => present,
     owner   => 'root',
     group   => 'root',

manifests/videodriver.pp

@@ -38,8 +38,8 @@
   package {$remove_packages :
     ensure          => absent,
     install_options => '-dds',
-  } ->
-  package {$add_packages :
+  }
+  -> package {$add_packages :
     ensure  => present,
     # TODO: is this needed?
     #notify  => Exec['mkinitcpio'],

manifests/webcam.pp

@@ -7,17 +7,17 @@
 # Parameters:
 #
 # Actions:
-#   - Install bcwc-pcie-dkms and bcwc-pcie-firmware on MacBookPro11,4
+#   - Install bcwc-pcie-git and facetimehd-firmware on MacBookPro11,4
 #
 class archlinux_macbookretina::webcam {
 
   case $::productname {
     'MacBookPro11,4': {
-      package {'bcwc-pcie-dkms':
+      package {'bcwc-pcie-git':
         ensure => present,
       }
 
-      package {'bcwc-pcie-firmware':
+      package {'facetimehd-firmware':
         ensure => present,
       }
     }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "jantman-archlinux_macbookretina",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "summary": "Configure Arch Linux on a MacBook Retina",
   "author": "jantman",
   "description": "Provides many classes (and a sane default class/init.pp) for configuring Arch Linux on a MacBook Retina.",

spec/acceptance/classes/webcam_spec.rb

@@ -14,11 +14,11 @@ class { 'archlinux_macbookretina::webcam': }
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe package('bcwc-pcie-dkms') do
+    describe package('bcwc-pcie-git') do
       it { should be_installed }
     end
 
-    describe package('bcwc-pcie-firmware') do
+    describe package('facetimehd-firmware') do
       it { should be_installed }
     end
   end

spec/acceptance/nodesets/default.yml

@@ -1,10 +1,10 @@
 HOSTS:
-  archlinux-2016.12.01-amd64:
+  archlinux-2017.07.01-amd64:
     roles:
       - master
-    platform: archlinux-2016.12.01-amd64
+    platform: archlinux-2017.07.01-amd64
     box: ogarcia/archlinux-x64
-    box_version: 2016.12.01
+    box_version: 2017.07.01
     hypervisor: vagrant
 CONFIG:
   log_level: verbose

spec/classes/webcam_spec.rb

@@ -12,8 +12,8 @@
 
   describe "installs packages" do
       it { should compile.with_all_deps }
-      it { should contain_package('bcwc-pcie-dkms').with_ensure('present') }
-      it { should contain_package('bcwc-pcie-firmware').with_ensure('present') }
+      it { should contain_package('bcwc-pcie-git').with_ensure('present') }
+      it { should contain_package('facetimehd-firmware').with_ensure('present') }
   end
   describe 'uses broadcom-wl on MBP 10,1' do
     let(:facts) {{
@@ -25,7 +25,7 @@
                    :dmi             => { 'product' => { 'name' => 'MacBookPro10,1' } },
                  }}
    it { should compile.with_all_deps }
-   it { should_not contain_package('bcwc-pcie-dkms') }
-   it { should_not contain_package('bcwc-pcie-firmware') }
+   it { should_not contain_package('bcwc-pcie-git') }
+   it { should_not contain_package('facetimehd-firmware') }
   end
 end