Refactored and simplified.

maestrodev · Nov 5, 2012 · e07ff12 · e07ff12
1 parent b029376
commit e07ff12
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 33 deletions.
diff --git a/manifests/ant.pp b/manifests/ant.pp
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,3 +1,15 @@
-class ant {
+class ant($version = $ant::params::version) inherits ant::params {
+  wget::fetch { "ant":
+    source => "http://archive.apache.org/dist/ant/binaries/apache-ant-${version}-bin.tar.gz",
+    destination => "${ant::params::srcdir}/apache-ant-${version}-bin.tar.gz"
+  } ->
+  exec { "tar zxvf ${ant::params::srcdir}/apache-ant-${version}-bin.tar.gz":
+    cwd => "/usr/share/",
+    creates => "/usr/share/apache-ant-${version}",
+    path    => "/bin/:/usr/bin"
+  } ->
+  file { "/usr/bin/ant":
+    ensure => "/usr/share/apache-ant-${version}/bin/ant",
+  }
 
 }
diff --git a/manifests/ivy.pp b/manifests/ivy.pp
@@ -1,5 +1,5 @@
 class ant::ivy($version="2.2.0") {
-  include ant::params
+  require ant
 
   wget::fetch { "ivy":
     source => "http://mirrors.gigenet.com/apache//ant/ivy/${version}/apache-ivy-${version}-bin.tar.gz",

diff --git a/manifests/tasks/maven.pp b/manifests/tasks/maven.pp
@@ -1,5 +1,6 @@
 class ant::tasks::maven($version = "2.1.3") {
-  include ant::params
+  require ant
+
   wget::fetch { "maven-ant-task":
      source => "http://archive.apache.org/dist/maven/binaries/maven-ant-tasks-$version.jar",
      destination => "/usr/share/apache-ant-${ant::params::version}/lib/maven-ant-tasks-$version.jar"

diff --git a/manifests/tasks/sonar.pp b/manifests/tasks/sonar.pp
@@ -1,5 +1,5 @@
 class ant::tasks::sonar($version="1.2") {
-  include ant::params
+  require ant
   wget::fetch { "sonar-ant-task":
     source => "http://repository.codehaus.org/org/codehaus/sonar-plugins/sonar-ant-task/$version/sonar-ant-task-$version.jar",
     destination => "/usr/share/apache-ant-${ant::params::version}/lib/sonar-ant-task-$version.jar"

diff --git a/spec/classes/ant_spec.rb b/spec/classes/ant_spec.rb