embulk 0.8.28-java → 0.8.29-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb3a3ad55003d5d87e050680472c891f8fef9de9
-  data.tar.gz: d9a164a0112947615e837dcf42a260eaaff716f0
+  metadata.gz: 455af0eb268193a9c0a81f20a6823da090ec8714
+  data.tar.gz: 5881f11ed75bbd8a0d7798635298db475be835e7
 SHA512:
-  metadata.gz: 9e6dfbcea73023ac911cc6260176a681d632e6a3023daa2cd9236504c91a30a9b00a121f633974b8ad7637a872da9be9c467b9bdc46182af06c7c09a4b715a0d
-  data.tar.gz: c4b28535cb4c54d2427f2b86a13f62e83c73dc89436b913ae8b6d2ac917dbc7e075f746c8eb6494a092bf615949b3989d39e6ec5a65342c3700d2cfc3e812b45
+  metadata.gz: c580a2b6e69a90b60c4b3ba61a2eafccaba9edee05c9b2dcb47567a3dadcafc2bece12753bfb6d1ba2c229cd9ab01a661b0a847cb0b1aa11087507095f051ea4
+  data.tar.gz: 7aa021e2a4f55fce2894c5bf3b394c1756a2d02e068a4517e032df24506f869d66f5ecb8ca73e85f1999f98301ad387cb980f7bf542812a6ee7e59d207f1acbd

data/build.gradle

