code polishing after lint check

dsestero · dsestero · commit 74dd732433a3 · 2015-04-22T12:02:46.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+##2015-04-22 - Release - 1.0.1
+###Summary
+Code polishing to be more compliant with puppet-lint suggestions.
+
 ##2015-04-21 - Release - 1.0.0
 ###Summary
 Initial release as PuppetForge module.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -5,29 +5,32 @@
 #
 # == Actions:
 #
-# Sets up the default java according to the parameter <tt>java_default_version</tt> if it is not null.
+# Sets up the default java according to the parameter
+# <tt>java_default_version</tt> if it is not null.
 #
 # == Requires:
 # none
 #
-define java::config ($java_version = $title, $java_default_version) {
+define java::config ($java_default_version, $java_version = $title,) {
   if $java_default_version != undef and $java_version == $java_default_version {
     case $::operatingsystem {
       'Ubuntu' : {
         case $::operatingsystemrelease {
           '10.04' : {
-            $javadir = "/usr/lib/jvm/java-${$java_version}-openjdk/jre/bin/java"
+            $javadir = "/usr/lib/jvm/java-${java_version}-openjdk/jre/bin/java"
           }
           '12.04' : {
-            $javadir = "/usr/lib/jvm/java-${$java_version}-openjdk-${::architecture}/jre/bin/java"
+            $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${::architecture}/jre/bin/java"
           }
           default : {
-            fail("The ${module_name} module is not supported on ${::operatingsystem} release ${::operatingsystemrelease}")
+            fail("The ${module_name} module is not supported on ${::operatingsystem} release ${::operatingsystemrelease}"
+            )
           }
         }
       }
       default  : {
-        fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution.")
+        fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution."
+        )
       }
     }
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -4,27 +4,35 @@
 #
 # Parameters:
 #
-# $java_version::         The java version. Possible values at this time are <tt>6</tt> and <tt>7</tt>.
+# $java_version::         The java version. Possible values at this time are
+#                         <tt>6</tt> and <tt>7</tt>.
 #                         Defaults to the resource's title.
 #
-# $java_default_version:: The java default version. Possible values at this time are <tt>6</tt> and <tt>7</tt>.
-#                         If different than +undef+ it will be used to configure the alternative system.
+# $java_default_version:: The java default version. Possible values at this time
+#                         are <tt>6</tt> and <tt>7</tt>.
+#                         If different than +undef+ it will be used to configure
+#                         the alternative system.
 #                         Defaults to +undef+.
 #
 # Actions:
 #
 # Declares all other defines in the java module needed for installing Java.
 # Currently, these consists of java::install, and java::config.
-# Furthermore, the module provides two classes ready for use for installing java-6 and java-7 using the defines.
-# If hiera defines a value for the parameter <tt>java_default_version</tt> on the target node the
-# command <tt>update-alternatives</tt> is issued to set the default java accordingly.
+# Furthermore, the module provides two classes ready for use for installing
+# java-6 and java-7 using the defines.
+# If hiera defines a value for the parameter <tt>java_default_version</tt> on
+# the target node the
+# command <tt>update-alternatives</tt> is issued to set the default java
+# accordingly.
 #
 # Requires: see Modulefile
 #
 # Sample Usage:
 #
 #  java {'6': }
-define java ($java_version = $title, $java_default_version = hiera('java::java_default_version', undef)) {
+define java (
+  $java_version         = $title,
+  $java_default_version = hiera('java::java_default_version', undef)) {
   java::install { $java_version:
   } -> java::config { $java_version:
     java_default_version => $java_default_version,
diff --git a/metadata.json b/metadata.json
@@ -1,10 +1,10 @@
 {
   "author": "Dario Sestero",
   "dependencies": [],
-  "license": "Creative Commons Attribution-Share Alike 4.0 International license (CC-BY-SA-4.0)",
+  "license": "CC-BY-SA-4.0",
   "name": "dsestero-java",
   "project_page": "https://github.com/dsestero/java",
-  "source": "ssh://git@github.com:dsestero/java.git",
+  "source": "https://github.com/dsestero/java.git",
   "summary": "Install Java OpenJDK and configure the default java alternative",
   "requirements": [{"name": "puppet", "version_requirement": "3.x"}],
   "operatingsystem_support": [
@@ -14,5 +14,5 @@
       }
   ],
   "tags": ["java", "jee", "jvm", "middleware"],
-  "version": "1.0.0"
+  "version": "1.0.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,29 +5,32 @@`
`5`	`5`	`#`
`6`	`6`	`# == Actions:`
`7`	`7`	`#`
`8`		`-# Sets up the default java according to the parameter <tt>java_default_version</tt> if it is not null.`
	`8`	`+# Sets up the default java according to the parameter`
	`9`	`+# <tt>java_default_version</tt> if it is not null.`
`9`	`10`	`#`
`10`	`11`	`# == Requires:`
`11`	`12`	`# none`
`12`	`13`	`#`
`13`		`-define java::config ($java_version = $title, $java_default_version) {`
	`14`	`+define java::config ($java_default_version, $java_version = $title,) {`
`14`	`15`	`if $java_default_version != undef and $java_version == $java_default_version {`
`15`	`16`	`case $::operatingsystem {`
`16`	`17`	`'Ubuntu' : {`
`17`	`18`	`case $::operatingsystemrelease {`
`18`	`19`	`'10.04' : {`
`19`		`- $javadir = "/usr/lib/jvm/java-${$java_version}-openjdk/jre/bin/java"`
	`20`	`+ $javadir = "/usr/lib/jvm/java-${java_version}-openjdk/jre/bin/java"`
`20`	`21`	`}`
`21`	`22`	`'12.04' : {`
`22`		`- $javadir = "/usr/lib/jvm/java-${$java_version}-openjdk-${::architecture}/jre/bin/java"`
	`23`	`+ $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${::architecture}/jre/bin/java"`
`23`	`24`	`}`
`24`	`25`	`default : {`
`25`		`- fail("The ${module_name} module is not supported on ${::operatingsystem} release ${::operatingsystemrelease}")`
	`26`	`+ fail("The ${module_name} module is not supported on ${::operatingsystem} release ${::operatingsystemrelease}"`
	`27`	`+ )`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
`29`	`31`	`default : {`
`30`		`- fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution.")`
	`32`	`+ fail("The ${module_name} module is not supported on an ${::operatingsystem} distribution."`
	`33`	`+ )`
`31`	`34`	`}`
`32`	`35`	`}`
`33`	`36`
Original file line number	Diff line number	Diff line change
`@@ -4,27 +4,35 @@`
`4`	`4`	`#`
`5`	`5`	`# Parameters:`
`6`	`6`	`#`
`7`		`-# $java_version:: The java version. Possible values at this time are <tt>6</tt> and <tt>7</tt>.`
	`7`	`+# $java_version:: The java version. Possible values at this time are`
	`8`	`+# <tt>6</tt> and <tt>7</tt>.`
`8`	`9`	`# Defaults to the resource's title.`
`9`	`10`	`#`
`10`		`-# $java_default_version:: The java default version. Possible values at this time are <tt>6</tt> and <tt>7</tt>.`
`11`		`-# If different than +undef+ it will be used to configure the alternative system.`
	`11`	`+# $java_default_version:: The java default version. Possible values at this time`
	`12`	`+# are <tt>6</tt> and <tt>7</tt>.`
	`13`	`+# If different than +undef+ it will be used to configure`
	`14`	`+# the alternative system.`
`12`	`15`	`# Defaults to +undef+.`
`13`	`16`	`#`
`14`	`17`	`# Actions:`
`15`	`18`	`#`
`16`	`19`	`# Declares all other defines in the java module needed for installing Java.`
`17`	`20`	`# Currently, these consists of java::install, and java::config.`
`18`		`-# Furthermore, the module provides two classes ready for use for installing java-6 and java-7 using the defines.`
`19`		`-# If hiera defines a value for the parameter <tt>java_default_version</tt> on the target node the`
`20`		`-# command <tt>update-alternatives</tt> is issued to set the default java accordingly.`
	`21`	`+# Furthermore, the module provides two classes ready for use for installing`
	`22`	`+# java-6 and java-7 using the defines.`
	`23`	`+# If hiera defines a value for the parameter <tt>java_default_version</tt> on`
	`24`	`+# the target node the`
	`25`	`+# command <tt>update-alternatives</tt> is issued to set the default java`
	`26`	`+# accordingly.`
`21`	`27`	`#`
`22`	`28`	`# Requires: see Modulefile`
`23`	`29`	`#`
`24`	`30`	`# Sample Usage:`
`25`	`31`	`#`
`26`	`32`	`# java {'6': }`
`27`		`-define java ($java_version = $title, $java_default_version = hiera('java::java_default_version', undef)) {`
	`33`	`+define java (`
	`34`	`+ $java_version = $title,`
	`35`	`+ $java_default_version = hiera('java::java_default_version', undef)) {`
`28`	`36`	`java::install { $java_version:`
`29`	`37`	`} -> java::config { $java_version:`
`30`	`38`	`java_default_version => $java_default_version,`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`{`
`2`	`2`	`"author": "Dario Sestero",`
`3`	`3`	`"dependencies": [],`
`4`		`- "license": "Creative Commons Attribution-Share Alike 4.0 International license (CC-BY-SA-4.0)",`
	`4`	`+ "license": "CC-BY-SA-4.0",`
`5`	`5`	`"name": "dsestero-java",`
`6`	`6`	`"project_page": "https://github.com/dsestero/java",`
`7`		`- "source": "ssh://git@github.com:dsestero/java.git",`
	`7`	`+ "source": "https://github.com/dsestero/java.git",`
`8`	`8`	`"summary": "Install Java OpenJDK and configure the default java alternative",`
`9`	`9`	`"requirements": [{"name": "puppet", "version_requirement": "3.x"}],`
`10`	`10`	`"operatingsystem_support": [`
`@@ -14,5 +14,5 @@`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"tags": ["java", "jee", "jvm", "middleware"],`
`17`		`- "version": "1.0.0"`
	`17`	`+ "version": "1.0.1"`
`18`	`18`	`}`