embulk-input-remote 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16eac682d2976b476c1ecfd472a5b1a5cf466a79
-  data.tar.gz: 8a35909c67a6698da3c2316a334db2359c7829fc
+  metadata.gz: e30d0f99dcb958e08afc14b19630f2eab518c01f
+  data.tar.gz: 086290764bf8c788db1b8b2e705f9a1eebacb49e
 SHA512:
-  metadata.gz: fcccf3be60c766fbf165e33ee3d69d606c09cfee22eb8c0c96cf80fd72c4201fbeb0ac91c1d7999d7d2e4094fe3f4ffdf2b6b1f4d8f76b690d5a02e4e04ab5e1
-  data.tar.gz: caa457262c61d56ca484aa48d099c81e6e4577411456f1b7a903b398c2bb1198c3139046aa112566fbddc83eb638ffb01d1c96ad66e12f90d0093ae0f2352bb8
+  metadata.gz: 186acc6cf0ff2ef037819d0277f24b03760038515bf377334afcfce89918ab1bb8424a0f726047ad9e79bbef138e71c66b5fac78d17e1df420407cc0213e207c
+  data.tar.gz: d1090d03a03e2a4708897989dbda36d60d86fd4226a6b7893cc9bb9f72ef11080b7c69f79280c57374a0bc59f3496e64cb69ddcce9f3085d460b59e15d593f8e

data/README.md

@@ -15,7 +15,7 @@ This plugin load data from Remote hosts by SCP
 - **hosts_separator**: Separator for "hosts_command" result (string, default: " ")
 - **path**: Path of remote host (File or Directory) (string, default: "")
 - **path_command**: Command for getting path (Windows not supported). If given the option "path" is overwritten. (string, default: null)
-- **ignore_not_found_hosts**: If the option is true, Hosts which file(or directory) is not found is skipped. (Means it's not included in resume target.) (boolean, default: false)
+- **ignore_not_found_hosts**: If the option is true, Hosts which is not found file(or directory) or is occurred SSH error are skipped. (Means it's not included in resume target.) (boolean, default: false)
 - **auth**: SSH authentication setting (hash, default: {})
     - **user**: SSH username (string, default: execute user)
     - **type**: public_key or password (string, default: public_key)
@@ -45,7 +45,7 @@ in:
 
 ## Note
 When this plugin run on Linux, task is sometimes blocked.  
-The cause is java.security.SecureRandom. Solution is the following.
+The cause is java.security.SecureRandom. Please try one of the followings.
 
 ### set JVM_OPTION "-Djava.security.egd"
 

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.6.1"

data/src/main/java/org/embulk/input/RemoteFileInputPlugin.java

@@ -85,21 +85,16 @@ public class RemoteFileInputPlugin
 	@Override
 	public ConfigDiff transaction(ConfigSource config, FileInputPlugin.Control control) {
 		PluginTask task = config.loadConfig(PluginTask.class);
-		try {
-			List<Target> targets = listTargets(task);
-			log.info("Loading targets {}", targets);
-			task.setTargets(targets);
-	
-			// number of processors is same with number of targets
-			int taskCount = targets.size();
-			return resume(task.dump(), taskCount, control);
+		List<Target> targets = listTargets(task);
+		log.info("Loading targets {}", targets);
+		task.setTargets(targets);
 
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
+		// number of processors is same with number of targets
+		int taskCount = targets.size();
+		return resume(task.dump(), taskCount, control);
 	}
 
-	private List<Target> listTargets(PluginTask task) throws IOException {
+	private List<Target> listTargets(PluginTask task) {
 		final List<String> hosts = listHosts(task);
 		final String path = getPath(task);
 
@@ -110,8 +105,13 @@ public class RemoteFileInputPlugin
 
 			if (lastTarget == null || target.compareTo(lastTarget) > 0) {
 				if (task.getIgnoreNotFoundHosts()) {
-					// Check with file existing
-					if (!exists(target, task)) {
+					try {
+						final boolean exists = exists(target, task);
+						if (!exists) {
+							continue;
+						}
+					} catch (IOException e) {
+						log.warn("failed to check the file exists. " + target.toString(), e);
 						continue;
 					}
 				}

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-remote
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shinichi ISHIMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-07-28 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 hosts by SCP.
 email:
 - shiketaudonko41@gmail.com
@@ -59,7 +59,7 @@ files:
 - src/test/java/org/embulk/input/TestRemoteFileInputPlugin.java
 - classpath/bcpkix-jdk15on-1.51.jar
 - classpath/bcprov-jdk15on-1.51.jar
-- classpath/embulk-input-remote-0.1.3.jar
+- classpath/embulk-input-remote-0.1.4.jar
 - classpath/jzlib-1.1.3.jar
 - classpath/sshj-0.11.0.jar
 homepage: https://github.com/kamatama41/embulk-input-remote