embulk-input-s3 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 857c5f811620e1273a6fc5ec69a4eeefb658f1b0
-  data.tar.gz: deb852435fb0cee1d2db0391cd3a8d0f30255638
+  metadata.gz: ee2494b43bcc58768baa64772d07f73c521b87f4
+  data.tar.gz: e12a159f3ad9e6e3cf012bcdc2e779be3242580a
 SHA512:
-  metadata.gz: f5dd533e7e7d5fd366268496118c110689bde80d4f5c98469eb9ff1be77734a168080a24f52d3415dcda158ce5cd1ace35c9025fc4b654663c9726f3994b9bc3
-  data.tar.gz: 1d5cab1c9c166a6352dbab3a30e65d058740e3b1883bb0776fac7bc6b677b6fe2bc8e047dba6e006f75cae722e0416504e8d6f493c6466dd7d54be3e484c79a7
+  metadata.gz: 8cf67d08d7f4b11b0c4c35e2b15e2537e9bf984f3a9a77adc0ecd30222c958d493b28817c273045d8bcbfd99bde327ed79760e8fd5118f1dc8c466b93b6f74de
+  data.tar.gz: 36f4ee1d0bcddd46a5945865b9d2f2f41e997b562d15783b96f94b2389e3037acdc104ebe967108110550eeaed12ebf5a1a961c3826358f247c8b06f21fa1e0c

data/src/main/java/org/embulk/input/s3/FileList.java

@@ -129,7 +129,7 @@ public class FileList
                 return false;
             }
 
-            if (!pathMatchPattern.matcher(path).matches()) {
+            if (!pathMatchPattern.matcher(path).find()) {
                 return false;
             }
 

data/src/test/java/org/embulk/input/s3/TestS3FileInputPlugin.java

@@ -119,11 +119,22 @@ public class TestS3FileInputPlugin
     public void usePathMatchPattern()
             throws Exception
     {
-        ConfigSource config = this.config.deepCopy().set("path_match_pattern", "/match/");
-        ConfigDiff configDiff = runner.transaction(config, new Control(runner, output));
+        { // match pattern
+            ConfigSource config = this.config.deepCopy().set("path_match_pattern", "/sample_01");
+            ConfigDiff configDiff = runner.transaction(config, new Control(runner, output));
 
-        assertNull(configDiff.get(String.class, "last_path"));
-        assertEquals(0, getRecords(config, output).size());
+            assertEquals(EMBULK_S3_TEST_PATH_PREFIX + "/sample_01.csv", configDiff.get(String.class, "last_path"));
+            assertRecords(config, output);
+        }
+
+        output = new MockPageOutput();
+        { // not match pattern
+            ConfigSource config = this.config.deepCopy().set("path_match_pattern", "/match/");
+            ConfigDiff configDiff = runner.transaction(config, new Control(runner, output));
+
+            assertNull(configDiff.get(String.class, "last_path"));
+            assertEquals(0, getRecords(config, output).size());
+        }
     }
 
     static class Control

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-s3
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -60,7 +60,7 @@ files:
 - classpath/aws-java-sdk-kms-1.10.33.jar
 - classpath/aws-java-sdk-s3-1.10.33.jar
 - classpath/commons-codec-1.6.jar
-- classpath/embulk-input-s3-0.2.5.jar
+- classpath/embulk-input-s3-0.2.6.jar
 - classpath/httpclient-4.3.6.jar
 - classpath/httpcore-4.3.3.jar
 - classpath/jcl-over-slf4j-1.7.12.jar