From d531f47e8f7f06b94004838c62fea6079584439f Mon Sep 17 00:00:00 2001
From: Martin Jackson <martin@uncommonsense-uk.com>
Date: Thu, 20 Jun 2013 10:41:34 +0100
Subject: [PATCH 1/2] Added some files for git to ignore. Stop
 Intellij/RubyMine from polluting source tree.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 73879ef..2fe0063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ pkg/
 .DS_Store
 metadata.json
 spec/fixtures
+*.idea
+*.swp
+*.tmp
\ No newline at end of file

From 9fcf5d1a23475cbd115834f3e1352f80649fa72f Mon Sep 17 00:00:00 2001
From: Martin Jackson <martin@uncommonsense-uk.com>
Date: Thu, 20 Jun 2013 11:03:01 +0100
Subject: [PATCH 2/2] Added support Amazon Linux using facter >= 1.7.x. Fixes
 1.

---
 manifests/params.pp       |  4 ++++
 spec/classes/java_spec.rb | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/manifests/params.pp b/manifests/params.pp
index 09981db..520e0c4 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -24,6 +24,10 @@ class java::params {
           $jdk_package = 'java'
           $jre_package = 'java'
         }
+        'Amazon': {
+          $jdk_package = 'java-1.7.0-openjdk-devel'
+          $jre_package = 'java-1.7.0-openjdk'
+        }
       }
     }
     'Debian': {
diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb
index 5e802c9..96ef14e 100644
--- a/spec/classes/java_spec.rb
+++ b/spec/classes/java_spec.rb
@@ -28,4 +28,15 @@ describe 'java', :type => :class do
     it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
   end
 
+  context 'select openjdk for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
+  end
+
+  context 'select passed value for Amazon Linux' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
+    let(:params) { { 'distribution' => 'jre' } }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
 end