embulk 0.8.29-java → 0.8.30-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 455af0eb268193a9c0a81f20a6823da090ec8714
-  data.tar.gz: 5881f11ed75bbd8a0d7798635298db475be835e7
+  metadata.gz: a8d768ff1cdca1f30819495c0e0f4543a796aa3c
+  data.tar.gz: 00b77520c45ddd0772147dfa694fad09a6ba6e62
 SHA512:
-  metadata.gz: c580a2b6e69a90b60c4b3ba61a2eafccaba9edee05c9b2dcb47567a3dadcafc2bece12753bfb6d1ba2c229cd9ab01a661b0a847cb0b1aa11087507095f051ea4
-  data.tar.gz: 7aa021e2a4f55fce2894c5bf3b394c1756a2d02e068a4517e032df24506f869d66f5ecb8ca73e85f1999f98301ad387cb980f7bf542812a6ee7e59d207f1acbd
+  metadata.gz: 7d25f42dc63816c532f125df3b37556a265fcf06d6ef2b8cb97d26f1421907ca223adc27cf36307599e42c67eaecb2997c894389f8555ea3e295664a6dd1ec9c
+  data.tar.gz: 1873eb4116e45d7b7c28b55d54ac5b81a8fce36c65eaab573ee2ffa0ed78aea2393563cc0e158209d54a3e9b9e4855c01cb5676ddb9d54bf4ad109ca2e6a76d4

data/bin/embulk

@@ -16,16 +16,16 @@ if RUBY_PLATFORM =~ /java/i
     # Bundler may be enabled in this path.
     ENV.delete('EMBULK_BIN_ENABLE_BUNDLE')
 
-    # Handle environment variables before entering org.embulk.cli.EmbulkBundle.
+    # Handle environment variables before initializing the global JRuby instance in org.embulk.EmbulkRunner.
     # See: https://github.com/embulk/embulk/pull/604
 
     bundle_path = ENV['EMBULK_BUNDLE_PATH'].to_s
     bundle_path = nil if bundle_path.empty?
 
-    # Search for -b or --bundle, and remove it.
+    # The -b or --bundle option are processed in org.embulk.EmbulkRunner. The option should be kept.
     bundle_option_index = ARGV.find_index {|arg| arg == '-b' || arg == '--bundle' }
     if bundle_option_index
-      ARGV.slice!(bundle_option_index, 2)[1]
+      bundle_path = ARGV[bundle_option_index + 1]
     end
 
     if bundle_path
@@ -43,26 +43,28 @@ if RUBY_PLATFORM =~ /java/i
       ENV['GEM_PATH'] = ''
       ENV.delete('BUNDLE_GEMFILE')
     end
-
-    require 'embulk/version'
-    Java::org.embulk.cli.EmbulkBundle::checkBundleWithEmbulkVersion(ARGV,
-                                                                    Java::JavaUtil::ArrayList.new,
-                                                                    Embulk::VERSION_INTERNAL)
   else
     # bin/embulk is started by JRuby (embulk gem for JRuby is installed).
     # Bundler must be disabled in this path not to bother the JRuby's bundler.
+
+    # org.embulk.EmbulkRunner processes the -b or --bundle option. The option should be removed to disable Bundler.
+    # Search for -b or --bundle, and just remove it.
+    bundle_option_index = ARGV.find_index {|arg| arg == '-b' || arg == '--bundle' }
+    if bundle_option_index
+      STDERR.puts "-b or --bundle options do not work when Embulk is triggered from command line by JRuby."
+      ARGV.slice!(bundle_option_index, 2)[1]
+    end
+
     $LOAD_PATH << File.expand_path('../lib', File.dirname(__FILE__))
     Dir.glob("#{File.expand_path('../classpath', File.dirname(__FILE__))}/*").each do |f_jar|
       $CLASSPATH << f_jar
     end
-    require 'embulk/version'
-    # The ScriptingContainer instance below is the same JRuby instance with the one running this bin/embulk itself
-    # as it's LocalContextScope.SINGLETON. The instance then inherits $LOAD_PATH and $CLASSPATH configured above.
-    global_jruby_container = Java::org.jruby.embed.ScriptingContainer.new(
-      Java::org.jruby.embed.LocalContextScope::SINGLETON, Java::org.jruby.embed.LocalVariableBehavior::PERSISTENT)
-    embulk_run = Java::org.embulk.cli.EmbulkRun.new(Embulk::VERSION_INTERNAL, global_jruby_container)
-    embulk_run.run(Java::JavaUtil::ArrayList.new(ARGV), Java::JavaUtil::ArrayList.new)
   end
+
+  require 'embulk/version'
+  embulk_run = Java::org.embulk.cli.EmbulkRun.new(Embulk::VERSION_INTERNAL)
+  embulk_run.run(Java::JavaUtil::ArrayList.new(ARGV), Java::JavaUtil::ArrayList.new)
+
   exit 0
 end
 

data/build.gradle

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

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

@@ -30,13 +30,12 @@ import org.jruby.embed.ScriptingContainer;
 
 public class EmbulkRun
 {
-    public EmbulkRun(final String embulkVersion, final ScriptingContainer jrubyContainer)
+    public EmbulkRun(final String embulkVersion)
     {
         this.embulkVersion = embulkVersion;
-        this.jrubyContainer = jrubyContainer;
     }
 
-    public int run(final List<String> argsEmbulk, final List<String> argsJRuby)
+    public int run(final List<String> argsEmbulk, final List<String> jrubyOptions)
     {
         final EmbulkArguments arguments;
         try {
@@ -79,7 +78,7 @@ public class EmbulkRun
         case EXEC:
         case GEM:
         case IRB:
-            return runSubcommand(subcommand, subcommandArguments, null);
+            return runSubcommand(subcommand, subcommandArguments, null, jrubyOptions);
         default:
             final EmbulkCommandLineParser parser = buildCommandLineParser(subcommand);
             final EmbulkCommandLine commandLine;
@@ -97,7 +96,7 @@ public class EmbulkRun
                 parser.printHelp(System.err);
                 return 1;
             }
-            return runSubcommand(subcommand, subcommandArguments, commandLine);
+            return runSubcommand(subcommand, subcommandArguments, commandLine, jrubyOptions);
         }
     }
 
@@ -344,7 +343,8 @@ public class EmbulkRun
 
     private int runSubcommand(final EmbulkSubcommand subcommand,
                               final List<String> subcommandArguments,
-                              final EmbulkCommandLine commandLine)
+                              final EmbulkCommandLine commandLine,
+                              final List<String> jrubyOptions)
     {
         switch (subcommand) {
         case EXAMPLE:
@@ -447,11 +447,12 @@ public class EmbulkRun
             // NOTE: |EmbulkSetup.setup| returns |EmbulkEmbed| while it stores Ruby |Embulk::EmbulkRunner(EmbulkEmbed)|
             // into Ruby |Embulk::Runner|.
             final EmbulkRunner runner = EmbulkSetup.setup(
+                jrubyOptions,
                 commandLine.getSystemConfig(),
                 commandLine.getLoadPath(),
                 commandLine.getLoad(),
                 commandLine.getClasspath(),
-                this.jrubyContainer);
+                commandLine.getBundle());
 
             final Path configDiffPath =
                 (commandLine.getConfigDiff() == null ? null : Paths.get(commandLine.getConfigDiff()));
@@ -763,5 +764,4 @@ public class EmbulkRun
     }
 
     private final String embulkVersion;
-    private final ScriptingContainer jrubyContainer;
 }

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

@@ -2,6 +2,7 @@ package org.embulk.cli;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import org.embulk.EmbulkVersion;
 
 public class Main
 {
@@ -18,11 +19,12 @@ public class Main
             }
         }
 
-        final String[] embulkArgs = new String[args.length - i];
-        for (int j = 0; i < args.length; ++i, ++j) {
-            embulkArgs[j] = args[i];
+        final ArrayList<String> embulkArgs = new ArrayList<String>();
+        for (; i < args.length; ++i) {
+            embulkArgs.add(args[i]);
         }
 
-        EmbulkBundle.checkBundle(embulkArgs, Collections.unmodifiableList(jrubyOptions));
+        final EmbulkRun run = new EmbulkRun(EmbulkVersion.VERSION);
+        run.run(Collections.unmodifiableList(embulkArgs), Collections.unmodifiableList(jrubyOptions));
     }
 }

