From 768e58c8d9763628255898099242f789cdcc400d Mon Sep 17 00:00:00 2001
From: Andrei Dreyer <andrei@whirlylabs.com>
Date: Tue, 8 Oct 2024 12:11:42 +0200
Subject: [PATCH 1/4] trying to fix require issues on joern side

---
 ruby_ast_gen.gemspec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ruby_ast_gen.gemspec b/ruby_ast_gen.gemspec
index 0d28fe8..e9d7c36 100644
--- a/ruby_ast_gen.gemspec
+++ b/ruby_ast_gen.gemspec
@@ -23,8 +23,9 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   gemspec = File.basename(__FILE__)
-  spec.files = Dir.glob("{lib,exe,sig,vendor}/**/*") + %w[README.md LICENSE.txt Rakefile]
+  spec.files = Dir["lib/**/*.rb", "exe/**/*", "sig/**/*", "vender/**/*", "README.md", "LICENSE.txt", "RAKEFILE"]
+  # spec.files = Dir.glob("{lib,exe,sig,vendor}/**/*") + %w[README.md LICENSE.txt Rakefile]
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib", "vendor/bundle"]
 end

From 1cc91b52cd515153da29b379f81d43907c305066 Mon Sep 17 00:00:00 2001
From: Andrei Dreyer <andrei@whirlylabs.com>
Date: Tue, 8 Oct 2024 12:25:57 +0200
Subject: [PATCH 2/4] Update gemfile

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1f43650..e9c0487 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_ast_gen (0.6.0)
+    ruby_ast_gen (0.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -44,4 +44,4 @@ DEPENDENCIES
   slop (~> 4.10)
 
 BUNDLED WITH
-   2.5.18
+   2.5.21

From 2387bac6fe2203dc97d3ce6798354798d269dfcd Mon Sep 17 00:00:00 2001
From: Andrei Dreyer <andrei@whirlylabs.com>
Date: Tue, 8 Oct 2024 14:05:55 +0200
Subject: [PATCH 3/4] Reverted cahnges on gemspec file, added vendor/bundler
 folders to LOAD_PATH in exe script

---
 exe/ruby_ast_gen     | 5 ++++-
 ruby_ast_gen.gemspec | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/exe/ruby_ast_gen b/exe/ruby_ast_gen
index 0d93b66..7eb4a09 100755
--- a/exe/ruby_ast_gen
+++ b/exe/ruby_ast_gen
@@ -1,7 +1,10 @@
 #!/usr/bin/env ruby
 
-require "slop"
+libs = File.expand_path("../../vendor/bundle/ruby/3.0.0/gems/**/lib", __FILE__)
+$LOAD_PATH.unshift *Dir.glob(libs)
+
 require "bundler/setup"
+require "slop"
 
 require_relative "../lib/ruby_ast_gen"
 
diff --git a/ruby_ast_gen.gemspec b/ruby_ast_gen.gemspec
index e9d7c36..0d28fe8 100644
--- a/ruby_ast_gen.gemspec
+++ b/ruby_ast_gen.gemspec
@@ -23,9 +23,8 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   gemspec = File.basename(__FILE__)
-  spec.files = Dir["lib/**/*.rb", "exe/**/*", "sig/**/*", "vender/**/*", "README.md", "LICENSE.txt", "RAKEFILE"]
-  # spec.files = Dir.glob("{lib,exe,sig,vendor}/**/*") + %w[README.md LICENSE.txt Rakefile]
+  spec.files = Dir.glob("{lib,exe,sig,vendor}/**/*") + %w[README.md LICENSE.txt Rakefile]
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib", "vendor/bundle"]
+  spec.require_paths = ["lib"]
 end

From 6a066a87ad4261def2fa51e258572877f6b35f95 Mon Sep 17 00:00:00 2001
From: Andrei Dreyer <andrei@whirlylabs.com>
Date: Tue, 8 Oct 2024 15:29:41 +0200
Subject: [PATCH 4/4] Added wildcard for ruby version folder to libs

---
 exe/ruby_ast_gen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exe/ruby_ast_gen b/exe/ruby_ast_gen
index 7eb4a09..42842e9 100755
--- a/exe/ruby_ast_gen
+++ b/exe/ruby_ast_gen
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-libs = File.expand_path("../../vendor/bundle/ruby/3.0.0/gems/**/lib", __FILE__)
+libs = File.expand_path("../../vendor/bundle/ruby/*/gems/**/lib", __FILE__)
 $LOAD_PATH.unshift *Dir.glob(libs)
 
 require "bundler/setup"