embulk-output-sftp 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 710ac44d40d18dba8f0908dcbf6afbfe12d9e31b
-  data.tar.gz: 1b3db32005085759baaf4490617485d710756eb9
+  metadata.gz: ad46da79ff43c877955983ffd837db623628c9d7
+  data.tar.gz: 46aedede7ab91cd623f6e1d00da01a6b8498c143
 SHA512:
-  metadata.gz: 0be90ca5936246c2e7665866c9db29f6a82f95a4f64b362d370ba4e2ec9ace7ce649764213d24db29d98eee10d3b6ac8742d50338ca8b3617da68200a19562c2
-  data.tar.gz: a01a312973bd7e08f7db360323066d141bc0737186cb2d227bc58de31134cbb6d4ccd5c04c7313ba6e8750855d4f146287b189fa1efef1492b3b29f18e3c4ccd
+  metadata.gz: 5ecdfe335690467595c9d810b86ab63d9bd0dbf2fad31d1d888fe69e3f8557d925cdea42f0e38108176fb3958c2647d17c0345914a1c5de89922da6bd72d51c5
+  data.tar.gz: 1834934554622086027d05dca31bedad8415206999bc159df1c12c4bb25dcd9c75c1ee7ec12ca71755de91b4746313572e19cdbfd55c0d75467c9208ef40a1c8

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.0.8 (2016-09-26)
+==================
+- Fix: Use second as timetout setting instead of milli second
+  - https://github.com/civitaspo/embulk-output-sftp/pull/22
+- Fix: Fix CI failure only with Java7
+  - https://github.com/civitaspo/embulk-output-sftp/pull/21
+- Fix: Format code that were warned by `./gradlew checkstyle` command
+  - https://github.com/civitaspo/embulk-output-sftp/pull/23
+
 0.0.7 (2016-03-22)
 ==================
 - Fix: Plugin throws ClassNotFoundException with EmbulkEmbed

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
     provided
 }
 