data/{embulk-cli/src/main/java/org/embulk/cli → embulk-core/src/main/java/org/embulk}/EmbulkGlobalJRubyScriptingContainer.java

@@ -1,4 +1,4 @@
-package org.embulk.cli;
+package org.embulk;
 
 import java.io.PrintStream;
 import java.net.URISyntaxException;
@@ -33,7 +33,6 @@ public class EmbulkGlobalJRubyScriptingContainer
      * Sets up a ScriptingContainer instance for global use in Embulk.
      */
     public static ScriptingContainer setup(
-            final String[] embulkArgs,
             final List<String> jrubyOptions,
             final String bundlePath,
             final PrintStream warning)
@@ -104,7 +103,16 @@ public class EmbulkGlobalJRubyScriptingContainer
             //
             // NOTE: It was written in Ruby as follows:
             //   $LOAD_PATH << File.expand_path('../../', File.dirname(__FILE__))
-            jrubyGlobalContainer.put("__internal_load_path__", getEmbulkJRubyLoadPath());
+            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__");
 
@@ -114,6 +122,17 @@ public class EmbulkGlobalJRubyScriptingContainer
 
     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
@@ -154,26 +173,27 @@ public class EmbulkGlobalJRubyScriptingContainer
      *     "/some/directory"
      */
     private static String getEmbulkJRubyLoadPath()
+            throws UnrecognizedJRubyLoadPathException
     {
         final ProtectionDomain protectionDomain;
         try {
             protectionDomain = EmbulkGlobalJRubyScriptingContainer.class.getProtectionDomain();
         }
         catch (SecurityException ex) {
-            throw new EmbulkCommandLineException("Failed to achieve ProtectionDomain", ex);
+            throw new UnrecognizedJRubyLoadPathException("Failed to achieve ProtectionDomain", ex);
         }
 
         final CodeSource codeSource = protectionDomain.getCodeSource();
         if (codeSource == null) {
-            throw new EmbulkCommandLineException("Failed to achieve CodeSource");
+            throw new UnrecognizedJRubyLoadPathException("Failed to achieve CodeSource");
         }
 
         final URL locationUrl = codeSource.getLocation();
         if (locationUrl == null) {
-            throw new EmbulkCommandLineException("Failed to achieve location");
+            throw new UnrecognizedJRubyLoadPathException("Failed to achieve location");
         }
         else if (!locationUrl.getProtocol().equals("file")) {
-            throw new EmbulkCommandLineException("Invalid location: " + locationUrl.toString());
+            throw new UnrecognizedJRubyLoadPathException("Invalid location: " + locationUrl.toString());
         }
 
         final Path locationPath;
@@ -181,7 +201,7 @@ public class EmbulkGlobalJRubyScriptingContainer
             locationPath = Paths.get(locationUrl.toURI());
         }
         catch (URISyntaxException ex) {
-            throw new EmbulkCommandLineException("Invalid location: " + locationUrl.toString(), ex);
+            throw new UnrecognizedJRubyLoadPathException("Invalid location: " + locationUrl.toString(), ex);
         }
 
         if (Files.isDirectory(locationPath)) {  // Out of a JAR file

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

@@ -8,6 +8,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.embulk.command.PreviewPrinter;
@@ -38,9 +39,19 @@ public class EmbulkRunner
 {
     // |EmbulkSetup.setup| initializes:
     // new EmbulkRunner(embed)
-    public EmbulkRunner(final EmbulkEmbed embed)
+    public EmbulkRunner(final EmbulkEmbed embed,
+                        final List<String> jrubyOptions,
+                        final List<String> loadPaths,
+                        final List<String> pluginPaths,
+                        final List<String> classpaths,
+                        final String bundlePath)
     {
         this.embed = embed;  // org.embulk.EmbulkEmbed
+        this.jrubyOptions = jrubyOptions;
+        this.loadPaths = loadPaths;
+        this.pluginPaths = pluginPaths;
+        this.classpaths = classpaths;
+        this.bundlePath = bundlePath;
     }
 
     /**
@@ -217,6 +228,9 @@ public class EmbulkRunner
     private void guessInternal(final ConfigSource configSource, final Path outputPath)
             throws IOException
     {
+        initializeGlobalJRubyScriptingContainer(
+            this.jrubyOptions, this.loadPaths, this.pluginPaths, this.classpaths, this.bundlePath);
+
         try {
             checkFileWritable(outputPath);
         }
@@ -239,6 +253,9 @@ public class EmbulkRunner
     private void previewInternal(final ConfigSource configSource, final String format)
             throws IOException
     {
+        initializeGlobalJRubyScriptingContainer(
+            this.jrubyOptions, this.loadPaths, this.pluginPaths, this.classpaths, this.bundlePath);
+
         final PreviewResult previewResult = this.embed.preview(configSource);
         final ModelManager modelManager = this.embed.getModelManager();
 
@@ -266,6 +283,9 @@ public class EmbulkRunner
             final Path resumeStatePath)
             throws IOException
     {
+        initializeGlobalJRubyScriptingContainer(
+            this.jrubyOptions, this.loadPaths, this.pluginPaths, this.classpaths, this.bundlePath);
+
         try {
             checkFileWritable(outputPath);
         }
@@ -397,7 +417,9 @@ public class EmbulkRunner
             return this.embed.newConfigLoader().fromYamlString(
                 runLiquid(new String(Files.readAllBytes(configFilePath), StandardCharsets.UTF_8),
                           templateParams,
-                          templateIncludePath));
+                          (templateIncludePath == null
+                           ? configFilePath.toAbsolutePath().getParent().toString()
+                           : templateIncludePath)));
         }
         else if (EXT_YAML.matcher(configFilePath.toString()).matches()) {
             return this.embed.newConfigLoader().fromYamlString(
@@ -518,6 +540,49 @@ public class EmbulkRunner
     //   end
     // end
 
+    // TODO: Check if it is required to process JRuby options.
+    private void initializeGlobalJRubyScriptingContainer(
+            final List<String> jrubyOptions,
+            final List<String> loadPaths,
+            final List<String> pluginPaths,
+            final List<String> classpaths,
+            final String bundlePath)
+    {
+        final ScriptingContainer globalJRubyContainer =
+            EmbulkGlobalJRubyScriptingContainer.setup(jrubyOptions, bundlePath, System.err);
+
+        // 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__");
+        }
+
+        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__");
+        }
+
+        // see also embulk/java/bootstrap.rb loaded by JRubyScriptingModule
+        globalJRubyContainer.runScriptlet("module Embulk; end");
+        globalJRubyContainer.put("__internal_embulk_runner_java__", this);
+        globalJRubyContainer.runScriptlet("Embulk.const_set :Runner, Embulk::EmbulkRunner.new(__internal_embulk_runner_java__)");
+        globalJRubyContainer.remove("__internal_embulk_runner_java__");
+    }
+
     // NOTE: The root logger directly from |LoggerFactory|, not from |Exec.getLogger| as it's outside of |Exec.doWith|.
     private static final Logger rootLogger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 
@@ -525,4 +590,9 @@ public class EmbulkRunner
     private final Pattern EXT_YAML_LIQUID = Pattern.compile(".*\\.ya?ml\\.liquid$");
 
     private final EmbulkEmbed embed;
+    private final List<String> jrubyOptions;
+    private final List<String> loadPaths;
+    private final List<String> pluginPaths;
+    private final List<String> classpaths;
+    private final String bundlePath;
 }

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

@@ -7,9 +7,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.embulk.config.ConfigSource;
-import org.jruby.embed.LocalContextScope;
-import org.jruby.embed.LocalVariableBehavior;
-import org.jruby.embed.ScriptingContainer;
 
 /**
  * EmbulkSetup initiates an EmbulkRunner instance. It was originally implemented with Ruby in lib/embulk.rb.
@@ -19,26 +16,13 @@ import org.jruby.embed.ScriptingContainer;
  */
 public class EmbulkSetup
 {
-    @Deprecated
-    public static EmbulkRunner setupWithNewScriptingContainer(final Map<String, Object> systemConfigGiven)
-    {
-        // 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 globalJRubyContainer =
-            new ScriptingContainer(LocalContextScope.SINGLETON, LocalVariableBehavior.PERSISTENT);
-        return setup(systemConfigGiven,
-                     Collections.<String>emptyList(),
-                     Collections.<String>emptyList(),
-                     Collections.<String>emptyList(),
-                     globalJRubyContainer);
-    }
-
     public static EmbulkRunner setup(
+            final List<String> jrubyOptions,
             final Map<String, Object> systemConfigGiven,
             final List<String> loadPaths,
             final List<String> pluginPaths,
             final List<String> classpaths,
-            final ScriptingContainer globalJRubyContainer)
+            final String bundlePath)
     {
         // NOTE: When it was in Ruby "require 'json'" was required to format the system config into a JSON string.
 
@@ -66,49 +50,6 @@ 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.runScriptlet("Embulk.const_set :Runner, Embulk::EmbulkRunner.new(__internal_embulk_setup_embed__)");
-        globalJRubyContainer.remove("__internal_embulk_setup_embed__");
-
-        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__");
-        }
+        return new EmbulkRunner(embed, jrubyOptions, loadPaths, pluginPaths, classpaths, bundlePath);
     }
 }

