align Dir[] and Dir.glob with kwargs and reset early

Author: kares

core/src/main/java/org/jruby/RubyDir.java

@@ -234,9 +234,6 @@ private static class GlobOptions {
     private static void globOptions(ThreadContext context, IRubyObject[] args, String[] keys, GlobOptions options) {
         Ruby runtime = context.runtime;
 
-        // just clear callInfo for now; future PR will handle it appropriately
-        ThreadContext.resetCallInfo(context);
-
         if (args.length > 1) {
             IRubyObject tmp = TypeConverter.checkHashType(runtime, args[args.length - 1]);
             boolean processFlags = keys == BASE_FLAGS_KEYWORDS;
@@ -277,6 +274,7 @@ private static void globOptions(ThreadContext context, IRubyObject[] args, Strin
 
     @JRubyMethod(name = "[]", rest = true, meta = true, keywords = true)
     public static IRubyObject aref(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        ThreadContext.resetCallInfo(context);
         Ruby runtime = context.runtime;
         GlobOptions options = new GlobOptions();
         globOptions(context, args, BASE_KEYWORDS, options);
@@ -324,8 +322,9 @@ private static ByteList globArgumentAsByteList(ThreadContext context, IRubyObjec
      * with each filename is passed to the block in turn. In this case, Nil is
      * returned.
      */
-    @JRubyMethod(required = 1, optional = 2, checkArity = false, meta = true)
+    @JRubyMethod(required = 1, optional = 2, checkArity = false, meta = true, keywords = true)
     public static IRubyObject glob(ThreadContext context, IRubyObject recv, IRubyObject[] args, Block block) {
+        ThreadContext.resetCallInfo(context);
         Arity.checkArgumentCount(context, args, 1, 3);
 
         Ruby runtime = context.runtime;