-version = "0.0.7"
+version = "0.0.8"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
@@ -23,7 +23,7 @@ dependencies {
     compile  "org.embulk:embulk-core:0.8.6"
     provided "org.embulk:embulk-core:0.8.6"
     // compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
-    compile "org.apache.commons:commons-vfs2:2.+"
+    compile "org.apache.commons:commons-vfs2:2.1.1660580.2"
     compile "com.jcraft:jsch:0.1.53"
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-core:0.8.6:tests"

data/src/main/java/org/embulk/output/sftp/SftpFileOutput.java

@@ -17,7 +17,6 @@ import org.embulk.spi.TransactionalFileOutput;
 import org.embulk.spi.unit.LocalFile;
 import org.slf4j.Logger;
 
-import java.lang.Void;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -83,7 +82,7 @@ public class SftpFileOutput
         try {
             SftpFileSystemConfigBuilder builder = SftpFileSystemConfigBuilder.getInstance();
             builder.setUserDirIsRoot(fsOptions, task.getUserDirIsRoot());
-            builder.setTimeout(fsOptions, task.getSftpConnectionTimeout());
+            builder.setTimeout(fsOptions, task.getSftpConnectionTimeout() * 1000);
             builder.setStrictHostKeyChecking(fsOptions, "no");
             if (task.getSecretKeyFilePath().isPresent()) {
                 IdentityInfo identityInfo = new IdentityInfo(
@@ -174,7 +173,7 @@ public class SftpFileOutput
                 withConnectionRetry(retriable);
             }
             catch (Exception e) {
-                throw (IOException)e;
+                throw (IOException) e;
             }
         }
         catch (IOException e) {
@@ -255,20 +254,21 @@ public class SftpFileOutput
     {
         /**
          * Execute the operation with the given (or null) return value.
-         * 
          * @return any return value from the operation
          * @throws Exception
          */
         public T execute() throws Exception;
     }
 
-    private <T> T withConnectionRetry( final Retriable<T> op ) throws Exception {
+    private <T> T withConnectionRetry(final Retriable<T> op)
+            throws Exception
+    {
         int count = 0;
         while (true) {
             try {
                 return op.execute();
             }
-            catch(final Exception e) {
+            catch (final Exception e) {
                 if (++count > maxConnectionRetry) {
                     throw e;
                 }
@@ -309,7 +309,7 @@ public class SftpFileOutput
             return withConnectionRetry(retriable);
         }
         catch (Exception e) {
-            throw (FileSystemException)e;
+            throw (FileSystemException) e;
         }
     }
 
@@ -326,7 +326,7 @@ public class SftpFileOutput
             return withConnectionRetry(retriable);
         }
         catch (Exception e) {
-            throw (FileSystemException)e;
+            throw (FileSystemException) e;
         }
     }
 

data/src/test/java/org/embulk/output/sftp/TestSftpFileOutputPlugin.java

@@ -4,7 +4,6 @@ import com.google.common.base.Charsets;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
 import com.google.common.io.Resources;
-import org.apache.commons.vfs2.FileSystemException;
 import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
 import org.apache.sshd.server.Command;
@@ -30,7 +29,6 @@ import org.embulk.spi.PageTestUtils;
 import org.embulk.spi.Schema;
 import org.embulk.spi.TransactionalPageOutput;
 import org.embulk.spi.time.Timestamp;
-import org.hamcrest.CoreMatchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -187,7 +185,7 @@ public class TestSftpFileOutputPlugin
         return fileNames;
     }
 
-    private void run(String configYaml, final Optional<Integer> sleep)
+    private void run(String configYaml)
     {
         ConfigSource config = getConfigFromYaml(configYaml);
         runner.transaction(config, SCHEMA, 1, new Control()
@@ -206,16 +204,10 @@ public class TestSftpFileOutputPlugin
                                  true, 2L, 3.0D, "45", Timestamp.ofEpochMilli(678L), newMap(newString("k"), newString("v")),
                                  true, 2L, 3.0D, "45", Timestamp.ofEpochMilli(678L), newMap(newString("k"), newString("v")))) {
                         pageOutput.add(page);
-                        if (sleep.isPresent()) {
-                            Thread.sleep(sleep.get() * 1000);
-                        }
                     }
                     pageOutput.commit();
                     committed = true;
                 }
-                catch (InterruptedException e) {
-                    logger.debug(e.getMessage(), e);
-                }
                 finally {
                     if (!committed) {
                         pageOutput.abort();
@@ -374,7 +366,7 @@ public class TestSftpFileOutputPlugin
                 "  default_timezone: 'UTC'";
 
         // runner.transaction -> ...
-        run(configYaml, Optional.<Integer>absent());
+        run(configYaml);
 
         List<String> fileList = lsR(Lists.<String>newArrayList(), Paths.get(testFolder.getRoot().getAbsolutePath()));
         assertThat(fileList, hasItem(containsString(pathPrefix + "001.00.txt")));
@@ -410,7 +402,7 @@ public class TestSftpFileOutputPlugin
                 "  default_timezone: 'UTC'";
 
         // runner.transaction -> ...
-        run(configYaml, Optional.<Integer>absent());
+        run(configYaml);
 
         List<String> fileList = lsR(Lists.<String>newArrayList(), Paths.get(testFolder.getRoot().getAbsolutePath()));
         assertThat(fileList, hasItem(containsString(pathPrefix + "001.00.txt")));
@@ -458,7 +450,7 @@ public class TestSftpFileOutputPlugin
                     "  default_timezone: 'UTC'";
 
             // runner.transaction -> ...
-            run(configYaml, Optional.<Integer>absent());
+            run(configYaml);
 
             List<String> fileList = lsR(Lists.<String>newArrayList(), Paths.get(testFolder.getRoot().getAbsolutePath()));
             assertThat(fileList, hasItem(containsString(pathPrefix + "001.00.txt")));
@@ -474,42 +466,6 @@ public class TestSftpFileOutputPlugin
         }
     }
 
-    @Test
-    public void testTimeout()
-    {
-        // setting embulk config
-        final String pathPrefix = "/test/testUserPassword";
-        String configYaml = "" +
-                "type: sftp\n" +
-                "host: " + HOST + "\n" +
-                "port: " + PORT + "\n" +
-                "user: " + USERNAME + "\n" +
-                "secret_key_file: " + SECRET_KEY_FILE + "\n" +
-                "secret_key_passphrase: " + SECRET_KEY_PASSPHRASE + "\n" +
-                "path_prefix: " + testFolder.getRoot().getAbsolutePath() + pathPrefix + "\n" +
-                "timeout: 1\n" +
-                "file_ext: txt\n" +
-                "formatter:\n" +
-                "  type: csv\n" +
-                "  newline: CRLF\n" +
-                "  newline_in_field: LF\n" +
-                "  header_line: true\n" +
-                "  charset: UTF-8\n" +
-                "  quote_policy: NONE\n" +
-                "  quote: \"\\\"\"\n" +
-                "  escape: \"\\\\\"\n" +
-                "  null_string: \"\"\n" +
-                "  default_timezone: 'UTC'";
-
-        // exception
-        exception.expect(RuntimeException.class);
-        exception.expectCause(CoreMatchers.<Throwable>instanceOf(FileSystemException.class));
-        exception.expectMessage("Could not connect to SFTP server");
-
-        // runner.transaction -> ...
-        run(configYaml, Optional.of(60)); // sleep 1 minute while processing
-    }
-
     @Test
     public void testProxyType()
     {

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-sftp
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Civitaspo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-09-26 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: Stores files on Sftp.
 email:
 - civitaspo@gmail.com
@@ -69,7 +69,7 @@ files:
 - src/test/resources/id_rsa.pub
 - classpath/commons-logging-1.2.jar
 - classpath/commons-vfs2-2.1.1660580.2.jar
-- classpath/embulk-output-sftp-0.0.7.jar
+- classpath/embulk-output-sftp-0.0.8.jar
 - classpath/jsch-0.1.53.jar
 homepage: https://github.com/civitaspo/embulk-output-sftp
 licenses: