embulk 0.8.24-java → 0.8.25-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4304649d3c657ab61884394e4b04c32934ecc516
-  data.tar.gz: e99e2b6296c4660d6da94e9465e502dcdd218f22
+  metadata.gz: a2368360f1531d901df3fb7f5d0fe6069ad3362c
+  data.tar.gz: ef5f5347e9cfabb4ea31d9e29fd69695c9d4ebe4
 SHA512:
-  metadata.gz: 29a99a36b30105da946f964c8f131c98a5f3dedb2fa16edf6e50b2463f9b08939ee4602e0cf6353bde581ae6b7ee471dbb5da8a0ca6a90d6872308609c15e6ad
-  data.tar.gz: 0496df6ebb63f5bbef27d3dbf0fed1b6a2e8d6609b17651009f2c9498d97df289ca8a9e0f2f1868031b0aa273be28c36609552cc88d47bec9d4592f7cea8c9a8
+  metadata.gz: af58995886e862f1cc30dcbe23813da71f72bd443eb4b9af62584ff5c4aa49ab85a6c53d717e3258f331020e28f4e7b2ff9701c1fde24f1e58d93bff89705387
+  data.tar.gz: 791c332fcac833460e2a5458d72d8f937ec5881af769fe4100f1b30e225e7b6ed4db0c058f0eec5274f8d3cef56f86a73ff79e95d1987f5f479ad56330f77135

data/build.gradle

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

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

@@ -2,7 +2,10 @@
 
 setlocal
 
+rem Do not use %0 to identify the JAR (bat) file.
+rem %0 is just "embulk" when run by just "> embulk" while %0 is "embulk.bat" when run by "> embulk.bat".
 set this=%~f0
+
 set java_args=
 set jruby_args=
 set default_optimize=
@@ -76,7 +79,7 @@ endlocal && set BUNDLE_GEMFILE=%bundle_gemfile%
 setlocal enabledelayedexpansion
 
 if not defined EMBULK_BUNDLE_PATH (
-    for /f "delims=" %%w in ('java -cp %0 org.jruby.Main -e "print RbConfig::CONFIG['ruby_version']"') do set ruby_version=%%w
+    for /f "delims=" %%w in ('java -cp %this% org.jruby.Main -e "print RbConfig::CONFIG['ruby_version']"') do set ruby_version=%%w
     set gem_home=%USERPROFILE%\.embulk\jruby\!ruby_version!
 ) else (
     set gem_home=

data/embulk-core/src/main/java/org/embulk/exec/BulkLoader.java

@@ -528,7 +528,7 @@ public class BulkLoader
     private ExecutorPlugin newExecutorPlugin(BulkLoaderTask task)
     {
         return Exec.newPlugin(ExecutorPlugin.class,
-                task.getExecConfig().get(PluginType.class, "type", new PluginType("local")));
+                task.getExecConfig().get(PluginType.class, "type", PluginType.LOCAL));
     }
 
     private ExecutionResult doRun(ConfigSource config)

data/embulk-core/src/main/java/org/embulk/jruby/JRubyPluginSource.java

