erb 6.0.2 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac01e59591c3650d2a79080161f086a58a5ee6ab5d5633d57cfbc452b91da28b
-  data.tar.gz: '092313e6acc991af7182703476d31b7cb724c95cac1fa9ad8b0a422745e2c985'
+  metadata.gz: b25d5fdfe9fee1fe6ecfb1e2e065899b51e0c1c4db0ad2d77684234b68483660
+  data.tar.gz: cd8460dbde78e4a3989a45bc2f1ac355f8ab949d2f5b15e26fbe4f049da1458b
 SHA512:
-  metadata.gz: 1ecc49906929716abf47d59ac7086dc10c205f073533e35181bd2e703ce4c8f5e1f2d93a9bafd4cc640c0a9ed92fbe536aa969457aded80d641dffa9e7952f61
-  data.tar.gz: ded8eb9ec0f62253490b2af5f5b89c2a1cc949de5bd6d25df936d38402a415cf5f7c3385e1ce0cd7ac02bd301ab8b1804c6e17e6e5f56cc12b9757c3ff2363c3
+  metadata.gz: dc41315bc958e50efdc1db906e998e9a6808410381be3ec70ffb0f9330b5520c89a5652fa0cf3e605caa237f52c8c5b05c9435d2a77fd08806664fdf769c56a9
+  data.tar.gz: 9937928ce2742fe22dd16317ea011984046a227782ea71b50c57b8c2d00e41534ae9f548ca8d14d2dc2a87a0fd42367462a75b56ea9e8678783c86ad0d57827a

data/NEWS.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## 6.0.4
+
+* Prohibit `def_method` on marshal-loaded ERB instances
+
+## 6.0.3
+
+* Exclude some files from published gem https://github.com/ruby/erb/pull/108
+
 ## 6.0.2
 
-* Freeze `src` in `ERB#initialize` for Ractor compatibility
+* Freeze `src` in `ERB#initialize` for Ractor compatibility https://github.com/ruby/erb/pull/105
 
 ## 6.0.1
 

data/erb.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "https://github.com/ruby/erb/blob/v#{spec.version}/NEWS.md"
 
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|\.git|\.github)/}) }
   end
   spec.bindir        = 'libexec'
   spec.executables   = ['erb']

data/lib/erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class ERB
   # The string \ERB version.
-  VERSION = '6.0.2'
+  VERSION = '6.0.4'
 end

data/lib/erb.rb

@@ -1087,6 +1087,9 @@ class ERB
   # ```
   #
   def def_method(mod, methodname, fname='(ERB)')
+    unless @_init.equal?(self.class.singleton_class)
+      raise ArgumentError, "not initialized"
+    end
     src = self.src.sub(/^(?!#|$)/) {"def #{methodname}\n"} << "\nend\n"
     mod.module_eval do
       eval(src, binding, fname, -1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.0.4
 platform: ruby
 authors:
 - Masatoshi SEKI
@@ -21,12 +21,6 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".document"
-- ".github/dependabot.yml"
-- ".github/release.yml"
-- ".github/workflows/dependabot_automerge.yml"
-- ".github/workflows/push-gem.yml"
-- ".github/workflows/sync-ruby.yml"
-- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rdoc_options"
 - BSDL
@@ -56,7 +50,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/erb
   source_code_uri: https://github.com/ruby/erb
-  changelog_uri: https://github.com/ruby/erb/blob/v6.0.2/NEWS.md
+  changelog_uri: https://github.com/ruby/erb/blob/v6.0.4/NEWS.md
 rdoc_options: []
 require_paths:
 - lib

data/.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'monthly'

data/.github/release.yml

@@ -1,4 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - dependencies # Added by Dependabot

data/.github/workflows/dependabot_automerge.yml

@@ -1,30 +0,0 @@
-name: Dependabot auto-merge
-on:
-  pull_request:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'ruby/erb'
-    steps:
-      - name: Dependabot metadata
-        uses: dependabot/fetch-metadata@v2
-        id: metadata
-
-      - name: Wait for status checks
-        uses: lewagon/wait-on-check-action@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-          check-regexp: 'build \(.*\)'
-          wait-interval: 30
-
-      - name: Auto-merge for Dependabot PRs
-        run: gh pr merge --auto --rebase "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.MATZBOT_DEPENDABOT_MERGE_TOKEN }}

data/.github/workflows/push-gem.yml

@@ -1,51 +0,0 @@
-name: Publish gem to rubygems.org
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-permissions:
-  contents: read
-
-jobs:
-  push:
-    if: github.repository_owner == 'ruby'
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby: [ruby, jruby]
-      fail-fast: false
-
-    environment:
-      name: rubygems.org
-      url: https://rubygems.org/gems/erb
-
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
-        with:
-          bundler-cache: true
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Publish to RubyGems
-        uses: rubygems/release-gem@1c162a739e8b4cb21a676e97b087e8268d8fc40b # v1.1.2
-
-      - name: Create GitHub release
-        run: |
-          tag_name="$(git describe --tags --abbrev=0)"
-          gh release create "${tag_name}" --verify-tag --generate-notes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        if: ${{ matrix.ruby == 'ruby' }}

data/.github/workflows/sync-ruby.yml

@@ -1,33 +0,0 @@
-name: Sync ruby
-on:
-  push:
-    branches: [master]
-jobs:
-  sync:
-    name: Sync ruby
-    runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'ruby' }}
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Create GitHub App token
-        id: app-token
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: 2060836
-          private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}
-          owner: ruby
-          repositories: ruby
-
-      - name: Sync to ruby/ruby
-        uses: convictional/trigger-workflow-and-wait@v1.6.5
-        with:
-          owner: ruby
-          repo: ruby
-          workflow_file_name: sync_default_gems.yml
-          github_token: ${{ steps.app-token.outputs.token }}
-          ref: master
-          client_payload: |
-            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
-          propagate_failure: true
-          wait_interval: 10

data/.github/workflows/test.yml

@@ -1,36 +0,0 @@
-name: test
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  ruby-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 }})
-    strategy:
-      matrix:
-        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
-        os: [ubuntu-latest]
-      fail-fast: false
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v6
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - name: Run test
-      run: bundle exec rake test
-    - name: RDoc coverage
-      run: |
-        rdoc -C --visibility=private .