embulk 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc04e8ab92c677b7c5891a2818354f81da3ef70
-  data.tar.gz: 4a43292bb55fec0d3d981089572e574dcafa525d
+  metadata.gz: 29b4fbf4ef36c7354cf89e39b25212d5dbf6a0fa
+  data.tar.gz: 8e2387077d348272bf6e09736f51b48722b9287a
 SHA512:
-  metadata.gz: 122d1f4632210c5d807d3301fdab9046a509420e9557caff224696f35a1f21eac9731dade238044fd36f70e0b24e382b276e3da4165f680d76875a8a7d399440
-  data.tar.gz: 6a671967d0c53640f977e286d0dd874712454af12ba361a7d6db85599be510da2bfdd67bc685803e0d5426b8b8b7f17e2e01c1aa3172f23c55635b8e1af8697e
+  metadata.gz: c39a0c665331889057cd4c2c74cfb7610f56dc1665c3e8e4fae8513f8a37f7dab7f463d68d814794b4a2b5a8401ca6ddbb366ade4ab0d2ef85a82d6f895776d6
+  data.tar.gz: 491c5c617a8868ac232fca6a7034263ef338e6213bca61806223acd10dd5a59a61e5fed8f09e86809bdc5c880906baf4122563d4c7187413a660a3d55eebf127

data/build.gradle

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

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

@@ -42,7 +42,7 @@ java %java_args% -jar %this% %jruby_args% %args%
 
 endlocal
 
-exit /b
+exit /b %ERRORLEVEL%
 
 :check_arg
 set arg=%*

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

