erb 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675c468f525ff93b95dce4365f40d238bed3c247a2f46d116312f32933e88070
-  data.tar.gz: '0909f701d87673867c5ba63e5d74d5cdc09538ca821af6a9f46943169e9b2ada'
+  metadata.gz: 03030fb364b8bce3d2b601c42f5274670bce6ceed6bc63c6ccf1e3277ce48f17
+  data.tar.gz: fb3c201f09a8d73611e65102ba06f138e3502a6f62c456f18fef5d9922ecd50b
 SHA512:
-  metadata.gz: f96aa045940fdd84702ff12ce46eb243fa95f0e6e912bb3f32873e3513588b8c7db94d83873f8ce8b19187b1187ac27bea00c38d9ccc479d92e222c304a8305f
-  data.tar.gz: ef97afccd0201e81ad6660e643b1c7e2d3449e75069bae06e595099cbe1f9c913710c9a7553234b40ee5834932d9d0bbf8d679a76416cc39e28df30138a8b97e
+  metadata.gz: c968d506080390520a3cfe5743f762006d65e6ebb7451e2aa7356bc23ec29848899d7e5bedfaad17112d419a84d7eb5df010f51f5f5548fcf29cc8db67402253
+  data.tar.gz: a4c3f4013ee6673a2d835b90ebc6ad4564162b912cfde279bded8b96389c0a18a1c23dd1fafef336c1d90340fec79633a7a9a2934b9287c229cd647780c7fe92

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: ruby
 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
   name: cgi
@@ -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:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.