embulk 0.6.2 → 0.6.3

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

@@ -26,15 +26,29 @@ task classpath(type: Copy, dependsOn: ["jar"]) {
     from (configurations.runtime - configurations.provided + files(jar.archivePath))
     into "classpath"
 }
-clean { delete 'classpath' }
+clean { delete "classpath" }
 
-task gem(type: JRubyExec, dependsOn: ["build", "gemspec", "classpath"]) {
+task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
     jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "build/gemspec"
+    script "${project.name}.gemspec"
     doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
 }
 
-task gemspec << { file("build/gemspec").write($/
+task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
+    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
+    script "${project.name}-${project.version}.gem"
+}
+
+task "package"(dependsOn: ["gemspec", "classpath"]) << {
+    println "> Build succeeded."
+    println "> You can run embulk with '-L ${file(".").absolutePath}' argument."
+}
+
+task gemspec {
+    ext.gemspecFile = file("${project.name}.gemspec")
+    inputs.file "build.gradle"
+    outputs.file gemspecFile
+    doLast { gemspecFile.write($/
 Gem::Specification.new do |spec|
   spec.name          = "${project.name}"
   spec.version       = "${project.version}"
@@ -54,4 +68,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', ['>= 10.0']
 end
 /$)
+    }
 }
+clean { delete "${project.name}.gemspec" }

data/lib/embulk/java/bootstrap.rb

@@ -5,13 +5,13 @@ module Embulk
 
     module Injected
       # Following constats are set by org.embulk.jruby.JRubyScriptingModule:
+      #   Injector
       #   ModelManager
       #   BufferAllocator
     end
 
     def self.injector
-      # TODO use org.embulk.spi.Exec.getInjector
-      Injector
+      Injected::Injector
     end
   end
 end

data/lib/embulk/plugin.rb

@@ -190,7 +190,7 @@ module Embulk
 
     # TODO lookup should fallback to Java PluginSource
     # if not found so that ruby plugins can call java plugins.
-    # call injector.newPlugin and wrap the instance in a reverse bridge object.
+    # call Java.injector.newPlugin and wrap the instance in a reverse bridge object.
 
     def lookup(category, type)
       @registries[category].lookup(type)

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/test/helper.rb

@@ -1,5 +1,12 @@
 require 'test/unit'
 
+classpath_dir = File.expand_path('../classpath', File.dirname(__FILE__))
+jars = Dir.entries(classpath_dir).select {|f| f =~ /\.jar$/ }.sort
+jars.each do |jar|
+  require File.join(classpath_dir, jar)
+end
+
+require 'embulk/java/bootstrap'
 require 'embulk'
 
 # TODO simplecov

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -211,6 +211,7 @@ files:
 - embulk-core/src/main/java/org/embulk/spi/type/Type.java
 - embulk-core/src/main/java/org/embulk/spi/type/TypeDeserializer.java
 - embulk-core/src/main/java/org/embulk/spi/type/Types.java
+- embulk-core/src/main/java/org/embulk/spi/unit/ByteSize.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/Encoders.java
@@ -249,18 +250,18 @@ files:
 - embulk-core/src/test/java/org/embulk/spi/time/TestTimestamp.java
 - embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParser.java
 - embulk-core/src/test/java/org/embulk/spi/type/TestTypeSerDe.java
+- embulk-core/src/test/java/org/embulk/spi/unit/TestByteSize.java
 - embulk-core/src/test/java/org/embulk/spi/util/TestLineDecoder.java
 - embulk-core/src/test/java/org/embulk/spi/util/TestLineEncoder.java
 - embulk-docs/Makefile
 - embulk-docs/build.gradle
 - embulk-docs/make.bat
-- embulk-docs/plugins/index.html.erb
-- embulk-docs/plugins/plugins.css
 - embulk-docs/push-gh-pages.sh
 - embulk-docs/src/_static/embulk-architecture.png
 - embulk-docs/src/_static/embulk-logo.png
 - embulk-docs/src/built-in.rst
 - embulk-docs/src/conf.py
+- embulk-docs/src/customization.rst
 - embulk-docs/src/index.rst
 - embulk-docs/src/recipe.rst
 - embulk-docs/src/recipe/scheduled-csv-load-to-elasticsearch-kibana4.rst
@@ -291,6 +292,7 @@ files:
 - embulk-docs/src/release/release-0.6.0.rst
 - embulk-docs/src/release/release-0.6.1.rst
 - embulk-docs/src/release/release-0.6.2.rst
+- embulk-docs/src/release/release-0.6.3.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/CsvFormatterPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/CsvParserPlugin.java
@@ -396,8 +398,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.2.jar
-- classpath/embulk-standards-0.6.2.jar
+- classpath/embulk-core-0.6.3.jar
+- classpath/embulk-standards-0.6.3.jar
 - classpath/guava-18.0.jar
 - classpath/guice-3.0.jar
 - classpath/guice-multibindings-3.0.jar

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

@@ -1,73 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>List of Embulk Plugins by Category | Embulk</title>
-    <link rel="stylesheet" href="../docs/_static/haiku.css" type="text/css" />
-    <link rel="stylesheet" href="../docs/_static/pygments.css" type="text/css" />
-    <link rel="stylesheet" href="plugins.css" type="text/css" />
-    <link rel="top" title="Embulk 0.4 documentation" href="../docs/index.html" />
-  </head>
-  <body>
-    <div class="header"><h1 class="heading"><a href="../docs/index.html">
-        <span>Embulk plugins</span></a></h1>
-      <h2 class="heading"><span>Embulk plugins by category</span></h2>
-    </div>
-
-    <div class="content">
-      <div class="section">
-        <h1>List of Plugins by Category</h1>
-
-        <% categories.each do |category,gems| %>
-        <div class="section">
-          <h2 id="<%= category.gsub(/[^a-zA-Z0-9]/, '-') %>"><%= category.upcase %></h2>
-          <table class="plugins">
-            <thead>
-              <tr>
-                  <th>Star</th>
-                  <th>Name</th>
-                  <th>Author</th>
-                  <th>About</th>
-                  <th>Download</th>
-              </tr>
-            </thead>
-            <tbody>
-              <% gems.each do |gem| %>
-              <tr>
-                <td style="width:80px">
-                  <div class="github-btn-container">
-                    <span class="github-btn" class="github-stargazers">
-                      <a class="gh-btn" href="https://github.com/<%=e gem[:owner] %>/<%=e gem[:repo] %>" target="_blank">
-                        <span class="gh-ico"></span>
-                        <span class="gh-text">Star</span>
-                      </a>
-                      <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>
-                <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>
-                  <% else %>
-                </td>
-                <% end %>
-                <td><%=h gem[:info] %></td>
-                <td style="width:3em"><%=h gem[:downloads] %></td>
-              </tr>
-              <% end %>
-            </tbody>
-          </table>
-        </div>
-        <% end %>
-
-      </div>
-    </div>
-
-    <div class="footer">
-        &copy; Copyright 2015, Embulk Project.
-        Created using <a href="https://github.com/embulk/plugin-crawler">Embulk plugin crawler</a>.
-    </div>
-  </body>
-</html>

data/embulk-docs/plugins/plugins.css

@@ -1,148 +0,0 @@
-body {
-  max-width: 90em;
-  font-size: 105%;
-}
-.plugins {
-  border-collapse: collapse
-}
-.plugins th, td {
-  padding: 8px 20px;
-  border: 1px solid #eee;
-  vertical-align: middle;
-}
-.plugins pre.install {
-  font-size: 50%;
-  padding: 7px 0 2px 0;
-  margin: 0;
-  background: none;
-  border: none;
-  color: #999;
-}
-
-.github-btn-container {
-  padding: 0;
-  margin: 0;
-  font: bold 11px/14px "Helvetica Neue", Helvetica, Arial, sans-serif;
-  overflow: hidden;
-  color: black
-}
-.github-btn-container a {
-  color: black;
-}
-.github-btn-container a:hover {
-  text-decoration: none;
-}
-
-.github-btn {
-  height: 20px;
-  overflow: hidden;
-}
-.gh-btn,
-.gh-count,
-.gh-ico {
-  float: left;
-}
-.gh-btn,
-.gh-count {
-  padding: 2px 5px 2px 4px;
-  color: #333;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #fff;
-  white-space: nowrap;
-  cursor: pointer;
-  border-radius: 3px;
-}
-.gh-btn {
-  background-color: #eee;
-  background-image: -moz-linear-gradient(#fcfcfc, #eee);
-  background-image: -webkit-linear-gradient(#fcfcfc, #eee);
-  background-image: linear-gradient(#fcfcfc, #eee);
-  background-repeat: no-repeat;
-  border: 1px solid #d5d5d5;
-}
-.gh-btn:hover,
-.gh-btn:focus {
-  text-decoration: none;
-  background-color: #ddd;
-  background-image: -moz-linear-gradient(#eee, #ddd);
-  background-image: -webkit-linear-gradient(#eee, #ddd);
-  background-image: linear-gradient(#eee, #ddd);
-  border-color: #ccc;
-}
-.gh-btn:active {
-  background-image: none;
-  background-color: #dcdcdc;
-  border-color: #b5b5b5;
-  box-shadow: inset 0 2px 4px rgba(0,0,0,0.15);
-}
-.gh-ico {
-  width: 14px;
-  height: 14px;
-  margin-right: 4px;
-  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNDBweCIgaGVpZ2h0PSI0MHB4IiB2aWV3Qm94PSIxMiAxMiA0MCA0MCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAxMiAxMiA0MCA0MCIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8cGF0aCBmaWxsPSIjMzMzMzMzIiBkPSJNMzIsMTMuNGMtMTAuNSwwLTE5LDguNS0xOSwxOWMwLDguNCw1LjUsMTUuNSwxMywxOGMxLDAuMiwxLjMtMC40LDEuMy0wLjljMC0wLjUsMC0xLjcsMC0zLjINCgljLTUuMywxLjEtNi40LTIuNi02LjQtMi42QzIwLDQxLjYsMTguOCw0MSwxOC44LDQxYy0xLjctMS4yLDAuMS0xLjEsMC4xLTEuMWMxLjksMC4xLDIuOSwyLDIuOSwyYzEuNywyLjksNC41LDIuMSw1LjUsMS42DQoJYzAuMi0xLjIsMC43LTIuMSwxLjItMi42Yy00LjItMC41LTguNy0yLjEtOC43LTkuNGMwLTIuMSwwLjctMy43LDItNS4xYy0wLjItMC41LTAuOC0yLjQsMC4yLTVjMCwwLDEuNi0wLjUsNS4yLDINCgljMS41LTAuNCwzLjEtMC43LDQuOC0wLjdjMS42LDAsMy4zLDAuMiw0LjcsMC43YzMuNi0yLjQsNS4yLTIsNS4yLTJjMSwyLjYsMC40LDQuNiwwLjIsNWMxLjIsMS4zLDIsMywyLDUuMWMwLDcuMy00LjUsOC45LTguNyw5LjQNCgljMC43LDAuNiwxLjMsMS43LDEuMywzLjVjMCwyLjYsMCw0LjYsMCw1LjJjMCwwLjUsMC40LDEuMSwxLjMsMC45YzcuNS0yLjYsMTMtOS43LDEzLTE4LjFDNTEsMjEuOSw0Mi41LDEzLjQsMzIsMTMuNHoiLz4NCjwvc3ZnPg0K);
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
-.gh-count {
-  position: relative;
-  display: none; /* hidden to start */
-  margin-left: 4px;
-  background-color: #fafafa;
-  border: 1px solid #d4d4d4;
-}
-.gh-count:hover,
-.gh-count:focus {
-  color: #4183C4;
-}
-.gh-count:before,
-.gh-count:after {
-  content: '';
-  position: absolute;
-  display: inline-block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.gh-count:before {
-  top: 50%;
-  left: -3px;
-  margin-top: -4px;
-  border-width: 4px 4px 4px 0;
-  border-right-color: #fafafa;
-}
-.gh-count:after {
-  top: 50%;
-  left: -4px;
-  z-index: -1;
-  margin-top: -5px;
-  border-width: 5px 5px 5px 0;
-  border-right-color: #d4d4d4;
-}
-.github-btn-large {
-  height: 30px;
-}
-.github-btn-large .gh-btn,
-.github-btn-large .gh-count {
-  padding: 3px 10px 3px 8px;
-  font-size: 16px;
-  line-height: 22px;
-  border-radius: 4px;
-}
-.github-btn-large .gh-ico {
-  width: 20px;
-  height: 20px;
-}
-.github-btn-large .gh-count {
-  margin-left: 6px;
-}
-.github-btn-large .gh-count:before {
-  left: -5px;
-  margin-top: -6px;
-  border-width: 6px 6px 6px 0;
-}
-.github-btn-large .gh-count:after {
-  left: -6px;
-  margin-top: -7px;
-  border-width: 7px 7px 7px 0;
-}