embulk-output-ftp 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0494ae651d3e5c17bb41c2cb08712ed7d6388d2
-  data.tar.gz: 9463836af3ca53940c83237a3e84126dadb8d153
+  metadata.gz: 1235e5dc7f3eea1852b1bb9a78f0e0f4dd99cf9d
+  data.tar.gz: 8b73b609b94b5d2f00a95b13aaf7d416d2716248
 SHA512:
-  metadata.gz: 66c737b48bc821ca444806d7d555ed17c1f7b4385f75743428a2fa3d94e72488791c0aa9883720155ac86e4d65de7e08f2c6af91afbf6ed7756cdb558116e67f
-  data.tar.gz: ccd8a59f0f4b58d9e02158ad757fd490c6e678768bf2e8f75aaa0a74dd0bfcfc465522b8126fe47710bf583c585218b860d410ccdd027c2e23ca4b92f8e41112
+  metadata.gz: cd0b1ffc89da7fd8e8a0a204503b3fc6bfb6d71760054a3708e6691e87d5c8ab75e5ce5075d64ab54e0925fadb18c0d05c4d2132ad6967757934b09ea7fe2f7c
+  data.tar.gz: bd01eb4835cbced4fb699b9a78bf2dbef3eba47461870ed8974ebbbd46a470b0ff4c48260e5079b8ce794a89f44b13b6d55d5619612cf792446425507e4db04d

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 0.1.6 - 2016-09-09
+
+* [maintenance] Fix NullPointerException at FtpFileOutput.getRemoteDirectory() method [#12](https://github.com/embulk/embulk-output-ftp/pull/12)
+
+
 ## 0.1.5 - 2016-08-08
 
-* [maintenance] Improve connection stability [#8](https://github.com/embulk/embulk-output-ftp/pull/9)
+* [maintenance] Improve connection stability [#9](https://github.com/embulk/embulk-output-ftp/pull/9)
 
 ## 0.1.4 - 2016-07-29
 

data/README.md

@@ -19,7 +19,7 @@ If you want to use SFTP, please use [embulk-output-sftp](https://github.com/civi
 - **password**: password to login (string, default: `""`)
 - **path_prefix** prefix of target files (string, required)
 - **sequence_format** Format for sequence part of output files (string, default: `".%03d.%02d"`)
-- **ext** e.g. "csv.gz, json.gz" (string, required)
+- **file_ext** e.g. "csv.gz, json.gz" (string, required)
 - **passive_mode**: use passive mode (boolean, default: true)
 - **ascii_mode**: use ASCII mode instead of binary mode (boolean, default: false)
 - **ssl**: use FTPS (SSL encryption). (boolean, default: false)
@@ -54,7 +54,7 @@ out:
   port: 21
   user: anonymous
   path_prefix: /ftp/file/path/prefix
-  ext: csv
+  file_ext: csv
   formatter:
     type: csv.gz
     header_line: false
@@ -76,7 +76,7 @@ out:
   ssl_verify: false
 
   path_prefix: /ftp/file/path/prefix
-  ext: csv
+  file_ext: csv
 ```
 
 FTPS encryption with server certificate verification:
@@ -106,7 +106,7 @@ out:
       -----END CERTIFICATE-----
 
   path_prefix: /ftp/file/path/prefix
-  ext: csv
+  file_ext: csv
 ```
 
 ## Build

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.1.5"
+version = "0.1.6"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

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

@@ -92,6 +92,10 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
         @Config("max_connection_retry")
         @ConfigDefault("10") // 10 times retry to connect FTP server if failed.
         int getMaxConnectionRetry();
+
+        @Config("directory_separator")
+        @ConfigDefault("\"/\"")
+        String getDirectorySeparator();
     }
 
     private static final Logger log = Exec.getLogger(FtpFileOutputPlugin.class);
@@ -150,6 +154,7 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
         private final String sequenceFormat;
         private final String pathSuffix;
         private final int maxConnectionRetry;
+        private final String separator;
         private BufferedOutputStream output = null;
         private int fileIndex;
         private File file;
@@ -165,6 +170,7 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
             this.sequenceFormat = task.getSequenceFormat();
             this.pathSuffix = task.getFileNameExtension();
             this.maxConnectionRetry = task.getMaxConnectionRetry();
+            this.separator = task.getDirectorySeparator();
         }
 
         @Override
@@ -178,7 +184,10 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
                     suffix = "." + suffix;
                 }
                 filePath = pathPrefix + String.format(sequenceFormat, taskIndex, fileIndex) + suffix;
-                remoteDirectory = getRemoteDirectory(filePath);
+                if (!filePath.startsWith(separator)) {
+                    filePath = separator + filePath;
+                }
+                remoteDirectory = getRemoteDirectory(filePath, separator);
                 file = Exec.getTempFileSpace().createTempFile(filePath, "tmp");
                 log.info("Writing local temporary file \"{}\"", file.getAbsolutePath());
                 output = new BufferedOutputStream(new FileOutputStream(file));
@@ -308,10 +317,17 @@ public class FtpFileOutputPlugin implements FileOutputPlugin
             return Exec.newTaskReport();
         }
 
-        private String getRemoteDirectory(String filePath)
+        private String getRemoteDirectory(String filePath, String separator)
         {
             Path path = Paths.get(filePath);
-            return path.getParent().toString();
+            if (path.getParent() == null) {
+                return separator;
+            }
+            String parent = path.getParent().toString();
+            if (!parent.startsWith(separator)) {
+                parent = separator + parent;
+            }
+            return parent;
         }
     }
 

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

@@ -117,6 +117,7 @@ public class TestFtpFileOutputPlugin
         assertEquals(false, task.getSsl());
         assertEquals(true, task.getSslExplicit());
         assertEquals(10, task.getMaxConnectionRetry());
+        assertEquals("/", task.getDirectorySeparator());
     }
 
     @Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-ftp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,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.5.jar
+- classpath/embulk-output-ftp-0.1.6.jar
 - classpath/ftp4j-1.7.2.jar
 homepage: https://github.com/embulk/embulk-output-ftp
 licenses: