embulk-input-sftp 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e082ddfd3a77e9619752b28ddf6ab0cc6046b2b
-  data.tar.gz: 6a419208239b6c68bfee14581da320c8774ebb8f
+  metadata.gz: b9e0c79f27fccf85103bbbfca4fe4230e16e564d
+  data.tar.gz: 53b679a39dfddb526e44397781d6ef240652823f
 SHA512:
-  metadata.gz: 1748b5a9b2a12209d18ec387baa5486792ded7b6dd0348f9c2b96dd5caa85be4c5c84158d0b94a572ff97844d1583ec80eafcc4907ac97089b3d50b9f0606956
-  data.tar.gz: c25afa29d5cbc857bd337686cc8052768685623a749e72b7098c274f6c4584211003bbce33afdd048e38b671997920ac4ec179b47660e5947570156ec2f0a8a9
+  metadata.gz: fe0c37dad8a9b545d194b01b11b34a8cb745bcc48c3b85031b30caf839d40d2f5a32ccf4cfea976a85388333c0c7417b876a34aa49fb18cd8457fe6793eee9e8
+  data.tar.gz: 1122f60a71055f2e390b96c5cc2fdd0b00c36607ccaf53d94301cfa21d3cf8dc09f6a0831de123c1b77942ffddc73b07c1db2f303a24ab954b6d9e38a83ce252

data/.travis.yml

@@ -1,17 +1,10 @@
-dist: precise
 language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
 
 script:
   - ./gradlew test
 
 after_success:
-  - ./gradlew jacocoTestReport coveralls
-addons:
-  hosts:
-    - example.com
-  hostname: example.com
+  - ./gradlew check jacocoRootReport

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## 0.2.9 - 2018-04-20
+* [maintenance] Throw ConfigException when process fails with "com.jcraft.jsch.JSchException: Auth fail" [#29](https://github.com/embulk/embulk-input-sftp/pull/29) 
+
 ## 0.2.8 - 2018-03-12
-* [maintenance] Fix SFTP non existent last_path [#28](https://github.com/sakama/embulk-input-sftp/pull/28)
+* [maintenance] Fix SFTP non existent last_path [#28](https://github.com/embulk/embulk-input-sftp/pull/28)
 
 ## 0.2.7 - 2018-03-02
 * [maintenance] Fix SFTP connection remaining problem [#27](https://github.com/sakama/embulk-input-sftp/pull/27)

data/build.gradle

@@ -16,7 +16,7 @@ configurations {
 }
 
 group = "org.embulk.input.sftp"
-version = "0.2.8"
+version = "0.2.9"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/java/org/embulk/input/sftp/SftpFileInput.java

@@ -3,6 +3,7 @@ package org.embulk.input.sftp;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
+import com.jcraft.jsch.JSchException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.vfs2.FileObject;
@@ -197,9 +198,10 @@ public class SftpFileInput
 
                                 if (task.getLastPath().isPresent() && !task.getLastPath().get().isEmpty()) {
                                     final FileObject remotedLastPath = manager.resolveFile(getSftpFileUri(task, task.getLastPath().get()), fsOptions);
-                                    if(remotedLastPath.exists()) {
+                                    if (remotedLastPath.exists()) {
                                         lastKey = remotedLastPath.toString();
-                                    } else {
+                                    }
+                                    else {
                                         log.warn("Failed to load last_path due to non-existence in sftp, skip using last_path");
                                     }
                                 }
@@ -215,10 +217,12 @@ public class SftpFileInput
                                             addFileToList(builder, f.toString(), f.getContent().getSize(), "", lastKey);
                                         }
                                     }
-                                } else if (files.isFile()) {
+                                }
+                                else if (files.isFile()) {
                                     //path_prefix is a file then we just need to add that file
                                     addFileToList(builder, files.toString(), files.getContent().getSize(), "", lastKey);
-                                } else {
+                                }
+                                else {
                                     // path_prefix is neither file or folder, then we scan the parent folder to file path
                                     // that match the path_prefix basename
                                     FileObject parent = files.getParent();
@@ -264,6 +268,14 @@ public class SftpFileInput
                         public void onGiveup(Exception firstException, Exception lastException)
                                 throws RetryGiveupException
                         {
+                            // Generally, Auth fail should be caught and throw ConfigException when first retry. But this library is a bit unstable.
+                            // So we throw ConfigException after all retries are completed
+                            if (lastException.getCause().getCause() != null) {
+                                Throwable cause = lastException.getCause().getCause();
+                                if (cause.getMessage().contains("Auth fail")) {
+                                    throw new ConfigException(lastException);
+                                }
+                            }
                         }
                     });
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,10 +69,10 @@ files:
 - src/test/resources/id_rsa.pub
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
+- classpath/commons-io-2.6.jar
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.2.jar
-- classpath/commons-io-2.6.jar
-- classpath/embulk-input-sftp-0.2.8.jar
+- classpath/embulk-input-sftp-0.2.9.jar
 - classpath/jsch-0.1.54.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses: