embulk-parser-jsonpath 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a5c5cf3bdba81a3a1bb16dae74d6c4a7af3379c
-  data.tar.gz: e041030833ba05bcc5967e84d4d0e6604b10094c
+  metadata.gz: 49180c10e5303a641a121a2a3cc25d3d295f2340
+  data.tar.gz: 963973743caae051e01e91d886dd47879cb5dd2f
 SHA512:
-  metadata.gz: 2a532592bc7672a092c43da076b51a0773284a55db1e1b3a4a547247031f981a3acdde9afa53ed5653f4742b94d7abc9ed76bb93ac4cae1ed58bff6eb3242a54
-  data.tar.gz: 428416e6b448f50458c7e36e0b1de078fb110737ae081b3a92e70751639216efd49f91017743ecfdcb20d23bdfab16d168621daf45981b7c8c70318a5af74604
+  metadata.gz: fbc51f30d1b62484f8a4241b9efb9685913ac0b10ce398109ded932f0887c9d80e0bf810627de8deec0d89bb9cff7736c5459ddb7e22139ca71204dee0e359d5
+  data.tar.gz: 2b073ca42f004f64db8238ecf85e047765f06d34c090bda759bc322129b0188b5f3c526560e822c290dbd725da3cef0d60791317fcee00bf4fdca651b52c3e48

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 0.3.0 (2018-06-11)
+
+* Upgrade Embulk version to 0.9.7
+
 ## 0.2.0 (2017-03-13)
 
 * Support `path` parameter in column config. (@takumakanari)

data/build.gradle

@@ -14,20 +14,20 @@ configurations {
     provided
 }
 
-version = "0.2.0"
+version = "0.3.0"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.8.13"
-    provided "org.embulk:embulk-core:0.8.13"
+    compile  "org.embulk:embulk-core:0.9.7"
+    provided "org.embulk:embulk-core:0.9.7"
 
     compile 'com.jayway.jsonpath:json-path:2.2.0'
 
     testCompile "junit:junit:4.+"
-    testCompile  "org.embulk:embulk-core:0.8.13:tests"
-    testCompile  "org.embulk:embulk-standards:0.8.13"
+    testCompile  "org.embulk:embulk-core:0.9.7:tests"
+    testCompile  "org.embulk:embulk-standards:0.9.7"
 }
 
 findbugs {

data/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jan 13 12:41:02 JST 2016
+#Mon Jun 11 08:53:57 JST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.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,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# 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
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,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
@@ -150,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/test/java/org/embulk/parser/jsonpath/TestColumnCaster.java

@@ -5,7 +5,6 @@ import org.embulk.spi.DataException;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -23,19 +22,17 @@ public class TestColumnCaster
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
     public MapValue mapValue;
     public DataException thrown;
-    public ScriptingContainer jruby;
     public TimestampParser parser;
 
     @Before
     public void createResource()
     {
-        jruby = new ScriptingContainer();
         thrown = new DataException("any");
         Value[] kvs = new Value[2];
         kvs[0] = ValueFactory.newString("k");
         kvs[1] = ValueFactory.newString("v");
         mapValue = ValueFactory.newMap(kvs);
-        parser = new TimestampParser(jruby, "%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC);
+        parser = TimestampParser.of("%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC.toString());
     }
 
     @Test

data/src/test/java/org/embulk/parser/jsonpath/cast/TestStringCast.java

@@ -5,8 +5,6 @@ import org.embulk.spi.DataException;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampParser;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -18,13 +16,6 @@ public class TestStringCast
 {
     @Rule
     public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
-    public ScriptingContainer jruby;
-
-    @Before
-    public void createResource()
-    {
-        jruby = new ScriptingContainer();
-    }
 
     @Test
     public void asBoolean()
@@ -89,7 +80,7 @@ public class TestStringCast
     public void asTimestamp()
     {
         Timestamp expected = Timestamp.ofEpochSecond(1463084053, 123456000);
-        TimestampParser parser = new TimestampParser(jruby, "%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC);
+        TimestampParser parser = TimestampParser.of("%Y-%m-%d %H:%M:%S.%N", DateTimeZone.UTC.toString());
         assertEquals(expected, StringCast.asTimestamp("2016-05-12 20:14:13.123456", parser));
 
         try {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiroyuki Sato
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -110,12 +110,12 @@ files:
 - src/test/java/org/embulk/parser/jsonpath/cast/TestJsonCast.java
 - src/test/java/org/embulk/parser/jsonpath/cast/TestLongCast.java
 - src/test/java/org/embulk/parser/jsonpath/cast/TestStringCast.java
-- classpath/accessors-smart-1.1.jar
-- classpath/asm-5.0.3.jar
-- classpath/embulk-parser-jsonpath-0.2.0.jar
 - classpath/json-path-2.2.0.jar
+- classpath/embulk-parser-jsonpath-0.3.0.jar
+- classpath/asm-5.0.3.jar
 - classpath/json-smart-2.2.1.jar
 - classpath/slf4j-api-1.7.16.jar
+- classpath/accessors-smart-1.1.jar
 homepage: https://github.com/hiroyuki-sato/embulk-parser-jsonpath
 licenses:
 - MIT