embulk-output-ftp 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db87448f5b289f68ebb6c9d03b36f295a0139ac0
-  data.tar.gz: ab5abab07a3bec49eed5ec362c8fdec549564d88
+  metadata.gz: 3b64ed089208e577c405d228e5c0f5229e667587
+  data.tar.gz: d1cc2104d30d5451df24596199ea9383b09d0da9
 SHA512:
-  metadata.gz: 7281539145640359c6c084c031b7a212efd3044755e57ea5b823f5a4b80635facf0c0f300e59fdf1ced7db7425104a0fdd0f737de7274674a0fba93987b4d8b5
-  data.tar.gz: a2d49e39e67f7c5c680e62651db9ccf6e845bc42e317d81a834d52e9c83a3630003b10667f304fc4351e637f74bb9304b985510d688d5b39db86d837b89eb4de
+  metadata.gz: 90f8c88a80c849c15584780a865c7bd9ca2cb9d538108265364f717eff007c570aa9bbd48b1e30baa66b1681eab314abdeae6098ed5cbdbc40889cc59ddf3fba
+  data.tar.gz: d9548123c3a9ddd42d165769fd24a8f9bb22e4eb3ad08922bd131ea4db009eebb4c0c79b7510880157b9a2106bcb8c0e5292a1d88204594407cda059bdbba7e1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.2 - 2016-07-21
+
+* [maintenance] Force to create remote directory if remote directory doesn't exists. [#2](https://github.com/sakama/embulk-output-ftp/pull/2)
+* [maintenance] Add additional environmental variables for unit test. [#3](https://github.com/sakama/embulk-output-ftp/pull/3)
+
 ## 0.1.1 - 2016-07-20
 
 * [maintenance] Add unit test, refactoring, change logging logic

data/README.md

@@ -115,6 +115,12 @@ FTP_TEST_SSL_TRUSTED_CA_CERT_FILE
 FTP_TEST_SSL_TRUSTED_CA_CERT_DATA
 ```
 
+Following option is optional
+```
+FTP_TEST_PORT (default:21)
+FTP_TEST_SSL__PORT (default:990)
+```
+
 If you're using Mac OS X El Capitan and GUI Applications(IDE), like as follows.
 ```xml
 $ vi ~/Library/LaunchAgents/environment.plist

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -65,7 +65,7 @@ Gem::Specification.new do |spec|
   spec.version       = "${project.version}"
   spec.authors       = ["Satoshi Akama"]
   spec.summary       = %[FTP file output plugin for Embulk]
-  spec.description   = %[Stores files on FTP.]
+  spec.description   = %[Store files using FTP.]
   spec.email         = ["satoshiakama@gmail.com"]
   spec.licenses      = ["Apache 2.0"]
   spec.homepage      = "https://github.com/sakama/embulk-output-ftp"

data/src/main/java/org/embulk/output/ftp/FtpFileOutputPlugin.java

@@ -36,6 +36,8 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
 
 public class FtpFileOutputPlugin implements FileOutputPlugin
@@ -145,6 +147,7 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
         private int fileIndex;
         private File file;
         private String filePath;
+        private String remoteDirectory;
         private int taskIndex;
 
         public FtpFileOutput(FTPClient client, PluginTask task, int taskIndex)
@@ -168,7 +171,8 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
                     suffix = "." + suffix;
                 }
                 filePath = pathPrefix + String.format(sequenceFormat, taskIndex, fileIndex) + suffix;
-                file = Exec.getTempFileSpace().createTempFile(filePath, ".tmp");
+                remoteDirectory = getRemoteDirectory(filePath);
+                file = Exec.getTempFileSpace().createTempFile(filePath, "tmp");
                 log.info("Writing local temporary file \"{}\"", file.getAbsolutePath());
                 output = new BufferedOutputStream(new FileOutputStream(file));
             }
