Issue 126: renamed to scriptbuilder

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2346 3d8758e0-26b5-11de-8745-db77d3ebf521

initbuilder/src/test/resources/test_script_funcs.cmd

@@ -1,27 +0,0 @@
-@echo off
-
-goto END_FUNCTIONS
-:ABORT_SUB
-    echo Aborting:  %EXCEPTION%.
-    exit /b 1
-    
-:SOURCE_ENV
-    set ENV_FILE=%1
-    shift
-    if not defined ENV_FILE (
-        set EXCEPTION=Internal error.  Called SOURCE_ENV with no file param
-        exit /b 1
-    )
-    call %SETTINGS_FILE%
-    if errorlevel 1 (
-        set EXCEPTION=Please end your '%SETTINGS_FILE%' file with the command 'exit /b 0' to enable this script to detect syntax errors.
-        exit /b 1
-    )
-    exit /b 0
-
-:END_FUNCTIONS
-
-if exist "%APPENV_SETTINGS_FILE%" (
-    call :SOURCE_SF "%APPENV_SETTINGS_FILE%"
-    if errorlevel 1 goto ABORT_SUB
-)

pom.xml

@@ -49,7 +49,7 @@
         <module>vcloud</module>
         <module>twitter</module>
         <module>rimuhosting</module>
-        <module>initbuilder</module>
+        <module>scriptbuilder</module>
     </modules>
     <build>
         <plugins>

scriptbuilder/pom.xml

@@ -29,10 +29,10 @@
         <relativePath>../project/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jclouds-initbuilder</artifactId>
+    <artifactId>jclouds-scriptbuilder</artifactId>
-    <name>jclouds init builder</name>
+    <name>jclouds script builder</name>
     <packaging>jar</packaging>
-    <description>creates init scripts that can be used to manage services</description>
+    <description>creates scripts that can be used to manage services</description>
     <properties>
         <jclouds.test.listener></jclouds.test.listener>
     </properties>

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/EnvBuilder.java

@@ -21,15 +21,15 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder;
+package org.jclouds.scriptbuilder;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.Map;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.OsFamily;
-import org.jclouds.initbuilder.domain.ShellToken;
+import org.jclouds.scriptbuilder.domain.ShellToken;
-import org.jclouds.initbuilder.util.Utils;
+import org.jclouds.scriptbuilder.util.Utils;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/ScriptBuilder.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder;
+package org.jclouds.scriptbuilder;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -29,9 +29,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.OsFamily;
-import org.jclouds.initbuilder.domain.ShellToken;
+import org.jclouds.scriptbuilder.domain.ShellToken;
-import org.jclouds.initbuilder.util.Utils;
+import org.jclouds.scriptbuilder.util.Utils;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
@@ -40,11 +40,11 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 /**
- * Creates a start script.
+ * Creates a shell script.
  * 
  * @author Adrian Cole
  */
-public class InitBuilder {
+public class ScriptBuilder {
 
    @VisibleForTesting
    Map<String, Map<String, String>> switchExec = Maps.newHashMap();
@@ -74,7 +74,7 @@ public class InitBuilder {
     *           - case statements, if the value of the variable matches a key, the corresponding
     *           value will be invoked.
     */
-   public InitBuilder switchOn(String variable, Map<String, String> valueToActions) {
+   public ScriptBuilder switchOn(String variable, Map<String, String> valueToActions) {
       switchExec.put(checkNotNull(variable, "variable"), checkNotNull(valueToActions,
                "valueToActions"));
       return this;
@@ -83,7 +83,7 @@ public class InitBuilder {
    /**
     * Unsets a variable to ensure it is set within the script.
     */
-   public InitBuilder unsetEnvironmentVariable(String name) {
+   public ScriptBuilder unsetEnvironmentVariable(String name) {
       variablesToUnset.add(checkNotNull(name, "name"));
       return this;
    }
@@ -91,7 +91,7 @@ public class InitBuilder {
    /**
     * Exports a variable inside the script
     */
-   public InitBuilder export(String name, String value) {
+   public ScriptBuilder export(String name, String value) {
       variables.put(checkNotNull(name, "name"), checkNotNull(value, "value"));
       return this;
    }

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/InitMetadata.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/JavaInitMetadata.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/OsFamily.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 /**
  * Type of an Operating System.

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/ShellToken.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/StoppableJavaInitMetadata.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/util/Utils.java

@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.util;
+package org.jclouds.scriptbuilder.util;
 
 import java.util.List;
 import java.util.Map;
@@ -29,8 +29,8 @@ import java.util.Map.Entry;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.OsFamily;
-import org.jclouds.initbuilder.domain.ShellToken;
+import org.jclouds.scriptbuilder.domain.ShellToken;
 
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Function;

scriptbuilder/src/test/java/org/jclouds/scriptbuilder/EnvBuilderTest.java

@@ -1,12 +1,13 @@
-package org.jclouds.initbuilder;
+package org.jclouds.scriptbuilder;
 
 import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.EnvBuilder;
-import org.jclouds.initbuilder.domain.ShellToken;
+import org.jclouds.scriptbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.ShellToken;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Charsets;

scriptbuilder/src/test/java/org/jclouds/scriptbuilder/ScriptBuilderTest.java

@@ -1,12 +1,13 @@
-package org.jclouds.initbuilder;
+package org.jclouds.scriptbuilder;
 
 import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.ScriptBuilder;
-import org.jclouds.initbuilder.domain.ShellToken;
+import org.jclouds.scriptbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.ShellToken;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Charsets;
@@ -15,13 +16,13 @@ import com.google.common.io.CharStreams;
 import com.google.common.io.Resources;
 
 /**
- * Tests possible uses of InitBuilder
+ * Tests possible uses of ScriptBuilder
  * 
  * @author Adrian Cole
  */
-public class InitBuilderTest {
+public class ScriptBuilderTest {
 
-   InitBuilder testScriptBuilder = new InitBuilder().switchOn("1",
+   ScriptBuilder testScriptBuilder = new ScriptBuilder().switchOn("1",
             ImmutableMap.of("start", "echo started", "stop", "echo stopped")).export("javaHome",
             "/apps/jdk1.6");
 
@@ -41,7 +42,7 @@ public class InitBuilderTest {
 
    @Test
    public void testSwitchOn() {
-      InitBuilder builder = new InitBuilder();
+      ScriptBuilder builder = new ScriptBuilder();
       builder.switchOn("1", ImmutableMap.of("start", "echo started", "stop", "echo stopped"));
       assertEquals(builder.switchExec, ImmutableMap.of("1", ImmutableMap.of("start",
                "echo started", "stop", "echo stopped")));
@@ -49,13 +50,13 @@ public class InitBuilderTest {
 
    @Test
    public void testNoSwitchOn() {
-      InitBuilder builder = new InitBuilder();
+      ScriptBuilder builder = new ScriptBuilder();
       assertEquals(builder.switchExec.size(), 0);
    }
 
    @Test
    public void testExport() {
-      InitBuilder builder = new InitBuilder();
+      ScriptBuilder builder = new ScriptBuilder();
       builder.export("javaHome", "/apps/jdk1.6");
       assertEquals(builder.variables, ImmutableMap.of("javaHome", "/apps/jdk1.6"));
 
@@ -63,13 +64,13 @@ public class InitBuilderTest {
 
    @Test
    public void testNoExport() {
-      InitBuilder builder = new InitBuilder();
+      ScriptBuilder builder = new ScriptBuilder();
       assertEquals(builder.variables.size(), 0);
    }
 
    @Test(expectedExceptions = NullPointerException.class)
    public void testExportNPE() {
-      new InitBuilder().export(null, null);
+      new ScriptBuilder().export(null, null);
    }
 
 }

scriptbuilder/src/test/java/org/jclouds/scriptbuilder/domain/ShellTokenTest.java

@@ -21,12 +21,14 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.domain;
+package org.jclouds.scriptbuilder.domain;
 
 import static org.testng.Assert.assertEquals;
 
 import java.util.Map;
 
+import org.jclouds.scriptbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.ShellToken;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMap;
@@ -34,7 +36,7 @@ import com.google.common.collect.ImmutableMap;
 /**
  * @author Adrian Cole
  */
-@Test(groups = "unit", testName = "initbuilder.ShellTokenTest")
+@Test(groups = "unit", testName = "scriptbuilder.ShellTokenTest")
 public class ShellTokenTest {
 
    public void testTokenValueMapUNIX() {

scriptbuilder/src/test/java/org/jclouds/scriptbuilder/util/UtilsTest.java

@@ -21,13 +21,14 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.initbuilder.util;
+package org.jclouds.scriptbuilder.util;
 
 import static org.testng.Assert.assertEquals;
 
 import java.io.UnsupportedEncodingException;
 
-import org.jclouds.initbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.util.Utils;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableList;
@@ -36,7 +37,7 @@ import com.google.common.collect.ImmutableMap;
 /**
  * @author Adrian Cole
  */
-@Test(groups = "unit", testName = "initbuilder.UtilsTest")
+@Test(groups = "unit", testName = "scriptbuilder.UtilsTest")
 public class UtilsTest {
 
    public void testReplaceTokens() throws UnsupportedEncodingException {

scriptbuilder/src/test/resources/test_script_funcs.cmd

@@ -0,0 +1,27 @@
+@echo off
+
+goto END_FUNCTIONS
+:abortFunction
+    echo Aborting:  %EXCEPTION%.
+    exit /b 1
+    
+:sourceEnv
+    set ENV_FILE=%1
+    shift
+    if not defined ENV_FILE (
+        set EXCEPTION=Internal error.  Called sourceEnv with no file param
+        exit /b 1
+    )
+    call %ENV_FILE%
+    if errorlevel 1 (
+        set EXCEPTION=Please end your '%ENV_FILE%' file with the command 'exit /b 0' to enable this script to detect syntax errors.
+        exit /b 1
+    )
+    exit /b 0
+
+:END_FUNCTIONS
+
+if exist "%APPENV_SETTINGS_FILE%" (
+    call :sourceEnv "%APPENV_SETTINGS_FILE%"
+    if errorlevel 1 goto abortFunction
+)