Merge pull request #4 from RoboticCheese/jdh-update-provider-resolver…

…-style

Update provider resolver style

CHANGELOG.md

@@ -3,6 +3,8 @@ Gimp Cookbook CHANGELOG
 
 v?.?.? (????-??-??)
 -------------------
+- Update provider resolution to adhere to the most recent standards set by e.g.
+  the [httpd cookbook](https://github.com/chef-cookbooks/httpd).
 
 v0.1.0 (2015-06-28)
 -------------------

README.md

@@ -92,9 +92,9 @@ Provider for FreeBSD platforms.
 
 Provider for Red Hat/CentOS/Scientific/Amazon/Fedora platforms.
 
-***Chef::Provider::GimpApp::Opensuse***
+***Chef::Provider::GimpApp::Suse***
 
-Provider for OpenSUSE platforms.
+Provider for SUSE platforms.
 
 ***Chef::Provider::GimpApp::Package***
 

libraries/provider_gimp_app.rb

@@ -23,7 +23,7 @@
 require_relative 'provider_gimp_app_debian'
 require_relative 'provider_gimp_app_freebsd'
 require_relative 'provider_gimp_app_mac_os_x'
-require_relative 'provider_gimp_app_opensuse'
+require_relative 'provider_gimp_app_suse'
 require_relative 'provider_gimp_app_rhel'
 require_relative 'provider_gimp_app_windows'
 

libraries/provider_gimp_app_debian.rb

@@ -32,6 +32,8 @@ class GimpApp < Provider::LWRPBase
       class Debian < GimpApp::Package
         include Chef::DSL::IncludeRecipe
 
+        provides :gimp_app, platform_family: 'debian'
+
         private
 
         #

libraries/provider_gimp_app_freebsd.rb

@@ -32,6 +32,8 @@ class GimpApp < Provider::LWRPBase
       class Freebsd < GimpApp::Package
         include Chef::DSL::IncludeRecipe
 
+        provides :gimp_app, platform: 'freebsd'
+
         private
 
         #

libraries/provider_gimp_app_mac_os_x.rb

@@ -31,6 +31,8 @@ class GimpApp < Provider::LWRPBase
       class MacOsX < GimpApp
         PATH ||= '/Applications/GIMP.app'
 
+        provides :gimp_app, platform_family: 'mac_os_x'
+
         private
 
         #

libraries/provider_gimp_app_rhel.rb

@@ -29,6 +29,7 @@ class GimpApp < Provider::LWRPBase
       #
       # @author Jonathan Hartman <j@p4nt5.com>
       class Rhel < GimpApp::Package
+        provides :gimp_app, platform_family: %w(rhel fedora)
       end
     end
   end

libraries/provider_gimp_app_opensuse.rb → libraries/provider_gimp_app_suse.rb

@@ -1,7 +1,7 @@
 # Encoding: UTF-8
 #
 # Cookbook Name:: gimp
-# Library:: provider_gimp_app_opensuse
+# Library:: provider_gimp_app_suse
 #
 # Copyright 2015 Jonathan Hartman
 #
@@ -26,12 +26,14 @@
 class Chef
   class Provider
     class GimpApp < Provider::LWRPBase
-      # A GIMP provider for OpenSUSE.
+      # A GIMP provider for SUSE.
       #
       # @author Jonathan Hartman <j@p4nt5.com>
-      class Opensuse < GimpApp::Package
+      class Suse < GimpApp::Package
         include Chef::DSL::IncludeRecipe
 
+        provides :gimp_app, platform_family: 'suse'
+
         #
         # Update Zypper before trying to install the GIMP package.
         #

libraries/provider_gimp_app_windows.rb

@@ -33,6 +33,8 @@ class Windows < GimpApp
 
         include ::Windows::Helper
 
+        provides :gimp_app, platform_family: 'windows'
+
         private
 
         #

metadata.rb

@@ -26,4 +26,5 @@
 supports         'amazon'
 supports         'fedora'
 supports         'opensuse'
+supports         'suse'
 # rubocop:enable SingleSpaceBeforeFirstArg

spec/libraries/provider_gimp_app_debian_spec.rb

@@ -8,6 +8,25 @@
   let(:new_resource) { Chef::Resource::GimpApp.new(name, nil) }
   let(:provider) { described_class.new(new_resource, nil) }
 
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    {
+      'Debian' => { platform: 'debian', version: '7.6' },
+      'Ubuntu' => { platform: 'ubuntu', version: '14.04' }
+    }.each do |k, v|
+      context k do
+        let(:platform) { v }
+
+        it 'returns true' do
+          expect(res).to eq(true)
+        end
+      end
+    end
+  end
+
   describe '#install!' do
     it 'uses an package to install GIMP' do
       p = provider

spec/libraries/provider_gimp_app_freebsd_spec.rb

@@ -8,6 +8,20 @@
   let(:new_resource) { Chef::Resource::GimpApp.new(name, nil) }
   let(:provider) { described_class.new(new_resource, nil) }
 
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    context 'FreeBSD' do
+      let(:platform) { { platform: 'freebsd', version: '10.0' } }
+
+      it 'returns true' do
+        expect(res).to eq(true)
+      end
+    end
+  end
+
   describe '#install!' do
     it 'uses an package to install GIMP' do
       p = provider

spec/libraries/provider_gimp_app_mac_os_x_spec.rb

@@ -15,6 +15,20 @@
     end
   end
 
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    context 'Mac OS X' do
+      let(:platform) { { platform: 'mac_os_x', version: '10.10' } }
+
+      it 'returns true' do
+        expect(res).to eq(true)
+      end
+    end
+  end
+
   describe '#install!' do
     before(:each) do
       allow_any_instance_of(described_class).to receive(:remote_path)

spec/libraries/provider_gimp_app_rhel_spec.rb

@@ -8,6 +8,27 @@
   let(:new_resource) { Chef::Resource::GimpApp.new(name, nil) }
   let(:provider) { described_class.new(new_resource, nil) }
 
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    {
+      'Amazon' => { platform: 'amazon', version: '2014.09' },
+      'CentOS' => { platform: 'centos', version: '7.0' },
+      'Fedora' => { platform: 'fedora', version: '21' },
+      'Red Hat' => { platform: 'redhat', version: '7.0' }
+    }.each do |k, v|
+      context k do
+        let(:platform) { v }
+
+        it 'returns true' do
+          expect(res).to eq(true)
+        end
+      end
+    end
+  end
+
   describe '#install!' do
     it 'uses a package to install GIMP' do
       p = provider

spec/libraries/provider_gimp_app_suse_spec.rb

@@ -0,0 +1,40 @@
+# Encoding: UTF-8
+
+require_relative '../spec_helper'
+require_relative '../../libraries/provider_gimp_app_suse'
+
+describe Chef::Provider::GimpApp::Suse do
+  let(:name) { 'default' }
+  let(:new_resource) { Chef::Resource::GimpApp.new(name, nil) }
+  let(:provider) { described_class.new(new_resource, nil) }
+
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    {
+      'OpenSUSE' => { platform: 'opensuse', version: '13.1' },
+      'SUSE' => { platform: 'suse', version: '12.0' }
+    }.each do |k, v|
+      context k do
+        let(:platform) { v }
+
+        it 'returns true' do
+          expect(res).to eq(true)
+        end
+      end
+    end
+  end
+
+  describe '#install!' do
+    it 'uses a package to install GIMP' do
+      p = provider
+      expect(p).to receive(:include_recipe).with('zypper')
+      expect(p).to receive(:package).with('gimp').and_yield
+      expect(p).to receive(:version).with(nil)
+      expect(p).to receive(:action).with(:install)
+      p.send(:install!)
+    end
+  end
+end

spec/libraries/provider_gimp_app_windows_spec.rb

@@ -15,6 +15,20 @@
     end
   end
 
+  describe '.provides?' do
+    let(:platform) { nil }
+    let(:node) { ChefSpec::Macros.stub_node('node.example', platform) }
+    let(:res) { described_class.provides?(node, new_resource) }
+
+    context 'Windows' do
+      let(:platform) { { platform: 'windows', version: '2012R2' } }
+
+      it 'returns true' do
+        expect(res).to eq(true)
+      end
+    end
+  end
+
   describe '#install!' do
     before(:each) do
       [:download_package, :install_package].each do |m|