Use nanliu/archive for download and extraction

Minor fixes

Author: antoineco

CHANGELOG.md

@@ -1,3 +1,9 @@
+###2.0.0
+
+* Major refactoring
+* Use nanliu/archive for download and extraction
+* Minor fixes 
+
 ###1.1.5
 
 * Add support for Java '7u71', '7u72' and '8u25'

manifests/download.pp

@@ -5,9 +5,11 @@
     fail('You must include the oracle_java base class before using any oracle_java sub class')
   }
 
-  # define packages required by the exec resources
-  if !defined(Package['wget']) {
-    package { 'wget': ensure => present }
+  include ::archive
+
+  $require_extraction = $oracle_java::type ? {
+    'tar.gz' => true,
+    default  => false
   }
 
   # make sure install/download directory exists
@@ -17,13 +19,15 @@
     owner  => 'root',
     group  => 'root'
   } ->
-  # download RPM
-  exec { 'download java RPM':
-    path    => '/usr/bin',
-    cwd     => '/usr/java',
-    creates => "/usr/java/${oracle_java::filename}",
-    command => "wget --no-cookies --no-check-certificate --header \"Cookie: oraclelicense=accept-securebackup-cookie\" \"${oracle_java::downloadurl}\"",
-    timeout => 0, # Oracle's servers can sometimes be (very) slow
-    require => Package['wget']
+  # download archive
+  archive { 'java archive':
+    ensure       => present,
+    path         => '/usr/java',
+    cookie       => "oraclelicense=accept-securebackup-cookie",
+    source       => $oracle_java::downloadurl,
+    extract      => $require_extraction,
+    extract_path => '/usr/java',
+    creates      => "/usr/java/${oracle_java::longversion}",
+    cleanup      => true,
   }
 }

manifests/init.pp

@@ -8,6 +8,8 @@
 #   Java SE version to install (valid format: 'major'u'minor' or just 'major')
 # [*type*]
 #   envionment type to install (valid: 'jre'|'jdk')
+# [*format*]
+#   archive format (valid: 'rpm'|'tar.gz')
 #
 # === Actions:
 #
@@ -16,19 +18,22 @@
 # === Requires:
 #
 # * puppetlabs/stdlib module
-# * 'wget' and 'sed' packages
+# * nanliu/archive module
+# * 'sed' package
 #
 # === Sample Usage:
 #
 #  class { '::oracle_java':
 #    version => '8u5',
-#    type    => 'jdk'
+#    type    => 'jdk',
+#    format  => 'rpm'
 #  }
 #
-class oracle_java ($version = '8', $type = 'jre') {
+class oracle_java ($version = '8', $type = 'jre', $format = 'rpm') {
   # parameters validation
   validate_re($version, '^([0-9]|[0-9]u[0-9]{1,2})$', '$version must be formated as \'major\'u\'minor\' or just \'major\'')
   validate_re($type, '^(jre|jdk)$', '$type must be either \'jre\' or \'jdk\'')
+  validate_re($format, '^(rpm|tar.gz)$', '$format must be either \'rpm\' or \'tar.gz\'')
 
   # set to latest release if no minor version was provided
   if $version == '8' {
@@ -139,6 +144,10 @@
 
   # remove extra particle if minor version is 0
   $version_final = delete($version_real, 'u0')
+  $longversion = $min_version ? {
+    '0'     => "${type}1.${maj_version}.0",
+    default => "${type}1.${maj_version}.0_${min_version}"
+  }
 
   # translate system architecture to expected value
   case $::architecture {
@@ -163,6 +172,7 @@
     default => "${type}-${version_final}-linux-${arch}.rpm"
   }
   $downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}"
+
   # used for installing Java 6
   # translate system architecture one more time
   $arch_extracted = $::architecture ? {
@@ -173,7 +183,7 @@
 
   # define package name
   if $maj_version == '8' and $min_version >= '20' {
-    $packagename = "${type}1.${maj_version}.0_${min_version}"
+    $packagename = $longversion
   } else {
     $packagename = $type
   }

metadata.json

@@ -5,12 +5,16 @@
   "project_page": "https://github.com/tOnI0/aco-oracle_java",
   "source": "git://github.com/tOnI0/aco-oracle_java.git",
   "summary": "Puppet module to install Oracle Java on RPM-based Linux systems",
-  "version": "1.1.5",
+  "version": "2.0.0",
   "tags": ["rpm","jre","jdk","oracle","java"],
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 3.2.0"
+    },
+    {
+      "name": "nanliu/archive",
+      "version_requirement": ">= 0.1.2"
     }
   ],
   "requirements": [