embulk 0.7.8-java → 0.7.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf761efe988b3d306299a56b251209e2d30d473
-  data.tar.gz: 2ffff3b608e07887cfa5988513b30e65bc4efb4c
+  metadata.gz: ccf9468e1acf89766906c83b17b8590fda8daa6d
+  data.tar.gz: dcaf8a5f2d78d9e411a91a0897fae959b85b59af
 SHA512:
-  metadata.gz: d9d4ca224cdff843099f630f430995737b45b6c53b618e6b05d7f677648fe61ac1b849774884cc42afbf064c62d50838870e37e6c78b5e7ab4793da10d245606
-  data.tar.gz: 3f02b050a1d3552663563b1460898c2b2e969cbc5d905f771d95ffd9d77eec740c1f64b8a36eefc284aa491076fdb0595d8c3def0ba96a3e1bbe14c575467f3f
+  metadata.gz: a286f427f59edaca492afaee075885bdbe3843a048929525de6cebc2becd5c8c0f73a3d6d360c4fb1130c87cffcd01f821b6971ae260e4a4d90f3c2ae21182a9
+  data.tar.gz: 34219d8af862a6fbb6b46357e4c2bfb3e480d28bb7195fa8ea7bba618316fdafe3f8a673187942c6e20115b31d371ee69aa81c523ac7283eb79291d61cf8704c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    embulk (0.7.7)
+    embulk (0.7.9)
       jruby-jars (= 9.0.0.0)
 
 GEM
@@ -20,7 +20,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0)
   embulk!
   kramdown (~> 1.5.0)
   rake (>= 0.10.0)

data/build.gradle

@@ -16,7 +16,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards")]
 
 allprojects {
     group = 'org.embulk'
-    version = '0.7.8'
+    version = '0.7.9'
 
     ext {
         jrubyVersion = '9.0.0.0'

data/embulk-core/build.gradle

@@ -50,9 +50,12 @@ task unpackGems(type: JRubyPrepare) {
     dependencies configurations.gems
     doLast {
         // move to build/gem/*/lib/* to build/gemlib/
-        file("${buildDir}/gemlib").mkdirs()
         file("${buildDir}/gem/gems").eachDir { gemDir ->
-            file("${gemDir}/lib").renameTo("${buildDir}/gemlib/")
+            copy {
+                from "${gemDir}/lib"
+                into "${buildDir}/gemlib/"
+                include "**"
+            }
         }
         fileTree(dir: "${buildDir}/gemlib", include: "**/.jrubydir").each { f -> f.delete() }
     }

data/embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParser.java

@@ -28,22 +28,22 @@ public class TestTimestampFormatterParser
     public void testSimpleFormat() throws Exception
     {
         ConfigSource config = Exec.newConfigSource()
-            .set("default_timestamp_format", "%Y-%m-%d %H:%M:%S.%9N %Z");
+            .set("default_timestamp_format", "%Y-%m-%d %H:%M:%S.%9N %z");  // %Z is OS-dependent
         FormatterTestTask task = config.loadConfig(FormatterTestTask.class);
 
         TimestampFormatter formatter = new TimestampFormatter(task, Optional.<TimestampFormatter.TimestampColumnOption>absent());
-        assertEquals("2014-11-19 02:46:29.123456000 UTC", formatter.format(Timestamp.ofEpochSecond(1416365189, 123456*1000)));
+        assertEquals("2014-11-19 02:46:29.123456000 +0000", formatter.format(Timestamp.ofEpochSecond(1416365189, 123456*1000)));
     }
 
     @Test
     public void testSimpleParse() throws Exception
     {
         ConfigSource config = Exec.newConfigSource()
-            .set("default_timestamp_format", "%Y-%m-%d %H:%M:%S %Z");
+            .set("default_timestamp_format", "%Y-%m-%d %H:%M:%S %z");  // %Z is OS-dependent
         ParserTestTask task = config.loadConfig(ParserTestTask.class);
 
         TimestampParser parser = new TimestampParser(task);
-        assertEquals(Timestamp.ofEpochSecond(1416365189, 0), parser.parse("2014-11-19 02:46:29 UTC"));
+        assertEquals(Timestamp.ofEpochSecond(1416365189, 0), parser.parse("2014-11-19 02:46:29 +0000"));
     }
 
     @Test

data/embulk-core/src/test/java/org/embulk/spi/time/TestTimestampFormatterParserDeprecated.java

@@ -32,22 +32,22 @@ public class TestTimestampFormatterParserDeprecated
     public void testSimpleFormat() throws Exception
     {
         ConfigSource config = Exec.newConfigSource()
-            .set("time_format", "%Y-%m-%d %H:%M:%S.%6N %Z");
+            .set("time_format", "%Y-%m-%d %H:%M:%S.%6N %z");
         FormatterTestTask task = config.loadConfig(FormatterTestTask.class);
 
         TimestampFormatter formatter = task.getTimeFormat().newFormatter(task);
-        assertEquals("2014-11-19 02:46:29.123456 UTC", formatter.format(Timestamp.ofEpochSecond(1416365189, 123456*1000)));
+        assertEquals("2014-11-19 02:46:29.123456 +0000", formatter.format(Timestamp.ofEpochSecond(1416365189, 123456*1000)));
     }
 
     @Test
     public void testSimpleParse() throws Exception
     {
         ConfigSource config = Exec.newConfigSource()
-            .set("time_format", "%Y-%m-%d %H:%M:%S.%N %Z");
+            .set("time_format", "%Y-%m-%d %H:%M:%S.%N %z");
         ParserTestTask task = config.loadConfig(ParserTestTask.class);
 
         TimestampParser parser = task.getTimeFormat().newParser(task);
-        assertEquals(Timestamp.ofEpochSecond(1416365189, 123456*1000), parser.parse("2014-11-19 02:46:29.123456 UTC"));
+        assertEquals(Timestamp.ofEpochSecond(1416365189, 123456*1000), parser.parse("2014-11-19 02:46:29.123456 +00:00"));
     }
 
     @Test

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.7.9
     release/release-0.7.8
     release/release-0.7.7
     release/release-0.7.6

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

@@ -0,0 +1,14 @@
+Release 0.7.9
+==================================
+
+General Changes
+------------------
+
+* Liquid template engine uses strict validation. When a liquid template file includes an error (e.g. included file does not exist), embulk command fails rather than including an error message in the config file (@notpeter++).
+* Fixed liquid template engine processing.
+* Fixed ``embulk bundle --help`` and ``embulk bundle help <command>`` to work.
+
+
+Release Date
+------------------
+2015-11-11

data/lib/embulk/command/embulk_run.rb

@@ -410,6 +410,16 @@ examples:
   def self.run_bundler(argv)
     require 'bundler'  # bundler is included in embulk-core.jar
 
+    # this hack is necessary to make --help working
+    Bundler.define_singleton_method(:which_orig, Bundler.method(:which))
+    Bundler.define_singleton_method(:which) do |executable|
+      if executable == "man"
+        false
+      else
+        which_orig(executable)
+      end
+    end
+
     require 'bundler/friendly_errors'
     require 'bundler/cli'
     Bundler.with_friendly_errors do

data/lib/embulk/runner.rb

@@ -132,7 +132,7 @@ module Embulk
 
     def run_liquid(source, params, template_include_path)
       require 'liquid'
-      template = Liquid::Template.parse(source)
+      template = Liquid::Template.parse(source, :error_mode => :strict)
       template.registers[:file_system] = Liquid::LocalFileSystem.new(template_include_path, "_%s.yml.liquid") if template_include_path
 
       data = {

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: java
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,8 +133,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.7.8.jar
-- classpath/embulk-standards-0.7.8.jar
+- classpath/embulk-core-0.7.9.jar
+- classpath/embulk-standards-0.7.9.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar
@@ -442,6 +442,7 @@ files:
 - embulk-docs/src/release/release-0.7.6.rst
 - embulk-docs/src/release/release-0.7.7.rst
 - embulk-docs/src/release/release-0.7.8.rst
+- embulk-docs/src/release/release-0.7.9.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