data/embulk-core/src/main/java/org/embulk/spi/ExecSession.java

@@ -203,8 +203,9 @@ public class ExecSession
     {
         ConfigSource config = Exec.newConfigSource();
         config.set("timezone", timezone.getID());
+        // TODO: Stop creating the |FormatterTask| as |TimestampFormater.FormatterTask| is deprecated since v0.6.14.
         FormatterTask formatterTask = config.loadConfig(FormatterTask.class);
-        return new TimestampFormatter(format, formatterTask);
+        return new TimestampFormatter(format, formatterTask.getTimeZone());
     }
 
     public TempFileSpace getTempFileSpace()

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

@@ -26,13 +26,13 @@ public class TimestampFormat
     @Deprecated
     public TimestampFormatter newFormatter(TimestampFormatter.FormatterTask task)
     {
-        return new TimestampFormatter(format, task);
+        return new TimestampFormatter(format, task.getTimeZone());
     }
 
     @Deprecated
     public TimestampParser newParser(TimestampParser.ParserTask task)
     {
-        return new TimestampParser(format, task);
+        return new TimestampParser(format, task.getDefaultTimeZone());
     }
 
     private static Set<String> availableTimeZoneNames = ImmutableSet.copyOf(DateTimeZone.getAvailableIDs());

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

@@ -16,6 +16,7 @@ public class PagePrinter
     private final TimestampFormatter[] timestampFormatters;
     private final ArrayList<String> record;
 
+    // TODO: Update this constructor because |TimestampFormater.FormatterTask| is deprecated since v0.6.14.
     public PagePrinter(Schema schema, TimestampFormatter.FormatterTask task)
     {
         this.schema = schema;
@@ -23,7 +24,7 @@ public class PagePrinter
         for (int i=0; i < timestampFormatters.length; i++) {
             if (schema.getColumnType(i) instanceof TimestampType) {
                 TimestampType type = (TimestampType) schema.getColumnType(i);
-                timestampFormatters[i] = new TimestampFormatter(type.getFormat(), task);
+                timestampFormatters[i] = new TimestampFormatter(type.getFormat(), task.getTimeZone());
             }
         }
 

data/embulk-docs/src/release.rst

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

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

@@ -0,0 +1,14 @@
+Release 0.8.30
+==================================
+
+General Changes
+------------------
+
+* Fix -L option syntax error [#759]
+* Make Liquid's "include" work again [#757] [#761]
+* Avoid calling deprecated constructors and using `TimestampFormatter.FormatterTask` [#760] [#762] [#763]
+* Some refactoring [#755]
+
+Release Date
+------------------
+2017-08-23

data/lib/embulk.rb

@@ -63,6 +63,13 @@ module Embulk
 
     require_classpath(true)
 
-    Java::org.embulk.EmbulkSetup::setupWithNewScriptingContainer(Java::java.util.HashMap.new(system_config))
+    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
+    )
   end
 end

data/lib/embulk/runner.rb

@@ -1,23 +1,19 @@
 module Embulk
 
-  # Embulk.setup initializes:
-  # Runner = EmbulkRunner.new
-
   class EmbulkRunner
-    def initialize(embed)
-      @embed = embed  # org.embulk.EmbulkEmbed
+    def initialize(runner_java)
+      @runner_java = runner_java  # Java::org.embulk.EmbulkRunner
     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)
 
       case config
       when String
-        embulk_runner_java.guess(Java::java.lang.String.new(config), output_path)
+        @runner_java.guess(Java::java.lang.String.new(config), output_path)
       when Hash, DataSource
-        embulk_runner_java.guess(DataSource.new(config).to_java, output_path)
+        @runner_java.guess(DataSource.new(config).to_java, output_path)
       end
 
       nil
@@ -25,13 +21,12 @@ 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)
 
       case config
       when String
-        embulk_runner_java.preview(Java::java.lang.String.new(config), format)
+        @runner_java.preview(Java::java.lang.String.new(config), format)
       when Hash, DataSource
-        embulk_runner_java.preview(DataSource.new(config).to_java, format)
+        @runner_java.preview(DataSource.new(config).to_java, format)
       end
 
       nil
@@ -44,13 +39,12 @@ 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)
 
       case config
       when String
