erb 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59e65e447aa2698cab1c4f1f99322edabac2a8e480fb885c711529464f6842c8
-  data.tar.gz: 72e69acb55471846d7d07240a4c1ff023d0a6719ed24d9564f029dfd97b81402
+  metadata.gz: 8f3996670474a52bba08a0a8cdeba934a01d09fb7a45047ad14de049823cea90
+  data.tar.gz: e23035811fc69fb375930eb155ecbf47b67e7991ba7c96fd3c95d6f823e58b6b
 SHA512:
-  metadata.gz: ea5447f6851f8752637b1b93aae084d58479808f65f11c3dd1d946e7f005cf4c0b1d607428f398ba2597b5ee48cc8c1e44bfdb6074eeb819b781d1c5d66dc927
-  data.tar.gz: 17bede5cf619b2d9d5f8d983835e9664dcd901920727071b59ba37698a0cc1f31624eef8a6132f14de780975f1f49860381103d7f54b0ad325104e8111ab1e0a
+  metadata.gz: '09a2991c267e42f6b46f9c629db1596c3238a711e409099c1b50874ded8752d1dd64a9828b6eaec79796b06dab92d402d408c97b24a06eda3e4b12bb8c9e49ac'
+  data.tar.gz: 4341ca9b16e9e646121dd7e2da710156c6ce71a15983b6c12daaad6fc43fec918b4c57b15b933ff7e6a94a32894e8a458f580f3371300253cb36aaf955b2e07c

data/.github/workflows/test.yml

@@ -7,8 +7,13 @@ jobs:
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ 2.7, 2.6, 2.5, head ]
-        os: [ ubuntu-latest, macos-latest ]
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - head
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@master

data/Gemfile

@@ -1,4 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rake"
-gem "test-unit"
+gemspec
+
+gem 'rake'
+gem 'test-unit'

data/NEWS.md

@@ -0,0 +1,9 @@
+# Change Log
+
+## 2.2.1
+
+- `ERB#initialize` warns `safe_level` and later arguments even without -w
+
+## 2.2.0
+
+- Ruby 3.0 promoted ERB to a default gem

data/README.md

@@ -1,8 +1,6 @@
-# Erb
+# ERB
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/erb`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+An easy to use but powerful templating system for Ruby.
 
 ## Installation
 
@@ -20,10 +18,6 @@ Or install it yourself as:
 
     $ gem install erb
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -32,5 +26,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/hsbt/erb.
+Bug reports and pull requests are welcome on GitHub at https://github.com/ruby/erb.
+
+## License
 
+The gem is available as open source under the terms of the [2-Clause BSD License](https://opensource.org/licenses/BSD-2-Clause).

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test/lib"
-  t.ruby_opts << "-rhelper"
-  t.test_files = FileList["test/**/test_*.rb"]
+  t.libs << 'test/lib'
+  t.ruby_opts << '-rhelper'
+  t.test_files = FileList['test/**/test_*.rb']
 end
 
-task :default => :test
+task default: :test

data/erb.gemspec

@@ -1,22 +1,31 @@
+begin
+  require_relative 'lib/erb/version'
+rescue LoadError
+  # for Ruby core repository
+  require_relative 'erb/version'
+end
+
 Gem::Specification.new do |spec|
-  spec.name          = "erb"
-  spec.version       = "2.2.0"
-  spec.authors       = ["Masatoshi SEKI"]
-  spec.email         = ["seki@ruby-lang.org"]
+  spec.name          = 'erb'
+  spec.version       = ERB.const_get(:VERSION, false)
+  spec.authors       = ['Masatoshi SEKI']
+  spec.email         = ['seki@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.}
-  spec.homepage      = "https://github.com/ruby/erb"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
-  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+  spec.homepage      = 'https://github.com/ruby/erb'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.licenses      = ['Ruby', 'BSD-2-Clause']
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
 
-  spec.files         = Dir.chdir(File.expand_path("..", __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "libexec"
-  spec.executables   = ["erb"]
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'libexec'
+  spec.executables   = ['erb']
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'cgi'
 end

data/lib/erb.rb

@@ -12,7 +12,8 @@
 #
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require "cgi/util"
+require 'cgi/util'
+require 'erb/version'
 
 #
 # = ERB -- Ruby Templating
@@ -257,10 +258,11 @@ require "cgi/util"
 #
 class ERB
   Revision = '$Date::                           $' # :nodoc: #'
+  deprecate_constant :Revision
 
   # Returns revision information for the erb.rb module.
   def self.version
-    "erb.rb [2.2.0 #{ERB::Revision.split[1]}]"
+    VERSION
   end
 end
 
@@ -809,14 +811,14 @@ class ERB
   def initialize(str, safe_level=NOT_GIVEN, legacy_trim_mode=NOT_GIVEN, legacy_eoutvar=NOT_GIVEN, trim_mode: nil, eoutvar: '_erbout')
     # Complex initializer for $SAFE deprecation at [Feature #14256]. Use keyword arguments to pass trim_mode or eoutvar.
     if safe_level != NOT_GIVEN
-      warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1 if $VERBOSE || !ZERO_SAFE_LEVELS.include?(safe_level)
+      warn 'Passing safe_level with the 2nd argument of ERB.new is deprecated. Do not use it, and specify other arguments as keyword arguments.', uplevel: 1
     end
     if legacy_trim_mode != NOT_GIVEN
-      warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1 if $VERBOSE
+      warn 'Passing trim_mode with the 3rd argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, trim_mode: ...) instead.', uplevel: 1
       trim_mode = legacy_trim_mode
     end
     if legacy_eoutvar != NOT_GIVEN
-      warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1 if $VERBOSE
+      warn 'Passing eoutvar with the 4th argument of ERB.new is deprecated. Use keyword argument like ERB.new(str, eoutvar: ...) instead.', uplevel: 1
       eoutvar = legacy_eoutvar
     end
 
@@ -829,8 +831,6 @@ class ERB
   end
   NOT_GIVEN = Object.new
   private_constant :NOT_GIVEN
-  ZERO_SAFE_LEVELS = [0, nil]
-  private_constant :ZERO_SAFE_LEVELS
 
   ##
   # Creates a new compiler for ERB.  See ERB::Compiler.new for details

data/lib/erb/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: erb
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Masatoshi SEKI
 autorequire:
 bindir: libexec
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
-dependencies: []
+date: 2021-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cgi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An easy to use but powerful templating system for Ruby.
 email:
 - seki@ruby-lang.org
@@ -22,12 +36,14 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
+- NEWS.md
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - erb.gemspec
 - lib/erb.rb
+- lib/erb/version.rb
 - libexec/erb
 homepage: https://github.com/ruby/erb
 licenses:
@@ -51,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.rc.1
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: An easy to use but powerful templating system for Ruby.