@@ -16,7 +16,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards"), p
 
 allprojects {
     group = 'org.embulk'
-    version = '0.8.28'
+    version = '0.8.29'
 
     ext {
         jrubyVersion = '9.1.5.0'

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

@@ -178,7 +178,7 @@ public class EmbulkGlobalJRubyScriptingContainer
 
         final Path locationPath;
         try {
-            locationPath = Paths.get(locationUrl.toURI().getPath());
+            locationPath = Paths.get(locationUrl.toURI());
         }
         catch (URISyntaxException ex) {
             throw new EmbulkCommandLineException("Invalid location: " + locationUrl.toString(), ex);

data/embulk-cli/src/main/java/org/embulk/cli/EmbulkRun.java

@@ -24,6 +24,8 @@ import org.embulk.cli.parse.OptionDefinition;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
+import org.jruby.embed.LocalContextScope;
+import org.jruby.embed.LocalVariableBehavior;
 import org.jruby.embed.ScriptingContainer;
 
 public class EmbulkRun
@@ -398,14 +400,14 @@ public class EmbulkRun
             }
             return 0;
         case BUNDLE:
-            if (!commandLine.getArguments().isEmpty() && commandLine.getArguments().get(0).equals("new")) {
-                if (commandLine.getArguments().size() != 2) {
+            if (!subcommandArguments.isEmpty() && subcommandArguments.get(0).equals("new")) {
+                if (subcommandArguments.size() != 2) {
                     printGeneralUsage(System.err);
                     System.err.println("");
                     System.err.println("Use `<command> --help` to see description of the commands.");
                     return 1;
                 }
-                newBundle(commandLine.getArguments().get(1), null);
+                newBundle(subcommandArguments.get(1), null);
                 System.err.println("'embulk bundle new' is deprecated. This will be removed in future release. Please use 'embulk mkbundle' instead.");
             }
             else {
@@ -413,24 +415,16 @@ public class EmbulkRun
             }
             return 0;
         case GEM:
-            this.jrubyContainer.runScriptlet("require 'rubygems/gem_runner'");
-            this.jrubyContainer.put("__internal_argv_java__", subcommandArguments);
-            this.jrubyContainer.runScriptlet("__internal_argv__ = Array.new(__internal_argv_java__)");
-            this.jrubyContainer.runScriptlet("Gem::GemRunner.new.run __internal_argv__");
-            this.jrubyContainer.remove("__internal_argv_java__");
+            callJRubyGem(subcommandArguments);
             return 0;
         case MKBUNDLE:
             newBundle(commandLine.getArguments().get(0), commandLine.getBundlePath());
             break;
         case EXEC:
-            this.jrubyContainer.put("__internal_argv_java__", subcommandArguments);
-            this.jrubyContainer.runScriptlet("__internal_argv__ = Array.new(__internal_argv_java__)");
-            this.jrubyContainer.runScriptlet("exec(*__internal_argv__)");
-            this.jrubyContainer.remove("__internal_argv_java__");
+            callJRubyExec(subcommandArguments);
             return 127;
         case IRB:
-            this.jrubyContainer.runScriptlet("require 'irb'");
-            this.jrubyContainer.runScriptlet("IRB.start");
+            callJRubyIRB();
             return 0;
         case RUN:
         case CLEANUP:
@@ -446,14 +440,18 @@ public class EmbulkRun
 
             // NOTE: When it was in Ruby ""require 'json'" was required.
 
-            setupLoadPaths(commandLine.getLoadPath(), commandLine.getLoad());
-            setupClasspaths(commandLine.getClasspath());
+            // NOTE: $LOAD_PATH and $CLASSPATH are set in |EmbulkSetup|.
 
             // call |EmbulkSetup.setup| after setup_classpaths to allow users to overwrite
             // embulk classes
             // NOTE: |EmbulkSetup.setup| returns |EmbulkEmbed| while it stores Ruby |Embulk::EmbulkRunner(EmbulkEmbed)|
             // into Ruby |Embulk::Runner|.
-            final EmbulkRunner runner = EmbulkSetup.setup(commandLine.getSystemConfig(), this.jrubyContainer);
+            final EmbulkRunner runner = EmbulkSetup.setup(
+                commandLine.getSystemConfig(),
+                commandLine.getLoadPath(),
+                commandLine.getLoad(),
+                commandLine.getClasspath(),
+                this.jrubyContainer);
 
             final Path configDiffPath =
                 (commandLine.getConfigDiff() == null ? null : Paths.get(commandLine.getConfigDiff()));
@@ -490,12 +488,7 @@ public class EmbulkRun
 
     private int newBundle(final String pathString, final String bundlePath)
     {
-        this.jrubyContainer.runScriptlet("require 'embulk'");
-
         final Path path = Paths.get(pathString);
-        this.jrubyContainer.runScriptlet("require 'fileutils'");
-        this.jrubyContainer.runScriptlet("require 'rubygems/gem_runner'");
-
         if (Files.exists(path)) {
             System.err.println("'" + pathString + "' already exists.");
             return 1;
@@ -511,16 +504,19 @@ public class EmbulkRun
         }
         boolean success = false;
         try {
+            // TODO: Rewrite this part in Java.
+            final ScriptingContainer localJRubyContainer = createLocalJRubyScriptingContainer();
+            localJRubyContainer.runScriptlet("require 'embulk'");
+            localJRubyContainer.runScriptlet("require 'fileutils'");
+            localJRubyContainer.runScriptlet("require 'rubygems/gem_runner'");
+
             // copy embulk/data/bundle/ contents
-            this.jrubyContainer.runScriptlet("require 'embulk/data/package_data'");
-            this.jrubyContainer.put("__internal_path__", pathString);
-            this.jrubyContainer.runScriptlet("pkg = Embulk::PackageData.new('bundle', __internal_path__)");
-            this.jrubyContainer.remove("__internal_path__");
-            this.jrubyContainer.runScriptlet("%w[Gemfile .ruby-version .bundle/config embulk/input/example.rb embulk/output/example.rb embulk/filter/example.rb].each { |file| pkg.cp(file, file) }");
+            localJRubyContainer.runScriptlet("require 'embulk/data/package_data'");
+            localJRubyContainer.put("__internal_path__", pathString);
+            localJRubyContainer.runScriptlet("pkg = Embulk::PackageData.new('bundle', __internal_path__)");
+            localJRubyContainer.remove("__internal_path__");
+            localJRubyContainer.runScriptlet("%w[Gemfile .ruby-version .bundle/config embulk/input/example.rb embulk/output/example.rb embulk/filter/example.rb].each { |file| pkg.cp(file, file) }");
                                                                                                                                     // run the first bundle-install
-            final ArrayList<String> bundlerArguments = new ArrayList<String>();
-            bundlerArguments.add("install");
-            bundlerArguments.add("--path");
             runBundler(Arrays.asList("install", "--path", bundlePath != null ? bundlePath : "."), path);
             success = true;
         }
@@ -570,26 +566,26 @@ public class EmbulkRun
 
     private void runBundler(final List<String> arguments, final Path path)
     {
-        this.jrubyContainer.runScriptlet("require 'bundler'");  // bundler is included in embulk-core.jar
+        final ScriptingContainer localJRubyContainer = createLocalJRubyScriptingContainer();
+        localJRubyContainer.runScriptlet("require 'bundler'");  // bundler is included in embulk-core.jar
 
         // this hack is necessary to make --help working
-        this.jrubyContainer.runScriptlet("Bundler.define_singleton_method(:which_orig, Bundler.method(:which))");
-        this.jrubyContainer.runScriptlet("Bundler.define_singleton_method(:which) { |executable| (executable == 'man' ? false : which_orig(executable)) }");
+        localJRubyContainer.runScriptlet("Bundler.define_singleton_method(:which_orig, Bundler.method(:which))");
+        localJRubyContainer.runScriptlet("Bundler.define_singleton_method(:which) { |executable| (executable == 'man' ? false : which_orig(executable)) }");
 
-        this.jrubyContainer.runScriptlet("require 'bundler/friendly_errors'");
-        this.jrubyContainer.runScriptlet("require 'bundler/cli'");
+        localJRubyContainer.runScriptlet("require 'bundler/friendly_errors'");
+        localJRubyContainer.runScriptlet("require 'bundler/cli'");
 
-        this.jrubyContainer.put("__internal_argv_java__", arguments);
-        this.jrubyContainer.runScriptlet("__internal_argv__ = Array.new(__internal_argv_java__)");
+        localJRubyContainer.put("__internal_argv_java__", arguments);
         if (path == null) {
-            this.jrubyContainer.runScriptlet("Bundler.with_friendly_errors { Bundler::CLI.start(__internal_argv__, debug: true) }");
+            localJRubyContainer.runScriptlet("Bundler.with_friendly_errors { Bundler::CLI.start(Array.new(__internal_argv_java__), debug: true) }");
         }
         else {
-            this.jrubyContainer.put("__internal_working_dir__", path.toString());
-            this.jrubyContainer.runScriptlet("Dir.chdir(__internal_working_dir__) { Bundler.with_friendly_errors { Bundler::CLI.start(__internal_argv__, debug: true) } }");
-            this.jrubyContainer.remove("__internal_working_dir__");
+            localJRubyContainer.put("__internal_working_dir__", path.toString());
+            localJRubyContainer.runScriptlet("Dir.chdir(__internal_working_dir__) { Bundler.with_friendly_errors { Bundler::CLI.start(__internal_argv__, debug: true) } }");
+            localJRubyContainer.remove("__internal_working_dir__");
         }
-        this.jrubyContainer.remove("__internal_argv_java__");
+        localJRubyContainer.remove("__internal_argv_java__");
     }
 
     private void addPluginLoadOptionDefinitions(final EmbulkCommandLineParser.Builder parserBuilder)
@@ -700,37 +696,6 @@ public class EmbulkRun
             }));
     }
 
-    private void setupLoadPaths(final List<String> loadPaths, final List<String> pluginPaths)
-    {
-        // first $LOAD_PATH has highet priority. later load_paths should have highest priority.
-        for (final String loadPath : loadPaths) {
-            // ruby script directory (use unshift to make it highest priority)
-            this.jrubyContainer.put("__internal_load_path__", loadPath);
-            this.jrubyContainer.runScriptlet("$LOAD_PATH.unshift File.expand_path(__internal_load_path__)");
-            this.jrubyContainer.remove("__internal_load_path__");
-        }
-
-        // # Gem::StubSpecification is an internal API that seems chainging often.
-        // # Gem::Specification.add_spec is deprecated also. Therefore, here makes
-        // # -L <path> option alias of -I <path>/lib by assuming that *.gemspec file
-        // # always has require_paths = ["lib"].
-        for (final String pluginPath : pluginPaths) {
-            this.jrubyContainer.put("__internal_plugin_path__", pluginPath);
-            this.jrubyContainer.runScriptlet("$LOAD_PATH.unshift File.expand_path(File.join(__internal_plugin_path__, 'lib')");
-            this.jrubyContainer.remove("__internal_plugin_path__");
-        }
-    }
-
-    private void setupClasspaths(final List<String> classpaths)
-    {
-        for (final String classpath : classpaths) {
-            this.jrubyContainer.put("__internal_classpath__", classpath);
-            // $CLASSPATH object doesn't have concat method
-            this.jrubyContainer.runScriptlet("$CLASSPATH << __internal_classpath__");
-            this.jrubyContainer.remove("__internal_classpath__");
-        }
-    }
-
     private void printGeneralUsage(final PrintStream out)
     {
         final String gemHomeEnv = System.getenv("GEM_HOME");
@@ -764,6 +729,39 @@ public class EmbulkRun
         out.println(now + ": Embulk v" + this.embulkVersion);
     }
 
+    // TODO: Check if it is required to process JRuby options.
+    private ScriptingContainer createLocalJRubyScriptingContainer()
+    {
+        // Not |LocalContextScope.SINGLETON| to narrow down considerations.
+        final ScriptingContainer localJRubyContainer =
+            new ScriptingContainer(LocalContextScope.SINGLETHREAD, LocalVariableBehavior.PERSISTENT);
+        return localJRubyContainer;
+    }
+
+    private void callJRubyGem(final List<String> subcommandArguments)
+    {
+        final ScriptingContainer localJRubyContainer = createLocalJRubyScriptingContainer();
+        localJRubyContainer.runScriptlet("require 'rubygems/gem_runner'");
+        localJRubyContainer.put("__internal_argv_java__", subcommandArguments);
+        localJRubyContainer.runScriptlet("Gem::GemRunner.new.run Array.new(__internal_argv_java__)");
+        localJRubyContainer.remove("__internal_argv_java__");
+    }
+
+    private void callJRubyExec(final List<String> subcommandArguments)
+    {
+        final ScriptingContainer localJRubyContainer = createLocalJRubyScriptingContainer();
+        localJRubyContainer.put("__internal_argv_java__", subcommandArguments);
+        localJRubyContainer.runScriptlet("exec(*Array.new(__internal_argv_java__))");
+        localJRubyContainer.remove("__internal_argv_java__");
+    }
+
+    private void callJRubyIRB()
+    {
+        final ScriptingContainer localJRubyContainer = createLocalJRubyScriptingContainer();
+        localJRubyContainer.runScriptlet("require 'irb'");
+        localJRubyContainer.runScriptlet("IRB.start");
+    }
+
     private final String embulkVersion;
     private final ScriptingContainer jrubyContainer;
 }

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

@@ -7,6 +7,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.util.Collections;
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.embulk.command.PreviewPrinter;
@@ -21,7 +22,8 @@ import org.embulk.exec.ExecutionResult;
 import org.embulk.exec.PreviewResult;
 import org.embulk.exec.ResumeState;
 import org.embulk.exec.TransactionStage;
-import org.jruby.RubyHash;
+import org.jruby.embed.LocalContextScope;
+import org.jruby.embed.LocalVariableBehavior;
 import org.jruby.embed.ScriptingContainer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,11 +37,10 @@ import org.slf4j.LoggerFactory;
 public class EmbulkRunner
 {
     // |EmbulkSetup.setup| initializes:
-    // new EmbulkRunner(embed, globalJRubyContainer)
-    public EmbulkRunner(final EmbulkEmbed embed, final ScriptingContainer globalJRubyContainer)
+    // new EmbulkRunner(embed)
+    public EmbulkRunner(final EmbulkEmbed embed)
     {
         this.embed = embed;  // org.embulk.EmbulkEmbed
-        this.globalJRubyContainer = globalJRubyContainer;
     }
 
     /**
@@ -54,8 +55,7 @@ public class EmbulkRunner
         // in Ruby Embulk::EmbulkRunner.
         final ConfigSource configSource;
         try {
-            configSource = readConfig(
-                configFilePath, new RubyHash(this.globalJRubyContainer.getProvider().getRuntime()), null);
+            configSource = readConfig(configFilePath, Collections.<String, Object>emptyMap(), null);
         }
         catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -108,8 +108,7 @@ public class EmbulkRunner
         // in Ruby Embulk::EmbulkRunner.
         final ConfigSource configSource;
         try {
-            configSource = readConfig(
-                configFilePath, new RubyHash(this.globalJRubyContainer.getProvider().getRuntime()), null);
+            configSource = readConfig(configFilePath, Collections.<String, Object>emptyMap(), null);
         }
         catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -164,8 +163,7 @@ public class EmbulkRunner
         // in Ruby Embulk::EmbulkRunner.
         final ConfigSource configSource;
         try {
-            configSource = readConfig(
-                configFilePath, new RubyHash(this.globalJRubyContainer.getProvider().getRuntime()), null);
+            configSource = readConfig(configFilePath, Collections.<String, Object>emptyMap(), null);
         }
         catch (IOException ex) {
             throw new RuntimeException(ex);
@@ -289,9 +287,8 @@ public class EmbulkRunner
 
         final ConfigSource configSource;
         if (configDiffPath != null && Files.size(configDiffPath) > 0L) {
-            final ConfigSource lastConfigDiff =
-                readConfig(configDiffPath, new RubyHash(this.globalJRubyContainer.getProvider().getRuntime()), null);
-            configSource = originalConfigSource.merge(lastConfigDiff);
+            configSource = originalConfigSource.merge(
+                readConfig(configDiffPath, Collections.<String, Object>emptyMap(), null));
         }
         else {
             configSource = originalConfigSource;
@@ -391,7 +388,7 @@ public class EmbulkRunner
 
     private ConfigSource readConfig(
             final Path configFilePath,
-            final RubyHash templateParams,
+            final Map<String, Object> templateParams,
             final String templateIncludePath)
             throws IOException
     {
@@ -422,28 +419,34 @@ public class EmbulkRunner
 
     private String runLiquid(
             final String templateSource,
-            final RubyHash templateParams,
+            final Map<String, Object> templateParams,
             final String templateIncludePath)
     {
-        this.globalJRubyContainer.runScriptlet("require 'liquid'");
+        // TODO: Check if it is required to process JRuby options.
+        // Not |LocalContextScope.SINGLETON| to narrow down considerations.
+        final ScriptingContainer localJRubyContainer =
+            new ScriptingContainer(LocalContextScope.SINGLETHREAD, LocalVariableBehavior.PERSISTENT);
 
-        this.globalJRubyContainer.put("__internal_liquid_template_source__", templateSource);
-        this.globalJRubyContainer.runScriptlet("template = Liquid::Template.parse(__internal_liquid_template_source__, :error_mode => :strict)");
-        this.globalJRubyContainer.remove("__internal_liquid_template_source__");
+        localJRubyContainer.runScriptlet("require 'liquid'");
+
+        localJRubyContainer.put("__internal_liquid_template_source__", templateSource);
+        localJRubyContainer.runScriptlet("template = Liquid::Template.parse(__internal_liquid_template_source__, :error_mode => :strict)");
+        localJRubyContainer.remove("__internal_liquid_template_source__");
 
         if (templateIncludePath != null) {
-            this.globalJRubyContainer.put("__internal_liquid_template_include_path_java__", templateIncludePath);
-            this.globalJRubyContainer.runScriptlet("__internal_liquid_template_include_path__ = File.expand_path(__internal_liquid_template_include_path_java__ || File.dirname(config)) unless __internal_liquid_template_include_path_java__ == false");
-            this.globalJRubyContainer.runScriptlet("template.registers[:file_system] = Liquid::LocalFileSystem.new(__internal_liquid_template_include_path__, \"_%s.yml.liquid\")");
-            this.globalJRubyContainer.remove("__internal_liquid_template_include_path__");
+            localJRubyContainer.put("__internal_liquid_template_include_path_java__", templateIncludePath);
+            localJRubyContainer.runScriptlet("__internal_liquid_template_include_path__ = File.expand_path(__internal_liquid_template_include_path_java__ || File.dirname(config)) unless __internal_liquid_template_include_path_java__ == false");
+            localJRubyContainer.runScriptlet("template.registers[:file_system] = Liquid::LocalFileSystem.new(__internal_liquid_template_include_path__, \"_%s.yml.liquid\")");
+            localJRubyContainer.remove("__internal_liquid_template_include_path__");
         }
 
-        this.globalJRubyContainer.put("__internal_liquid_template_params__", templateParams);
-        this.globalJRubyContainer.runScriptlet("__internal_liquid_template_data__ = { 'env' => ENV.to_h }.merge(__internal_liquid_template_params__)");
-        this.globalJRubyContainer.remove("__internal_liquid_template_params__");
+        // TODO: Convert |templateParams| recursively to Ruby's Hash.
+        localJRubyContainer.put("__internal_liquid_template_params__", templateParams);
+        localJRubyContainer.runScriptlet("__internal_liquid_template_data__ = { 'env' => ENV.to_h }.merge(__internal_liquid_template_params__)");
+        localJRubyContainer.remove("__internal_liquid_template_params__");
 
         final Object renderedObject =
-            this.globalJRubyContainer.runScriptlet("template.render(__internal_liquid_template_data__)");
+            localJRubyContainer.runScriptlet("template.render(__internal_liquid_template_data__)");
         return renderedObject.toString();
     }
 
@@ -522,5 +525,4 @@ public class EmbulkRunner
     private final Pattern EXT_YAML_LIQUID = Pattern.compile(".*\\.ya?ml\\.liquid$");
 
     private final EmbulkEmbed embed;
-    private final ScriptingContainer globalJRubyContainer;
 }

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

@@ -2,7 +2,9 @@ package org.embulk;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.embulk.config.ConfigSource;
 import org.jruby.embed.LocalContextScope;
@@ -24,11 +26,18 @@ public class EmbulkSetup
         // The local variable should be persistent so that local variables are set through ScriptingContainer.put.
         final ScriptingContainer globalJRubyContainer =
             new ScriptingContainer(LocalContextScope.SINGLETON, LocalVariableBehavior.PERSISTENT);
-        return setup(systemConfigGiven, globalJRubyContainer);
+        return setup(systemConfigGiven,
+                     Collections.<String>emptyList(),
+                     Collections.<String>emptyList(),
+                     Collections.<String>emptyList(),
+                     globalJRubyContainer);
     }
 
     public static EmbulkRunner setup(
             final Map<String, Object> systemConfigGiven,
+            final List<String> loadPaths,
+            final List<String> pluginPaths,
+            final List<String> classpaths,
             final ScriptingContainer globalJRubyContainer)
     {
         // NOTE: When it was in Ruby "require 'json'" was required to format the system config into a JSON string.
@@ -57,14 +66,49 @@ public class EmbulkSetup
         bootstrap.setSystemConfig(systemConfig);
         final EmbulkEmbed embed = bootstrap.initialize();  // see embulk-core/src/main/java/org/embulk/jruby/JRubyScriptingModule.
 
+        setupLoadPaths(loadPaths, pluginPaths, globalJRubyContainer);
+        setupClasspaths(classpaths, globalJRubyContainer);
+
         // see also embulk/java/bootstrap.rb loaded by JRubyScriptingModule
         globalJRubyContainer.runScriptlet("module Embulk; end");
         globalJRubyContainer.put("__internal_embulk_setup_embed__", embed);
-        globalJRubyContainer.put("__internal_embulk_setup_global_jruby_container__", globalJRubyContainer);
         globalJRubyContainer.runScriptlet("Embulk.const_set :Runner, Embulk::EmbulkRunner.new(__internal_embulk_setup_embed__)");
-        globalJRubyContainer.remove("__internal_embulk_setup_global_jruby_container__");
         globalJRubyContainer.remove("__internal_embulk_setup_embed__");
 
-        return new EmbulkRunner(embed, globalJRubyContainer);
+        return new EmbulkRunner(embed);
+    }
+
+    private static void setupLoadPaths(
+            final List<String> loadPaths,
+            final List<String> pluginPaths,
+            final ScriptingContainer globalJRubyContainer)
+    {
+        // first $LOAD_PATH has highet priority. later load_paths should have highest priority.
+        for (final String loadPath : loadPaths) {
+            // ruby script directory (use unshift to make it highest priority)
+            globalJRubyContainer.put("__internal_load_path__", loadPath);
+            globalJRubyContainer.runScriptlet("$LOAD_PATH.unshift File.expand_path(__internal_load_path__)");
+            globalJRubyContainer.remove("__internal_load_path__");
+        }
+
+        // # Gem::StubSpecification is an internal API that seems chainging often.
+        // # Gem::Specification.add_spec is deprecated also. Therefore, here makes
+        // # -L <path> option alias of -I <path>/lib by assuming that *.gemspec file
+        // # always has require_paths = ["lib"].
+        for (final String pluginPath : pluginPaths) {
+            globalJRubyContainer.put("__internal_plugin_path__", pluginPath);
+            globalJRubyContainer.runScriptlet("$LOAD_PATH.unshift File.expand_path(File.join(__internal_plugin_path__, 'lib')");
+            globalJRubyContainer.remove("__internal_plugin_path__");
+        }
+    }
+
+    private static void setupClasspaths(final List<String> classpaths, final ScriptingContainer globalJRubyContainer)
+    {
+        for (final String classpath : classpaths) {
+            globalJRubyContainer.put("__internal_classpath__", classpath);
+            // $CLASSPATH object doesn't have concat method
+            globalJRubyContainer.runScriptlet("$CLASSPATH << __internal_classpath__");
+            globalJRubyContainer.remove("__internal_classpath__");
+        }
     }
 }

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampFormatter.java

@@ -22,6 +22,7 @@ public class TimestampFormatter
         public DateTimeZone getTimeZone();
 
         @ConfigInject
+        @Deprecated
         public ScriptingContainer getJRuby();
     }
 
@@ -36,6 +37,7 @@ public class TimestampFormatter
         public String getDefaultTimestampFormat();
 
         @ConfigInject
+        @Deprecated
         public ScriptingContainer getJRuby();
     }
 
@@ -56,12 +58,20 @@ public class TimestampFormatter
     @Deprecated
     public TimestampFormatter(String format, FormatterTask task)
     {
-        this(task.getJRuby(), format, task.getTimeZone());
+        this(format, task.getTimeZone());
+        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
+        // TODO: Notify users about deprecated calls through the notification reporter.
+        System.err.println("[WARN] A plugin uses a deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
+        System.err.println("[WARN] Please tell the plugin developer to stop using the constructor, or report this to:");
+        System.err.println("[WARN] https://github.com/embulk/embulk/issues/745");
+        for (final StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) {
+            System.err.println("[WARN] " + stackTrace.toString());
+        }
     }
 
     public TimestampFormatter(Task task, Optional<? extends TimestampColumnOption> columnOption)
     {
-        this(task.getJRuby(),
+        this(
                 columnOption.isPresent() ?
                     columnOption.get().getFormat().or(task.getDefaultTimestampFormat())
                     : task.getDefaultTimestampFormat(),
@@ -70,7 +80,20 @@ public class TimestampFormatter
                     : task.getDefaultTimeZone());
     }
 
+    @Deprecated
     public TimestampFormatter(ScriptingContainer jruby, String format, DateTimeZone timeZone)
+    {
+        this(format, timeZone);
+        // TODO: Notify users about deprecated calls through the notification reporter.
+        System.err.println("[WARN] A plugin uses a deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
+        System.err.println("[WARN] Please tell the plugin developer to stop using the constructor, or report this to:");
+        System.err.println("[WARN] https://github.com/embulk/embulk/issues/745");
+        for (final StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) {
+            System.err.println("[WARN] " + stackTrace.toString());
+        }
+    }
+
+    public TimestampFormatter(final String format, final DateTimeZone timeZone)
     {
         this.timeZone = timeZone;
         this.dateFormat = new RubyDateFormat(format, Locale.ENGLISH, true);

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampParser.java

@@ -32,6 +32,7 @@ public class TimestampParser
         public DateTimeZone getDefaultTimeZone();
 
         @ConfigInject
+        @Deprecated
         public ScriptingContainer getJRuby();
     }
 
@@ -50,6 +51,7 @@ public class TimestampParser
         public String getDefaultDate();
 
         @ConfigInject
+        @Deprecated
         public ScriptingContainer getJRuby();
     }
 
@@ -77,30 +79,64 @@ public class TimestampParser
     @Deprecated
     public TimestampParser(String format, ParserTask task)
     {
-        this(task.getJRuby(), format, task.getDefaultTimeZone());
+        this(format, task.getDefaultTimeZone());
+        // NOTE: Its deprecation is not actually from ScriptingContainer, though.
+        // TODO: Notify users about deprecated calls through the notification reporter.
+        System.err.println("[WARN] A plugin uses a deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
+        System.err.println("[WARN] Please tell the plugin developer to stop using the constructor, or report this to:");
+        System.err.println("[WARN] https://github.com/embulk/embulk/issues/745");
+        for (final StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) {
+            System.err.println("[WARN] " + stackTrace.toString());
+        }
     }
 
     @VisibleForTesting
     static TimestampParser createTimestampParserForTesting(Task task)
 
     {
-        return new TimestampParser(task.getJRuby(), task.getDefaultTimestampFormat(), task.getDefaultTimeZone(), task.getDefaultDate());
+        return new TimestampParser(task.getDefaultTimestampFormat(), task.getDefaultTimeZone(), task.getDefaultDate());
     }
 
     public TimestampParser(Task task, TimestampColumnOption columnOption)
     {
-        this(task.getJRuby(),
+        this(
                 columnOption.getFormat().or(task.getDefaultTimestampFormat()),
                 columnOption.getTimeZone().or(task.getDefaultTimeZone()),
                 columnOption.getDate().or(task.getDefaultDate()));
     }
 
+    @Deprecated
     public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone)
     {
-        this(jruby, format, defaultTimeZone, "1970-01-01");
+        this(format, defaultTimeZone);
+        // TODO: Notify users about deprecated calls through the notification reporter.
+        System.err.println("[WARN] A plugin uses a deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
+        System.err.println("[WARN] Please tell the plugin developer to stop using the constructor, or report this to:");
+        System.err.println("[WARN] https://github.com/embulk/embulk/issues/745");
+        for (final StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) {
+            System.err.println("[WARN] " + stackTrace.toString());
+        }
+    }
+
+    public TimestampParser(String format, DateTimeZone defaultTimeZone)
+    {
+        this(format, defaultTimeZone, "1970-01-01");
     }
 
+    @Deprecated
     public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone, String defaultDate)
+    {
+        this(format, defaultTimeZone, defaultDate);
+        // TODO: Notify users about deprecated calls through the notification reporter.
+        System.err.println("[WARN] A plugin uses a deprecated constructor of org.embulk.spi.time.TimestampFormatter.");
+        System.err.println("[WARN] Please tell the plugin developer to stop using the constructor, or report this to:");
+        System.err.println("[WARN] https://github.com/embulk/embulk/issues/745");
+        for (final StackTraceElement stackTrace : Thread.currentThread().getStackTrace()) {
+            System.err.println("[WARN] " + stackTrace.toString());
+        }
+    }
+
+    public TimestampParser(final String format, final DateTimeZone defaultTimeZone, final String defaultDate)
     {
         // TODO get default current time from ExecTask.getExecTimestamp
         this.format = format;

data/embulk-core/src/main/java/org/embulk/spi/util/DynamicColumnSetterFactory.java

@@ -52,16 +52,16 @@ public class DynamicColumnSetterFactory
         } else if (type instanceof DoubleType) {
             return new DoubleColumnSetter(pageBuilder, column, defaultValue);
         } else if (type instanceof StringType) {
-            TimestampFormatter formatter = new TimestampFormatter(task.getJRuby(),
+            TimestampFormatter formatter = new TimestampFormatter(
                     getTimestampFormat(column).getFormat(), getTimeZone(column));
             return new StringColumnSetter(pageBuilder, column, defaultValue, formatter);
         } else if (type instanceof TimestampType) {
             // TODO use flexible time format like Ruby's Time.parse
-            TimestampParser parser = new TimestampParser(task.getJRuby(),
+            TimestampParser parser = new TimestampParser(
                     getTimestampFormat(column).getFormat(), getTimeZone(column));
             return new TimestampColumnSetter(pageBuilder, column, defaultValue, parser);
         } else if (type instanceof JsonType) {
-            TimestampFormatter formatter = new TimestampFormatter(task.getJRuby(),
+            TimestampFormatter formatter = new TimestampFormatter(
                     getTimestampFormat(column).getFormat(), getTimeZone(column));
             return new JsonColumnSetter(pageBuilder, column, defaultValue, formatter);
         }

data/embulk-core/src/main/java/org/embulk/spi/util/DynamicPageBuilder.java

@@ -43,6 +43,7 @@ public class DynamicPageBuilder
 
         // required by TimestampFormatter
         @ConfigInject
+        @Deprecated
         public ScriptingContainer getJRuby();
     }
 

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.29
     release/release-0.8.28
     release/release-0.8.27
     release/release-0.8.26

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

@@ -0,0 +1,14 @@
+Release 0.8.29
+==================================
+
+General Changes
+------------------
+
+* Deprecate Timestamp-related methods using JRuby ScriptingContainer. [#744]
+* Reduce usage of the global (Singleton) JRuby instance [#747]
+* Fix how to get the CodeSource location on Windows. [#751]
+* Fix the broken "bundle" subcommand rewritten in Java. [#752]
+
+Release Date
+------------------
+2017-08-02

data/lib/embulk/runner.rb

@@ -4,22 +4,14 @@ module Embulk
   # Runner = EmbulkRunner.new
 
   class EmbulkRunner
-    def initialize(embed, jruby_container=nil)
+    def initialize(embed)
       @embed = embed  # org.embulk.EmbulkEmbed
-      if jruby_container
-        @jruby_container = jruby_container
-      else
-        # The ScriptingContainer instance below is the same JRuby instance with the one running this runner.rb itself
-        # as it's LocalContextScope.SINGLETON.
-        @jruby_container = Java::org.jruby.embed.ScriptingContainer.new(
-          Java::org.jruby.embed.LocalContextScope::SINGLETON, Java::org.jruby.embed.LocalVariableBehavior::PERSISTENT)
-      end
     end
 
     def guess(config, options={})
       output_path =
         (options[:next_config_output_path] ? Java::java.lang.String.new(options[:next_config_output_path]) : nil)
-      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed, @jruby_container)
+      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed)
 
       case config
       when String
@@ -33,7 +25,7 @@ module Embulk
 
     def preview(config, options={})
       format = (options[:format] ? Java::java.lang.String.new(options[:format]) : nil)
-      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed, @jruby_container)
+      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed)
 
       case config
       when String
@@ -52,7 +44,7 @@ module Embulk
         (options[:next_config_output_path] ? Java::java.lang.String.new(options[:next_config_output_path]) : nil)
       resume_state_path =
         (options[:resume_state_path] ? Java::java.lang.String.new(options[:resume_state_path]) : nil)
-      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed, @jruby_container)
+      embulk_runner_java = Java::org.embulk.EmbulkRunner.new(@embed)
 
       case config
       when String

data/lib/embulk/version.rb

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
 
-  VERSION_INTERNAL = '0.8.28'
+  VERSION_INTERNAL = '0.8.29'
 
   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.28
+  version: 0.8.29
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-02 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.28.jar
-- classpath/embulk-core-0.8.28.jar
-- classpath/embulk-jruby-strptime-0.8.28.jar
-- classpath/embulk-standards-0.8.28.jar
+- classpath/embulk-cli-0.8.29.jar
+- classpath/embulk-core-0.8.29.jar
+- classpath/embulk-jruby-strptime-0.8.29.jar
+- classpath/embulk-standards-0.8.29.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -558,6 +558,7 @@ files:
 - embulk-docs/src/release/release-0.8.26.rst
 - embulk-docs/src/release/release-0.8.27.rst
 - embulk-docs/src/release/release-0.8.28.rst
+- embulk-docs/src/release/release-0.8.29.rst
 - embulk-docs/src/release/release-0.8.3.rst
 - embulk-docs/src/release/release-0.8.4.rst
 - embulk-docs/src/release/release-0.8.5.rst