embulk-output-td 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a267fd641a84253cb29de2ec4c37976fa7f0760f
-  data.tar.gz: 642cca9fe3ec33c04946f58142fbc7c1429c9c3f
+  metadata.gz: 9ebf964f7fb872e56a7a39508835b3414aaeb600
+  data.tar.gz: 2c40c6bbfbff60c1bf390ced74ced48a726e1a4b
 SHA512:
-  metadata.gz: 7a977689516a89bbc73d79b2c909b0ef2556e5c17c84792a33f305ea8c044b7c982f4cd7ec9aa93077684b15c2d17e80ec891d05674fc07ff98008ba938b4e60
-  data.tar.gz: 115af84da016a98b1fc68f80588d573a944d50c79caba8dd2f8f8eddfdbdb45bce18ee658704469fc6a464a56fbb076194a020cfa298dd27b954ffdf86c6adef
+  metadata.gz: d425caf2d476d054c76bd0acff2760df98ad8a90c461b8fb4442d85a77572063740761713888f43608a779a61ad739ba52c4e231841226ba466b7f2b62181ab2
+  data.tar.gz: 0f042e174cc191748954dd8b8e63e8a648f6db5d874b2b57a7df07b54bdc3aff3fbc05a8fa4a02599d15a11eb179338f0d840c568d99c6c776ca6b0b84cf904e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.2 - 2017-08-09
+
+* [maintenance] Fix Embulk version check logic bug [#79](https://github.com/treasure-data/embulk-output-td/pull/79)
+
 ## 0.4.1 - 2017-08-08
 
 * [maintenance] Upgrade gradle 3.2.1 [#77](https://github.com/treasure-data/embulk-output-td/pull/77)

data/build.gradle

@@ -19,7 +19,7 @@ configurations {
 }
 
 group = "org.embulk.output.td"
-version = "0.4.1"
+version = "0.4.2"
 
 compileJava.options.encoding = 'UTF-8' // source encoding
 sourceCompatibility = 1.7

data/embulk-output-td.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-td"
-  spec.version       = "0.4.1"
+  spec.version       = "0.4.2"
   spec.authors       = ["Muga Nishizawa"]
   spec.summary       = %[TreasureData output plugin for Embulk]
   spec.description   = %[TreasureData output plugin is an Embulk plugin that loads records to TreasureData read by any input plugins. Search the input plugins by 'embulk-output' keyword.]

data/src/main/java/org/embulk/output/td/TdOutputPlugin.java

@@ -819,15 +819,26 @@ public class TdOutputPlugin
     {
         // Embulk v0.8.21 and lower version uses old Jackson and doesn't works with this plugin
         // https://github.com/embulk/embulk/pull/615
-        String[] versionNumber = EmbulkVersion.VERSION.split("-"); // to split e.g. "0.8.26-SNAPSHOT" or "0.8.30-ALPHA1"
-        if (versionNumber[0] != null) {
-            String[] versions = versionNumber[0].split("\\.");
-            if (versions.length == 3) {
-                if (Integer.valueOf(versions[1]) <= 8 && Integer.valueOf(versions[2]) < 22) {
-                    throw new ConfigException("embulk-output-td v0.4.x+ only supports Embulk v0.8.22 or higher versions");
+        boolean isValidVersion = true;
+        try {
+            // Embulk v0.8.18 or lower version doesn't have class org.embulk.EmbulkVersion
+            Class.forName("org.embulk.EmbulkVersion");
+            String[] versionNumber = EmbulkVersion.VERSION.split("-"); // to split e.g. "0.8.26-SNAPSHOT" or "0.8.30-ALPHA1"
+            if (versionNumber[0] != null) {
+                String[] versions = versionNumber[0].split("\\.");
+                if (versions.length == 3) {
+                    if (Integer.valueOf(versions[1]) <= 8 && Integer.valueOf(versions[2]) < 22) {
+                        isValidVersion = false;
+                    }
                 }
             }
         }
+        catch (ClassNotFoundException ex) {
+            isValidVersion = false;
+        }
+        if (!isValidVersion) {
+            throw new ConfigException("embulk-output-td v0.4.x+ only supports Embulk v0.8.22 or higher versions");
+        }
     }
 
     @VisibleForTesting

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-td
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Muga Nishizawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  type: :development
 description: TreasureData output plugin is an Embulk plugin that loads records to TreasureData read by any input plugins. Search the input plugins by 'embulk-output' keyword.
 email:
 - muga.nishizawa@gmail.com
@@ -82,7 +82,7 @@ files:
 - src/test/java/org/embulk/output/td/TestTdOutputPlugin.java
 - src/test/java/org/embulk/output/td/TestTimeValueGenerator.java
 - src/test/java/org/embulk/output/td/writer/TestFieldWriterSet.java
-- classpath/embulk-output-td-0.4.1.jar
+- classpath/embulk-output-td-0.4.2.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/jackson-datatype-json-org-2.6.7.jar
 - classpath/jetty-client-9.2.22.v20170606.jar