readapt 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 576bfe9759ad1652ed7e1f9be3275e7edf0a6e18bc168f35a97b4b30a0a9728b
-  data.tar.gz: 77c1174abc7c9c3af32f383ad08eaa530580386c2c1bc9547d1021839ff52e6a
+  metadata.gz: ca110db308531d06091109f30be41eade7e691deedef85925b758510590142a1
+  data.tar.gz: 75527ab9f084610c45a5bd2127e45d10c805b47f64932b96468869eabcdd1faf
 SHA512:
-  metadata.gz: f1f25315559f32d7d5e1e4577abdbefca704bfd3e40678bb830ec7ad9e01ec6bb5e10cb0056a68d2e05434651d72331d5347f8096c5bc7bbd4122a6dbdae2e99
-  data.tar.gz: 0a8bb70abe9d5e9b8b856a2d42c27dc29e17b0e7242a20fcda56ba2977803eceb7b7e1ba69b5d8e14d91ccdc0dd4671d67021d0a05df59cc392f7344592b9d9c
+  metadata.gz: 3c3f6ca8d4bdce3fed59f0dafc98713ca48d85aa1a7676203c16da6ae6f43563e499942648b7022ccd546e6e9ebcdee2898dc136121e9b4bccd889dd3519ce4f
+  data.tar.gz: f7f7c707ae55f1ac8433e9ac682f9cd39f6c44195f4403b70f0917e9957102c87f730bb8eab20fd241774e17b290be0eab7b81308881a87fd6a24ba544803c8c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.3.4 - August 12, 2019
+- Monitor normalizes paths.
+
 # 0.3.3 - August 12, 2019
 - Remove RB_NIL_P for backwards compatibility
 

data/ext/readapt/monitor.c

@@ -1,10 +1,13 @@
 #include "ruby.h"
 #include "ruby/debug.h"
 #include "threads.h"
+#include "normalize.h"
 
+static VALUE readapt;
 static VALUE m_Monitor;
 static VALUE c_Snapshot;
 
+static VALUE readapt;
 static VALUE tpLine;
 static VALUE tpCall;
 static VALUE tpReturn;
@@ -112,10 +115,10 @@ process_line_event(VALUE tracepoint, void *data)
 			if (!firstLineEvent || threadPaused || knownBreakpoints || ptr->control != rb_intern("continue"))
 			{
 				tp = rb_tracearg_from_tracepoint(tracepoint);
-				tp_file = rb_tracearg_path(tp);
+				tp_file = normalize_path(rb_tracearg_path(tp));
 				tp_line = NUM2INT(rb_tracearg_lineno(tp));
 
-				dapEvent = NULL;
+				dapEvent = rb_intern("continue");
 				if (!firstLineEvent)
 				{
 					dapEvent = rb_intern("initialize");
@@ -136,7 +139,8 @@ process_line_event(VALUE tracepoint, void *data)
 				{
 					dapEvent = rb_intern("entry");
 				}
-				if (dapEvent)
+
+				if (dapEvent != rb_intern("continue"))
 				{
 					result = monitor_debug(tp_file, tp_line, tracepoint, ptr, dapEvent);
 					if (dapEvent == rb_intern("initialize") && result == rb_intern("ready"))
@@ -146,6 +150,11 @@ process_line_event(VALUE tracepoint, void *data)
 						process_line_event(tracepoint, data);
 					}
 				}
+				else
+				{
+					ptr->prev_file = Qnil;
+					ptr->prev_line = Qnil;
+				}
 			}
 			else
 			{
@@ -304,6 +313,7 @@ monitor_know_breakpoints_s(VALUE self)
 
 void initialize_monitor(VALUE m_Readapt)
 {
+	readapt = m_Readapt;
 	m_Monitor = rb_define_module_under(m_Readapt, "Monitor");
 	c_Snapshot = rb_define_class_under(m_Readapt, "Snapshot", rb_cObject);
 

data/ext/readapt/normalize.c

@@ -0,0 +1,54 @@
+#include "ruby.h"
+#include "ruby/debug.h"
+
+static int isWindows;
+
+static int
+checkIfWindows()
+{
+    VALUE regexp, result;
+    
+    regexp = rb_reg_new("/cygwin|mswin|mingw|bccwin|wince|emx/", 37, 0);
+    result = rb_reg_match(regexp, rb_str_new_cstr(RUBY_PLATFORM));
+    return result == Qnil ? 0 : 1;
+}
+
+VALUE
+normalize_path(VALUE str)
+{
+    VALUE result;
+    char *buffer;
+    long i, len;
+
+    if (isWindows)
+    {
+        buffer = malloc((rb_str_strlen(str) + 1) * sizeof(char));
+        strcpy(buffer, StringValueCStr(str));
+        buffer[0] = toupper(buffer[0]);
+        len = strlen(buffer);
+        for (i = 2; i < len; i++)
+        {
+            if (buffer[i] == '\\')
+            {
+                buffer[i] = '/';
+            }
+        }
+        result = rb_str_new_cstr(buffer);
+        free(buffer);
+        return result;
+    }
+    return str;
+}
+
+static VALUE
+normalize_path_s(VALUE self, VALUE str)
+{
+    return normalize_path(str);
+}
+
+void initialize_normalize(VALUE m_Readapt)
+{
+    isWindows = checkIfWindows();
+    
+    rb_define_singleton_method(m_Readapt, "normalize_path", normalize_path_s, 1);
+}

data/ext/readapt/normalize.h

@@ -0,0 +1,2 @@
+void initialize_normalize(VALUE);
+VALUE normalize_path(VALUE);

data/ext/readapt/readapt.c

@@ -1,6 +1,7 @@
 #include "ruby.h"
 #include "ruby/debug.h"
 #include "monitor.h"
+#include "normalize.h"
 
 static VALUE m_Readapt;
 
@@ -8,5 +9,6 @@ void Init_readapt()
 {
 	m_Readapt = rb_define_module("Readapt");
 
+	initialize_normalize(m_Readapt);
 	initialize_monitor(m_Readapt);
 }

data/lib/readapt.rb

@@ -17,18 +17,4 @@ require 'readapt/readapt'
 require 'readapt/shell'
 
 module Readapt
-  class Error < StandardError; end
-  # Your code goes here...
-end
-
-Readapt.module_exec do
-  if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-    define_singleton_method :normalize_path do |path|
-      path[0].upcase + path[1..-1].gsub('\\', '/')
-    end
-  else
-    define_singleton_method :normalize_path do |path|
-      path
-    end
-  end
 end

data/lib/readapt/version.rb

@@ -1,3 +1,3 @@
 module Readapt
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: readapt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Fred Snyder
@@ -119,6 +119,8 @@ files:
 - ext/readapt/extconf.rb
 - ext/readapt/monitor.c
 - ext/readapt/monitor.h
+- ext/readapt/normalize.c
+- ext/readapt/normalize.h
 - ext/readapt/readapt.c
 - ext/readapt/threads.c
 - ext/readapt/threads.h