embulk-input-gcs 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9248a8e1b730f9885caa93b24cbf47dfb8a8c0
-  data.tar.gz: 6405b783b5d7ea6a6b74f017946f69e9b7c5b3a6
+  metadata.gz: 9113cbc31b8a47e6dbb6377c3ae7dcbb3d4f03e5
+  data.tar.gz: 60744784255a366230bce11a16632b42df6c08f2
 SHA512:
-  metadata.gz: fbbce0c9ba052477d392ba00586d6951f00924a9d163409b3394ac393035b9b33c5acb2aeecc2111b1a3febc8d59ab0b9401a4b680ed6e578cfc5e57ab844e3d
-  data.tar.gz: 23604910383ac32a7aa66b0afb94144cd23bea0b26866748d24ec8189f27ea313e4a9cda0a599a1aefce8be84e0bcc3957754dbe95e6d5755dfc517666685806
+  metadata.gz: 8e1f54da44d5ae5cc84815a76a3a13c9d289be3844ff322c49f3463ac918140193a9eef35d21b319b792c4149c5c03498dbbf0d9ca7123d782608971aaa40251
+  data.tar.gz: f66b8c1bc9d6d0ed8663b19edfbb815850cf2dd24bb3fc60e1c7cb20a4381a1967d4aef35a05ab3633717d3fb16da616cbf70687e0f74f354fb1b992e1dd55f2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.2.2 - 2016-08-08
+* [maintenance] Fix validation logic for `path_prefix` and `paths` options [#23](https://github.com/embulk/embulk-input-gcs/pull/23)
+
 ## 0.2.1 - 2016-08-04
 * [maintenance] Use retry logic when generate GCS client [#21](https://github.com/embulk/embulk-input-gcs/pull/21)
 

data/build.gradle

@@ -17,7 +17,7 @@ configurations {
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-version = "0.2.1"
+version = "0.2.2"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.2"

data/src/main/java/org/embulk/input/gcs/GcsFileInputPlugin.java

@@ -142,8 +142,10 @@ public class GcsFileInputPlugin
         if (task.getPathPrefix().isPresent()) {
             task.setFiles(listFiles(task, client));
         }
-        if (task.getFiles().isEmpty()) {
-            throw new ConfigException("No file is found. Fix path_prefix or specify paths directly");
+        else {
+            if (task.getFiles().isEmpty()) {
+                throw new ConfigException("No file is found. Confirm paths option isn't empty");
+            }
         }
         // number of processors is same with number of files
         return resume(task.dump(), task.getFiles().size(), control);

data/src/test/java/org/embulk/input/gcs/TestGcsFileInputPlugin.java

@@ -315,6 +315,42 @@ public class TestGcsFileInputPlugin
         plugin.listGcsFilesByPrefix(client, "non-exists-bucket", "prefix", Optional.<String>absent()); // no errors happens
     }
 
+    @Test
+    public void testNonExistingFilesWithPathPrefix() throws Exception
+    {
+        ConfigSource config = Exec.newConfigSource()
+                .set("bucket", GCP_BUCKET)
+                .set("path_prefix", "/path/to/notfound")
+                .set("auth_method", "private_key")
+                .set("service_account_email", GCP_EMAIL)
+                .set("p12_keyfile", GCP_P12_KEYFILE)
+                .set("json_keyfile", GCP_JSON_KEYFILE)
+                .set("application_name", GCP_APPLICATION_NAME)
+                .set("last_path", "")
+                .set("parser", parserConfig(schemaConfig()));
+
+        ConfigDiff configDiff = runner.transaction(config, new Control());
+
+        assertEquals("", configDiff.get(String.class, "last_path"));
+    }
+
+    @Test(expected = ConfigException.class)
+    public void testNonExistingFilesWithPaths() throws Exception
+    {
+        ConfigSource config = Exec.newConfigSource()
+                .set("bucket", GCP_BUCKET)
+                .set("paths", Arrays.asList())
+                .set("auth_method", "private_key")
+                .set("service_account_email", GCP_EMAIL)
+                .set("p12_keyfile", GCP_P12_KEYFILE)
+                .set("json_keyfile", GCP_JSON_KEYFILE)
+                .set("application_name", GCP_APPLICATION_NAME)
+                .set("last_path", "")
+                .set("parser", parserConfig(schemaConfig()));
+
+        runner.transaction(config, new Control());
+    }
+
     @Test
     public void testGcsFileInputByOpen()
             throws NoSuchMethodException, IllegalAccessException, InvocationTargetException, IOException

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-gcs
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ files:
 - src/test/resources/secretkeys.tar.enc
 - classpath/commons-codec-1.3.jar
 - classpath/commons-logging-1.1.1.jar
-- classpath/embulk-input-gcs-0.2.1.jar
+- classpath/embulk-input-gcs-0.2.2.jar
 - classpath/google-api-client-1.21.0.jar
 - classpath/google-api-services-storage-v1-rev59-1.21.0.jar
 - classpath/google-http-client-1.21.0.jar