embulk 0.8.18-java → 0.8.19-java

data/embulk-cli/src/main/sh/selfrun.sh

@@ -1,106 +1,3 @@
-
-: <<BAT
-@echo off
-
-setlocal
-
-set this=%~f0
-set java_args=
-set jruby_args=
-set default_optimize=
-set overwrite_optimize=
-set status=
-set error=
-set args=
-
-rem In jar file, cannot goto ahread for some reason.
-
-for %%a in ( %* ) do (
-    call :check_arg %%a
-)
-
-if "%error%" == "true" exit /b 1
-
-set optimize=false
-if "%overwrite_optimize%" == "true" (
-    set optimize=true
-) else (
-    if "%default_optimize%" == "true" (
-        if not "%overwrite_optimize%" == "false" (
-            set optimize=true
-        )
-    )
-)
-
-if "%optimize%" == "true" (
-    set java_args=-XX:+AggressiveOpts -XX:+UseConcMarkSweepGC %java_args%
-) else (
-    set java_args=-XX:+AggressiveOpts -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none %java_args%
-)
-
-java %java_args% -jar %this% %jruby_args% %args%
-
-endlocal
-
-exit /b %ERRORLEVEL%
-
-:check_arg
-set arg=%*
-
-rem Remove double quotations
-set p1=%arg:~0,1%
-set p1=%p1:"=%
-set p2=%arg:~-1,1%
-set p2=%p2:"=%
-set arg=%p1%%arg:~1,-1%%p2%
-
-if "%status%" == "rest" (
-    set args=%args% %arg%
-
-) else if "%status%" == "read" (
-    call :read_file %arg%
-
-) else if "%arg%" == "-J+O" (
-    set overwrite_optimize=true
-    set status=rest
-
-) else if "%arg%" == "-J-O" (
-    set overwrite_optimize=false
-    set status=rest
-
-) else if "%arg:~0,2%" == "-J" (
-    if not "%arg:~2%" == "" (
-        set java_args=%java_args% %arg:~2%
-    ) else (
-        set status=read
-    )
-
-) else if "%arg:~0,2%" == "-R" (
-    set jruby_args=%jruby_args% %arg%
-
-) else if "%arg%" == "run" (
-    set default_optimize=true
-    set args=%args% %arg%
-    set status=rest
-
-) else (
-    set args=%args% %arg%
-    set status=rest
-)
-exit /b
-
-:read_file
-if not exist "%~1" (
-    echo "failed to load java argument file."
-    set error=true
-) else (
-    for /f "delims=" %%i in (%~1) do set java_args=%java_args% %%i
-)
-set status=
-exit /b
-
-BAT
-
 java_args=""
 jruby_args=""
 default_optimize=""

data/embulk-cli/src/test/java/org/embulk/cli/SelfrunTest.java

@@ -6,13 +6,13 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
-import java.nio.file.Files;
 import java.nio.file.StandardOpenOption;
 import java.util.Arrays;
 import java.util.List;
@@ -20,237 +20,247 @@ import java.util.List;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-
 public class SelfrunTest {
-
-    private static File testSelfrun;
+    private static File testSelfrunFile;
 
     @BeforeClass
     public static void prepare() throws Exception {
-        File selfrun = findSelfrun();
-        FileSystem fs = FileSystems.getDefault();
-        String line = new String(Files.readAllBytes(fs.getPath(selfrun.getAbsolutePath())), Charset.defaultCharset());
+        final File originalSelfrunFile = findSelfrun();
+        final FileSystem fileSystem = FileSystems.getDefault();
 
-        File thisFolder = new File(SelfrunTest.class.getResource("/org/embulk/cli/SelfrunTest.class").toURI()).getParentFile();
-        testSelfrun = new File(thisFolder, System.getProperty("file.separator").equals("\\") ? "selfrun.bat" : "selfrun.sh");
+        final File thisFolder = new File(
+            SelfrunTest.class.getResource("/org/embulk/cli/SelfrunTest.class").toURI()).getParentFile();
+        testSelfrunFile = new File(
+            thisFolder, System.getProperty("file.separator").equals("\\") ? "selfrun.bat" : "selfrun.sh");
 
-        File classpath = thisFolder.getParentFile().getParentFile().getParentFile();
-        line = line.replaceAll("java ", "java -classpath " + classpath.getAbsolutePath().replaceAll("\\\\", "\\\\\\\\") + " org.embulk.cli.DummyMain ");
+        final File classpath = thisFolder.getParentFile().getParentFile().getParentFile();
+        final String line =
+            new String(Files.readAllBytes(fileSystem.getPath(originalSelfrunFile.getAbsolutePath())),
+                       Charset.defaultCharset())
+            .replaceAll("java ",
+                        "java -classpath "
+                        + classpath.getAbsolutePath().replaceAll("\\\\", "\\\\\\\\")
+                        + " org.embulk.cli.DummyMain ");
 
         // Modify selfrun so that arguments are written in 'args.txt' .
-        Files.write(fs.getPath(testSelfrun.getAbsolutePath()), line.getBytes(Charset.defaultCharset()), StandardOpenOption.CREATE);
-        if (!testSelfrun.setExecutable(true)) {
-        	throw new Exception("Cannot se executable.");
+        Files.write(fileSystem.getPath(testSelfrunFile.getAbsolutePath()),
+                    line.getBytes(Charset.defaultCharset()),
+                    StandardOpenOption.CREATE);
+
+        if (!testSelfrunFile.setExecutable(true)) {
+            throw new Exception("Cannot set the copied selfrun file executable..");
         }
     }
 
-
     @Test
     public void testNoArgument() throws Exception {
         List<String> args = execute();
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-jar",
-                testSelfrun.getAbsolutePath()),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath()),
+                     args);
     }
 
     @Test
     public void testArguments() throws Exception {
         List<String> args = execute("a1", "a2", "\"a3=v3\"");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2",
-                "a3=v3"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2",
+                         "a3=v3"),
+                     args);
     }
 
     @Test
     public void testRun() throws Exception {
         List<String> args = execute("run", "a1");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+UseConcMarkSweepGC",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "run",
-                "a1"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+UseConcMarkSweepGC",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "run",
+                         "a1"),
+                     args);
     }
 
     @Test
     public void testJpO() throws Exception {
         List<String> args = execute("-J+O", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+UseConcMarkSweepGC",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+UseConcMarkSweepGC",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testJmO() throws Exception {
         List<String> args = execute("-J-O", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testR1() throws Exception {
         List<String> args = execute("-Rr1", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "-Rr1",
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "-Rr1",
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testR2() throws Exception {
         List<String> args = execute("\"-Rr1=v1\"", "\"-Rr2=v2\"", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "-Rr1=v1",
-                "-Rr2=v2",
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "-Rr1=v1",
+                         "-Rr2=v2",
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testRRun() throws Exception {
         List<String> args = execute("-Rr1", "run", "a1");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+UseConcMarkSweepGC",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "-Rr1",
-                "run",
-                "a1"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+UseConcMarkSweepGC",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "-Rr1",
+                         "run",
+                         "a1"),
+                     args);
     }
 
     @Test
     public void testJ1() throws Exception {
         List<String> args = execute("-J-Dj1", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-Dj1",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-Dj1",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testJ2() throws Exception {
         List<String> args = execute("\"-J-Dj1=v1\"", "\"-J-Dj2=v2\"", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "-Dj1=v1",
-                "-Dj2=v2",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "-Dj1=v1",
+                         "-Dj2=v2",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testJR() throws Exception {
         List<String> args = execute("-Jj1", "-Rr1", "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "j1",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "-Rr1",
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "j1",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "-Rr1",
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     @Test
     public void testJFile() throws Exception {
-        File javaArgsFile = new File(testSelfrun.getParentFile(), "java_args.txt");
-        FileSystem fs = FileSystems.getDefault();
-        Files.write(fs.getPath(javaArgsFile.getAbsolutePath()), "j1 j2 j3".getBytes(Charset.defaultCharset()), StandardOpenOption.CREATE);
+        File javaArgsFile = new File(testSelfrunFile.getParentFile(), "java_args.txt");
+        FileSystem fileSystem = FileSystems.getDefault();
+        Files.write(fileSystem.getPath(javaArgsFile.getAbsolutePath()),
+                    "j1 j2 j3".getBytes(Charset.defaultCharset()),
+                    StandardOpenOption.CREATE);
 
         List<String> args = execute("-J", javaArgsFile.getAbsolutePath(), "a1", "a2");
         assertEquals(Arrays.asList(
-                "-XX:+AggressiveOpts",
-                "-XX:+TieredCompilation",
-                "-XX:TieredStopAtLevel=1",
-                "-Xverify:none",
-                "j1",
-                "j2",
-                "j3",
-                "-jar",
-                testSelfrun.getAbsolutePath(),
-                "a1",
-                "a2"),
-                args);
+                         "-XX:+AggressiveOpts",
+                         "-XX:+TieredCompilation",
+                         "-XX:TieredStopAtLevel=1",
+                         "-Xverify:none",
+                         "j1",
+                         "j2",
+                         "j3",
+                         "-jar",
+                         testSelfrunFile.getAbsolutePath(),
+                         "a1",
+                         "a2"),
+                     args);
     }
 
     private List<String> execute(String... arguments) throws Exception {
-        File temp = new File(testSelfrun.getParentFile(), "call-" + testSelfrun.getName());
-        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(temp), Charset.defaultCharset()))) {
-            writer.write(testSelfrun.getAbsolutePath());
+        File temp = new File(testSelfrunFile.getParentFile(), "call-" + testSelfrunFile.getName());
+        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(temp),
+                                                                               Charset.defaultCharset()))) {
+            writer.write(testSelfrunFile.getAbsolutePath());
             for (String argument : arguments) {
                 writer.write(" ");
                 writer.write(argument);
             }
         }
         if (!temp.setExecutable(true)) {
-        	throw new Exception("Cannot se executable.");
+            throw new Exception("Cannot set the copied selfrun file executable..");
         }
 
-        File argsFile = new File(testSelfrun.getParentFile(), "args.txt");
+        File argsFile = new File(testSelfrunFile.getParentFile(), "args.txt");
         if (argsFile.exists()) {
             if (!argsFile.delete()) {
-            	throw new IOException("Cannot delete " + argsFile);
+                throw new IOException("Cannot delete " + argsFile);
             }
         }
 
@@ -258,15 +268,17 @@ public class SelfrunTest {
         int exitCode = process.waitFor();
         if (exitCode != 0 || !argsFile.exists()) {
             StringBuilder builder = new StringBuilder();
-            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream(), Charset.defaultCharset()))) {
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream(),
+                                                                                  Charset.defaultCharset()))) {
                 builder.append(reader.readLine());
                 builder.append(System.getProperty("line.separator"));
             }
             throw new Exception(builder.toString());
         }
 
-        FileSystem fs = FileSystems.getDefault();
-        List<String> args = Files.readAllLines(fs.getPath(argsFile.getAbsolutePath()), Charset.defaultCharset());
+        FileSystem fileSystem = FileSystems.getDefault();
+        List<String> args = Files.readAllLines(fileSystem.getPath(argsFile.getAbsolutePath()),
+                                               Charset.defaultCharset());
         return args;
     }
 
@@ -275,7 +287,10 @@ public class SelfrunTest {
         if (new File(folder, "embulk-cli").exists()) {
             folder = new File(folder, "embulk-cli");
         }
-        return new File(new File(new File(new File(folder, "src"), "main"), "sh"), "selfrun.sh");
+        if (System.getProperty("file.separator").equals("\\")) {
+            return new File(new File(new File(new File(folder, "src"), "main"), "bat"), "selfrun.bat");
+        } else {
+            return new File(new File(new File(new File(folder, "src"), "main"), "sh"), "selfrun.sh");
+        }
     }
-
 }