embulk 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d98c0a02ab92bbf1946711baf3d7ed6e595a370
-  data.tar.gz: 42feb91bb67cf47d56bcbcecbb0ab3503c60f8b4
+  metadata.gz: 1aea38d2d64e785a477bb3b7aa81a0801b78bbf9
+  data.tar.gz: b1c68158658a6c8274cb4375be5c03e6c58410e1
 SHA512:
-  metadata.gz: 6c51c434afe98f3a6f1ee85e03fed5224238892830308c406eb67be38c1ec4f5a22fe103bde6cc89cfee44875281d2887c3624bcc5fda0c1ddb5aa388cf972e0
-  data.tar.gz: 88d1f71adf38f007dc876d5bc55672e1ae69b3c8895aec589dcc77a98801bab4b55fb849979635955c628c4300da343de2f2e60a11aa1d9054dac8011cdac705
+  metadata.gz: 38bed0a199023c3989997a48a466c70e8e6a778714951c0cbef215dbb351c4a6eced66722f41ed7dfb8984976f2d2c44352a955c7146d871de0c1c8e9e8d47d3
+  data.tar.gz: 68fa1091e21c306cc7ed12e87f68e387e3a98e4319b5806b2eaf09eb4991fe1a0bc09fd86490155a8be0fab2000c37c6781fdfcfd0c6072eac61913f79e09f82

data/README.md

@@ -28,7 +28,7 @@ The single-file package is the simplest way to try Embulk. You can download the
 Following 4 commands install embulk to your home directory:
 
 ```
-curl --create-dirs -o ~/.embulk/bin/embulk -L https://bintray.com/artifact/download/embulk/maven/embulk-0.4.9.jar
+curl --create-dirs -o ~/.embulk/bin/embulk -L https://bintray.com/artifact/download/embulk/maven/embulk-0.4.10.jar
 chmod +x ~/.embulk/bin/embulk
 echo 'export PATH="$HOME/.embulk/bin:$PATH"' >> ~/.bashrc
 source ~/.bashrc
@@ -39,7 +39,7 @@ source ~/.bashrc
 You can assume the jar file is a .bat file.
 
 ```
-curl -o embulk.bat -L https://bintray.com/artifact/download/embulk/maven/embulk-0.4.9.jar
+curl -o embulk.bat -L https://bintray.com/artifact/download/embulk/maven/embulk-0.4.10.jar
 ```
 
 ### Trying examples

data/build.gradle

@@ -12,7 +12,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.4.9'
+    version = '0.4.10'
 
     apply plugin: 'java'
     apply plugin: 'maven-publish'

data/embulk-core/src/main/java/org/embulk/config/TaskSerDe.java

@@ -156,7 +156,7 @@ class TaskSerDe
                 } else {
                     Object value = nestedObjectMapper.readValue(jp, new GenericTypeReference(field.getType()));
                     if (value == null) {
-                        throw new JsonMappingException("Setting null to a @Config field is not allowed. Configuration object must be Optional<T> (com.google.common.base.Optional)");
+                        throw new JsonMappingException("Setting null to a task field is not allowed. Use Optional<T> (com.google.common.base.Optional) to represent null.");
                     }
                     objects.put(field.getName(), value);
                     unusedMappings.remove(key);
@@ -169,7 +169,7 @@ class TaskSerDe
                 if (field.getDefaultJsonString().isPresent()) {
                     Object value = nestedObjectMapper.readValue(field.getDefaultJsonString().get(), new GenericTypeReference(field.getType()));
                     if (value == null) {
-                        throw new JsonMappingException("Setting null to a @Config field is not allowed. Configuration object must be Optional<T> (com.google.common.base.Optional)");
+                        throw new JsonMappingException("Setting null to a task field is not allowed. Use Optional<T> (com.google.common.base.Optional) to represent null.");
                     }
                     objects.put(field.getName(), value);
                 } else {

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

@@ -1,7 +1,9 @@
 package org.embulk.spi;
 
+import java.nio.file.Path;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.net.MalformedURLException;
 import java.util.List;
 import com.google.common.collect.ImmutableList;
 import org.jruby.Ruby;
@@ -9,14 +11,10 @@ import org.jruby.Ruby;
 public class PluginClassLoader
         extends URLClassLoader
 {
-    private static final String[] PARENT_FIRST_PACKAGES = new String[] {
-        "org.embulk.",
-        "io.airlift.slice.",
-        "com.fasterxml.jackson.",
-        "com.google.inject.",
-        "org.jruby.",
-        "javax.inject.",
-        "java.",
+    private static final String[] CHILD_FIRST_PACKAGES = new String[] {
+        "io.netty.",
+        "org.yaml.",
+        "com.ibm.icu.",
     };
 
     public PluginClassLoader(Ruby pluginJRubyRuntime, List<URL> urls)
@@ -29,6 +27,20 @@ public class PluginClassLoader
         super(urls.toArray(new URL[urls.size()]), parent);
     }
 
+    public void addPath(Path path)
+    {
+        try {
+            addUrl(path.toUri().toURL());
+        } catch (MalformedURLException ex) {
+            throw new IllegalArgumentException(ex);
+        }
+    }
+
+    public void addUrl(URL url)
+    {
+        super.addURL(url);
+    }
+
     @Override
     protected Class<?> loadClass(String name, boolean resolve)
             throws ClassNotFoundException
@@ -39,8 +51,8 @@ public class PluginClassLoader
                 return resolveClass(loadedClass, resolve);
             }
 
-            boolean parentFirst = isInParentFirstPackage(name);
-            if (!parentFirst) {
+            boolean childFirst = isInChildFirstPackage(name);
+            if (childFirst) {
                 try {
                     return resolveClass(findClass(name), resolve);
                 } catch (ClassNotFoundException ignored) {
@@ -52,7 +64,7 @@ public class PluginClassLoader
             } catch (ClassNotFoundException ignored) {
             }
 
-            if (parentFirst) {
+            if (!childFirst) {
                 return resolveClass(findClass(name), resolve);
             }
 
@@ -68,9 +80,9 @@ public class PluginClassLoader
         return clazz;
     }
 
-    private boolean isInParentFirstPackage(String name)
+    private boolean isInChildFirstPackage(String name)
     {
-        for (String pkg : PARENT_FIRST_PACKAGES) {
+        for (String pkg : CHILD_FIRST_PACKAGES) {
             if (name.startsWith(pkg)) {
                 return true;
             }

data/embulk-docs/plugins/index.html.erb

@@ -12,7 +12,7 @@
   <body>
     <div class="header"><h1 class="heading"><a href="../docs/index.html">
         <span>Embulk plugins</span></a></h1>
-      <h2 class="heading"><span>Embulk by category</span></h2>
+      <h2 class="heading"><span>Embulk plugins by category</span></h2>
     </div>
 
     <div class="content">
@@ -45,10 +45,11 @@
                       <a class="gh-count" href="https://github.com/<%=e gem[:owner] %>/<%=e gem[:repo] %>/stargazers" target="_blank" style="display: block"><%=h gem[:stargazers_count] %></a>
                     </span>
                   </div>
-                <td style="width:9em"><a href="<%=h gem[:url] %>"><%=h gem[:name] %></a></td>
-                <td style="width:15em"><%=h gem[:author] %>
+                </td>
+                <td style="min-width:9em"><a href="<%=h gem[:url] %>"><%=h gem[:name] %></a><pre class="install">$ embulk gem install <%=h gem[:gem_name] %></pre></td>
+                <td style="min-width:13em"><%=h gem[:author] %>
                   <% if gem[:avatar_url] %>
-                  <img src="<%=h gem[:avatar_url] %>" height=32 width=32></img></td>
+                  <img src="<%=h gem[:avatar_url] %>" height=32 width=32></img>
                   <% else %>
                 </td>
                 <% end %>

data/embulk-docs/plugins/plugins.css

@@ -1,15 +1,22 @@
 body {
   max-width: 90em;
+  font-size: 105%;
 }
 .plugins {
   border-collapse: collapse
 }
 .plugins th, td {
-  padding: 5px 20px;
+  padding: 8px 20px;
   border: 1px solid #eee;
   vertical-align: middle;
 }
-.author-avator {
+.plugins pre.install {
+  font-size: 50%;
+  padding: 7px 0 2px 0;
+  margin: 0;
+  background: none;
+  border: none;
+  color: #999;
 }
 
 .github-btn-container {

data/embulk-docs/src/recipe/scheduled-csv-load-to-elasticsearch-kibana4.rst

@@ -56,7 +56,7 @@ You can find the latest embulk binary from the `releases <https://bintray.com/em
 
 .. code-block:: console
 
-    $ sudo wget https://bintray.com/artifact/download/embulk/maven/embulk-0.4.9.jar -O /usr/local/bin/embulk
+    $ sudo wget https://bintray.com/artifact/download/embulk/maven/embulk-0.4.10.jar -O /usr/local/bin/embulk
     $ sudo chmod +x /usr/local/bin/embulk
 
 Step 2. Install Elasticsearch plugin

data/embulk-docs/src/release.rst

@@ -20,4 +20,5 @@ Release Notes
     release/release-0.4.7
     release/release-0.4.8
     release/release-0.4.9
+    release/release-0.4.10
 

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

@@ -0,0 +1,17 @@
+Release 0.4.10
+==================================
+
+Plugin API Changes
+------------------
+
+* Classloader of Java-based plugins search classes from the embulk's classloader by default. This solves mismatches of the same class loaded by 2 classloaders.
+* Added ``spi.PluginClassLoader.addPath(Path)`` method so that Java-based plugins can load jar files dynamically.
+
+General Changes
+------------------
+
+* Rakefile generated by plugin template generator has default task aliased to ``build`` task (@takei-yuya++)
+
+Release Date
+------------------
+2015-02-26

data/lib/embulk/command/embulk_new_plugin.rb

@@ -45,7 +45,7 @@ module Embulk
           %[Dumps records to #{display_name}.]
         when :file_output
           %[Stores files on #{display_name}.]
-        when :formtter
+        when :formatter
           %[Formats #{display_name} files for other file output plugins.]
         when :encoder
           %[Encodes files using #{display_name} for other file output plugins.]

data/lib/embulk/data/new/java/build.gradle.erb

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.description   = %[<%= "#{description}".dump %>]
   spec.email         = [<%= email.dump %>]
   spec.licenses      = ["MIT"]
-  # TODO: spec.homepage      = <%= "https://github.com/#{email[/([^@]*)/]}/#{project_name}".dump %>
+  # TODO set this: spec.homepage      = <%= "https://github.com/#{email[/([^@]*)/]}/#{project_name}".dump %>
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")

data/lib/embulk/data/new/ruby/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+
+task default: :build

data/lib/embulk/data/new/ruby/gemspec.erb

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.description   = <%= "#{description}".dump %>
   spec.email         = [<%= email.dump %>]
   spec.licenses      = ["MIT"]
-  # TODO: spec.homepage      = "https://github.com/<%= email[/([^@]*)/] %>/<%= project_name %>"
+  # TODO set this: spec.homepage      = "https://github.com/<%= email[/([^@]*)/] %>/<%= project_name %>"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r{^(test|spec)/})

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -261,6 +261,7 @@ files:
 - embulk-docs/src/release/release-0.3.2.rst
 - embulk-docs/src/release/release-0.4.0.rst
 - embulk-docs/src/release/release-0.4.1.rst
+- embulk-docs/src/release/release-0.4.10.rst
 - embulk-docs/src/release/release-0.4.2.rst
 - embulk-docs/src/release/release-0.4.3.rst
 - embulk-docs/src/release/release-0.4.4.rst
@@ -369,8 +370,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.4.9.jar
-- classpath/embulk-standards-0.4.9.jar
+- classpath/embulk-core-0.4.10.jar
+- classpath/embulk-standards-0.4.10.jar
 - classpath/guava-18.0.jar
 - classpath/guice-3.0.jar
 - classpath/guice-multibindings-3.0.jar