embulk 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff085042dbecce04ca4a8095c59802bc4336a67e
-  data.tar.gz: aab28c9c0d9ae11a758ba6148baa12a8973e7903
+  metadata.gz: 0525d84746ae3f0cbd2839f3b6447063fc8f72ed
+  data.tar.gz: ea6a6a7c3a2a74b05466b5c1170239a6f32d0fa3
 SHA512:
-  metadata.gz: bace1db62e73980869cbf11118be290cdcacda974473bb6e334fbb0075bbbdcf8dec7096cff6f35c8de185baa67b6f5efee498e13d974183a5ec15a7ab9bf0db
-  data.tar.gz: 2d1e67648bc4eec548433c69f147e70647fe958d53c15234af3df6289e562a2aaa2e1d49bc9342204f83f6718f2965fa9b7713e5a415bb3e733d3a32e9fcdeac
+  metadata.gz: b5972147aab6f9e81cbdd13eb536ffbbdee7dfcff9ee32122b90a76e3e41756fd144f709f6bbbd22d603a57c613e86c671f135903528f0c94beccea70066d0a1
+  data.tar.gz: 10383e3a6a6362decade2631ad9b365455be007e9600c97e4564f3a7df2a9556f7356985ea45975a37bbc2c612a3255c79a1ae11657084fa78a643b345625722

data/README.md

@@ -121,6 +121,14 @@ embulk run    -b ./embulk_bundle ...
 
 For further details, visit [Embulk documentation](http://www.embulk.org/docs/).
 
+## Upgrading to the latest version
+
+Following command updates embulk itself to the latest released version.
+
+```sh
+embulk selfupdate
+```
+
 ## Embulk Development
 
 ### Build

data/build.gradle

@@ -11,7 +11,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.6.18'
+    version = '0.6.19'
 
     ext {
         jrubyVersion = '1.7.19'

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

@@ -11,22 +11,18 @@ import org.embulk.exec.ExtensionServiceLoaderModule;
 import org.embulk.plugin.PluginClassLoaderModule;
 import org.embulk.plugin.BuiltinPluginSourceModule;
 import org.embulk.jruby.JRubyScriptingModule;
+import static com.google.common.base.Preconditions.checkState;
 
 public class EmbulkService
 {
-    protected final Injector injector;
+    private final ConfigSource systemConfig;
+
+    protected Injector injector;
+    private boolean initialized;
 
     public EmbulkService(ConfigSource systemConfig)
     {
-        ImmutableList.Builder<Module> modules = ImmutableList.builder();
-        modules.add(new SystemConfigModule(systemConfig));
-        modules.add(new ExecModule());
-        modules.add(new ExtensionServiceLoaderModule(systemConfig));
-        modules.add(new PluginClassLoaderModule(systemConfig));
-        modules.add(new BuiltinPluginSourceModule());
-        modules.add(new JRubyScriptingModule(systemConfig));
-        modules.addAll(getAdditionalModules(systemConfig));
-        injector = Guice.createInjector(modules.build());
+        this.systemConfig = systemConfig;
     }
 
     protected Iterable<? extends Module> getAdditionalModules(ConfigSource systemConfig)
@@ -34,8 +30,40 @@ public class EmbulkService
         return ImmutableList.of();
     }
 
-    public Injector getInjector()
+    protected Iterable<? extends Module> overrideModules(Iterable<? extends Module> modules, ConfigSource systemConfig)
+    {
+        return modules;
+    }
+
+    public Injector initialize()
     {
+        checkState(!initialized, "Already initialized");
+
+        ImmutableList.Builder<Module> builder = ImmutableList.builder();
+        builder.add(new SystemConfigModule(systemConfig));
+        builder.add(new ExecModule());
+        builder.add(new ExtensionServiceLoaderModule(systemConfig));
+        builder.add(new PluginClassLoaderModule(systemConfig));
+        builder.add(new BuiltinPluginSourceModule());
+        builder.add(new JRubyScriptingModule(systemConfig));
+
+        builder.addAll(getAdditionalModules(systemConfig));
+
+        Iterable<? extends Module> modules = builder.build();
+        modules = overrideModules(modules, systemConfig);
+
+        injector = Guice.createInjector(modules);
+        initialized = true;
+
         return injector;
     }
+
+    @Deprecated
+    public synchronized Injector getInjector()
+    {
+        if (initialized) {
+            return injector;
+        }
+        return initialize();
+    }
 }

data/embulk-core/src/main/java/org/embulk/command/Runner.java

@@ -67,7 +67,7 @@ public class Runner
         this.systemConfig = new ConfigLoader(bootstrapModelManager).fromPropertiesYamlLiteral(System.getProperties(), "embulk.");
         mergeOptionsToSystemConfig(options, systemConfig);
         this.service = new EmbulkService(systemConfig);
-        this.injector = service.getInjector();
+        this.injector = service.initialize();
     }
 
     @SuppressWarnings("unchecked")

data/embulk-core/src/main/java/org/embulk/spi/unit/ToString.java

@@ -0,0 +1,54 @@
+package org.embulk.spi.unit;
+
+import com.google.common.base.Optional;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class ToString
+{
+    private final String string;
+
+    public ToString(String string)
+    {
+        this.string = string;
+    }
+
+    @JsonCreator
+    public ToString(Optional<JsonNode> option) throws JsonMappingException
+    {
+        JsonNode node = option.or(NullNode.getInstance());
+        if (node.isTextual()) {
+            this.string = node.textValue();
+        } else if (node.isValueNode()) {
+            this.string = node.toString();
+        } else {
+            throw new JsonMappingException(String.format("Arrays and objects are invalid: '%s'", node));
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (!(obj instanceof ToString)) {
+            return false;
+        }
+        ToString o = (ToString) obj;
+        return string.equals(o.string);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return string.hashCode();
+    }
+
+    @JsonValue
+    @Override
+    public String toString()
+    {
+        return string;
+    }
+}

data/embulk-core/src/main/java/org/embulk/spi/unit/ToStringMap.java

@@ -0,0 +1,35 @@
+package org.embulk.spi.unit;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class ToStringMap
+        extends HashMap<String, String>
+{
+    @JsonCreator
+    public ToStringMap(Map<String, ToString> map)
+    {
+        super(Maps.transformValues(map, new Function<ToString, String>() {
+            public String apply(ToString value)
+            {
+                if (value == null) {
+                    return "null";
+                } else {
+                    return value.toString();
+                }
+            }
+        }));
+    }
+
+    public Properties toProperties()
+    {
+        Properties props = new Properties();
+        props.putAll(this);
+        return props;
+    }
+}

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.6.19
     release/release-0.6.18
     release/release-0.6.17
     release/release-0.6.16

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

@@ -0,0 +1,18 @@
+Release 0.6.19
+==================================
+
+Java Plugin API
+------------------
+
+* Added spi.unit.ToStringMap utility class which can be used as a field type of a Task class. ToStringMap is a ``Map<String,String>`` but also accepts non-string values and converts it to string. This fuzzy behavior is useful for options such as ``options``.
+
+
+Embulk Embed API
+------------------
+
+* EmbulkService supports ``overrideModules`` method so that applications can use ``Modules.override`` to override specific injections.
+
+
+Release Date
+------------------
+2015-07-23

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.6.18'
+  VERSION = '0.6.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -222,6 +222,8 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/unit/ByteSize.java
 - embulk-core/src/main/java/org/embulk/spi/unit/LocalFile.java
 - embulk-core/src/main/java/org/embulk/spi/unit/LocalFileSerDe.java
+- embulk-core/src/main/java/org/embulk/spi/unit/ToString.java
+- embulk-core/src/main/java/org/embulk/spi/unit/ToStringMap.java
 - embulk-core/src/main/java/org/embulk/spi/util/CharsetSerDe.java
 - embulk-core/src/main/java/org/embulk/spi/util/Decoders.java
 - embulk-core/src/main/java/org/embulk/spi/util/DynamicColumnNotFoundException.java
@@ -335,6 +337,7 @@ files:
 - embulk-docs/src/release/release-0.6.16.rst
 - embulk-docs/src/release/release-0.6.17.rst
 - embulk-docs/src/release/release-0.6.18.rst
+- embulk-docs/src/release/release-0.6.19.rst
 - embulk-docs/src/release/release-0.6.2.rst
 - embulk-docs/src/release/release-0.6.3.rst
 - embulk-docs/src/release/release-0.6.4.rst
@@ -451,8 +454,8 @@ files:
 - classpath/bval-jsr303-0.5.jar
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-core-0.6.18.jar
-- classpath/embulk-standards-0.6.18.jar
+- classpath/embulk-core-0.6.19.jar
+- classpath/embulk-standards-0.6.19.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar