embulk-input-sftp 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df31c9ece3349f98ed7d6cb077ea54d93eb03983
-  data.tar.gz: 86a2988731cc55a81ed7e191eb453b952a3d13a4
+  metadata.gz: 6b0613256f73dca8ccdec6e3f5f37b551d967f80
+  data.tar.gz: 59136d00ccd17ab0d1a4ece5d1c061deda3d6651
 SHA512:
-  metadata.gz: 5200a610d8dbcde6e46597d9749504da4e1afdeb44f1803c1ff162204ccb96f4eab73397ec889046111b6adf6677653521696fa4e88f4d35e5a0b9c4e3998fe2
-  data.tar.gz: 33a363400d78fd010f238a0270f7e086610ba9a9bc9ea25cf59dcf2d03fb66f09198f5df0aa35ea46545fea2dded4eaa5264cc9a56aaf2c604cb49b424617171
+  metadata.gz: e2e6035fff5490c1ac3403f02e5d83b845347018e4bccf09f3d47971bf9a78e1d48d2e3c63650600089429dfad469e81e9cdce234e906c3f5a36eff5ef670427
+  data.tar.gz: db80accf97beba6ba00d546728913c74a6992e93068da7ae69775545468713cc5d0a0b11eced97de9173bd4ca05313958d07aa881eaa22d94475e25554c7d5bf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.5 - 2017-06-20
+
+* [maintenance] Fix bug path_prefix extension are removed [#23](https://github.com/sakama/embulk-input-sftp/pull/23)
+
 ## 0.2.4 - 2017-06-05
 
 * [maintenance] Improve logic for remote file search with path_prefix  [#22](https://github.com/sakama/embulk-input-sftp/pull/22)

data/build.gradle

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

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

@@ -197,7 +197,7 @@ public class SftpFileInput
                             }
 
                             FileObject files = manager.resolveFile(getSftpFileUri(task, task.getPathPrefix()), fsOptions);
-                            String basename = FilenameUtils.getBaseName(task.getPathPrefix());
+
                             if (files.isFolder()) {
                                 //path_prefix is a folder, we add everything in that folder
                                 FileObject[] children = files.getChildren();
@@ -218,9 +218,10 @@ public class SftpFileInput
                                 FileObject parent = files.getParent();
                                 FileObject[] children = parent.getChildren();
                                 Arrays.sort(children);
+                                String fileName = FilenameUtils.getName(task.getPathPrefix());
                                 for (FileObject f : children) {
                                     if (f.isFile()) {
-                                        addFileToList(builder, f.toString(), f.getContent().getSize(), basename, lastKey);
+                                        addFileToList(builder, f.toString(), f.getContent().getSize(), fileName, lastKey);
                                     }
                                 }
                             }

data/src/test/java/org/embulk/input/sftp/TestSftpFileInputPlugin.java

@@ -234,6 +234,29 @@ public class TestSftpFileInputPlugin
         assertEquals(SftpFileInput.getRelativePath(task, Optional.of(expected.get(1).get(0))), configDiff.get(String.class, "last_path"));
     }
 
+    @Test
+    public void testListFilesWithPathPrefixPointToFile() throws Exception
+    {
+        uploadFile(Resources.getResource("sample_01.csv").getPath(), REMOTE_DIRECTORY + "sample_01.csv", true);
+        ConfigSource configSource = config.deepCopy();
+        configSource.set("path_prefix", REMOTE_DIRECTORY + "not_exist.csv");
+        PluginTask task = configSource.loadConfig(PluginTask.class);
+        FileList actual = (FileList) SftpFileInput.listFilesByPrefix(task);
+        assertEquals(0, actual.getTaskCount());
+    }
+
+    @Test
+    public void testListFilesWithPathPrefix() throws Exception
+    {
+        uploadFile(Resources.getResource("sample_01.csv").getPath(), REMOTE_DIRECTORY + "sample_01.csv", true);
+        ConfigSource configSource = config.deepCopy();
+        configSource.set("path_prefix", REMOTE_DIRECTORY + "sample_01");
+        PluginTask task = configSource.loadConfig(PluginTask.class);
+        FileList actual = (FileList) SftpFileInput.listFilesByPrefix(task);
+        assertEquals(1, actual.getTaskCount());
+        assertEquals(actual.get(0).get(0), "sftp://username:password@127.0.0.1:20022/home/username/unittest/sample_01.csv");
+    }
+
     @Test
     public void testSftpInputByOpen() throws Exception
     {

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-sftp
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-20 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: Reads files stored on remote server using SFTP.
 email:
 - satoshiakama@gmail.com
@@ -69,11 +69,11 @@ files:
 - src/test/resources/id_rsa.pub
 - src/test/resources/sample_01.csv
 - src/test/resources/sample_02.csv
+- classpath/jsch-0.1.53.jar
 - classpath/commons-io-1.3.2.jar
 - classpath/commons-logging-1.2.jar
+- classpath/embulk-input-sftp-0.2.5.jar
 - classpath/commons-vfs2-2.1.jar
-- classpath/embulk-input-sftp-0.2.4.jar
-- classpath/jsch-0.1.53.jar
 homepage: https://github.com/embulk/embulk-input-sftp
 licenses:
 - Apache-2.0