Fix ci build

Author: katzer

test/process.rb

@@ -18,11 +18,25 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+class String
+  def strip
+    a = 0
+    z = size - 1
+    a += 1 while a <= z and " \f\n\r\t\v".include?(self[a])
+    z -= 1 while a <= z and " \f\n\r\t\v\0".include?(self[z])
+    z >= 0 ? self[a..z] : ''
+  end
+end unless ''.respond_to? :strip
+
+def IO.sysopen(path, mod)
+  ProcessTest.sysopen(path, mod)
+end if OS.windows?
+
 def read(path)
   f = File.open(path)
-  f.read.to_s[0..-2]
+  f.read.to_s.strip
 ensure
-  f.close
+  f.close if f
 end
 
 def wait_for_pid(pid)
@@ -32,14 +46,6 @@ def wait_for_pid(pid)
   end
 end
 
-if OS.windows?
-  class IO
-    def self.sysopen(path, _mod)
-      ProcessTest.sysopen(path)
-    end
-  end
-end
-
 def assert_not_windows(*args, &block)
   assert(*args, &block) if OS.posix?
 end
@@ -117,7 +123,7 @@ def assert_windows(*args, &block)
   assert_equal $?.pid, pid
 
   var = "#{ENV['RAND']}x"
-  pid = spawn("echo #{var}>tmp/spawn.txt")
+  pid = spawn("echo #{var} > tmp/spawn.txt")
 
   wait_for_pid(pid)
   assert_equal var, read('tmp/spawn.txt')
@@ -126,12 +132,13 @@ def assert_windows(*args, &block)
 assert('Process.spawn', 'env') do
   var = "x#{ENV['RAND']}"
   env = OS.posix? ? '$MYVAR' : '%MYVAR%'
-  pid = spawn({ MYVAR: var }, "echo #{env}>tmp/spawn.txt")
+  pid = spawn({ MYVAR: var }, "echo #{env} > tmp/spawn.txt")
 
   wait_for_pid(pid)
   assert_equal var, read('tmp/spawn.txt')
 end
 
+# TODO: More tests for edge cases!
 assert('Process.spawn', 'pipe') do
   begin
     var = ENV['RAND']
@@ -145,7 +152,8 @@ def assert_windows(*args, &block)
     pid = spawn({ MYVAR: var }, "echo #{env}", out: pip)
 
     wait_for_pid(pid)
-    assert_equal "#{var}\n#{var}", read('tmp/pipe.txt')
+
+    assert_equal var * 2, read('tmp/pipe.txt').sub("\r", '').sub("\n", '')
   ensure
     IO._sysclose(pip) if OS.posix?
   end
@@ -252,7 +260,7 @@ def assert_windows(*args, &block)
   var = ENV['RAND']
   env = OS.posix? ? '$MYVAR' : '%MYVAR%'
 
-  system({ MYVAR: var }, "echo #{env}>tmp/system.txt")
+  system({ MYVAR: var }, "echo #{env} > tmp/system.txt")
 
   assert_equal var, read('tmp/system.txt')
 end

test/process_test.c

@@ -20,56 +20,25 @@
  */
 
 #include "mruby.h"
-#include "mruby/string.h"
 
 #if !defined(__APPLE__) && !defined(__linux__)
 
-#include <sys/types.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <winsock.h>
+#include "mruby/string.h"
+#include <windows.h>
 #include <io.h>
 
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <dirent.h>
-
-
 static mrb_value
-mrb_io_test_sysopen(mrb_state *mrb, mrb_value self)
+mrb_process_mock_sysopen(mrb_state *mrb, mrb_value self)
 {
-  mrb_value toReturn;
-  DIR* dir = opendir("tmp");
-  // FILE *fp;
-  mrb_value file;
-  HANDLE foo;
-
-  if (dir)
-  {
-      /* Directory exists. */
-      closedir(dir);
-  }
-  else if (ENOENT == errno)
-  {
-      mkdir("tmp");
-  }
-  else
-  {
-      /* opendir() failed for some other reason. */
-  }
-
+    mrb_int file_len, mod_len;
+    char *file, *mod;
+    HANDLE handle;
 
-  mrb_get_args(mrb, "S", &file);
+    mrb_get_args(mrb, "ss", &file, &file_len, &mod, &mod_len);
 
-  // if( access( mrb_string_value_ptr(mrb,file), F_OK ) = -1 ) {
-  //     fp = fopen(mrb_string_value_ptr(mrb,file) ,"a");
-  //     fclose(fp);
-  // }
+    handle = (HANDLE) _get_osfhandle(fileno(fopen(file, mod)));
 
-  foo = (HANDLE)_get_osfhandle(fileno(fopen(mrb_string_value_ptr(mrb,file), "w")));
-  return mrb_cptr_value(mrb,foo);
+    return mrb_cptr_value(mrb, handle);
 }
 
 #endif
@@ -78,8 +47,8 @@ mrb_io_test_sysopen(mrb_state *mrb, mrb_value self)
 void
 mrb_mruby_process_gem_test(mrb_state* mrb)
 {
-  struct RClass *io_test = mrb_define_module(mrb, "ProcessTest");
+    struct RClass *pt = mrb_define_module(mrb, "ProcessTest");
 #if !defined(__APPLE__) && !defined(__linux__)
-  mrb_define_class_method(mrb, io_test, "sysopen", mrb_io_test_sysopen, MRB_ARGS_REQ(1));
+    mrb_define_class_method(mrb, pt, "sysopen", mrb_process_mock_sysopen, MRB_ARGS_REQ(2));
 #endif
 }