feat: support Ruby 3.4.1

tamatebako · Jan 1, 2025 · 6ba5162 · 6ba5162
1 parent 1443df9
commit 6ba5162
Show file tree

Hide file tree

Showing 9 changed files with 150 additions and 13 deletions.
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
@@ -121,7 +121,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
     env: ${{ matrix.env }}
     steps:
       - name: Install packages
@@ -178,7 +178,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
     env: ${{ matrix.env }}
     steps:
       - name: Install packages
@@ -234,7 +234,7 @@ jobs:
         env:
           - { CC: gcc,   CXX: g++,     ALPINE_VER: "3.17" }
           - { CC: clang, CXX: clang++, ALPINE_VER: "3.17" }
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6']
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1']
     env: ${{ matrix.env }}
     steps:
       - name: Install packages

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -114,7 +114,7 @@ jobs:
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
 
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment
@@ -167,7 +167,7 @@ jobs:
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
 
-        package_ruby_ver: [ '3.3.6' ]
+        package_ruby_ver: [ '3.3.6', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment
@@ -218,7 +218,7 @@ jobs:
           - { os: macos-14, xcode: 15.0.1, LG_VADDR: 39}
           - { os: macos-14, xcode: 15.4 }
           - { os: macos-15, xcode: 16.1 }
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
         ruby_ver: ['3.2.6']
     steps:
       - name: Checkout tebako packaging environment

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -112,7 +112,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }
@@ -162,7 +162,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }
@@ -211,7 +211,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6' ]
+        package_ruby_ver: [ '2.7.8', '3.0.7', '3.1.6', '3.2.4', '3.2.5', '3.2.6', '3.3.3', '3.3.4', '3.3.5', '3.3.6', '3.4.1' ]
         env:
           - { os: ubuntu-20.04, CC: gcc-10,   CXX: g++-10 }
           - { os: ubuntu-20.04, CC: clang-12, CXX: clang++-12 }

diff --git a/.github/workflows/windows-msys.yml b/.github/workflows/windows-msys.yml
@@ -149,7 +149,7 @@ jobs:
           - sys: ucrt64
             CC: gcc
             CXX: g++
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
         script: ['bundle', 'app']
     env: ${{ matrix.env }}
 
@@ -232,7 +232,7 @@ jobs:
           - sys: ucrt64
             CC: gcc
             CXX: g++
-        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6' ]
+        package_ruby_ver: [ '3.1.6', '3.2.6', '3.3.6', '3.4.1' ]
     env: ${{ matrix.env }}
 
     defaults:

diff --git a/include/tebako/tebako-prism.h b/include/tebako/tebako-prism.h
@@ -0,0 +1,49 @@
+static pm_string_init_result_t
+tebako_string_file_init(pm_string_t *string, const char *filepath) {
+
+    // Open the file for reading
+    int fd = open(filepath, O_RDONLY);
+    if (fd == -1) {
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Stat the file to get the file size
+    struct stat sb;
+    if (fstat(fd, &sb) == -1) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    // Ensure it is a file and not a directory
+    if (S_ISDIR(sb.st_mode)) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_DIRECTORY;
+    }
+
+    // Check the size to see if it's empty
+    size_t size = (size_t) sb.st_size;
+    if (size == 0) {
+        close(fd);
+        const uint8_t source[] = "";
+        *string = (pm_string_t) { .type = PM_STRING_CONSTANT, .source = source, .length = 0 };
+        return PM_STRING_INIT_SUCCESS;
+    }
+
+    size_t length = (size_t) size;
+    uint8_t *source = xmalloc(length);
+    if (source == NULL) {
+        close(fd);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    long bytes_read = (long) read(fd, source, length);
+    close(fd);
+
+    if (bytes_read == -1) {
+        xfree(source);
+        return PM_STRING_INIT_ERROR_GENERIC;
+    }
+
+    *string = (pm_string_t) { .type = PM_STRING_OWNED, .source = source, .length = length };
+    return PM_STRING_INIT_SUCCESS;
+}
diff --git a/lib/tebako/packager/pass1.rb b/lib/tebako/packager/pass1.rb
@@ -174,7 +174,7 @@ def get_patch_map(ostype, mount_point, ruby_ver)
 
         private
 
-        include Tebako::Packager::PatchLiterals
+        #        include Tebako::Packager::PatchLiterals
         include Tebako::Packager::PatchBuildsystem
 
         def get_gnumakefile_in_patch_p1(ruby_ver) # rubocop:disable Metrics/MethodLength

diff --git a/lib/tebako/packager/pass2.rb b/lib/tebako/packager/pass2.rb
@@ -46,6 +46,8 @@ def get_patch_map(ostype, deps_lib_dir, ruby_ver)
             patch_map.store("common.mk", COMMON_MK_PATCH)
           end
           extend_patch_map_r33(patch_map, ostype, deps_lib_dir, ruby_ver)
+          patch_map.store("prism_compile.c", PRISM_PATCHES) if ruby_ver.ruby34?
+          patch_map
         end
 
         private

diff --git a/lib/tebako/packager/patch_literals.rb b/lib/tebako/packager/patch_literals.rb
@@ -29,7 +29,7 @@
 module Tebako
   module Packager
     # Ruby patching literals (pass2)
-    module PatchLiterals
+    module PatchLiterals # rubocop:disable Metrics/ModuleLength
       TOOL_MKCONFIG_RB_SUBST = <<~SUBST
         # -- Start of tebako patch --
             v_head_comp = "  CONFIG[\\"prefix\\"] \#{eq} "
@@ -332,6 +332,40 @@ module PatchLiterals
           "mf.macro \"EXTLIBS\", $extlibs" => "#  mf.macro \"EXTLIBS\", $extlibs   tebako patched"
         }
       }.freeze
