merge

Author: MrBlaTi

.gitignore

@@ -55,3 +55,5 @@ build-iPhoneSimulator/
 
 dummy
 temp
+TODO
+*.gch

.travis.yml

@@ -28,6 +28,10 @@ env:
 - MRUBY_VERSION=1.2.0
 - MRUBY_VERSION=head
 
+matrix:
+  allow_failures:
+  - env: MRUBY_VERSION=1.2.0
+
 script:
 - rake compile
 - rake test

README.md

@@ -5,16 +5,16 @@ Implementation of the Ruby 2.4.1 Core Library _Process_ for [mruby][mruby].
 All listed methods have been tested with Ubuntu, MacOS and Windows. Cross compilation works as well.
 
 ```ruby
-pid = spawn('ls', '-la')
+system { VAR: 'var' }, 'echo $VAR', out: pipe
 ```
 
-Include [process.h][process_h] to use the native methods within your own project:
+Include [mruby/ext/process.h][process_h] to use the native methods within your own project:
 
 ```c
 // To use kill, waitpid, fork, spawn, ... on Unix and Win32
 
 #ifdef HAVE_MRB_PROCESS_H
-# include 'process.h'
+# include "mruby/ext/process.h"
 #endif
 
 static pid_t
@@ -205,9 +205,9 @@ DEALINGS IN THE SOFTWARE.
 
 
 [mruby]: https://github.com/mruby/mruby
+[process_h]: https://github.com/appPlant/mruby-process/blob/windows/include/mruby/ext/process.h
 [mruby-process-ext]: https://github.com/ksss/mruby-process-ext
 [mruby-process-sys]: https://github.com/haconiwa/mruby-process-sys
 [mruby-sleep]: https://github.com/matsumotory/mruby-sleep
 [mruby-io]: https://github.com/iij/mruby-io
 [mruby-signal]: https://github.com/ksss/mruby-signal
-[process_h]: https://github.com/appPlant/mruby-process/blob/windows/include/process.h

include/process.h include/mruby/ext/process.hinclude/process.h renamed to include/mruby/ext/process.h

@@ -19,19 +19,23 @@
 # SOFTWARE.
 
 def target_win32?
-  return true if ENV['OS'] == 'Windows_NT'
+  return true if RUBY_PLATFORM =~ /mingw|mswin/
   build.is_a?(MRuby::CrossBuild) && build.host_target.to_s =~ /mingw/
 end
 
 MRuby::Gem::Specification.new('mruby-process') do |spec|
   spec.license = 'MIT'
   spec.authors = 'mruby developers'
 
-  spec.add_test_dependency 'mruby-print',       core: 'mruby-print'
-  spec.add_test_dependency 'mruby-env',         mgem: 'mruby-env'
-  spec.add_test_dependency 'mruby-os',          mgem: 'mruby-os'
+  spec.add_test_dependency 'mruby-print', core: 'mruby-print'
+  spec.add_test_dependency 'mruby-env',   mgem: 'mruby-env'
+  spec.add_test_dependency 'mruby-os',    mgem: 'mruby-os'
 
-  spec.cc.defines << 'HAVE_MRB_PROCESS_H'
+  spec.mruby.cc.defines << 'HAVE_MRB_PROCESS_H'
+
+  [spec.cc, spec.mruby.cc].each do |cc|
+    cc.include_paths << "#{spec.dir}/include/mruby/ext"
+  end
 
   ENV['RAND'] = Time.now.to_i.to_s if build.test_enabled?
 

include/process.h.gch

@@ -19,17 +19,15 @@
  * SOFTWARE.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
 #include "mruby.h"
 #include "mruby/class.h"
 #include "mruby/hash.h"
 #include "mruby/array.h"
 #include "mruby/string.h"
 #include "dln.c"
 
-
+#include <stdlib.h>
+#include <string.h>
 
 typedef struct mrb_execarg {
     struct {

mrbgem.rake

@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-
-
 #include <sys/stat.h>
 #include <fcntl.h>
 

src/internal.c

@@ -19,12 +19,11 @@
  * SOFTWARE.
  */
 
-#include "process.h"
-
 #include "mruby.h"
 #include "mruby/variable.h"
 #include "mruby/array.h"
 #include "mruby/error.h"
+#include "mruby/ext/process.h"
 
 #include "internal.c"
 

src/posix.c

@@ -21,8 +21,7 @@
 
 #include "mruby.h"
 #include "mruby/variable.h"
-
-#include "process.h"
+#include "mruby/ext/process.h"
 
 static mrb_value
 mrb_pst_new(mrb_state *mrb, pid_t pid, mrb_int status)