embulk 0.8.38 → 0.8.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55af3711ab3a9806eaff42dfba41acdc5f21f389
-  data.tar.gz: 97daabaa7947559ee3028717c3fb36d2cf35b5a7
+  metadata.gz: ebe3aaaaac493d48a7239516115cf094a943d057
+  data.tar.gz: a3559e3a41bbf658fe1286e58acd47ae9509a7ae
 SHA512:
-  metadata.gz: 7cb6005c6604e3e940f2139aeebb7a9e9e1e5fc3660ca160eb4e90c13edba63f75537ae508f78f79ec81846d438373366bf5848c0f12425f3cc1539d13a844db
-  data.tar.gz: 23dbeb33d2a3de6bea2a672ba8f4da05d02d8d13104efdffb2a2c086408216766b80dea360b1d793ea74c7d771b7ef70efb54b9e950e2c0c03000943289ee19b
+  metadata.gz: 1eab1ebc52cbeb553a8712d976278853ee713ae4b7778f68f1a425d15a29652b9d4e91a957ac10a603b8d746bf6de626ddcd66eb1638d86b8e3e9ae35eab0d59
+  data.tar.gz: 34491eb3cbaf1b736a1406f985cdba36056881c4c31923466e294a842cf3653a823c46f179680e23f940e502f9ced228d41cf39e20b583f82ec9005c3db4d3df

data/build.gradle