@@ -36,9 +36,13 @@ public class JRubyPluginSource
 
     public <T> T newPlugin(Class<T> iface, PluginType type) throws PluginSourceNotMatchException
     {
-        String name = type.getName();
+        if (type.getSourceType() != PluginSource.Type.DEFAULT) {
+            throw new PluginSourceNotMatchException();
+        }
+
+        final String name = type.getName();
 
-        String category;
+        final String category;
         if (InputPlugin.class.isAssignableFrom(iface)) {
             category = "input";
         } else if (OutputPlugin.class.isAssignableFrom(iface)) {

data/embulk-core/src/main/java/org/embulk/plugin/DefaultPluginType.java

@@ -0,0 +1,50 @@
+package org.embulk.plugin;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Objects;
+
+public final class DefaultPluginType
+        extends PluginType
+{
+    private DefaultPluginType(final String name)
+    {
+        super("default", name);
+    }
+
+    public static PluginType create(final String name)
+    {
+        if (name == null) {
+            throw new NullPointerException("name must not be null");
+        }
+        return new DefaultPluginType(name);
+    }
+
+    @JsonValue
+    public final String getJsonValue()
+    {
+        return this.getName();
+    }
+
+    @Override
+    public final int hashCode()
+    {
+        return Objects.hash(getSourceType(), getName());
+    }
+
+    @Override
+    public final boolean equals(final Object objectOther)
+    {
+        if (!(objectOther instanceof DefaultPluginType)) {
+            return false;
+        }
+        final DefaultPluginType other = (DefaultPluginType) objectOther;
+        return (this.getSourceType().equals(other.getSourceType()) &&
+                this.getName().equals(other.getName()));
+    }
+
+    @Override
+    public final String toString()
+    {
+        return this.getName();
+    }
+}

data/embulk-core/src/main/java/org/embulk/plugin/InjectedPluginSource.java

@@ -44,7 +44,11 @@ public class InjectedPluginSource
 
     public <T> T newPlugin(Class<T> iface, PluginType type) throws PluginSourceNotMatchException
     {
-        String name = type.getName();
+        if (type.getSourceType() != PluginSource.Type.DEFAULT) {
+            throw new PluginSourceNotMatchException();
+        }
+
+        final String name = type.getName();
         try {
             @SuppressWarnings("unchecked")
             PluginFactory<T> factory = (PluginFactory<T>) injector.getInstance(

data/embulk-core/src/main/java/org/embulk/plugin/MavenPluginType.java

@@ -0,0 +1,97 @@
+package org.embulk.plugin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public final class MavenPluginType
+        extends PluginType
+{
+    private MavenPluginType(final String name, final String group, final String version)
+    {
+        super("maven", name);
+        this.group = group;
+        this.version = version;
+
+        final StringBuilder fullNameBuilder = new StringBuilder();
+        fullNameBuilder.append("maven:");
+        fullNameBuilder.append(group);
+        fullNameBuilder.append(":");
+        fullNameBuilder.append(name);
+        fullNameBuilder.append(":");
+        fullNameBuilder.append(version);
+        this.fullName = fullNameBuilder.toString();
+
+        final HashMap<String, String> fullMapMutable = new HashMap<String, String>();
+        fullMapMutable.put("source", "maven");
+        fullMapMutable.put("name", name);
+        fullMapMutable.put("group", group);
+        fullMapMutable.put("version", version);
+        this.fullMap = Collections.unmodifiableMap(fullMapMutable);
+    }
+
+    public static MavenPluginType create(final String name, final String group, final String version)
+    {
+        if (name == null) {
+            throw new NullPointerException("\"name\" must not present.");
+        }
+        return new MavenPluginType(name, group, version);
+    }
+
+    @JsonValue
+    public final Map<String, String> getJsonValue()
+    {
+        return this.fullMap;
+    }
+
+    @JsonProperty("group")
+    public final String getGroup()
+    {
+        return this.group;
+    }
+
+    @JsonProperty("version")
+    public final String getVersion()
+    {
+        return this.version;
+    }
+
+    public final String getFullName()
+    {
+        return this.fullName;
+    }
+
+    @Override
+    public final int hashCode()
+    {
+        return Objects.hash(getSourceType(), getName(), this.group, this.version);
+    }
+
+    @Override
+    public boolean equals(Object objectOther)
+    {
+        if (!(objectOther instanceof MavenPluginType)) {
+            return false;
+        }
+        MavenPluginType other = (MavenPluginType) objectOther;
+        return (this.getSourceType().equals(other.getSourceType()) &&
+                this.getName().equals(other.getName()) &&
+                this.getGroup().equals(other.getGroup()) &&
+                this.getVersion().equals(other.getVersion()));
+    }
+
+    @JsonValue
+    @Override
+    public String toString()
+    {
+        return this.fullName;
+    }
+
+    private final String group;
+    private final String version;
+    private final String fullName;
+    private final Map<String, String> fullMap;
+}

data/embulk-core/src/main/java/org/embulk/plugin/PluginSource.java

@@ -1,6 +1,49 @@
 package org.embulk.plugin;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 public interface PluginSource
 {
     <T> T newPlugin(Class<T> iface, PluginType type) throws PluginSourceNotMatchException;
+
+    public enum Type
+    {
+        DEFAULT("default"),  // DEFAULT includes InjectedPluginSource and JRubyPluginSource.
+        MAVEN("maven"),
+        ;
+
+        private Type(final String sourceTypeName)
+        {
+            this.sourceTypeName = sourceTypeName;
+        }
+
+        public static Type of(final String sourceTypeName)
+        {
+            final Type found = MAP_FROM_STRING.get(sourceTypeName);
+            if (found == null) {
+                throw new IllegalArgumentException("\"" + sourceTypeName + "\" is not a plugin source.");
+            }
+            return found;
+        }
+
+        @Override
+        public final String toString()
+        {
+            return this.sourceTypeName;
+        }
+
+        static
+        {
+            final HashMap<String, Type> mapToBuild = new HashMap<String, Type>();
+            for (Type type : values()) {
+                mapToBuild.put(type.sourceTypeName, type);
+            }
+            MAP_FROM_STRING = Collections.unmodifiableMap(mapToBuild);
+        }
+
+        private static final Map<String, Type> MAP_FROM_STRING;
+        private final String sourceTypeName;
+    }
 }

data/embulk-core/src/main/java/org/embulk/plugin/PluginType.java

@@ -1,47 +1,121 @@
 package org.embulk.plugin;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ContainerNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import com.google.common.annotations.VisibleForTesting;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
 
-public class PluginType
+public abstract class PluginType
 {
-    private final String name;
+    public static final PluginType LOCAL = DefaultPluginType.create("local");
+
+    /**
+     * Constructs {@code PluginType}.
+     *
+     * The constructor is {@code protected} to be called from subclasses, e.g. {@code DefaultPluginType}.
+     */
+    protected PluginType(final String source, final String name)
+    {
+        this.sourceType = PluginSource.Type.of(source);
+        this.name = name;
+    }
 
-    // TODO accept isObject()/ObjectNode for complex PluginSource
     @JsonCreator
-    public PluginType(String name)
+    private static PluginType create(final JsonNode typeJson)
+    {
+        if (typeJson.isTextual()) {
+            return createFromString(((TextNode) typeJson).textValue());
+        }
+        else if (typeJson.isObject()) {
+            final HashMap<String, String> stringMap = new HashMap<String, String>();
+            final ObjectNode typeObject = (ObjectNode) typeJson;
+            final Iterator<Map.Entry<String, JsonNode>> fieldIterator = typeObject.fields();
+            while (fieldIterator.hasNext()) {
+                final Map.Entry<String, JsonNode> field = fieldIterator.next();
+                final JsonNode fieldValue = field.getValue();
+                if (fieldValue instanceof ContainerNode) {
+                    throw new IllegalArgumentException("\"type\" must be a string or a 1-depth mapping.");
+                }
+                stringMap.put(field.getKey(), fieldValue.textValue());
+            }
+            return createFromStringMap(stringMap);
+        }
+        else {
+            throw new IllegalArgumentException("\"type\" must be a string or a 1-depth mapping.");
+        }
+    }
+
+    private static PluginType createFromString(String name)
     {
         if (name == null) {
             throw new NullPointerException("name must not be null");
         }
-        this.name = name;
+        return DefaultPluginType.create(name);
     }
 
-    @JsonValue
-    public String getName()
+    private static PluginType createFromStringMap(Map<String, String> stringMap)
     {
-        return name;
+        final PluginSource.Type sourceType;
+        if (stringMap.containsKey("source")) {
+            sourceType = PluginSource.Type.of(stringMap.get("source"));
+        }
+        else {
+            sourceType = PluginSource.Type.DEFAULT;
+        }
+
+        switch (sourceType) {
+        case DEFAULT:
+            {
+                final String name = stringMap.get("name");
+                return createFromString(name);
+            }
+        case MAVEN:
+            {
+                final String name = stringMap.get("name");
+                final String group = stringMap.get("group");
+                final String version = stringMap.get("version");
+                return MavenPluginType.create(name, group, version);
+            }
+        default:
+            throw new IllegalArgumentException("\"source\" must be one of: [\"default\", \"maven\"]");
+        }
     }
 
-    @Override
-    public int hashCode()
+    @VisibleForTesting
+    static PluginType createFromStringForTesting(final String name)
     {
-        return name.hashCode();
+        return createFromString(name);
     }
 
-    @Override
-    public boolean equals(Object other)
+    @VisibleForTesting
+    static PluginType createFromStringMapForTesting(final Map<String, String> stringMap)
     {
-        if (!(other instanceof PluginType)) {
-            return false;
-        }
-        PluginType o = (PluginType) other;
-        return name.equals(o.name);
+        return createFromStringMap(stringMap);
     }
 
-    @Override
-    public String toString()
+    public final PluginSource.Type getSourceType()
+    {
+        return sourceType;
+    }
+
+    @JsonProperty("source")
+    public final String getSourceName()
+    {
+        return sourceType.toString();
+    }
+
+    @JsonProperty("name")
+    public final String getName()
     {
         return name;
     }
+
+    private final PluginSource.Type sourceType;
+    private final String name;
 }

data/embulk-core/src/test/java/org/embulk/plugin/TestPluginType.java

@@ -1,7 +1,10 @@
 package org.embulk.plugin;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import java.util.HashMap;
 import org.junit.Test;
 
 public class TestPluginType
@@ -9,10 +12,48 @@ public class TestPluginType
     @Test
     public void testEquals()
     {
-        PluginType type = new PluginType("a");
-        assertEquals(true, (type.equals(type)));
+        PluginType type = PluginType.createFromStringForTesting("a");
+        assertTrue(type instanceof DefaultPluginType);
+        assertEquals(PluginSource.Type.DEFAULT, type.getSourceType());
+        assertTrue(type.equals(type));
 
-        assertEquals(true, (type.equals(new PluginType("a"))));
-        assertEquals(false, (type.equals(new PluginType("b"))));
+        assertTrue(type.equals(PluginType.createFromStringForTesting("a")));
+        assertFalse(type.equals(PluginType.createFromStringForTesting("b")));
+    }
+
+    @Test
+    public void testMapping1()
+    {
+        HashMap<String, String> mapping = new HashMap<String, String>();
+        mapping.put("source", "default");
+        mapping.put("name", "c");
+
+        PluginType type = PluginType.createFromStringMapForTesting(mapping);
+        assertTrue(type instanceof DefaultPluginType);
+        assertEquals(PluginSource.Type.DEFAULT, type.getSourceType());
+        assertTrue(type.equals(type));
+
+        assertTrue(type.equals(PluginType.createFromStringForTesting("c")));
+        assertFalse(type.equals(PluginType.createFromStringForTesting("d")));
+    }
+
+    @Test
+    public void testMapping2()
+    {
+        HashMap<String, String> mapping = new HashMap<String, String>();
+        mapping.put("source", "maven");
+        mapping.put("name", "e");
+        mapping.put("group", "org.embulk.foobar");
+        mapping.put("version", "0.1.2");
+
+        PluginType type = PluginType.createFromStringMapForTesting(mapping);
+        assertTrue(type instanceof MavenPluginType);
+        assertEquals(PluginSource.Type.MAVEN, type.getSourceType());
+        MavenPluginType mavenType = (MavenPluginType) type;
+        assertTrue(mavenType.equals(mavenType));
+        assertEquals("e", mavenType.getName());
+        assertEquals("org.embulk.foobar", mavenType.getGroup());
+        assertEquals("0.1.2", mavenType.getVersion());
+        assertEquals("maven:org.embulk.foobar:e:0.1.2", mavenType.getFullName());
     }
 }

data/embulk-core/src/test/java/org/embulk/plugin/TestPluginTypeSerDe.java

@@ -0,0 +1,50 @@
+package org.embulk.plugin;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.embulk.EmbulkTestRuntime;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class TestPluginTypeSerDe
+{
+    @Rule
+    public EmbulkTestRuntime testRuntime = new EmbulkTestRuntime();
+
+    @Test
+    public void testParseTypeString()
+    {
+        PluginType pluginType = testRuntime.getModelManager().readObjectWithConfigSerDe(
+            PluginType.class,
+            "\"file\"");
+        assertTrue(pluginType instanceof DefaultPluginType);
+        assertEquals(PluginSource.Type.DEFAULT, pluginType.getSourceType());
+        assertEquals("file", pluginType.getName());
+    }
+
+    @Test
+    public void testParseTypeMapping()
+    {
+        PluginType pluginType = testRuntime.getModelManager().readObjectWithConfigSerDe(
+            PluginType.class,
+            "{ \"name\": \"dummy\" }");
+        assertTrue(pluginType instanceof DefaultPluginType);
+        assertEquals(PluginSource.Type.DEFAULT, pluginType.getSourceType());
+        assertEquals("dummy", pluginType.getName());
+    }
+
+    @Test
+    public void testParseTypeMaven()
+    {
+        PluginType pluginType = testRuntime.getModelManager().readObjectWithConfigSerDe(
+            PluginType.class,
+            "{ \"name\": \"foo\", \"source\": \"maven\", \"group\": \"org.embulk.bar\", \"version\": \"0.1.2\" }");
+        assertTrue(pluginType instanceof MavenPluginType);
+        assertEquals(PluginSource.Type.MAVEN, pluginType.getSourceType());
+        MavenPluginType mavenPluginType = (MavenPluginType) pluginType;
+        assertEquals(mavenPluginType.getName(), "foo");
+        assertEquals(mavenPluginType.getGroup(), "org.embulk.bar");
+        assertEquals(mavenPluginType.getVersion(), "0.1.2");
+    }
+}

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.25
     release/release-0.8.24
     release/release-0.8.23
     release/release-0.8.22

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

@@ -0,0 +1,14 @@
+Release 0.8.25
+==================================
+
+General Changes
+------------------
+
+* Prepare for JAR/Maven-based pure-Java plugins [#666] [#669]
+* Fix "could not find or load main class org.jruby.Main" when run as just "embulk" on Windows. [#676]
+* Fix "NameError: undefined local variable or method `bundle_path_index' for main:Object" when using Bundler. [#681]
+
+
+Release Date
+------------------
+2017-06-16

data/embulk-standards/src/main/java/org/embulk/standards/StandardPluginModule.java

@@ -10,7 +10,7 @@ import org.embulk.spi.OutputPlugin;
 import org.embulk.spi.ParserPlugin;
 import org.embulk.spi.DecoderPlugin;
 import org.embulk.spi.EncoderPlugin;
-import org.embulk.plugin.PluginType;
+import org.embulk.plugin.DefaultPluginType;
 import static org.embulk.plugin.InjectedPluginSource.registerPluginTo;
 import static org.embulk.exec.GuessExecutor.registerDefaultGuessPluginTo;
 
@@ -50,10 +50,10 @@ public class StandardPluginModule
         registerPluginTo(binder, FilterPlugin.class, "remove_columns", RemoveColumnsFilterPlugin.class);
 
         // default guess plugins
-        registerDefaultGuessPluginTo(binder, new PluginType("gzip"));
-        registerDefaultGuessPluginTo(binder, new PluginType("bzip2"));
-        registerDefaultGuessPluginTo(binder, new PluginType("json")); // should be registered before CsvGuessPlugin
-        registerDefaultGuessPluginTo(binder, new PluginType("csv"));
+        registerDefaultGuessPluginTo(binder, DefaultPluginType.create("gzip"));
+        registerDefaultGuessPluginTo(binder, DefaultPluginType.create("bzip2"));
+        registerDefaultGuessPluginTo(binder, DefaultPluginType.create("json")); // should be registered before CsvGuessPlugin
+        registerDefaultGuessPluginTo(binder, DefaultPluginType.create("csv"));
         // charset and newline guess plugins are loaded and invoked by CsvGuessPlugin
     }
 }

data/lib/embulk/command/embulk_bundle.rb

@@ -2,8 +2,9 @@ bundle_path = ENV['EMBULK_BUNDLE_PATH'].to_s
 bundle_path = nil if bundle_path.empty?
 
 # Search for -b or --bundle, and remove it.
-if ARGV.find_index {|arg| arg == '-b' || arg == '--bundle' }
-  ARGV.slice!(bundle_path_index, 2)[1]
+bundle_option_index = ARGV.find_index {|arg| arg == '-b' || arg == '--bundle' }
+if bundle_option_index
+  ARGV.slice!(bundle_option_index, 2)[1]
 end
 
 if bundle_path

data/lib/embulk/version.rb

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
 
-  VERSION_INTERNAL = '0.8.24'
+  VERSION_INTERNAL = '0.8.25'
 
   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,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.25
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
+  name: bundler
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.6
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+  name: msgpack
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
+  name: liquid
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.6
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rjack-icu
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.54.1.1
+  name: rjack-icu
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.54.1.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
+  name: rake
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
+  name: test-unit
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.9
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
+  name: yard
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
-  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
+  name: kramdown
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
-  prerelease: false
-  type: :development
 description: Embulk is an open-source, plugin-based bulk data loader to scale and simplify data management across heterogeneous data stores. It can collect and ship any kinds of data in high throughput with transaction control.
 email:
 - frsyuki@gmail.com
@@ -150,9 +150,9 @@ files:
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang-2.4.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-cli-0.8.24.jar
-- classpath/embulk-core-0.8.24.jar
-- classpath/embulk-standards-0.8.24.jar
+- classpath/embulk-cli-0.8.25.jar
+- classpath/embulk-core-0.8.25.jar
+- classpath/embulk-standards-0.8.25.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -246,7 +246,9 @@ files:
 - embulk-core/src/main/java/org/embulk/jruby/JRubyPluginSource.java
 - embulk-core/src/main/java/org/embulk/jruby/JRubyScriptingModule.java
 - embulk-core/src/main/java/org/embulk/plugin/BuiltinPluginSourceModule.java
+- embulk-core/src/main/java/org/embulk/plugin/DefaultPluginType.java
 - embulk-core/src/main/java/org/embulk/plugin/InjectedPluginSource.java
+- embulk-core/src/main/java/org/embulk/plugin/MavenPluginType.java
 - embulk-core/src/main/java/org/embulk/plugin/PluginClassLoader.java
 - embulk-core/src/main/java/org/embulk/plugin/PluginClassLoaderFactory.java
 - embulk-core/src/main/java/org/embulk/plugin/PluginClassLoaderModule.java
@@ -379,6 +381,7 @@ files:
 - embulk-core/src/test/java/org/embulk/config/TestTaskSource.java
 - embulk-core/src/test/java/org/embulk/plugin/MockPluginSource.java
 - embulk-core/src/test/java/org/embulk/plugin/TestPluginType.java
+- embulk-core/src/test/java/org/embulk/plugin/TestPluginTypeSerDe.java
 - embulk-core/src/test/java/org/embulk/spi/MockFileOutput.java
 - embulk-core/src/test/java/org/embulk/spi/MockFormatterPlugin.java
 - embulk-core/src/test/java/org/embulk/spi/MockParserPlugin.java
@@ -503,6 +506,7 @@ files:
 - embulk-docs/src/release/release-0.8.22.rst
 - embulk-docs/src/release/release-0.8.23.rst
 - embulk-docs/src/release/release-0.8.24.rst
+- embulk-docs/src/release/release-0.8.25.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