@@ -4,7 +4,7 @@ public class UserDataExceptions
 {
     private UserDataExceptions() { }
 
-    public boolean isUserDataException(Throwable exception)
+    public static boolean isUserDataException(Throwable exception)
     {
         while (exception != null) {
             if (exception instanceof UserDataException) {

data/embulk-docs/src/built-in.rst

@@ -162,7 +162,7 @@ Options
 +============================+==========+================================================================================================================+========================+
 | delimiter                  | string   | Delimiter character such as ``,`` for CSV, ``"\t"`` for TSV, ``"|"`` or any single-byte character              | ``,`` by default       |
 +----------------------------+----------+----------------------------------------------------------------------------------------------------------------+------------------------+
-| quote                      | string   | The character surrounding a quoted value. Setting ``null`` disables quoting.                                   | ``\"`` by default      |
+| quote                      | string   | The character surrounding a quoted value. Setting ``null`` disables quoting.                                   | ``"`` by default       |
 +----------------------------+----------+----------------------------------------------------------------------------------------------------------------+------------------------+
 | escape                     | string   | Escape character to escape a special character. Setting ``null`` disables escaping.                            | ``\\`` by default      |
 +----------------------------+----------+----------------------------------------------------------------------------------------------------------------+------------------------+
@@ -319,31 +319,33 @@ The ``csv`` formatter plugin formats records using CSV or TSV format.
 Options
 ~~~~~~~~~~~~~~~~~~
 
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| name                 | type    | description                                                                                           | required?              |
-+======================+=========+=======================================================================================================+========================+
-| delimiter            | string  | Delimiter character such as ``,`` for CSV, ``"\t"`` for TSV, ``"|"`` or any single-byte character     | ``,`` by default       |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| quote                | string  | The character surrounding a quoted value                                                              | ``\"`` by default      |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| quote\_policy        | enum    | Policy for quote (ALL, MINIMAL, NONE) (see below)                                                     | ``MINIMAL`` by default |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| escape               | string  | Escape character to escape a quote character when quote\_policy is ALL or MINIMAL                     | ``\"`` by default      |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| header\_line         | boolean | If true, write the header line with column name at the first line                                     | ``true`` by default    |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| null_string          | string  | Expression of NULL values                                                                             | empty by default       |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| newline              | enum    | Newline character (CRLF, LF or CR)                                                                    | ``CRLF`` by default    |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| newline\_in\_field   | enum    | Newline character in each field (CRLF, LF, CR)                                                        | ``LF`` by default      |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| charset              | enum    | Character encoding (eg. ISO-8859-1, UTF-8)                                                            | ``UTF-8`` by default   |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| default\_timezone    | string  | Time zone of timestamp columns. This can be overwritten for each column using ``column_options``      | ``UTC`` by default     |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
-| column\_options      | hash    | See bellow                                                                                            | optional               |
-+----------------------+---------+-------------------------------------------------------------------------------------------------------+------------------------+
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| name                 | type    | description                                                                                           | required?                     |
++======================+=========+=======================================================================================================+===============================+
+| delimiter            | string  | Delimiter character such as ``,`` for CSV, ``"\t"`` for TSV, ``"|"`` or any single-byte character     | ``,`` by default              |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| quote                | string  | The character surrounding a quoted value                                                              | ``"`` by default              |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| quote\_policy        | enum    | Policy for quote (ALL, MINIMAL, NONE) (see below)                                                     | ``MINIMAL`` by default        |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| escape               | string  | Escape character to escape quote character                                                            | same with quote default (\*1) |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| header\_line         | boolean | If true, write the header line with column name at the first line                                     | ``true`` by default           |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| null_string          | string  | Expression of NULL values                                                                             | empty by default              |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| newline              | enum    | Newline character (CRLF, LF or CR)                                                                    | ``CRLF`` by default           |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| newline\_in\_field   | enum    | Newline character in each field (CRLF, LF, CR)                                                        | ``LF`` by default             |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| charset              | enum    | Character encoding (eg. ISO-8859-1, UTF-8)                                                            | ``UTF-8`` by default          |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| default\_timezone    | string  | Time zone of timestamp columns. This can be overwritten for each column using ``column_options``      | ``UTC`` by default            |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+| column\_options      | hash    | See bellow                                                                                            | optional                      |
++----------------------+---------+-------------------------------------------------------------------------------------------------------+-------------------------------+
+
+(\*1): if quote\_policy is NONE, ``quote`` option is ignored, and default ``escape`` is ``\``.
 
 The ``quote_policy`` option is used to determine field type to quote.
 

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.7.6
     release/release-0.7.5
     release/release-0.7.4
     release/release-0.7.3

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

@@ -0,0 +1,18 @@
+Release 0.7.6
+==================================
+
+General Changes
+------------------
+
+* On Cygwin/Windows environment, embulk command returns exit code 1 correctly if a transaction fails (@hishidama++)
+
+
+Built-in plugins
+------------------
+
+* ``formatter-csv``: fixed a problem where a ``"`` character is escaped when ``quote_plicy: NONE`` is set. The fixed behavior is that, if ``quote_plicy: NONE`` is set, ``quote`` option (which means ``"`` character) is completely ignored, and only newline and delimiter are escaped ([#327] @sonots++).
+
+
+Release Date
+------------------
+2015-10-27

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

@@ -108,7 +108,7 @@ public class CsvFormatterPlugin
         final char delimiter = task.getDelimiterChar();
         final QuotePolicy quotePolicy = task.getQuotePolicy();
         final char quote = task.getQuoteChar() != '\0' ? task.getQuoteChar() : '"';
-        final char escape = task.getEscapeChar().or(quotePolicy == QuotePolicy.NONE ? '\\' : '\"');
+        final char escape = task.getEscapeChar().or(quotePolicy == QuotePolicy.NONE ? '\\' : quote);
         final String newlineInField = task.getNewlineInField().getString();
         final String nullString = task.getNullString();
 
@@ -235,7 +235,7 @@ public class CsvFormatterPlugin
         for (int i = 0; i < v.length(); i++) {
             char c = v.charAt(i);
 
-            if (c == quote) {
+            if (policy != QuotePolicy.NONE && c == quote) {
                 escapedValue.append(escape);
                 escapedValue.append(c);
                 isRequireQuote = true;

data/embulk-standards/src/test/java/org/embulk/standards/TestCsvFormatterPlugin.java

@@ -194,7 +194,7 @@ public class TestCsvFormatterPlugin
 
         char delimiter = ',';
         char quote = '"';
-        char escape = '"';
+        char escape = '\\';
         CsvFormatterPlugin.QuotePolicy policy = CsvFormatterPlugin.QuotePolicy.NONE;
         String newline = Newline.LF.getString();
         String nullString = "";
@@ -211,10 +211,10 @@ public class TestCsvFormatterPlugin
                 ImmutableMap.of("expected", "0x4d2", "actual", "0x4d2"),
                 ImmutableMap.of("expected", "123L", "actual", "123L"),
                 ImmutableMap.of("expected", "3.141592", "actual", "3.141592"),
-                ImmutableMap.of("expected", "1\",000", "actual", "1,000"),
+                ImmutableMap.of("expected", "1\\,000", "actual", "1,000"),
                 ImmutableMap.of("expected", "ABC", "actual", "ABC"),
-                ImmutableMap.of("expected", "ABC\"\"DEF", "actual", "ABC\"DEF"),
-                ImmutableMap.of("expected", "ABC\"\nDEF", "actual", "ABC\nDEF"),
+                ImmutableMap.of("expected", "ABC\"DEF", "actual", "ABC\"DEF"),
+                ImmutableMap.of("expected", "ABC\\\nDEF", "actual", "ABC\nDEF"),
                 ImmutableMap.of("expected", "", "actual", ""),
                 ImmutableMap.of("expected", "NULL", "actual", "NULL"),
                 ImmutableMap.of("expected", "2015-01-01 12:01:01", "actual", "2015-01-01 12:01:01"),

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -121,8 +121,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.5.jar
-- classpath/embulk-standards-0.7.5.jar
+- classpath/embulk-core-0.7.6.jar
+- classpath/embulk-standards-0.7.6.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-multibindings-4.0.jar
@@ -425,6 +425,7 @@ files:
 - embulk-docs/src/release/release-0.7.3.rst
 - embulk-docs/src/release/release-0.7.4.rst
 - embulk-docs/src/release/release-0.7.5.rst
+- embulk-docs/src/release/release-0.7.6.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