Ruby: Do not expose AST layer through ruby.qll

Author: hvitved

.github/workflows/ruby-build.yml

@@ -197,7 +197,7 @@ jobs:
       - name: Prepare test files
         shell: bash
         run: |
-          echo "import ruby select count(File f)" > "test.ql"
+          echo "import codeql.ruby.AST select count(File f)" > "test.ql"
           echo "| 4 |" > "test.expected"
           echo 'name: sample-tests
           version: 0.0.0

ruby/ql/examples/snippets/emptythen.ql

@@ -11,7 +11,7 @@
  *       statement
  */
 
-import ruby
+import codeql.ruby.AST
 
 from IfExpr i
 where not exists(i.getThen().getAChild())

ruby/ql/lib/Customizations.qll

@@ -9,4 +9,3 @@
  * to model frameworks that are not covered by the standard library.
  */
 
-import ruby

ruby/ql/lib/codeql/ruby/AST.qll

@@ -17,6 +17,7 @@ private import ast.internal.AST
 private import ast.internal.Scope
 private import ast.internal.Synthesis
 private import ast.internal.TreeSitter
+private import Customizations
 
 cached
 private module Cached {

ruby/ql/lib/codeql/ruby/ApiGraphs.qll

@@ -6,7 +6,7 @@
  * directed and labeled; they specify how the components represented by nodes relate to each other.
  */
 
-private import ruby
+private import codeql.ruby.AST
 private import codeql.ruby.DataFlow
 private import codeql.ruby.typetracking.TypeTracker
 private import codeql.ruby.ast.internal.Module

ruby/ql/lib/codeql/ruby/CFG.qll

@@ -1,5 +1,6 @@
 /** Provides classes representing the control flow graph. */
 
+import codeql.Locations
 import controlflow.ControlFlowGraph
 import controlflow.CfgNodes as CfgNodes
 import controlflow.BasicBlocks

ruby/ql/lib/codeql/ruby/DataFlow.qll

@@ -2,6 +2,9 @@
  * Provides classes for performing local (intra-procedural) and
  * global (inter-procedural) data flow analyses.
  */
+
+import codeql.Locations
+
 module DataFlow {
   import codeql.ruby.dataflow.internal.DataFlowImpl
 }

ruby/ql/lib/codeql/ruby/InclusionTests.qll

@@ -2,7 +2,7 @@
  * Contains classes for recognizing array and string inclusion tests.
  */
 
-private import ruby
+private import codeql.ruby.AST
 private import codeql.ruby.DataFlow
 private import codeql.ruby.controlflow.CfgNodes
 

ruby/ql/lib/codeql/ruby/StringOps.qll

@@ -2,7 +2,7 @@
  * Provides classes and predicates for reasoning about string-manipulating expressions.
  */
 
-private import ruby
+private import codeql.ruby.AST
 private import codeql.ruby.DataFlow
 private import codeql.ruby.controlflow.CfgNodes
 private import InclusionTests

ruby/ql/lib/codeql/ruby/ast/Erb.qll

@@ -1,4 +1,3 @@
-private import codeql.Locations
 private import codeql.ruby.AST
 private import internal.Erb
 private import internal.TreeSitter