+
+      PRISM_PATTERN_1 = "pm_string_init_result_t init_result = pm_read_file(&result->input, RSTRING_PTR(filepath));"
+
+      PRISM_SUBST_1 = <<~SUBST
+        /* -- Start of tebako patch -- */
+            pm_string_init_result_t init_result;
+            if (within_tebako_memfs(RSTRING_PTR(filepath)))
+            {
+              init_result = tebako_string_file_init(&result->input, RSTRING_PTR(filepath));
+            }
+            else
+            {
+              init_result = pm_read_file(&result->input, RSTRING_PTR(filepath));
+            }
+            /* -- End of tebako patch -- */
+      SUBST
+
+      PRISM_PATTERN_2 = "#include \"prism.h\""
+      PRISM_SUBST_2 = <<~SUBST
+        #{PRISM_PATTERN_2}
+
+        /* -- Start of tebako patch -- */
+        #include <tebako/tebako-config.h>
+        #include <tebako/tebako-defines.h>
+        #include <tebako/tebako-io.h>
+        #include <tebako/tebako-prism.h>
+        /* -- End of tebako patch -- */
+
+      SUBST
+
+      PRISM_PATCHES = {
+        PRISM_PATTERN_1 => PRISM_SUBST_1,
+        PRISM_PATTERN_2 => PRISM_SUBST_2
+      }.freeze
     end
   end
 end
diff --git a/spec/ruby_version_spec.rb b/spec/ruby_version_spec.rb
@@ -79,6 +79,10 @@
         expect(version.ruby33?).to be false
       end
 
+      it "returns false for ruby34?" do
+        expect(version.ruby34?).to be false
+      end
+
       it "returns '3.1.0' for api_version" do
         expect(version.api_version).to eq("3.1.0")
       end
@@ -111,6 +115,10 @@
         expect(version.ruby33?).to be false
       end
 
+      it "returns false for ruby34?" do
+        expect(version.ruby34?).to be false
+      end
+
       it "returns '3.2.0' for api_version" do
         expect(version.api_version).to eq("3.2.0")
       end
@@ -143,6 +151,10 @@
         expect(version.ruby33?).to be true
       end
 
+      it "returns false for ruby34?" do
+        expect(version.ruby34?).to be false
+      end
+
       it "returns '3.3.0' for api_version" do
         expect(version.api_version).to eq("3.3.0")
       end
@@ -152,6 +164,42 @@
       end
     end
 
+    context "with version 3.4.1" do
+      let(:version) { Tebako::RubyVersion.new("3.4.1") }
+
+      it "returns true for ruby3x?" do
+        expect(version.ruby3x?).to be true
+      end
+
+      it "returns true for ruby31?" do
+        expect(version.ruby31?).to be true
+      end
+
+      it "returns true for ruby32?" do
+        expect(version.ruby32?).to be true
+      end
+
+      it "returns false for ruby32only?" do
+        expect(version.ruby32only?).to be false
+      end
+
+      it "returns true for ruby33?" do
+        expect(version.ruby33?).to be true
+      end
+
+      it "returns true for ruby34?" do
+        expect(version.ruby34?).to be true
+      end
+
+      it "returns '3.4.0' for api_version" do
+        expect(version.api_version).to eq("3.4.0")
+      end
+
+      it "returns '340' for lib_version" do
+        expect(version.lib_version).to eq("340")
+      end
+    end
+
     context "with version 2.7.0" do
       unless RUBY_PLATFORM =~ /msys|mingw|cygwin/
 
@@ -177,6 +225,10 @@
           expect(version.ruby33?).to be false
         end
 
+        it "returns false for ruby34?" do
+          expect(version.ruby34?).to be false
+        end
+
         it "returns '2.7.0' for api_version" do
           expect(version.api_version).to eq("2.7.0")
         end