embulk-input-gcs 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8331e71b0a9f82c385f328df68c243d2394b4a28
-  data.tar.gz: 0b923e4a693e3373f160da81a3190baf2ceba99e
+  metadata.gz: 6ce6983c74eefcfcb205c892493bd7ff599e57c2
+  data.tar.gz: 98715ab6fc0161496ef3b271f28a6d4b06c85f64
 SHA512:
-  metadata.gz: 5bd006df0e41586b1a9ebcdae830e11fe6621a80bb15cd5b8ee5e4ccd5dbb71431b69b86834d11bd9cd50c1f7adac5915ddd5a422a2c9fb8b0ebe6c01345cb23
-  data.tar.gz: 5fe9f54ad9489c920b6eb08bdc735bdbd71b02ccdcb3bcdae5725ca7ba6f6dede5ea0f8e94a6586a44dd155bb19366dd2d097c66a80ad944e304fc3e0821136a
+  metadata.gz: 20a443c53891a35dd23ef4e1a149b97ee46dd8052fc0c92927643c0ed83da3d47a80acf49f4cabc9e26b23aa389e0aecaa446f4d7d803f05eb0ea8e1d99e27ca
+  data.tar.gz: c2a1a41105caae03abfa2dd19331bc07486deb267d8166626bde9a0009868d1086e8fd92f8042427b9c1bb3766f41d78c7519106758d7d875b1e8e25fd95cd22

data/build.gradle

@@ -15,7 +15,7 @@ configurations {
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
-version = "0.1.3"
+version = "0.1.4"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.5.1"
@@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
   spec.description   = %[gcs input plugin is an Embulk plugin that loads records from Google Cloud Storage. read by any input plugins. Search the output plugins by 'embulk-output' keyword.]
   spec.email         = ["satoshiakama@gmail.com"]
   spec.licenses      = ["Apache-2.0"]
-  spec.homepage      = "https://github.com/sakama/embulk-input-gcs"
+  spec.homepage      = "https://github.com/embulk/embulk-input-gcs"
 
   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/input/gcs/GcsFileInputPlugin.java

@@ -81,7 +81,7 @@ public class GcsFileInputPlugin
     public ConfigDiff transaction(ConfigSource config,
                                   FileInputPlugin.Control control)
     {
-        final PluginTask task = config.loadConfig(PluginTask.class);
+        PluginTask task = config.loadConfig(PluginTask.class);
 
         try {
             httpTransport = GoogleNetHttpTransport.newTrustedTransport();
@@ -101,17 +101,24 @@ public class GcsFileInputPlugin
                              int taskCount,
                              FileInputPlugin.Control control)
     {
-        final PluginTask task = taskSource.loadTask(PluginTask.class);
+        PluginTask task = taskSource.loadTask(PluginTask.class);
 
         control.run(taskSource, taskCount);
 
+        ConfigDiff configDiff = Exec.newConfigDiff();
+
         List<String> files = new ArrayList<String>(task.getFiles());
-        if (files.size() == 0) {
-            return null;
+        if (files.isEmpty()) {
+            // keep the last value if any
+            if (task.getLastPath().isPresent()) {
+                configDiff.set("last_path", task.getLastPath().get());
+            }
+        } else {
+            Collections.sort(files);
+            configDiff.set("last_path", files.get(files.size() - 1));
         }
-        Collections.sort(files);
-        return Exec.newConfigDiff().
-                set("last_path", files.get(files.size() - 1));
+
+        return configDiff;
     }
 
     @Override
@@ -189,7 +196,7 @@ public class GcsFileInputPlugin
                 log.debug("bucket timeCreated: " + bk.getTimeCreated());
                 log.debug("bucket owner: " + bk.getOwner());
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             log.warn("Could not access to bucket:" + bucket);
             log.warn(e.getMessage());
         }
@@ -219,7 +226,7 @@ public class GcsFileInputPlugin
                 lastKey = objects.getNextPageToken();
                 listObjects.setPageToken(lastKey);
             } while (lastKey != null);
-        } catch (Exception e) {
+        } catch (IOException e) {
             log.warn(String.format("Could not get file list from bucket:%s", bucket));
             log.warn(e.getMessage());
         }
@@ -230,7 +237,7 @@ public class GcsFileInputPlugin
     @Override
     public TransactionalFileInput open(TaskSource taskSource, int taskIndex)
     {
-        final PluginTask task = taskSource.loadTask(PluginTask.class);
+        PluginTask task = taskSource.loadTask(PluginTask.class);
         return new GcsFileInput(task, taskIndex);
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-gcs
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Satoshi Akama
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-15 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ files:
 - src/test/java/org/embulk/input/gcs/TestGcsFileInputPlugin.java
 - classpath/commons-codec-1.3.jar
 - classpath/commons-logging-1.1.1.jar
-- classpath/embulk-input-gcs-0.1.3.jar
+- classpath/embulk-input-gcs-0.1.4.jar
 - classpath/google-api-client-1.19.1.jar
 - classpath/google-api-services-storage-v1-rev27-1.19.1.jar
 - classpath/google-http-client-1.19.0.jar
@@ -67,7 +67,7 @@ files:
 - classpath/httpclient-4.0.1.jar
 - classpath/httpcore-4.0.1.jar
 - classpath/jsr305-1.3.9.jar
-homepage: https://github.com/sakama/embulk-input-gcs
+homepage: https://github.com/embulk/embulk-input-gcs
 licenses:
 - Apache-2.0
 metadata: {}