embulk-input-command 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb60dbd8366d2d12a151d3cc28e9a8c4c126093
-  data.tar.gz: 98e6c40f52df206329ce696796842cd09e24a8e1
+  metadata.gz: bfb1edd3656ab3780a2abfdb1fce32a64871455b
+  data.tar.gz: 31a65a6ff23eaac1f6317fe2bec976b1830fedf4
 SHA512:
-  metadata.gz: f1b919f81f46a580ee580de8ef2eb48c732baaafd269e30fe5980effc644701b83cead5c2418624c0506c71abf4f142f433f3bed42387787c604dd517d710ed5
-  data.tar.gz: e77ef6a643a16f6c90aeb341ad7e3488f97e70ad50be9d9076e8698b2a0c8e043aabe32326673f0f959fb99b25425f9e9e7a49a543131b05efa0bdd3af10e8e5
+  metadata.gz: a82a97910aaa580c84f02c72872421e3159945116ae07bd0b027c3c5a11f27fdb06585e7885562ac8b2ef94eef5ecd81be906585211f2ff80bc239d9d4aa46d5
+  data.tar.gz: be3d0ece9a03569876144020e632d98069e3ef1c7ae415b59501cacd350627addcee72f3fee0fb1ea881c1ecacf5d3dc1965a755d4da7f7d7f3d85406a1fb57c

data/ChangeLog

@@ -0,0 +1,24 @@
+
+Release 0.1.4 - 2016-01-13
+
+* added support for Windows (@cosmo0920++)
+
+
+Release 0.1.3 - 2015-08-18
+
+* embulk version to v0.7.0
+
+
+Release 0.1.2 - 2015-02-25
+
+* fixed gem description
+
+
+Release 0.1.1 - 2015-02-25
+
+* upgraded to embulk-core v0.4.8
+
+
+Release 0.1.0 - 2015-02-17
+
+* The initial release

data/README.md

@@ -12,7 +12,7 @@ This plugin runs a command and reads data from its stdout (or stderr).
 - **command**: command line (string, required)
 - **pipe**: stdout or stderr (string, default: stdout)
 
-The **command** is exected using a shell. So it can include pipe (`|`), environment variables (`$VAR`), redirects, and so on.
+The **command** is exected using a shell (`sh -c` on UNIX/Linux, `PowerShell.exe -Command` on Windows). Therefore, it can include pipe (`|`), environment variables (`$VAR`), redirects, and so on.
 
 ## Example
 

data/build.gradle

@@ -12,11 +12,12 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 dependencies {
-    compile  "org.embulk:embulk-core:0.7.0"
-    provided "org.embulk:embulk-core:0.7.0"
+    compile  "org.embulk:embulk-core:0.7.+"
+    provided "org.embulk:embulk-core:0.7.+"
+    testCompile 'org.embulk:embulk-core:0.7.+:tests'
     testCompile "junit:junit:4.+"
 }
 

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.FilterInputStream;
+import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
@@ -88,7 +89,7 @@ public class CommandFileInputPlugin
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
         List<String> cmdline = new ArrayList<String>();
-        cmdline.addAll(SHELL);
+        cmdline.addAll(buildShell());
         cmdline.add(task.getCommand());
 
         logger.info("Running command {}", cmdline);
@@ -131,6 +132,17 @@ public class CommandFileInputPlugin
         }
     }
 
+    @VisibleForTesting
+    static List<String> buildShell()
+    {
+        String osName = System.getProperty("os.name");
+        if(osName.indexOf("Windows") >= 0) {
+            return ImmutableList.of("PowerShell.exe", "-Command");
+        } else {
+            return ImmutableList.of("sh", "-c");
+        }
+    }
+
     private static class ProcessWaitInputStream
             extends FilterInputStream
     {

data/src/test/java/org/embulk/input/TestCommandFileInputPlugin.java

@@ -1,5 +1,28 @@
 package org.embulk.input;
 
+import com.google.common.collect.ImmutableList;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.embulk.EmbulkTestRuntime;
+import static org.embulk.input.CommandFileInputPlugin.buildShell;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 public class TestCommandFileInputPlugin
 {
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    @Test
+    public void testShell() {
+        if (System.getProperty("os.name").indexOf("Windows") >= 0) {
+            assertEquals(ImmutableList.of("PowerShell.exe", "-Command"), buildShell());
+        }
+        else {
+            assertEquals(ImmutableList.of("sh", "-c"), buildShell());
+        }
+    }
 }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-command
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-14 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: Executes a command and reads a file from its STDOUT.
 email:
 - frsyuki@gmail.com
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - COPYING
+- ChangeLog
 - README.md
 - build.gradle
 - gradle/wrapper/gradle-wrapper.jar
@@ -56,7 +57,7 @@ files:
 - lib/embulk/input/command.rb
 - src/main/java/org/embulk/input/CommandFileInputPlugin.java
 - src/test/java/org/embulk/input/TestCommandFileInputPlugin.java
-- classpath/embulk-input-command-0.1.3.jar
+- classpath/embulk-input-command-0.1.4.jar
 homepage: https://github.com/embulk/embulk-input-command
 licenses:
 - Apache 2.0