embulk 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169a08fe7c64079ed0d67fcb6407bb2e70e4fcb2
-  data.tar.gz: 455cbbb90fca39312a155631ee1601ca775e7d99
+  metadata.gz: c2f4ce6246c951b41b33a123f74e33d54324a865
+  data.tar.gz: 7c7bb33676ac7bcad4bc03dec3b843242b5ebf15
 SHA512:
-  metadata.gz: a364df59f481375932ec165dc2e9e1e7164f9cebdb0c3aac12d85e8099e44ad243378fdf8a5041610d8b2665fa5b9429c5843b025308dff25d1c162ea83e1a7a
-  data.tar.gz: 57606c02eb5e567a74e81aafc3289f05d2ad24babdb507b846e5fa408547833f6c9618eeda7e7377c3b49c43ca4c60181aa76b34e62bb19179aa95b7a61888a3
+  metadata.gz: e4921463f2ec39d4f47981692059f2221eb98003d94a063a09b0fda6cae4fb697053a5199ce2abfc31d29e43d172d24b01eacacbb1b287e80f0a93abe4d698af
+  data.tar.gz: bb264a3a0528502f42222d6c86ec8d5d06214bdfd7bb29c06e9c1fd9252900a7a93b70c1316423a7338672ec05bff6382c1412fed8585a4461ebc1d9340b2997

data/build.gradle

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

data/embulk-core/build.gradle

@@ -38,7 +38,7 @@ dependencies {
     compile 'joda-time:joda-time:2.9.2'
     compile 'io.netty:netty-buffer:5.0.0.Alpha1'
     compile 'org.fusesource.jansi:jansi:1.11'
-    compile 'org.msgpack:msgpack-core:0.8.3'
+    compile 'org.msgpack:msgpack-core:0.8.7'
 
     // For embulk/guess/charset.rb. See also embulk.gemspec
     compile 'com.ibm.icu:icu4j:54.1.1'

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

@@ -1,11 +1,18 @@
 package org.embulk.spi.time;
 
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.Calendar;
+import java.text.SimpleDateFormat;
+import java.text.ParseException;
 import org.joda.time.DateTimeZone;
 import com.google.common.base.Optional;
 import org.jruby.embed.ScriptingContainer;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigDefault;
+import org.embulk.config.ConfigException;
 import static org.embulk.spi.time.TimestampFormat.parseDateTimeZone;
 
 public class TimestampParser
@@ -32,6 +39,10 @@ public class TimestampParser
         @ConfigDefault("\"%Y-%m-%d %H:%M:%S.%N %z\"")
         public String getDefaultTimestampFormat();
 
+        @Config("default_date")
+        @ConfigDefault("\"1970-01-01\"")
+        public String getDefaultDate();
+
         @ConfigInject
         public ScriptingContainer getJRuby();
     }
@@ -45,6 +56,10 @@ public class TimestampParser
         @Config("format")
         @ConfigDefault("null")
         public Optional<String> getFormat();
+
+        @Config("date")
+        @ConfigDefault("null")
+        public Optional<String> getDate();
     }
 
     private final JRubyTimeParserHelper helper;
@@ -58,21 +73,44 @@ public class TimestampParser
 
     TimestampParser(Task task)
     {
-        this(task.getJRuby(), task.getDefaultTimestampFormat(), task.getDefaultTimeZone());
+        this(task.getJRuby(), task.getDefaultTimestampFormat(), task.getDefaultTimeZone(), task.getDefaultDate());
     }
 
     public TimestampParser(Task task, TimestampColumnOption columnOption)
     {
         this(task.getJRuby(),
                 columnOption.getFormat().or(task.getDefaultTimestampFormat()),
-                columnOption.getTimeZone().or(task.getDefaultTimeZone()));
+                columnOption.getTimeZone().or(task.getDefaultTimeZone()),
+                columnOption.getDate().or(task.getDefaultDate()));
     }
 
     public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone)
+    {
+        this(jruby, format, defaultTimeZone, "1970-01-01");
+    }
+
+    public TimestampParser(ScriptingContainer jruby, String format, DateTimeZone defaultTimeZone, String defaultDate)
     {
         JRubyTimeParserHelperFactory helperFactory = (JRubyTimeParserHelperFactory) jruby.runScriptlet("Embulk::Java::TimeParserHelper::Factory.new");
+
+        // calculate default date
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd", Locale.ENGLISH);
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+        Date utc;
+        try {
+            utc = df.parse(defaultDate);
+        }
+        catch (ParseException ex) {
+            throw new ConfigException("Invalid date format. Expected yyyy-MM-dd: " + defaultDate);
+        }
+        Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ENGLISH);
+        cal.setTime(utc);
+        int year = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH) + 1;
+        int day = cal.get(Calendar.DAY_OF_MONTH);
+
         // TODO get default current time from ExecTask.getExecTimestamp
-        this.helper = (JRubyTimeParserHelper) helperFactory.newInstance(format, 1970, 1, 1, 0, 0, 0, 0);  // TODO default time zone
+        this.helper = (JRubyTimeParserHelper) helperFactory.newInstance(format, year, month, day, 0, 0, 0, 0);  // TODO default time zone
         this.defaultTimeZone = defaultTimeZone;
     }
 

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

@@ -60,4 +60,16 @@ public class TestTimestampFormatterParser
         TimestampParser parser = new TimestampParser(ptask);
         assertEquals(Timestamp.ofEpochSecond(1416365189), parser.parse("1416365189"));
     }
+
+    @Test
+    public void testDefaultDate() throws Exception
+    {
+        ConfigSource config = Exec.newConfigSource()
+            .set("default_timestamp_format", "%H:%M:%S %Z")
+            .set("default_date", "2016-02-03");
+
+        ParserTestTask ptask = config.loadConfig(ParserTestTask.class);
+        TimestampParser parser = new TimestampParser(ptask);
+        assertEquals(Timestamp.ofEpochSecond(1454467589, 0), parser.parse("02:46:29 +0000"));
+    }
 }

data/embulk-docs/src/release.rst

@@ -4,6 +4,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release/release-0.8.9
     release/release-0.8.8
     release/release-0.8.7
     release/release-0.8.6

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

@@ -0,0 +1,14 @@
+Release 0.8.9
+==================================
+
+General Changes
+------------------
+
+* Added ``date:`` option to timestamp parser. If format doesn't include date part, date option is used as the default date. For example, parsing text "02:46:29" with ``format: %H:%M:%S`` and ``date: 2016-02-03`` options returns "2016-02-03 02:46:29".
+
+* Upgraded msgpack-core version from 0.8.6 to 0.8.7. Release notes of msgpack-java: https://github.com/msgpack/msgpack-java/blob/develop/RELEASE_NOTES.md
+
+
+Release Date
+------------------
+2016-05-12

data/lib/embulk/command/embulk_example.rb

@@ -15,6 +15,7 @@ id,account,time,purchase,comment
 2,14824,2015-01-27 19:01:23,20150127,embulk jruby
 3,27559,2015-01-28 02:20:02,20150128,"Embulk ""csv"" parser plugin"
 4,11270,2015-01-29 11:54:36,20150129,NULL
+
 EOF
     end
 

data/lib/embulk/data/bundle/.ruby-version

@@ -1 +1 @@
-jruby-9.0.4.0
+jruby-9.0.5.0

data/lib/embulk/data/bundle/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org/'
-gem 'embulk', '~> 0.7.0'
+gem 'embulk', '~> 0.8.0'
 
 #
 # 1. Use following syntax to specify versions of plugins

data/lib/embulk/version.rb

@@ -1,3 +1,3 @@
 module Embulk
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jruby-jars
@@ -108,9 +108,9 @@ files:
 - classpath/commons-beanutils-core-1.8.3.jar
 - classpath/commons-compress-1.10.jar
 - classpath/commons-lang3-3.1.jar
-- classpath/embulk-cli-0.8.8.jar
-- classpath/embulk-core-0.8.8.jar
-- classpath/embulk-standards-0.8.8.jar
+- classpath/embulk-cli-0.8.9.jar
+- classpath/embulk-core-0.8.9.jar
+- classpath/embulk-standards-0.8.9.jar
 - classpath/guava-18.0.jar
 - classpath/guice-4.0.jar
 - classpath/guice-bootstrap-0.1.1.jar
@@ -126,7 +126,7 @@ files:
 - classpath/joda-time-2.9.2.jar
 - classpath/logback-classic-1.1.3.jar
 - classpath/logback-core-1.1.3.jar
-- classpath/msgpack-core-0.8.3.jar
+- classpath/msgpack-core-0.8.7.jar
 - classpath/netty-buffer-5.0.0.Alpha1.jar
 - classpath/netty-common-5.0.0.Alpha1.jar
 - classpath/slf4j-api-1.7.12.jar
@@ -429,6 +429,7 @@ files:
 - embulk-docs/src/release/release-0.8.6.rst
 - embulk-docs/src/release/release-0.8.7.rst
 - embulk-docs/src/release/release-0.8.8.rst
+- embulk-docs/src/release/release-0.8.9.rst
 - embulk-standards/build.gradle
 - embulk-standards/src/main/java/org/embulk/standards/Bzip2FileDecoderPlugin.java
 - embulk-standards/src/main/java/org/embulk/standards/Bzip2FileEncoderPlugin.java