@@ -225,9 +229,15 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
                                 public Void call() throws FTPIllegalReplyException, FTPException, FTPDataTransferException,
                                                           FTPAbortedException, IOException, RetryGiveupException
                                 {
+                                    try {
+                                        client.changeDirectory(remoteDirectory);
+                                    }
+                                    catch (FTPException e) {
+                                        client.createDirectory(remoteDirectory);
+                                    }
                                     client.upload(filePath,
-                                        new BufferedInputStream(new FileInputStream(file)), 0L, 0L,
-                                        new LoggingTransferListener(file.getAbsolutePath(), filePath, log, TRANSFER_NOTICE_BYTES)
+                                            new BufferedInputStream(new FileInputStream(file)), 0L, 0L,
+                                            new LoggingTransferListener(file.getAbsolutePath(), filePath, log, TRANSFER_NOTICE_BYTES)
                                     );
                                     if (!file.delete()) {
                                         throw new ConfigException("Couldn't delete local file " + file.getAbsolutePath());
@@ -290,6 +300,12 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
         {
             return Exec.newTaskReport();
         }
+
+        private String getRemoteDirectory(String filePath)
+        {
+            Path path = Paths.get(filePath);
+            return path.getParent().toString();
+        }
     }
 
     private static FTPClient newFTPClient(Logger log, PluginTask task)

data/src/test/java/org/embulk/output/ftp/TestFtpFileOutputPlugin.java

@@ -46,6 +46,8 @@ import java.util.List;
 public class TestFtpFileOutputPlugin
 {
     private static String FTP_TEST_HOST;
+    private static Integer FTP_TEST_PORT;
+    private static Integer FTP_TEST_SSL_PORT;
     private static String FTP_TEST_USER;
     private static String FTP_TEST_PASSWORD;
     private static String FTP_TEST_SSL_TRUSTED_CA_CERT_FILE;
@@ -65,6 +67,8 @@ public class TestFtpFileOutputPlugin
     public static void initializeConstant()
     {
         FTP_TEST_HOST = System.getenv("FTP_TEST_HOST");
+        FTP_TEST_PORT = System.getenv("FTP_TEST_PORT") != null ? Integer.valueOf(System.getenv("FTP_TEST_PORT")) : 21;
+        FTP_TEST_SSL_PORT = System.getenv("FTP_TEST_SSL_PORT") != null ? Integer.valueOf(System.getenv("FTP_TEST_SSL_PORT")) : 990;
         FTP_TEST_USER = System.getenv("FTP_TEST_USER");
         FTP_TEST_PASSWORD = System.getenv("FTP_TEST_PASSWORD");
         FTP_TEST_SSL_TRUSTED_CA_CERT_FILE = System.getenv("FTP_TEST_SSL_TRUSTED_CA_CERT_FILE");
@@ -117,6 +121,7 @@ public class TestFtpFileOutputPlugin
                 .set("parser", parserConfig(schemaConfig()))
                 .set("type", "ftp")
                 .set("host", FTP_TEST_HOST)
+                .set("port", FTP_TEST_PORT)
                 .set("user", FTP_TEST_USER)
                 .set("password", FTP_TEST_PASSWORD)
                 .set("path_prefix", "my-prefix")
@@ -155,7 +160,7 @@ public class TestFtpFileOutputPlugin
 //                .set("parser", parserConfig(schemaConfig()))
 //                .set("type", "ftp")
 //                .set("host", FTP_TEST_HOST)
-//                .set("port", 990)
+//                .set("port", FTP_TEST_SSL_PORT)
 //                .set("user", FTP_TEST_USER)
 //                .set("password", FTP_TEST_PASSWORD)
 //                .set("ssl", true)
@@ -225,6 +230,7 @@ public class TestFtpFileOutputPlugin
                 .set("parser", parserConfig(schemaConfig()))
                 .set("type", "ftp")
                 .set("host", FTP_TEST_HOST)
+                .set("port", FTP_TEST_SSL_PORT)
                 .set("user", FTP_TEST_USER)
                 .set("password", FTP_TEST_PASSWORD)
                 .set("path_prefix", FTP_TEST_PATH_PREFIX)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -38,7 +38,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Stores files on FTP.
+description: Store files using FTP.
 email:
 - satoshiakama@gmail.com
 executables: []
@@ -69,7 +69,7 @@ files:
 - src/test/resources/sample_02.csv
 - classpath/bcpkix-jdk15on-1.52.jar
 - classpath/bcprov-jdk15on-1.52.jar
-- classpath/embulk-output-ftp-0.1.1.jar
+- classpath/embulk-output-ftp-0.1.2.jar
 - classpath/ftp4j-1.7.2.jar
 homepage: https://github.com/sakama/embulk-output-ftp
 licenses: