embulk-filter-timestamp_format 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94f9cf903e02ed4a2c7a2fcbcd246d54e4d79918
-  data.tar.gz: e7a9224bb84bff01a5b177e6cea65b4535142219
+  metadata.gz: 578d0fabe6d896aedd6a07bd8c11d1cb1c81655f
+  data.tar.gz: 1cc1788749509ddbb3d5d15aaad28bece92c5f58
 SHA512:
-  metadata.gz: 3b0134f40cb27a9256c8fda3b694ccd7ca4bdd56c58e91f4002b9af21dc9883dcea42d725e397de176a45986ae2fd6bb253f4162fdd51c3271ea7e250a0b1661
-  data.tar.gz: c37e4f3210911938e33aab11dd1e977167d53f0b2234537a58370ce7e94536dc37c071c3936ebbafb4cf33a53b7f44131ae84dc5f392ae942e021543280ecbbb
+  metadata.gz: fd9a00885725dd08b68a296a6c0706895075835fa05a80803e03417a32439c0fec2eef3ba223ec12f8c21e768ab8e6b2c43f3fd9bec2e3437ae6a3c14453390c
+  data.tar.gz: edc6d27877426d758af4cc492b07061a12d154a9b244ae71b713ff03055a9938626218d22c2e9728d08f7da77895b7f7cbadd9d63f21fc1a72caced2dfbd64a7

data/.travis.yml

@@ -1,7 +1,5 @@
 language: java
 jdk:
-  - openjdk7
-  - oraclejdk7
   - oraclejdk8
 script:
   - ./gradlew test

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.2 (2019-01-11)
+
+Enhancements:
+
+* Support Embulk 0.9.x (thanks to @sakama)
+
 # 0.3.1 (2017-08-26)
 
 Enhancements:

data/build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "com.jfrog.bintray" version "1.1"
-    id "com.github.jruby-gradle.base" version "0.1.5"
+    id "com.github.jruby-gradle.base" version "1.5.0"
     id "java"
     id "checkstyle"
 }
@@ -13,17 +13,17 @@ configurations {
     provided
 }
 
-version = "0.3.1"
-sourceCompatibility = 1.7
-targetCompatibility = 1.7
+version = "0.3.2"
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.+"
-    provided "org.embulk:embulk-core:0.8.+"
+    compile  "org.embulk:embulk-core:0.9.12"
+    provided "org.embulk:embulk-core:0.9.12"
     compile  "io.github.medjed:JsonPathCompiler:0.1.+"
 
     testCompile "junit:junit:4.+"
-    testCompile "org.embulk:embulk-core:0.8.27+:tests"
+    testCompile "org.embulk:embulk-core:0.9.12:tests"
 }
 
 checkstyle {
@@ -38,14 +38,16 @@ task classpath(type: Copy, dependsOn: ["jar"]) {
 clean { delete "classpath" }
 
 task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
-    script "${project.name}.gemspec"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "build", "${project.name}.gemspec"
     doLast { ant.move(file: "${project.name}-${project.version}.gem", todir: "pkg") }
 }
 
 task gemPush(type: JRubyExec, dependsOn: ["gem"]) {
-    jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "push"
-    script "pkg/${project.name}-${project.version}.gem"
+    jrubyArgs "-S"
+    script "gem"
+    scriptArgs "push", "pkg/${project.name}-${project.version}.gem"
 }
 
 task "package"(dependsOn: ["gemspec", "classpath"]) << {

data/example/example.yml

@@ -0,0 +1 @@
+example/from_string.yml

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 09 13:08:20 JST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

data/gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,20 +6,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

data/src/main/java/org/embulk/filter/timestamp_format/TimestampParser.java

@@ -7,12 +7,8 @@ import org.embulk.config.ConfigDefault;
 
 import org.embulk.filter.timestamp_format.TimestampFormatFilterPlugin.PluginTask;
 
-import org.embulk.spi.time.JRubyTimeParserHelper;
-import org.embulk.spi.time.JRubyTimeParserHelperFactory;
 import org.embulk.spi.time.Timestamp;
 
-import static org.embulk.spi.time.TimestampFormat.parseDateTimeZone;
-
 import org.embulk.spi.time.TimestampParseException;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
@@ -67,7 +63,7 @@ public class TimestampParser {
         // TODO get default current time from ExecTask.getExecTimestamp
         for (String format : formatList) {
             if (format.contains("%")) {
-                org.embulk.spi.time.TimestampParser parser = getTimestampParser(format, defaultFromTimeZone);
+                org.embulk.spi.time.TimestampParser parser = createTimestampParser(format, defaultFromTimeZone);
                 this.jrubyParserList.add(parser);
             } else {
                 // special treatment for nano resolution. n is not originally supported by Joda-Time
@@ -190,6 +186,11 @@ public class TimestampParser {
             return this.defaultTimeZone;
         }
         @Override
+        public String getDefaultTimeZoneId()
+        {
+            return this.defaultTimeZone.getID();
+        }
+        @Override
         public String getDefaultTimestampFormat()
         {
             return this.defaultTimestampFormat;
@@ -199,7 +200,6 @@ public class TimestampParser {
         {
             return this.defaultDate;
         }
-        @Override
         public ScriptingContainer getJRuby()
         {
             return null;
@@ -226,6 +226,16 @@ public class TimestampParser {
             return this.timeZone;
         }
         @Override
+        public Optional<String> getTimeZoneId()
+        {
+            if (this.timeZone.isPresent()) {
+                return Optional.of(this.timeZone.get().getID());
+            }
+            else {
+                return Optional.absent();
+            }
+        }
+        @Override
         public Optional<String> getFormat()
         {
             return this.format;
@@ -237,12 +247,17 @@ public class TimestampParser {
         }
     }
 
-    private org.embulk.spi.time.TimestampParser getTimestampParser(String format, DateTimeZone timezone)
+    // ToDo: Replace with `TimestampParser.of(Task, TimestampColumnOption)`
+    // after deciding to drop supporting embulk < 0.8.29.
+    private org.embulk.spi.time.TimestampParser createTimestampParser(String format, DateTimeZone timezone)
+    {
+        return createTimestampParser(format, timezone, "1970-01-01");
+    }
+
+    // ToDo: Replace with `TimestampParser.of(Task, TimestampColumnOption)`
+    // after deciding to drop supporting embulk < 0.8.29.
+    private org.embulk.spi.time.TimestampParser createTimestampParser(String format, DateTimeZone timezone, String date)
     {
-        // ToDo: Use following codes after deciding to drop supporting embulk < 0.8.29.
-        //
-        //     return new org.embulk.spi.time.TimestampParser(format, timezone);
-        String date = "1970-01-01";
         TimestampParserTaskImpl task = new TimestampParserTaskImpl(timezone, format, date);
         TimestampParserColumnOptionImpl columnOption = new TimestampParserColumnOptionImpl(
                 Optional.of(timezone), Optional.of(format), Optional.of(date));

data/src/test/java/org/embulk/filter/timestamp_format/TestTimestampParser.java

@@ -16,8 +16,6 @@ import static org.junit.Assert.fail;
 
 public class TestTimestampParser
 {
-    @Rule
-    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
     public DateTimeZone zone;
     public Timestamp expected;
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-timestamp_format
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+  name: bundler
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: A filter plugin for Embulk to change timestamp format.
 email:
 - sonots@gmail.com
@@ -45,8 +45,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
@@ -57,6 +57,12 @@ files:
 - bench/config_nano.yml
 - bench/gen_dummy.rb
 - build.gradle
+- classpath/JsonPathCompiler-0.1.2.jar
+- classpath/accessors-smart-1.1.jar
+- classpath/asm-5.0.3.jar
+- classpath/embulk-filter-timestamp_format-0.3.2.jar
+- classpath/json-smart-2.2.1.jar
+- classpath/slf4j-api-1.7.21.jar
 - config/checkstyle/checkstyle.xml
 - example/bracket_notation.txt
 - example/bracket_notation.yml
@@ -108,12 +114,6 @@ files:
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampFormatConverter.java
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampParser.java
 - src/test/java/org/embulk/filter/timestamp_format/TestTimestampUnit.java
-- classpath/accessors-smart-1.1.jar
-- classpath/asm-5.0.3.jar
-- classpath/embulk-filter-timestamp_format-0.3.1.jar
-- classpath/json-smart-2.2.1.jar
-- classpath/JsonPathCompiler-0.1.2.jar
-- classpath/slf4j-api-1.7.21.jar
 homepage: https://github.com/sonots/embulk-filter-timestamp_format
 licenses:
 - MIT
@@ -124,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: A filter plugin for Embulk to change timestamp format

data/example/example.yml

@@ -1,27 +0,0 @@
-in:
-  type: file
-  path_prefix: example/from_string.csv
-  parser:
-    type: csv
-    columns:
-      - {name: string1, type: string}
-      - {name: string2, type: string}
-      - {name: string3, type: string}
-      - {name: string4, type: string}
-      - {name: record,  type: json}
-filters:
-  - type: timestamp_format
-    default_from_timezone: "Asia/Taipei"
-    default_from_timestamp_format: ["%Y-%m-%d %H:%M:%S.%N %z", "%Y-%m-%d %H:%M:%S %z", "%Y-%m-%d %H:%M:%S", "%Y-%m-%d %z", "%Y-%m-%d"]
-    default_to_timezone: "Asia/Taipei"
-    default_to_timestamp_format: "%Y-%m-%d %H:%M:%S.%N"
-    columns:
-      - {name: string1, type: string}
-      - {name: string2, type: long, to_unit: ms}
-      - {name: string3, type: double, to_unit: ms}
-      - {name: string4, type: timestamp}
-      - {name: $.record.string1, to_timezone: "Asia/Taipei", to_format: "%Y-%m-%d %H:%M:%S.%N"}
-      - {name: $.record.string2, type: long, to_unit: ms}
-      - {name: $.record.string3, type: double, to_unit: ms}
-out:
-  type: "null"