embulk-output-command 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1880f5cf82dd5ea86ca253cf39afc926fd6cefa6
-  data.tar.gz: 862b6032bb80311f630a9675836de5b1dcbd3650
+  metadata.gz: ff67dc43fd3f3b015cfe5c896b854d804965c0bd
+  data.tar.gz: e16b8fd85d43205af34543029f50ea7811c1d649
 SHA512:
-  metadata.gz: ca89155cb3c5d46d9f79bb3d1f5fd1ad736ba95d34b63128119c5ce25da0b69ddffee73d592604ec9c716b4697a0d586ea0eb72dcf3cd89a603363dd790d824e
-  data.tar.gz: 6ef7f878c444b90c0f1d90e91defeb5027c5fe7acb2e679d1fa8cfacc0049753009d47a25e00bb9cfd4c9d851e46091edf9b04d23f910323d098ab171cd102a0
+  metadata.gz: 92183c8fcda594460b9dd458f571ca1277fd3b90aae80de0a8917a0f053271d41cc65b73ffeadad4156ef53414888c029d235ffa811b5434797dc3d6066d9433
+  data.tar.gz: 89f535dabe00f6fee3bccf027fb308a23d1d9b3a2bd32f5895855c6615894d9d6efbfae4458f2377c962278b13cbeae22169aa6f957cbc831b9800fb63b854ac

data/ChangeLog

@@ -0,0 +1,24 @@
+
+Release 0.1.4 - 2016-01-13
+
+* added support for Windows
+
+
+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-18
+
+* The initial release

data/README.md

@@ -12,7 +12,7 @@ This plugin runs a command and writes formatted data to its stdin.
 
 - **command**: command line (string, required)
 
-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.
 
 The command runs `total-task-count * total-seqid-count` times. For example, if there is 3 local files and formatter produces 2 files for each input file, the command is executed for 6 times.
 

data/build.gradle

@@ -12,13 +12,14 @@ 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 "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
     testCompile "junit:junit:4.+"
+    testCompile 'org.embulk:embulk-core:0.7.+:tests'
 }
 
 task classpath(type: Copy, dependsOn: ["jar"]) {

data/src/main/java/org/embulk/output/CommandFileOutputPlugin.java

@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.io.OutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
+
+import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableList;
@@ -32,11 +34,6 @@ public class CommandFileOutputPlugin
         public String getCommand();
     }
 
-    public static final List<String> SHELL = ImmutableList.of(
-        // TODO use ["PowerShell.exe", "-Command"] on windows?
-        "sh", "-c"
-    );
-
     @Override
     public ConfigDiff transaction(ConfigSource config, int taskCount,
             FileOutputPlugin.Control control)
@@ -68,8 +65,9 @@ public class CommandFileOutputPlugin
     {
         PluginTask task = taskSource.loadTask(PluginTask.class);
 
+        List<String> shell = new ShellFactory().build().get();
         List<String> cmdline = new ArrayList<String>();
-        cmdline.addAll(SHELL);
+        cmdline.addAll(shell);
         cmdline.add(task.getCommand());
 
         logger.info("Using command {}", cmdline);
@@ -77,6 +75,26 @@ public class CommandFileOutputPlugin
         return new PluginFileOutput(cmdline, taskIndex);
     }
 
+    @VisibleForTesting
+    static class ShellFactory
+    {
+        private List<String> shell;
+
+        public List<String> get() {
+            return this.shell;
+        }
+
+        public ShellFactory build() {
+            String osName = System.getProperty("os.name");
+            if(osName.indexOf("Windows") >= 0) {
+                this.shell = ImmutableList.of("PowerShell.exe", "-Command");
+            } else {
+                this.shell = ImmutableList.of("sh", "-c");
+            }
+            return this;
+        }
+    }
+
     private static class ProcessWaitOutputStream
             extends FilterOutputStream
     {

data/src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java

@@ -1,5 +1,39 @@
 package org.embulk.output;
 
+import com.google.common.collect.ImmutableList;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.embulk.EmbulkTestRuntime;
+import org.embulk.output.CommandFileOutputPlugin.ShellFactory;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 public class TestCommandFileOutputPlugin
 {
+    @Rule
+    public EmbulkTestRuntime runtime = new EmbulkTestRuntime();
+
+    private ShellFactory shellFactory;
+
+    @Before
+    public void createResources()
+    {
+        shellFactory = new ShellFactory().build();
+    }
+
+    @Test
+    public void testShell() {
+        List<String> shell = shellFactory.get();
+        String osName = System.getProperty("os.name");
+        List<String> actualShellCmd;
+        if (osName.indexOf("Windows") >= 0) {
+            actualShellCmd = ImmutableList.of("PowerShell.exe", "-Command");
+        } else {
+            actualShellCmd = ImmutableList.of("sh", "-c");
+        }
+        assertEquals(actualShellCmd, shell);
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-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
@@ -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/output/command.rb
 - src/main/java/org/embulk/output/CommandFileOutputPlugin.java
 - src/test/java/org/embulk/output/TestCommandFileOutputPlugin.java
-- classpath/embulk-output-command-0.1.3.jar
+- classpath/embulk-output-command-0.1.4.jar
 homepage: https://github.com/embulk/embulk-output-command
 licenses:
 - Apache 2.0