embulk-output-ftp 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dc75d041719981674d7fae9fa33063917cbb78b
-  data.tar.gz: 10b76c0ea6377bfbc4e7843102380ef939bc803e
+  metadata.gz: 99f92ff252075824f860a2929aa8dc90609b3760
+  data.tar.gz: ae7284ac04e110cb17b02f5830a2bdc52c5e309c
 SHA512:
-  metadata.gz: 54f5d91122ba11013591355303f7ff57930a7f952998ee3bdb7d4d189b5b94b3a8062cbe2f75cebdd93a14ce91e257e116a19e38a9ceef6e11b85618634274d9
-  data.tar.gz: 60ec552f6383b58521f8f1054d4045664a71a0aa6c6d97531449eb87a513ffb7558912c9129ec6f5f9a98280da96d24b46d2f5658738d95988139aefe88d7dc4
+  metadata.gz: 6f867e7103b201e4ddbab093001d6fa657d4932c469bae0baca717ce618b45d6e72521ffae58f0aab43c93d171250e366cf3666b204be31b7906fdbd00505c92
+  data.tar.gz: 36e2127321a3cef31515fe3b037c35db61c3187afdf5fd7010e8de2e64c9eca48f6eb1eee83f55498f79f86b7ed232d4c1e54c9e06ef487ecdd5a64e9b7d7382

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4 - 2016-07-29
+
+* [maintenance] Fix default port number generation logic [#7](https://github.com/embulk/embulk-output-ftp/pull/7)
+
 ## 0.1.3 - 2016-07-21
 
 * [new feature] Support both of FTPS(explicit) and FTPS(implicit). [#4](https://github.com/sakama/embulk-output-ftp/pull/4)

data/README.md

@@ -1,5 +1,5 @@
 # FTP file output plugin for Embulk
-[![Build Status](https://travis-ci.org/sakama/embulk-output-ftp.svg?branch=master)](https://travis-ci.org/sakama/embulk-output-ftp)
+[![Build Status](https://travis-ci.org/embulk/embulk-output-ftp.svg?branch=master)](https://travis-ci.org/embulk/embulk-output-ftp)
 
 This plugin support **FTP**, **FTPES(FTPS explicit)**, **FTPS(FTPS implicit)** and doesn't support **SFTP**.
 
@@ -14,7 +14,7 @@ If you want to use SFTP, please use [embulk-output-sftp](https://github.com/civi
 ## Configuration
 
 - **host**: FTP server address (string, required)
-- **port**: FTP server port number (integer, default: `21`.)
+- **port**: FTP server port number (integer, default: `21`. `990` if `ssl` is true and `ssl_explicit` is false)
 - **user**: user name to login (string, optional)
 - **password**: password to login (string, default: `""`)
 - **path_prefix** prefix of target files (string, required)
@@ -173,4 +173,4 @@ Then start your applications.
 
 ## Acknowledgement
 
-This program is forked from [embulk-input-ftp](https://github.com/embulk/embulk-input-ftp) and originally written by @frsyuki, modified by @sakama.
+This program is forked from [embulk-input-ftp](https://github.com/embulk/embulk-input-ftp) and originally written by @frsyuki, modified by @sakama.

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -68,7 +68,7 @@ Gem::Specification.new do |spec|
   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"
+  spec.homepage      = "https://github.com/embulk/embulk-output-ftp"
 
   spec.files         = `git ls-files`.split("\n") + Dir["classpath/*.jar"]
   spec.test_files    = spec.files.grep(%r"^(test|spec)/")

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

@@ -32,10 +32,8 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-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;
@@ -48,7 +46,7 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
         String getHost();
 
         @Config("port")
-        @ConfigDefault("21")
+        @ConfigDefault("null")
         Optional<Integer> getPort();
         void setPort(Optional<Integer> port);
 
@@ -95,6 +93,9 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
     }
 
     private static final Logger log = Exec.getLogger(FtpFileOutputPlugin.class);
+    private static final Integer FTP_DEFULAT_PORT = 21;
+    private static final Integer FTPS_DEFAULT_PORT = 990;
+    private static final Integer FTPES_DEFAULT_PORT = 21;
     private static final long TRANSFER_NOTICE_BYTES = 100 * 1024 * 1024;
 
     @Override
@@ -315,19 +316,26 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
     private static FTPClient newFTPClient(Logger log, PluginTask task)
     {
         FTPClient client = new FTPClient();
+        Integer defaultPort = FTP_DEFULAT_PORT;
         try {
             if (task.getSsl()) {
                 client.setSSLSocketFactory(SSLPlugins.newSSLSocketFactory(task.getSSLConfig(), task.getHost()));
                 if (task.getSslExplicit()) {
                     client.setSecurity(FTPClient.SECURITY_FTPES);
+                    defaultPort = FTPES_DEFAULT_PORT;
                     log.info("Using FTPES(FTPS/explicit) mode");
                 }
                 else {
                     client.setSecurity(FTPClient.SECURITY_FTPS);
+                    defaultPort = FTPS_DEFAULT_PORT;
                     log.info("Using FTPS(FTPS/implicit) mode");
                 }
             }
 
+            if (!task.getPort().isPresent()) {
+                task.setPort(Optional.of(defaultPort));
+            }
+
             client.addCommunicationListener(new LoggingCommunicationListner(log));
 
             // TODO configurable timeout parameters
@@ -345,9 +353,13 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
             //client.setDataTimeout
             //client.setAutodetectUTF8
 
-            log.info("Connecting to {}", task.getHost());
             if (task.getPort().isPresent()) {
                 client.connect(task.getHost(), task.getPort().get());
+                log.info("Connecting to {}:{}", task.getHost(), task.getPort().get());
+            }
+            else {
+                client.connect(task.getHost());
+                log.info("Connecting to {}", task.getHost());
             }
 
             if (task.getUser().isPresent()) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -69,9 +69,9 @@ 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.3.jar
+- classpath/embulk-output-ftp-0.1.4.jar
 - classpath/ftp4j-1.7.2.jar
-homepage: https://github.com/sakama/embulk-output-ftp
+homepage: https://github.com/embulk/embulk-output-ftp
 licenses:
 - Apache 2.0
 metadata: {}