embulk 0.8.39-java → 0.10.24-java

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

@@ -1,60 +0,0 @@
-java_args=""
-jruby_args=""
-default_optimize=""
-overwrite_optimize=""
-
-while true; do
-    case "$1" in
-        -E*)
-            external_script="${1#-E}"
-            echo "Running an external shell script: $external_script"
-            . $external_script
-            shift
-            ;;
-        "-J+O")
-            overwrite_optimize="true"
-            shift
-            break;
-            ;;
-        "-J-O")
-            overwrite_optimize="false"
-            shift
-            break;
-            ;;
-        -J*)
-            v="${1#-J}"
-            if test "$v"; then
-                java_args="$java_args $v"
-            else
-                shift
-                file_args=`cat "$1"`
-                if test $? -ne 0; then
-                    echo "Failed to load java argument file."
-                    exit 1
-                fi
-                java_args="$java_args $file_args"
-            fi
-            shift
-            ;;
-        -R*)
-            jruby_args="$jruby_args $1"
-            shift
-            ;;
-        run)
-            default_optimize="true"
-            break
-            ;;
-        *)
-            break
-            ;;
-    esac
-done
-
-if test "$overwrite_optimize" = "true" -o "$default_optimize" -a "$overwrite_optimize" != "false"; then
-    java_args="-XX:+AggressiveOpts -XX:+UseConcMarkSweepGC $java_args"
-else
-    java_args="-XX:+AggressiveOpts -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Xverify:none $java_args"
-fi
-
-exec java $java_args -jar "$0" $jruby_args "$@"
-exit 127

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

@@ -1,23 +0,0 @@
-package org.embulk.cli;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-
-public class DummyMain {
-
-    public static void main(String[] args) throws Exception {
-        System.out.println(Arrays.asList(args));
-        File thisFolder = new File(SelfrunTest.class.getResource("/org/embulk/cli/DummyMain.class").toURI()).getParentFile();
-        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(new File(thisFolder, "args.txt")), Charset.defaultCharset()))) {
-            for (String arg : args) {
-                writer.write(arg);
-                writer.newLine();
-            }
-        }
-    }
-
-}

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

@@ -1,296 +0,0 @@
-package org.embulk.cli;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-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.StandardOpenOption;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class SelfrunTest {
-    private static File testSelfrunFile;
-
-    @BeforeClass
-    public static void prepare() throws Exception {
-        final File originalSelfrunFile = findSelfrun();
-        final FileSystem fileSystem = FileSystems.getDefault();
-
-        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");
-
-        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(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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         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",
-                         testSelfrunFile.getAbsolutePath(),
-                         "-Rr1",
-                         "a1",
-                         "a2"),
-                     args);
-    }
-
-    @Test
-    public void testJFile() throws Exception {
-        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",
-                         testSelfrunFile.getAbsolutePath(),
-                         "a1",
-                         "a2"),
-                     args);
-    }
-
-    private List<String> execute(String... arguments) throws Exception {
-        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 set the copied selfrun file executable..");
-        }
-
-        File argsFile = new File(testSelfrunFile.getParentFile(), "args.txt");
-        if (argsFile.exists()) {
-            if (!argsFile.delete()) {
-                throw new IOException("Cannot delete " + argsFile);
-            }
-        }
-
-        Process process = Runtime.getRuntime().exec(temp.getAbsolutePath());
-        int exitCode = process.waitFor();
-        if (exitCode != 0 || !argsFile.exists()) {
-            StringBuilder builder = new StringBuilder();
-            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 fileSystem = FileSystems.getDefault();
-        List<String> args = Files.readAllLines(fileSystem.getPath(argsFile.getAbsolutePath()),
-                                               Charset.defaultCharset());
-        return args;
-    }
-
-    private static File findSelfrun() {
-        File folder = new File(".");
-        if (new File(folder, "embulk-cli").exists()) {
-            folder = new File(folder, "embulk-cli");
-        }
-        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");
-        }
-    }
-}

data/embulk-core/build.gradle

@@ -1,83 +0,0 @@
-// TODO: Remove this block once rubygems.lasagna.io is back, or jruby-gradle-jar-plugin is upgraded to 1.5.0.
-// See also: https://github.com/jruby-gradle/jruby-gradle-plugin/issues/297
-// jruby-gradle-jar-plugin is not upgraded yet because its 1.5.0 depends on Java 8.
-repositories {
-    mavenLocal()
-    maven { url 'http://rubygems-proxy.torquebox.org/releases' }
-}
-
-apply plugin: "com.github.jruby-gradle.jar"
-
-// include ruby scripts to jar. don't use sourceSets.main.resources.srcDirs
-// because IntelliJ causes error if srcDirs includes files out of projectDir.
-processResources.from("${rootProject.projectDir}/lib/", "${buildDir}/gemlib")
-
-configurations {
-    // com.google.inject:guice depends on asm and cglib but version of the libraries conflict
-    // with ones bundled in jruby-complete and cause bytecode compatibility error
-    compile.exclude group: 'asm', module: 'asm'
-    compile.exclude group: 'org.sonatype.sisu.inject', module: 'cglib'
-}
-
-import com.github.jrubygradle.JRubyExec
-import com.github.jrubygradle.JRubyPrepare
-
-// determine which dependencies have updates: $ gradle dependencyUpdates
-dependencies {
-    compile project(':embulk-jruby-strptime')
-
-    compile 'org.embulk:guice-bootstrap:0.1.1'
-    compile 'com.google.guava:guava:18.0'
-    compile 'com.google.inject:guice:4.0'
-    compile 'com.google.inject.extensions:guice-multibindings:4.0'
-    compile 'javax.inject:javax.inject:1'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.6.7'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.6.7'
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.6.7'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-guava:2.6.7'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.7'
-    compile 'com.fasterxml.jackson.module:jackson-module-guice:2.6.7'
-    compile 'ch.qos.logback:logback-classic:1.1.3'
-    compile 'org.slf4j:slf4j-api:1.7.12'
-    compile 'org.jruby:jruby-complete:' + project.jrubyVersion
-    compile 'com.google.code.findbugs:annotations:3.0.0'
-    compile 'org.yaml:snakeyaml:1.18'
-    compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'org.apache.bval:bval-jsr303:0.5'
-    compile 'io.airlift:slice:0.9'
-    compile 'joda-time:joda-time:2.9.2'
-    compile 'io.netty:netty-buffer:4.0.44.Final'
-    compile 'org.fusesource.jansi:jansi:1.11'
-    compile 'org.msgpack:msgpack-core:0.8.11'
-
-    // For embulk/guess/charset.rb. See also embulk.gemspec
-    compile 'com.ibm.icu:icu4j:54.1.1'
-
-    // For MavenPluginSource / MavenArtifactFinder.
-    compile 'org.eclipse.aether:aether-api:1.1.0'
-    compile 'org.eclipse.aether:aether-spi:1.1.0'
-    compile 'org.eclipse.aether:aether-util:1.1.0'
-    compile 'org.eclipse.aether:aether-impl:1.1.0'
-    compile 'org.apache.maven:maven-aether-provider:3.3.9'
-
-    gems 'rubygems:bundler:1.10.6'
-    gems 'rubygems:msgpack:1.1.0'
-    gems 'rubygems:liquid:4.0.0'
-}
-
-task unpackGems(type: JRubyPrepare) {
-    outputDir file("${buildDir}/gem")
-    dependencies configurations.gems
-    doLast {
-        // move to build/gem/*/lib/* to build/gemlib/
-        file("${buildDir}/gem/gems").eachDir { gemDir ->
-            copy {
-                from "${gemDir}/lib"
-                into "${buildDir}/gemlib/"
-                include "**"
-            }
-        }
-        fileTree(dir: "${buildDir}/gemlib", include: "**/.jrubydir").each { f -> f.delete() }
-    }
-}
-processResources.dependsOn("unpackGems")