@@ -24,7 +24,7 @@ def release_projects = [project(":embulk-core"), project(":embulk-standards"), p
 
 allprojects {
     group = 'org.embulk'
-    version = '0.8.38'
+    version = '0.8.39'
 
     ext {
         jrubyVersion = '9.1.13.0'
@@ -333,7 +333,7 @@ task releaseCheck {
         if (!file("embulk-docs/src/release.rst").getText().contains("release-${project.version}")) {
             throw new GradleException("embulk-docs/src/release.rst doesn't include release-${project.version}")
         }
-        String date = new Date().format("yyyy-MM-dd")
+        String date = new Date().format("yyyy-MM-d")
         if (!file("embulk-docs/src/release/release-${project.version}.rst").getText().contains(date)) {
             throw new GradleException("embulk-docs/src/release/release-${project.version}.rst doesn't include today's release date")
         }

data/embulk-core/src/main/java/org/embulk/spi/time/TimestampFormat.java

@@ -57,20 +57,39 @@ public class TimestampFormat
 
     public static DateTimeZone parseDateTimeZone(String s)
     {
-        final int rubyStyleTimeOffsetInSecond = TimeZoneConverter.dateZoneToDiff(s);
-
-        if (rubyStyleTimeOffsetInSecond != Integer.MIN_VALUE) {
-            return DateTimeZone.forOffsetMillis(rubyStyleTimeOffsetInSecond * 1000);
+        DateTimeZone jodaDateTimeZoneTemporary = null;
+        try {
+            // Use TimeZone#forID, not TimeZone#getTimeZone.
+            // Because getTimeZone returns GMT even if given timezone id is not found.
+            jodaDateTimeZoneTemporary = DateTimeZone.forID(s);
+        }
+        catch (IllegalArgumentException ex) {
+            jodaDateTimeZoneTemporary = null;
         }
+        final DateTimeZone jodaDateTimeZone = jodaDateTimeZoneTemporary;
 
-        if(s.startsWith("+") || s.startsWith("-")) {
-            return DateTimeZone.forID(s);
+        if (jodaDateTimeZone != null && (s.startsWith("+") || s.startsWith("-"))) {
+            return jodaDateTimeZone;
 
         } else if (s.equals("Z")) {
             return DateTimeZone.UTC;
 
         } else {
             try {
+                // DateTimeFormat.forPattern("z").parseMillis(s) is incorrect, but kept for compatibility as of now.
+                //
+                // The offset of PDT (Pacific Daylight Time) should be -07:00.
+                // DateTimeFormat.forPattern("z").parseMillis("PDT") however returns 8 hours (-08:00).
+                // DateTimeFormat.forPattern("z").parseMillis("PDT") == 28800000
+                // https://github.com/JodaOrg/joda-time/blob/v2.9.2/src/main/java/org/joda/time/DateTimeUtils.java#L446
+                //
+                // Embulk has used it to parse time zones for a very long time since it was v0.1.
+                // https://github.com/embulk/embulk/commit/b97954a5c78397e1269bbb6979d6225dfceb4e05
+                //
+                // It is kept as -08:00 for compatibility as of now.
+                //
+                // TODO: Make time zone parsing consistent.
+                // @see <a href="https://github.com/embulk/embulk/issues/860">https://github.com/embulk/embulk/issues/860</a>
                 int rawOffset = (int) DateTimeFormat.forPattern("z").parseMillis(s);
                 if(rawOffset == 0) {
                     return DateTimeZone.UTC;
@@ -83,12 +102,24 @@ public class TimestampFormat
                 // parseMillis failed
             }
 
-            // TimeZone.getTimeZone returns GMT zone if given timezone id is not found
-            // we want to only return timezone if exact match, otherwise exception
-            if (availableTimeZoneNames.contains(s)) {
-                //return TimeZone.getTimeZone(s);
-                return DateTimeZone.forID(s);
+            if (jodaDateTimeZone != null && availableTimeZoneNames.contains(s)) {
+                return jodaDateTimeZone;
             }
+
+            // Parsing Ruby-style time zones in lower priority than Joda-Time because
+            // TimestampParser has parsed time zones with Joda-Time for a long time
+            // since ancient. The behavior is kept for compatibility.
+            //
+            // The following time zone IDs are duplicated in Ruby and Joda-Time 2.9.2
+            // while Ruby does not care summer time and Joda-Time cares summer time.
+            // "CET", "EET", "Egypt", "Iran", "MET", "WET"
+            //
+            // Some zone IDs (ex. "PDT") are parsed by DateTimeFormat#parseMillis as shown above.
+            final int rubyStyleTimeOffsetInSecond = TimeZoneConverter.dateZoneToDiff(s);
+            if (rubyStyleTimeOffsetInSecond != Integer.MIN_VALUE) {
+                return DateTimeZone.forOffsetMillis(rubyStyleTimeOffsetInSecond * 1000);
+            }
+
             return null;
         }
     }

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

@@ -55,7 +55,22 @@ public class TestTimestampParser {
     public void test__strptime__3_rfc822() {
         testToParse("Thu, 29 Jul 1999 09:54:21 UT", "%a, %d %b %Y %H:%M:%S %Z", 933242061L);
         testToParse("Thu, 29 Jul 1999 09:54:21 GMT", "%a, %d %b %Y %H:%M:%S %Z", 933242061L);
-        testToParse("Thu, 29 Jul 1999 09:54:21 PDT", "%a, %d %b %Y %H:%M:%S %Z", 933267261L);
+
+        // It should be 933267261L if PDT (Pacific Daylight Time) is correctly -07:00.
+        //
+        // Joda-Time's DateTimeFormat.forPattern("z").parseMillis("PDT") however returns 8 hours (-08:00).
+        // DateTimeFormat.forPattern("z").parseMillis("PDT") == 28800000
+        // https://github.com/JodaOrg/joda-time/blob/v2.9.2/src/main/java/org/joda/time/DateTimeUtils.java#L446
+        //
+        // Embulk has used it to parse time zones for a very long time since it was v0.1.
+        // https://github.com/embulk/embulk/commit/b97954a5c78397e1269bbb6979d6225dfceb4e05
+        //
+        // It is kept as -08:00 for compatibility as of now.
+        //
+        // TODO: Make time zone parsing consistent.
+        // @see <a href="https://github.com/embulk/embulk/issues/860">https://github.com/embulk/embulk/issues/860</a>
+        testToParse("Thu, 29 Jul 1999 09:54:21 PDT", "%a, %d %b %Y %H:%M:%S %Z", 933270861L);
+
         testToParse("Thu, 29 Jul 1999 09:54:21 z", "%a, %d %b %Y %H:%M:%S %Z", 933242061L);
         testToParse("Thu, 29 Jul 1999 09:54:21 +0900", "%a, %d %b %Y %H:%M:%S %Z", 933209661L);
         testToParse("Thu, 29 Jul 1999 09:54:21 +0430", "%a, %d %b %Y %H:%M:%S %Z", 933225861L);

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.39
     release/release-0.8.38
     release/release-0.8.37
     release/release-0.8.36

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

@@ -0,0 +1,12 @@
+Release 0.8.39
+==================================
+
+General Changes
+----------------
+
+* Backport hot-fix: Parse time zones in Ruby-style in lower priority than Joda-Time [#864]
+
+
+Release Date
+------------------
+2017-12-6

data/lib/embulk/version.rb

@@ -3,7 +3,7 @@
 module Embulk
   @@warned = false
 
-  VERSION_INTERNAL = '0.8.38'
+  VERSION_INTERNAL = '0.8.39'
 
   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)

data/test/vanilla/time/test_timestamp_parser.rb

@@ -45,7 +45,22 @@ class TimestampParserTest < ::Test::Unit::TestCase
       # rfc822
       ['Thu, 29 Jul 1999 09:54:21 UT', '%a, %d %b %Y %H:%M:%S %Z'],
       ['Thu, 29 Jul 1999 09:54:21 GMT', '%a, %d %b %Y %H:%M:%S %Z'],
-      ['Thu, 29 Jul 1999 09:54:21 PDT', '%a, %d %b %Y %H:%M:%S %Z'],
+
+      # They should be the same if PDT (Pacific Daylight Time) is correctly -07:00.
+      #
+      # Joda-Time's DateTimeFormat.forPattern("z").parseMillis("PDT") however returns 8 hours (-08:00).
+      # DateTimeFormat.forPattern("z").parseMillis("PDT") == 28800000
+      # https://github.com/JodaOrg/joda-time/blob/v2.9.2/src/main/java/org/joda/time/DateTimeUtils.java#L446
+      #
+      # Embulk has used it to parse time zones for a very long time since it was v0.1.
+      # https://github.com/embulk/embulk/commit/b97954a5c78397e1269bbb6979d6225dfceb4e05
+      #
+      # It is kept as -08:00 for compatibility as of now.
+      #
+      # TODO: Make time zone parsing consistent.
+      # See https://github.com/embulk/embulk/issues/860
+      # ['Thu, 29 Jul 1999 09:54:21 PDT', '%a, %d %b %Y %H:%M:%S %Z'],
+
       ['Thu, 29 Jul 1999 09:54:21 z', '%a, %d %b %Y %H:%M:%S %Z'],
       ['Thu, 29 Jul 1999 09:54:21 +0900', '%a, %d %b %Y %H:%M:%S %Z'],
       ['Thu, 29 Jul 1999 09:54:21 +0430', '%a, %d %b %Y %H:%M:%S %Z'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.38
+  version: 0.8.39
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -115,10 +115,10 @@ files:
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang-2.4.jar
 - classpath/commons-lang3-3.4.jar
-- classpath/embulk-cli-0.8.38.jar
-- classpath/embulk-core-0.8.38.jar
-- classpath/embulk-jruby-strptime-0.8.38.jar
-- classpath/embulk-standards-0.8.38.jar
+- classpath/embulk-cli-0.8.39.jar
+- classpath/embulk-core-0.8.39.jar
+- classpath/embulk-jruby-strptime-0.8.39.jar
+- classpath/embulk-standards-0.8.39.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -527,6 +527,7 @@ files:
 - embulk-docs/src/release/release-0.8.36.rst
 - embulk-docs/src/release/release-0.8.37.rst
 - embulk-docs/src/release/release-0.8.38.rst
+- embulk-docs/src/release/release-0.8.39.rst
 - embulk-docs/src/release/release-0.8.4.rst
 - embulk-docs/src/release/release-0.8.5.rst
 - embulk-docs/src/release/release-0.8.6.rst