-        embulk_runner_java.run(Java::java.lang.String.new(config), config_diff_path, output_path, resume_state_path)
+        @runner_java.run(Java::java.lang.String.new(config), config_diff_path, output_path, resume_state_path)
       when Hash, DataSource
-        embulk_runner_java.run(DataSource.new(config).to_java, config_diff_path, output_path, resume_state_path)
+        @runner_java.run(DataSource.new(config).to_java, config_diff_path, output_path, resume_state_path)
       end
 
       nil

data/lib/embulk/version.rb

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
 
-  VERSION_INTERNAL = '0.8.29'
+  VERSION_INTERNAL = '0.8.30'
 
   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.29
+  version: 0.8.30
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-23 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.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/embulk-cli-0.8.30.jar
+- classpath/embulk-core-0.8.30.jar
+- classpath/embulk-jruby-strptime-0.8.30.jar
+- classpath/embulk-standards-0.8.30.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -194,11 +194,9 @@ files:
 - embulk-cli/build.gradle
 - embulk-cli/src/main/bat/selfrun.bat.template
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkArguments.java
-- embulk-cli/src/main/java/org/embulk/cli/EmbulkBundle.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkCommandLine.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkCommandLineException.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkExample.java
-- embulk-cli/src/main/java/org/embulk/cli/EmbulkGlobalJRubyScriptingContainer.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkMigrate.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkNew.java
 - embulk-cli/src/main/java/org/embulk/cli/EmbulkRun.java
@@ -220,6 +218,7 @@ 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
@@ -560,6 +559,7 @@ files:
 - 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.30.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-cli/src/main/java/org/embulk/cli/EmbulkBundle.java

@@ -1,44 +0,0 @@
-package org.embulk.cli;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.embulk.EmbulkVersion;
-import org.jruby.embed.ScriptingContainer;
-
-public class EmbulkBundle
-{
-    public static void checkBundle(
-            final String[] embulkArgs,
-            final List<String> jrubyOptions)
-    {
-        checkBundleWithEmbulkVersion(embulkArgs, jrubyOptions, EmbulkVersion.VERSION);
-    }
-
-    // It accepts |embulkVersion| so that it can receive Embulk's version from Ruby (bin/embulk).
-    public static void checkBundleWithEmbulkVersion(
-            final String[] embulkArgs,
-            final List<String> jrubyOptions,
-            final String embulkVersion)
-    {
-        final String bundlePath = System.getenv("EMBULK_BUNDLE_PATH");
-
-        final ScriptingContainer globalJRubyContainer =
-            EmbulkGlobalJRubyScriptingContainer.setup(embulkArgs, jrubyOptions, bundlePath, System.err);
-
-        // NOTE: It was written in Ruby as follows in case |bundlePath| != null:
-        //   begin
-        //     require 'embulk/command/embulk_main'
-        //   rescue LoadError
-        //     $LOAD_PATH << File.expand_path('../../', File.dirname(__FILE__))
-        //     require 'embulk/command/embulk_main'
-        //   end
-        //
-        // NOTE: It was written in Ruby as follows in case |bundlePath| == null::
-        //   require 'embulk/command/embulk_main'
-        //
-        // TODO: Consider handling LoadError or similar errors.
-        final EmbulkRun runner = new EmbulkRun(embulkVersion, globalJRubyContainer);
-        runner.run(Collections.unmodifiableList(Arrays.asList(embulkArgs)), jrubyOptions);
-    }
-}