Fixes for centos versions

.fixtures.yml

@@ -0,0 +1,5 @@
+fixtures:
+  repositories:
+    stdlib: git://github.com/puppetlabs/puppetlabs-stdlib.git
+  symlinks:
+    java: "#{source_dir}"

.gitignore

@@ -1,3 +1,4 @@
 pkg/
 .DS_Store
 metadata.json
+spec/fixtures

Gemfile

@@ -0,0 +1,13 @@
+source "http://rubygems.org"
+
+if ENV.key?('PUPPET_VERSION')
+  puppetversion = "= #{ENV['PUPPET_VERSION']}"
+else
+  puppetversion = ['~> 2.7']
+end
+
+gem "rake"
+gem "puppet", puppetversion
+gem "puppet-lint"
+gem "rspec-puppet"
+gem "puppetlabs_spec_helper"

Gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.2)
+    facter (1.6.18)
+    metaclass (0.0.1)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    puppet (2.7.21)
+      facter (~> 1.5)
+    puppet-lint (0.3.2)
+    puppetlabs_spec_helper (0.4.1)
+      mocha (>= 0.10.5)
+      rake
+      rspec (>= 2.9.0)
+      rspec-puppet (>= 0.1.1)
+    rake (10.0.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+    rspec-puppet (0.1.6)
+      rspec
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  puppet (~> 2.7)
+  puppet-lint
+  puppetlabs_spec_helper
+  rake
+  rspec-puppet

Modulefile

@@ -1,11 +1,10 @@
-name    'puppetlabs-java'
-version '0.2.0'
-source 'git://github.com/puppetlabs/puppetlabs-java'
-author 'puppetlabs'
-license 'Apache'
-summary 'Manage the official Java runtime'
-description 'Manage the official Java runtime'
+name         'puppetlabs-java'
+version      '0.2.0'
+source       'git://github.com/puppetlabs/puppetlabs-java'
+author       'puppetlabs'
+license      'Apache'
+summary      'Manage the official Java runtime'
+description  'Manage the official Java runtime'
 project_page 'https://github.com/puppetlabs/puppetlabs-java'
 
-## Add dependencies, if any:
-dependency 'puppetlabs/stdlib', '>= 0.1.6'
+dependency   'puppetlabs/stdlib', '>= 0.1.6'

README.markdown

@@ -7,7 +7,10 @@ Currently this simply deploys the package on Enterprise Linux based systems and
 Tested on:
 
  * Centos 5.6
+ * Centos 5.8
+ * Centos 6.3
  * Ubuntu 10.04 Lucid
+ * Ubuntu 12.04 Precise
 
 # RedHat Support #
 

Rakefile

@@ -0,0 +1,5 @@
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet-lint/tasks/puppet-lint'
+
+PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"

manifests/init.pp

@@ -10,7 +10,6 @@
 #
 # Sample Usage:
 #
-# [Remember: No empty lines between comments and class definition]
 class java(
   $distribution = 'jdk',
   $version      = 'present'
@@ -26,20 +25,23 @@
 
     'RedHat': {
 
-      if ($operatingsystem == 'Fedora') {
-        class { 'java::package_redhat':
-          version      => $version,
-          distribution => 'java',
-          require      => Anchor['java::begin'],
-          before       => Anchor['java::end'],
+      if ($::operatingsystem == 'Fedora') {
+        $distribution_redhat = 'java'
+      } elsif ($::operatingsystem == 'Centos') {
+        case $::operatingsystemrelease {
+          '5.8': { $distribution_redhat = 'java-1.7.0-openjdk' }
+          '6.3': { $distribution_redhat = 'java-1.7.0-openjdk' }
+          default: { $distribution_redhat = $distribution }
         }
       } else {
-        class { 'java::package_redhat':
-          version      => $version,
-          distribution => $distribution,
-          require      => Anchor['java::begin'],
-          before       => Anchor['java::end'],
-        }
+        $distribution_redhat = $distribution
+      }
+
+      class { 'java::package_redhat':
+        version      => $version,
+        distribution => $distribution_redhat,
+        require      => Anchor['java::begin'],
+        before       => Anchor['java::end'],
       }
 
     }

spec/classes/java_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'java', :type => :class do
+
+  context 'select openjdk for Centos 5.8' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
+  context 'select openjdk for Centos 6.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
+    it { should contain_package('java').with_name('java-1.7.0-openjdk') }
+  end
+
+  context 'select default for Centos 5.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
+    it { should contain_package('java').with_name('jdk') }
+  end
+
+  context 'select passed value for Centos 5.3' do
+    let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
+    let(:params) { { 'distribution' => 'java-1.6.0-openjdk' } }
+    it { should contain_package('java').with_name('java-1.6.0-openjdk') }
+  end
+
+end

spec/spec_helper.rb

@@ -1,18 +1 @@
-require 'pathname'
-dir = Pathname.new(__FILE__).parent
-$LOAD_PATH.unshift(dir, dir + 'lib', dir + '../lib')
-
-require 'mocha'
-require 'puppet'
-gem 'rspec', '=1.2.9'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
+require 'puppetlabs_spec_helper/module_spec_helper'