From 52ce86b10a9e4fbf5ea7ba5d9299d045cb6a9d08 Mon Sep 17 00:00:00 2001 From: Austin Ziegler Date: Mon, 1 Jan 2024 23:18:42 -0500 Subject: [PATCH] Move Ruby 3.3 to the "default" version - Only test with latest Rubygems - Sort the contributor's list and add Masato Nakamura - Remove minitest-bonus-assertions - Auto-apply standardrb updates --- .github/workflows/ci.yml | 15 +++++++++++---- Contributing.md | 9 +++++---- Rakefile | 1 - lib/mime/types.rb | 2 +- lib/mime/types/logger.rb | 2 +- mime-types.gemspec | 35 +++++++++++++++++------------------ 6 files changed, 35 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 287e88d..9336535 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,14 @@ name: CI on: - push: - branches: [main] pull_request: + push: branches: [main] + workflow_dispatch: jobs: test: + name: Ruby ${{ matrix.ruby }} - ${{ matrix.os }} strategy: fail-fast: false matrix: @@ -40,10 +41,13 @@ jobs: continue-on-error: true - os: ubuntu-22.04 ruby: head + continue-on-error: true - os: ubuntu-22.04 ruby: '3.1' - os: ubuntu-22.04 ruby: '3.2' + - os: ubuntu-22.04 + ruby: '3.3' - os: ubuntu-22.04 ruby: truffleruby+graalvm-head continue-on-error: true @@ -53,14 +57,17 @@ jobs: runs-on: ${{ matrix.os }} continue-on-error: ${{ matrix.continue-on-error || false }} + steps: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} - rubygems: ${{ matrix.rubygems || 'latest' }} + rubygems: latest bundler: 2 bundler-cache: true + - run: bundle exec ruby -S rake test --trace - - if: matrix.os == 'ubuntu-22.04' && matrix.ruby == '3.2' + + - if: matrix.os == 'ubuntu-22.04' && matrix.ruby == '3.3' run: bundle exec standardrb diff --git a/Contributing.md b/Contributing.md index 058138a..1f4125b 100644 --- a/Contributing.md +++ b/Contributing.md @@ -82,9 +82,9 @@ Here's the most direct way to get your work merged into the project: Thanks to everyone else who has contributed to mime-types over the years: - Aaron Patterson -- Alex Vondrak - Aggelos Avgerinos - Al Snow +- Alex Vondrak - Andre Pankratz - Andy Brody - Arnaud Meuret @@ -93,8 +93,8 @@ Thanks to everyone else who has contributed to mime-types over the years: - Chris Gat - David Genord - Dillon Welch -- Eric Marden - Edward Betts +- Eric Marden - Garret Alfert - Godfrey Chan - Greg Brockman @@ -106,15 +106,16 @@ Thanks to everyone else who has contributed to mime-types over the years: - Jeremy Evans - Juanito Fatas - Jun Aruga -- Łukasz Śliwa - Keerthi Siva - Ken Ip - Kevin Menard - Koichi ITO +- Łukasz Śliwa - Martin d'Allens +- Masato Nakamura - Mauricio Linhares -- Nicolas Leger - Nicholas La Roux +- Nicolas Leger - nycvotes-dev - Olle Jonsson - Postmodern diff --git a/Rakefile b/Rakefile index 51254e5..15a8354 100644 --- a/Rakefile +++ b/Rakefile @@ -30,7 +30,6 @@ spec = Hoe.spec "mime-types" do extra_dev_deps << ["hoe-rubygems", "~> 1.0"] extra_dev_deps << ["minitest", "~> 5.0"] extra_dev_deps << ["minitest-autotest", "~> 1.0"] - extra_dev_deps << ["minitest-bonus-assertions", "~> 3.0"] extra_dev_deps << ["minitest-focus", "~> 1.0"] extra_dev_deps << ["minitest-hooks", "~> 1.4"] extra_dev_deps << ["rake", ">= 10.0", "< 14.0"] diff --git a/lib/mime/types.rb b/lib/mime/types.rb index bb0a3d0..026be34 100644 --- a/lib/mime/types.rb +++ b/lib/mime/types.rb @@ -165,7 +165,7 @@ def type_for(filename) # The last parameter may be the value :silent or +true+ which # will suppress duplicate MIME type warnings. def add(*types) - quiet = ((types.last == :silent) || (types.last == true)) + quiet = (types.last == :silent) || (types.last == true) types.each do |mime_type| case mime_type diff --git a/lib/mime/types/logger.rb b/lib/mime/types/logger.rb index 894f47c..2bc1a1d 100644 --- a/lib/mime/types/logger.rb +++ b/lib/mime/types/logger.rb @@ -26,7 +26,7 @@ def close end def initialize(_one, _two = nil, _three = nil) - super nil + super(nil) @logdev = WarnLogDevice.new @formatter = ->(_s, _d, _p, m) { m } end diff --git a/mime-types.gemspec b/mime-types.gemspec index 846f4c3..81f539b 100644 --- a/mime-types.gemspec +++ b/mime-types.gemspec @@ -3,13 +3,13 @@ Gem::Specification.new do |s| s.name = "mime-types".freeze - s.version = "3.5.1" + s.version = "3.5.1".freeze s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version= s.metadata = { "bug_tracker_uri" => "https://github.com/mime-types/ruby-mime-types/issues", "changelog_uri" => "https://github.com/mime-types/ruby-mime-types/blob/master/History.md", "homepage_uri" => "https://github.com/mime-types/ruby-mime-types/", "rubygems_mfa_required" => "true", "source_code_uri" => "https://github.com/mime-types/ruby-mime-types/" } if s.respond_to? :metadata= s.require_paths = ["lib".freeze] s.authors = ["Austin Ziegler".freeze] - s.date = "2023-08-22" + s.date = "2024-01-02" s.description = "The mime-types library provides a library and registry for information about\nMIME content type definitions. It can be used to determine defined filename\nextensions for MIME types, or to use filename extensions to look up the likely\nMIME type definitions.\n\nVersion 3.0 is a major release that requires Ruby 2.0 compatibility and removes\ndeprecated functions. The columnar registry format introduced in 2.6 has been\nmade the primary format; the registry data has been extracted from this library\nand put into {mime-types-data}[https://github.com/mime-types/mime-types-data].\nAdditionally, mime-types is now licensed exclusively under the MIT licence and\nthere is a code of conduct in effect. There are a number of other smaller\nchanges described in the History file.".freeze s.email = ["halostatue@gmail.com".freeze] s.extra_rdoc_files = ["Code-of-Conduct.md".freeze, "Contributing.md".freeze, "History.md".freeze, "Licence.md".freeze, "Manifest.txt".freeze, "README.rdoc".freeze] @@ -18,24 +18,23 @@ Gem::Specification.new do |s| s.licenses = ["MIT".freeze] s.rdoc_options = ["--main".freeze, "README.rdoc".freeze] s.required_ruby_version = Gem::Requirement.new(">= 2.0".freeze) - s.rubygems_version = "3.4.18".freeze + s.rubygems_version = "3.5.3".freeze s.summary = "The mime-types library provides a library and registry for information about MIME content type definitions".freeze s.specification_version = 4 - s.add_runtime_dependency(%q.freeze, ["~> 3.2015"]) - s.add_development_dependency(%q.freeze, ["~> 5.19"]) - s.add_development_dependency(%q.freeze, [">= 3.0", "< 5"]) - s.add_development_dependency(%q.freeze, ["~> 1.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.1"]) - s.add_development_dependency(%q.freeze, ["~> 1.7"]) - s.add_development_dependency(%q.freeze, ["~> 1.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.0"]) - s.add_development_dependency(%q.freeze, ["~> 3.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.4"]) - s.add_development_dependency(%q.freeze, [">= 10.0", "< 14.0"]) - s.add_development_dependency(%q.freeze, ["~> 1.0"]) - s.add_development_dependency(%q.freeze, [">= 4.0", "< 7"]) - s.add_development_dependency(%q.freeze, ["~> 0.21"]) + s.add_runtime_dependency(%q.freeze, ["~> 3.2015".freeze]) + s.add_development_dependency(%q.freeze, ["~> 5.20".freeze]) + s.add_development_dependency(%q.freeze, [">= 3.0".freeze, "< 5".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.0".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.1".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.7".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.0".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.0".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.0".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.4".freeze]) + s.add_development_dependency(%q.freeze, [">= 10.0".freeze, "< 14.0".freeze]) + s.add_development_dependency(%q.freeze, ["~> 1.0".freeze]) + s.add_development_dependency(%q.freeze, [">= 4.0".freeze, "< 7".freeze]) + s.add_development_dependency(%q.freeze, ["~> 0.21".freeze]) end