contrast-agent 5.3.0 → 6.1.1

data/ext/cs__contrast_patch/cs__contrast_patch.c

@@ -35,25 +35,29 @@ VALUE contrast_patch_call_original(const VALUE *args) {
     method = args[3];
     method_id = SYM2ID(method);
 
-    /* It looks like we can find the last Ruby block given so long as we don't
-     * change Ruby method scope (always call this function from C, not Ruby),
-     * which is the point of this C call.
-     */
-    /* Ruby >= 2.7 */
-    #ifdef RB_PASS_CALLED_KEYWORDS
-        if (rb_block_given_p()) {
-            return rb_funcall_with_block_kw(object, method_id, argc, params, rb_block_proc(), RB_PASS_CALLED_KEYWORDS);
-        } else {
-            return rb_funcallv_kw(object, method_id, argc, params, RB_PASS_CALLED_KEYWORDS);
-        }
-    /* Ruby < 2.7 */
-    #else
-        if (rb_block_given_p()) {
-            return rb_funcall_with_block(object, method_id, argc, params, rb_block_proc());
-        } else {
-            return rb_funcall2(object, method_id, argc, params);
-        }
-    #endif
+/* It looks like we can find the last Ruby block given so long as we don't
+ * change Ruby method scope (always call this function from C, not Ruby),
+ * which is the point of this C call.
+ */
+/* Ruby >= 2.7 */
+#ifdef RB_PASS_CALLED_KEYWORDS
+    if (rb_block_given_p()) {
+        return rb_funcall_with_block_kw(object, method_id, argc, params,
+                                        rb_block_proc(),
+                                        RB_PASS_CALLED_KEYWORDS);
+    } else {
+        return rb_funcallv_kw(object, method_id, argc, params,
+                              RB_PASS_CALLED_KEYWORDS);
+    }
+/* Ruby < 2.7 */
+#else
+    if (rb_block_given_p()) {
+        return rb_funcall_with_block(object, method_id, argc, params,
+                                     rb_block_proc());
+    } else {
+        return rb_funcall2(object, method_id, argc, params);
+    }
+#endif
 }
 
 VALUE contrast_call_pre_patch(const VALUE method_policy, const VALUE method,
@@ -94,7 +98,7 @@ VALUE rescue_func(VALUE arg1) {
     exception = rb_errinfo();
     rb_exc_raise(exception);
 
-	return Qnil;
+    return Qnil;
 }
 
 VALUE contrast_patch_call_ensure(const VALUE *args) {
@@ -121,7 +125,8 @@ VALUE ensure_wrapper(const VALUE *args) {
     original_args = (VALUE)args[1];
     ensure_args = (VALUE)args[2];
 
-	return rb_ensure(original_method, original_args, contrast_patch_call_ensure, (VALUE)ensure_args);
+    return rb_ensure(original_method, original_args, contrast_patch_call_ensure,
+                     (VALUE)ensure_args);
 }
 
 VALUE contrast_call_super(const VALUE *args) {
@@ -134,7 +139,8 @@ VALUE contrast_call_super(const VALUE *args) {
 }
 
 VALUE contrast_run_patches(const VALUE *wrapped_args) {
-    VALUE impl, method, method_policy, object, original_args, original_ret, preshift, transformed_ret;
+    VALUE impl, method, method_policy, object, original_args, original_ret,
+        preshift, transformed_ret;
     int argc;
     VALUE *argv;
     VALUE ensure_args[6];
@@ -198,12 +204,14 @@ VALUE contrast_run_patches(const VALUE *wrapped_args) {
     switch (impl) {
     case IMPL_ALIAS_INSTANCE:
     case IMPL_ALIAS_SINGLETON:
-        original_ret = rb_rescue(ensure_wrapper, rescue_wrapper_args, rescue_func, Qnil);
+        original_ret =
+            rb_rescue(ensure_wrapper, rescue_wrapper_args, rescue_func, Qnil);
         break;
     case IMPL_PREPEND_INSTANCE:
     case IMPL_PREPEND_SINGLETON:
         rescue_wrapper_args[0] = contrast_call_super;
-        original_ret = rb_rescue(ensure_wrapper, rescue_wrapper_args, rescue_func, Qnil);
+        original_ret =
+            rb_rescue(ensure_wrapper, rescue_wrapper_args, rescue_func, Qnil);
         break;
     };
 
@@ -272,9 +280,9 @@ VALUE contrast_patch_dispatch(const int argc, const VALUE *argv,
             rb_funcall(patch_status, rb_sym_info_for, 3, object, method, Qtrue);
         break;
     case IMPL_PREPEND_SINGLETON:
-       known =
-           rb_funcall(patch_status, rb_sym_info_for, 3, object, method, Qfalse);
-       break;
+        known = rb_funcall(patch_status, rb_sym_info_for, 3, object, method,
+                           Qfalse);
+        break;
     case IMPL_ALIAS_SINGLETON:
         known = rb_funcall(patch_status, rb_sym_info_for, 3, object, method,
                            Qfalse);
@@ -337,14 +345,14 @@ VALUE contrast_patch_dispatch(const int argc, const VALUE *argv,
     wrapped_args[5] = INT2NUM(argc);
     wrapped_args[6] = (VALUE)argv;
 
-    return rb_ensure(contrast_run_patches, (VALUE)wrapped_args, contrast_ensure_function, method_policy);
+    return rb_ensure(contrast_run_patches, (VALUE)wrapped_args,
+                     contrast_ensure_function, method_policy);
 
 call_original:
 
     /* exit scope */
     contrast_ensure_function(method_policy);
 
-
     switch (impl) {
     case IMPL_ALIAS_INSTANCE:
     case IMPL_ALIAS_SINGLETON:
@@ -366,19 +374,22 @@ VALUE contrast_alias_singleton_patch(const int argc, const VALUE *argv,
 }
 
 VALUE contrast_prepend_instance_patch(const int argc, const VALUE *argv,
-                             const VALUE object) {
+                                      const VALUE object) {
     return contrast_patch_dispatch(argc, argv, IMPL_PREPEND_INSTANCE, object);
 }
 
 VALUE contrast_prepend_singleton_patch(const int argc, const VALUE *argv,
-                             const VALUE object) {
+                                       const VALUE object) {
     return contrast_patch_dispatch(argc, argv, IMPL_PREPEND_SINGLETON, object);
 }
 
-VALUE contrast_patch_define_method(const VALUE self, const VALUE clazz, const VALUE method_policy,
+VALUE contrast_patch_define_method(const VALUE self, const VALUE clazz,
+                                   const VALUE method_policy,
                                    const VALUE cs_method) {
-    const VALUE original_method_name = rb_funcall(method_policy, rb_sym_method_name, 0);
-    const VALUE is_instance_method = rb_funcall(method_policy, rb_sym_instance_method, 0);
+    const VALUE original_method_name =
+        rb_funcall(method_policy, rb_sym_method_name, 0);
+    const VALUE is_instance_method =
+        rb_funcall(method_policy, rb_sym_instance_method, 0);
     char *cStr;
     VALUE str;
     rb_funcall(patch_status, rb_sym_set_info_for, 5, clazz,
@@ -444,8 +455,8 @@ VALUE contrast_patch_prepend(const VALUE self, const VALUE originalModule,
     const VALUE is_instance_method =
         rb_funcall(method_policy, rb_sym_instance_method, 0);
 
-// Set the value for instance or singleton method
-    if (RTEST(is_instance_method)){
+    // Set the value for instance or singleton method
+    if (RTEST(is_instance_method)) {
         rb_funcall(patch_status, rb_sym_set_info_for, 5, originalModule,
                    original_method_name, method_policy, instance, Qnil);
 
@@ -462,20 +473,22 @@ VALUE contrast_patch_prepend(const VALUE self, const VALUE originalModule,
             rb_define_private_method(module, cMethodName,
                                      contrast_prepend_instance_patch, -1);
         } else {
-            rb_define_method(module, cMethodName, contrast_prepend_instance_patch, -1);
+            rb_define_method(module, cMethodName,
+                             contrast_prepend_instance_patch, -1);
         }
     } else {
-        rb_define_singleton_method(module, cMethodName, contrast_prepend_singleton_patch,
-                                   -1);
+        rb_define_singleton_method(module, cMethodName,
+                                   contrast_prepend_singleton_patch, -1);
     }
     rb_prepend_module(originalModule, module);
 
     if (rb_ver_below_three()) {
         VALUE module_at;
-        VALUE rb_incl_in_mod_ary = rb_funcall(originalModule, rb_intern("included_in"), 0);
+        VALUE rb_incl_in_mod_ary =
+            rb_funcall(originalModule, rb_intern("included_in"), 0);
         if (RB_TYPE_P(rb_incl_in_mod_ary, T_ARRAY)) {
             int i = 0;
-            int size = rb_funcall(rb_incl_in_mod_ary, rb_intern("length"), 0);
+            int size = RARRAY_LEN(rb_incl_in_mod_ary);
             for (i = 0; i < size; ++i) {
                 module_at = rb_ary_entry(rb_incl_in_mod_ary, i);
                 if (RB_TYPE_P(module_at, T_MODULE)) {
@@ -483,7 +496,7 @@ VALUE contrast_patch_prepend(const VALUE self, const VALUE originalModule,
                 }
             }
         }
-   }
+    }
     return Qtrue;
 }
 
@@ -512,7 +525,6 @@ void Init_cs__contrast_patch(void) {
     rb_sym_scopes_to_enter = rb_intern("scopes_to_enter");
     rb_sym_scopes_to_exit = rb_intern("scopes_to_exit");
 
-
     rb_define_module_function(contrast_patcher(), "contrast_define_method",
                               contrast_patch_define_method, 3);
 
@@ -524,5 +536,4 @@ void Init_cs__contrast_patch(void) {
 
     /* preshift_class = Contrast::Agent::Assess::PreShift */
     preshift_class = rb_define_class_under(assess, "PreShift", rb_cObject);
-
 }

data/ext/cs__os_information/cs__os_information.c

@@ -8,24 +8,27 @@
 
 VALUE contrast, utils, os;
 
-VALUE contrast_get_system_information()
-{
+VALUE contrast_get_system_information() {
     struct utsname uname_pointer;
 
-    uname (&uname_pointer);
+    uname(&uname_pointer);
 
     VALUE rb_data_hash = rb_hash_new();
-    rb_hash_aset(rb_data_hash, rb_str_new2("os_type"), rb_str_new2(uname_pointer.sysname));
-    rb_hash_aset(rb_data_hash, rb_str_new2("os_version"), rb_str_new2(uname_pointer.release));
-    rb_hash_aset(rb_data_hash, rb_str_new2("os_complete_version"), rb_str_new2(uname_pointer.version));
-    rb_hash_aset(rb_data_hash, rb_str_new2("os_arch"), rb_str_new2(uname_pointer.machine));
+    rb_hash_aset(rb_data_hash, rb_str_new2("os_type"),
+                 rb_str_new2(uname_pointer.sysname));
+    rb_hash_aset(rb_data_hash, rb_str_new2("os_version"),
+                 rb_str_new2(uname_pointer.release));
+    rb_hash_aset(rb_data_hash, rb_str_new2("os_complete_version"),
+                 rb_str_new2(uname_pointer.version));
+    rb_hash_aset(rb_data_hash, rb_str_new2("os_arch"),
+                 rb_str_new2(uname_pointer.machine));
     return rb_data_hash;
 }
 
-void Init_cs__os_information(void)
-{
+void Init_cs__os_information(void) {
     contrast = rb_define_module("Contrast");
     utils = rb_define_module_under(contrast, "Utils");
     os = rb_define_module_under(utils, "OS");
-    rb_define_module_function(os, "get_system_information", contrast_get_system_information, 0);
+    rb_define_module_function(os, "get_system_information",
+                              contrast_get_system_information, 0);
 }