erb 4.0.2-java → 4.0.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e7e4bb69353d48304c116a64f6a98852dd29c627f3b2f91ea9a143b13cdc1e3
-  data.tar.gz: 710b7ebf7c02491f964d86f796c00427d1b168a250a2551cbe8f104c71e6279a
+  metadata.gz: 821d83da51a3173890406be721cf070117f0c77aee7ff443eb07b51411354fbc
+  data.tar.gz: 912b71f197853a716d236e00b443377a778dcf2bc06be22b953eb7d20b1fcd3a
 SHA512:
-  metadata.gz: b47fb0e7dcc200e247f410c5e39a12c289f8c485b63374271c71d52ffe7f3cb80e8ab14fb1224cbbf8e6924c9fbfae7bfe27c2d643c313393921cd460095c87f
-  data.tar.gz: 6324ca73147f348eddd892f329c8b4ac6380683eabe4bc032df24b6371ca64ce5999b9d9eb2b48e6e8d3449aca187cd574f5ade6745a380d7d288660a298c17b
+  metadata.gz: 7f49f29fd211bf37b3dc6afaca92267f629039fabdf86382728238db0614ec580830ebccf2988c139cf41e67e9893143190e27221cbea1b57ac8abbb98a56b19
+  data.tar.gz: 1cfb6832ba0bb8ccb75f1b437939b19d982b655f8574a5b05c3eaead31e5869a0a633fef583ffc1feda2aceb0aa95d9be1bd7d9996b48fb3c0e383fc792f15ac

data/.github/workflows/test.yml

@@ -8,14 +8,11 @@ on:
 
 jobs:
   ruby-versions:
-    runs-on: ubuntu-latest
-    outputs:
-      versions: ${{ steps.versions.outputs.value }}
-    steps:
-      - id: versions
-        run: |
-          versions=$(curl -s 'https://cache.ruby-lang.org/pub/misc/ci_versions/cruby.json' | jq -c '. + ["jruby", "truffleruby-head"]')
-          echo "::set-output name=value::${versions}"
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      versions: '["jruby", "truffleruby-head"]'
+
   test:
     needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
@@ -26,7 +23,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/Gemfile

@@ -6,4 +6,5 @@ group :development do
   gem 'rake'
   gem 'rake-compiler'
   gem 'test-unit'
+  gem "test-unit-ruby-core"
 end

data/NEWS.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 4.0.4
+
+* Skip building the C extension for JRuby [#52](https://github.com/ruby/erb/pull/52)
+
+## 4.0.3
+
+* Enable `frozen_string_literal` in all files [#49](https://github.com/ruby/erb/pull/49)
+
+## 4.0.2
+
+* Fix line numbers after multi-line `<%#` [#42](https://github.com/ruby/erb/pull/42)
+
 ## 4.0.1
 
 * Stop building the C extension for TruffleRuby [#39](https://github.com/ruby/erb/pull/39)

data/Rakefile

@@ -16,11 +16,4 @@ else
   task test: :compile
 end
 
-task :sync_tool do
-  require 'fileutils'
-  FileUtils.cp '../ruby/tool/lib/core_assertions.rb', './test/lib'
-  FileUtils.cp '../ruby/tool/lib/envutil.rb', './test/lib'
-  FileUtils.cp '../ruby/tool/lib/find_executable.rb', './test/lib'
-end
-
 task default: :test

data/erb.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'erb'
   spec.version       = ERB.const_get(:VERSION, false)
   spec.authors       = ['Masatoshi SEKI', 'Takashi Kokubun']
-  spec.email         = ['seki@ruby-lang.org', 'takashikkbn@gmail.com']
+  spec.email         = ['seki@ruby-lang.org', 'k0kubun@ruby-lang.org']
 
   spec.summary       = %q{An easy to use but powerful templating system for Ruby.}
   spec.description   = %q{An easy to use but powerful templating system for Ruby.}

data/ext/erb/escape/extconf.rb

@@ -1,6 +1,7 @@
 require 'mkmf'
 
-if RUBY_ENGINE == 'truffleruby'
+case RUBY_ENGINE
+when 'jruby', 'truffleruby'
   File.write('Makefile', dummy_makefile($srcdir).join)
 else
   create_makefile 'erb/escape'

data/lib/erb/compiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # ERB::Compiler
 #

data/lib/erb/def_method.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # ERB::DefMethod
 #

data/lib/erb/util.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # ERB::Escape
 #

data/lib/erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class ERB
-  VERSION = '4.0.2'
+  VERSION = '4.0.4'
   private_constant :VERSION
 end

data/lib/erb.rb

@@ -307,11 +307,11 @@ class ERB
   #    def build
   #      b = binding
   #      # create and run templates, filling member data variables
-  #      ERB.new(<<-'END_PRODUCT'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@product").result b
+  #      ERB.new(<<~'END_PRODUCT', trim_mode: "", eoutvar: "@product").result b
   #        <%= PRODUCT[:name] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRODUCT
-  #      ERB.new(<<-'END_PRICE'.gsub(/^\s+/, ""), trim_mode: "", eoutvar: "@price").result b
+  #      ERB.new(<<~'END_PRICE', trim_mode: "", eoutvar: "@price").result b
   #        <%= PRODUCT[:name] %> -- <%= PRODUCT[:cost] %>
   #        <%= PRODUCT[:desc] %>
   #      END_PRICE

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.4
 platform: java
 authors:
 - Masatoshi SEKI
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: libexec
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -28,7 +28,7 @@ dependencies:
 description: An easy to use but powerful templating system for Ruby.
 email:
 - seki@ruby-lang.org
-- takashikkbn@gmail.com
+- k0kubun@ruby-lang.org
 executables:
 - erb
 extensions: []
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.