embulk 0.8.31-java → 0.8.32-java

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.32
     release/release-0.8.31
     release/release-0.8.30
     release/release-0.8.29

data/embulk-docs/src/release/release-0.8.32.rst

@@ -0,0 +1,14 @@
+Release 0.8.32
+==================================
+
+General Changes
+------------------
+
+* Ensure plugin's "gradlew" to have executable permissions by "migrate" subcommand [#710] [#782]
+* Upgrade Gradle wrapper of plugin templates to 4.1.0. [#781]
+* Initialize the global JRuby instance in JRubyScriptingModule except for Embulk::Runner [#765]
+
+
+Release Date
+------------------
+2017-09-07

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jan 08 00:35:58 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

data/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

data/lib/embulk.rb

@@ -63,13 +63,10 @@ module Embulk
 
     require_classpath(true)
 
-    Java::org.embulk.EmbulkSetup::setup(
-      Java::java.util.ArrayList.new(),
-      Java::java.util.HashMap.new(system_config),
-      Java::java.util.ArrayList.new(),
-      Java::java.util.ArrayList.new(),
-      Java::java.util.ArrayList.new(),
-      nil
-    )
+    require 'embulk/runner'
+
+    # see also embulk/java/bootstrap.rb loaded by JRubyScriptingModule
+    runner_java = EmbulkRunner.new(Java::org.embulk.EmbulkSetup::setup(Java::java.util.HashMap.new(system_config)))
+    Embulk.const_set :Runner, runner_java
   end
 end

data/lib/embulk/data/new/java/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Jan 08 00:35:58 PST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

data/lib/embulk/data/new/java/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

data/lib/embulk/version.rb

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
 
-  VERSION_INTERNAL = '0.8.31'
+  VERSION_INTERNAL = '0.8.32'
 
   DEPRECATED_MESSAGE = 'Embulk::VERSION in (J)Ruby is deprecated. Use org.embulk.EmbulkVersion::VERSION instead. If this message is from a plugin, please tell this to the author of the plugin!'
   def self.const_missing(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.31
+  version: 0.8.32
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,10 +155,10 @@ files:
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang-2.4.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-cli-0.8.31.jar
-- classpath/embulk-core-0.8.31.jar
-- classpath/embulk-jruby-strptime-0.8.31.jar
-- classpath/embulk-standards-0.8.31.jar
+- classpath/embulk-cli-0.8.32.jar
+- classpath/embulk-core-0.8.32.jar
+- classpath/embulk-jruby-strptime-0.8.32.jar
+- classpath/embulk-standards-0.8.32.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -218,7 +218,6 @@ files:
 - embulk-cli/src/test/java/org/embulk/cli/SelfrunTest.java
 - embulk-core/build.gradle
 - embulk-core/src/main/java/org/embulk/EmbulkEmbed.java
-- embulk-core/src/main/java/org/embulk/EmbulkGlobalJRubyScriptingContainer.java
 - embulk-core/src/main/java/org/embulk/EmbulkRunner.java
 - embulk-core/src/main/java/org/embulk/EmbulkService.java
 - embulk-core/src/main/java/org/embulk/EmbulkSetup.java
@@ -434,6 +433,7 @@ files:
 - embulk-core/src/test/java/org/embulk/spi/TestFileOutputRunner.java
 - embulk-core/src/test/java/org/embulk/spi/TestInputStreamFileInput.java
 - embulk-core/src/test/java/org/embulk/spi/TestPageBuilderReader.java
+- embulk-core/src/test/java/org/embulk/spi/json/TestJsonParser.java
 - embulk-core/src/test/java/org/embulk/spi/time/TestTimestamp.java
 - embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParser.java
 - embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParserDeprecated.java
@@ -561,6 +561,7 @@ files:
 - embulk-docs/src/release/release-0.8.3.rst
 - embulk-docs/src/release/release-0.8.30.rst
 - embulk-docs/src/release/release-0.8.31.rst
+- embulk-docs/src/release/release-0.8.32.rst
 - embulk-docs/src/release/release-0.8.4.rst
 - embulk-docs/src/release/release-0.8.5.rst
 - embulk-docs/src/release/release-0.8.6.rst

data/embulk-core/src/main/java/org/embulk/EmbulkGlobalJRubyScriptingContainer.java

@@ -1,215 +0,0 @@
-package org.embulk;
-
-import java.io.PrintStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
-import java.util.Collections;
-import java.util.List;
-import org.jruby.RubyInstanceConfig;
-import org.jruby.embed.LocalContextScope;
-import org.jruby.embed.LocalVariableBehavior;
-import org.jruby.embed.PathType;
-import org.jruby.embed.ScriptingContainer;
-import org.jruby.util.cli.Options;
-
-/**
- * EmbulkGlobalJRubyScriptingContainer creates a ScriptingContainer instance for global use in Embulk.
- *
- * The creator method is static because the target instance is singleton by definition.
- */
-public class EmbulkGlobalJRubyScriptingContainer
-{
-    private EmbulkGlobalJRubyScriptingContainer()
-    {
-        // Do not instantiate.
-    }
-
-    /**
-     * Sets up a ScriptingContainer instance for global use in Embulk.
-     */
-    public static ScriptingContainer setup(
-            final List<String> jrubyOptions,
-            final String bundlePath,
-            final PrintStream warning)
-    {
-        // The JRuby instance is a global singleton so that the settings here affects later execution.
-        // The local variable should be persistent so that local variables are set through ScriptingContainer.put.
-        final ScriptingContainer jrubyGlobalContainer =
-            new ScriptingContainer(LocalContextScope.SINGLETON, LocalVariableBehavior.PERSISTENT);
-        final RubyInstanceConfig jrubyGlobalConfig = jrubyGlobalContainer.getProvider().getRubyInstanceConfig();
-
-        for (final String jrubyOption : jrubyOptions) {
-            try {
-                processJRubyOption(jrubyOption, jrubyGlobalConfig);
-            }
-            catch (UnrecognizedJRubyOptionException ex) {
-                warning.println("[WARN] The \"-R\" option(s) are not recognized in Embulk: -R" + jrubyOption);
-                warning.println("[WARN] Please add your requests at: https://github.com/embulk/embulk/issues/707");
-                warning.println("");
-            }
-            catch (NotWorkingJRubyOptionException ex) {
-                warning.println("[WARN] The \"-R\" option(s) do not work in Embulk: -R" + jrubyOption);
-                warning.println("");
-            }
-        }
-
-        if (bundlePath != null) {
-            /* Environment variables are set in the selfrun script or bin/embulk:
-             *   ENV['EMBULK_BUNDLE_PATH']: set through '-b' | '--bundle', or inherit from the runtime environment
-             *   ENV['BUNDLE_GEMFILE']: set for "ENV['EMBULK_BUNDLE_PATH']/Gemfile"
-             *   ENV['GEM_HOME']: unset
-             *   ENV['GEM_PATH']: unset
-             */
-
-            // bundler is included in embulk-core.jar
-            jrubyGlobalContainer.runScriptlet("Gem.clear_paths");
-            jrubyGlobalContainer.runScriptlet("require 'bundler'");
-
-            jrubyGlobalContainer.runScriptlet("Bundler.load.setup_environment");
-            jrubyGlobalContainer.runScriptlet("require 'bundler/setup'");
-            // since here, `require` may load files of different (newer) embulk versions
-            // especially following 'embulk/command/embulk_main'.
-
-            // NOTE: It is intentionally not done by building a Ruby statement string from |bundlePath|.
-            // It can cause insecure injections.
-            //
-            // add bundle directory path to load local plugins at ./embulk
-            jrubyGlobalContainer.put("__internal_bundle_path__", bundlePath);
-            jrubyGlobalContainer.runScriptlet("$LOAD_PATH << File.expand_path(__internal_bundle_path__)");
-            jrubyGlobalContainer.remove("__internal_bundle_path__");
-
-            return jrubyGlobalContainer;
-        }
-        else {
-            /* Environment variables are set in the selfrun script or bin/embulk:
-             *   ENV['EMBULK_BUNDLE_PATH']: unset
-             *   ENV['BUNDLE_GEMFILE']: unset
-             *   ENV['GEM_HOME']: set for "~/.embulk/jruby/${ruby-version}"
-             *   ENV['GEM_PATH']: set for ""
-             */
-
-            jrubyGlobalContainer.runScriptlet("Gem.clear_paths");  // force rubygems to reload GEM_HOME
-
-            // NOTE: The path from |getEmbulkJRubyLoadPath()| is added in $LOAD_PATH just in case.
-            // Though it is not mandatory just to run "embulk_main.rb", it may be required in later steps.
-            //
-            // NOTE: It is intentionally not done by building a Ruby statement string from |getEmbulkJRubyLoadPath()|.
-            // It can cause insecure injections.
-            //
-            // NOTE: It was written in Ruby as follows:
-            //   $LOAD_PATH << File.expand_path('../../', File.dirname(__FILE__))
-            final String jrubyLoadPath;
-            try {
-                jrubyLoadPath = getEmbulkJRubyLoadPath();
-            }
-            catch (UnrecognizedJRubyLoadPathException ex) {
-                warning.println("[ERROR] Failed to retrieve Embulk's path.");
-                ex.printStackTrace(warning);
-                throw new RuntimeException(ex);
-            }
-            jrubyGlobalContainer.put("__internal_load_path__", jrubyLoadPath);
-            jrubyGlobalContainer.runScriptlet("$LOAD_PATH << File.expand_path(__internal_load_path__)");
-            jrubyGlobalContainer.remove("__internal_load_path__");
-
-            return jrubyGlobalContainer;
-        }
-    }
-
-    private static final class UnrecognizedJRubyOptionException extends Exception {}
-    private static final class NotWorkingJRubyOptionException extends Exception {}
-    private static final class UnrecognizedJRubyLoadPathException extends Exception {
-        public UnrecognizedJRubyLoadPathException(final String message)
-        {
-            super(message);
-        }
-
-        public UnrecognizedJRubyLoadPathException(final String message, final Throwable cause)
-        {
-            super(message, cause);
-        }
-    }
-
-    private static void processJRubyOption(final String jrubyOption, final RubyInstanceConfig jrubyGlobalConfig)
-            throws UnrecognizedJRubyOptionException, NotWorkingJRubyOptionException
-    {
-        if (jrubyOption.charAt(0) != '-') {
-            throw new UnrecognizedJRubyOptionException();
-        }
-
-        for (int index = 1; index < jrubyOption.length(); ++index) {
-            switch (jrubyOption.charAt(index)) {
-            case '-':
-                if (jrubyOption.equals("--dev")) {
-                    // They are not all of "--dev", but they are most possible configurations after JVM boot.
-                    Options.COMPILE_INVOKEDYNAMIC.force("false");  // NOTE: Options is global.
-                    jrubyGlobalConfig.setCompileMode(RubyInstanceConfig.CompileMode.OFF);
-                    return;
-                }
-                else if (jrubyOption.equals("--client")) {
-                    throw new NotWorkingJRubyOptionException();
-                }
-                else if (jrubyOption.equals("--server")) {
-                    throw new NotWorkingJRubyOptionException();
-                }
-                throw new UnrecognizedJRubyOptionException();
-            default:
-                throw new UnrecognizedJRubyOptionException();
-            }
-        }
-    }
-
-    /**
-     * Returns a path to be added in JRuby's $LOAD_PATH.
-     *
-     * In case Embulk runs from the Embulk JAR file (normal case):
-     *     "file:/some/directory/embulk.jar!"
-     *
-     * In case Embulk runs out of a JAR file (irregular case):
-     *     "/some/directory"
-     */
-    private static String getEmbulkJRubyLoadPath()
-            throws UnrecognizedJRubyLoadPathException
-    {
-        final ProtectionDomain protectionDomain;
-        try {
-            protectionDomain = EmbulkGlobalJRubyScriptingContainer.class.getProtectionDomain();
-        }
-        catch (SecurityException ex) {
-            throw new UnrecognizedJRubyLoadPathException("Failed to achieve ProtectionDomain", ex);
-        }
-
-        final CodeSource codeSource = protectionDomain.getCodeSource();
-        if (codeSource == null) {
-            throw new UnrecognizedJRubyLoadPathException("Failed to achieve CodeSource");
-        }
-
-        final URL locationUrl = codeSource.getLocation();
-        if (locationUrl == null) {
-            throw new UnrecognizedJRubyLoadPathException("Failed to achieve location");
-        }
-        else if (!locationUrl.getProtocol().equals("file")) {
-            throw new UnrecognizedJRubyLoadPathException("Invalid location: " + locationUrl.toString());
-        }
-
-        final Path locationPath;
-        try {
-            locationPath = Paths.get(locationUrl.toURI());
-        }
-        catch (URISyntaxException ex) {
-            throw new UnrecognizedJRubyLoadPathException("Invalid location: " + locationUrl.toString(), ex);
-        }
-
-        if (Files.isDirectory(locationPath)) {  // Out of a JAR file
-            System.err.println("Warning: Embulk looks running out of the Embulk jar file. It is unsupported.");
-            return locationPath.toString();
-        }
-
-        // TODO: Consider checking the file is really a JAR file.
-        return locationUrl.toString() + "!";  // Inside the Embulk JAR file
-    }
-}