commit a0a215ba3b9bd67c3a32c5865b990c91637896a2
parent de66aa76ac4321d1d4495dee2245a52d5f5af691
Author: Dan Callaghan <djc@djc.id.au>
Date: Sun, 6 Apr 2025 14:40:18 +1000
depend on benchmark and fiddle gems
Fixes these warnings on Ruby 3.4:
lib/sup/util.rb:10: warning: benchmark was loaded from the standard library, but will no longer be part of the default gems starting from Ruby 3.5.0.
You can add benchmark to your Gemfile or gemspec to silence this warning.
lib/sup/util/locale_fiddler.rb:5: warning: fiddle was loaded from the standard library, but will no longer be part of the default gems starting from Ruby 3.5.0.
You can add fiddle to your Gemfile or gemspec to silence this warning.
Diffstat:
18 files changed, 159 insertions(+), 0 deletions(-)
diff --git a/contrib/nix/Gemfile b/contrib/nix/Gemfile
@@ -12,6 +12,8 @@ gem "chronic"
gem "unicode", "~> 0.4.4"
gem "unicode-display_width"
gem "string-scrub" if /^2\.0\./ =~ RUBY_VERSION
+gem "benchmark"
+gem "fiddle"
gem "bundler", ">= 1.3", "< 3"
gem "rake"
diff --git a/contrib/nix/Gemfile.lock b/contrib/nix/Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.3)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.1.6)
gpgme (2.0.24)
mini_portile2 (~> 2.7)
highline (3.1.2)
@@ -74,8 +76,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/gem-install-shell.nix b/contrib/nix/gem-install-shell.nix
@@ -3,6 +3,8 @@ pkgs.mkShell {
packages = with pkgs; [
ncurses
ncurses.dev
+ libffi
+ libffi.dev
libuuid
libuuid.dev
ruby_3_2
diff --git a/contrib/nix/gemset.nix b/contrib/nix/gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.3";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/contrib/nix/ruby2.4-Gemfile.lock b/contrib/nix/ruby2.4-Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.0.9)
gpgme (2.0.20)
mini_portile2 (~> 2.3)
highline (2.0.3)
@@ -58,8 +60,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/ruby2.4-gemset.nix b/contrib/nix/ruby2.4-gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.2";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d2y2qh6xml4w6p15kaz1v2ryb8p3nm6yy5x5mfygdrxgpsc63rd";
+ type = "gem";
+ };
+ version = "1.0.9";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/contrib/nix/ruby2.4-shell.nix b/contrib/nix/ruby2.4-shell.nix
@@ -11,6 +11,9 @@ let
lockfile = ./ruby2.4-Gemfile.lock;
gemset = ./ruby2.4-gemset.nix;
gemConfig = pkgs.defaultGemConfig // {
+ fiddle = attrs: {
+ buildInputs = [ pkgs.libffi ];
+ };
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
diff --git a/contrib/nix/ruby2.5-Gemfile.lock b/contrib/nix/ruby2.5-Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.0.9)
gpgme (2.0.20)
mini_portile2 (~> 2.3)
highline (2.0.3)
@@ -58,8 +60,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/ruby2.5-gemset.nix b/contrib/nix/ruby2.5-gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.2";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d2y2qh6xml4w6p15kaz1v2ryb8p3nm6yy5x5mfygdrxgpsc63rd";
+ type = "gem";
+ };
+ version = "1.0.9";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/contrib/nix/ruby2.5-shell.nix b/contrib/nix/ruby2.5-shell.nix
@@ -11,6 +11,9 @@ let
lockfile = ./ruby2.5-Gemfile.lock;
gemset = ./ruby2.5-gemset.nix;
gemConfig = pkgs.defaultGemConfig // {
+ fiddle = attrs: {
+ buildInputs = [ pkgs.libffi ];
+ };
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
diff --git a/contrib/nix/ruby2.6-Gemfile.lock b/contrib/nix/ruby2.6-Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.0.9)
gpgme (2.0.23)
mini_portile2 (~> 2.7)
highline (2.0.3)
@@ -60,8 +62,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/ruby2.6-gemset.nix b/contrib/nix/ruby2.6-gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.2";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d2y2qh6xml4w6p15kaz1v2ryb8p3nm6yy5x5mfygdrxgpsc63rd";
+ type = "gem";
+ };
+ version = "1.0.9";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/contrib/nix/ruby2.6-shell.nix b/contrib/nix/ruby2.6-shell.nix
@@ -11,6 +11,9 @@ let
lockfile = ./ruby2.6-Gemfile.lock;
gemset = ./ruby2.6-gemset.nix;
gemConfig = pkgs.defaultGemConfig // {
+ fiddle = attrs: {
+ buildInputs = [ pkgs.libffi ];
+ };
# Workaround for a new error in clang 16 (MacOS):
# https://github.com/blackwinter/unicode/pull/11
unicode = attrs: {
diff --git a/contrib/nix/ruby2.7-Gemfile.lock b/contrib/nix/ruby2.7-Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.0.9)
gpgme (2.0.24)
mini_portile2 (~> 2.7)
highline (3.0.1)
@@ -64,8 +66,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/ruby2.7-gemset.nix b/contrib/nix/ruby2.7-gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.2";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1d2y2qh6xml4w6p15kaz1v2ryb8p3nm6yy5x5mfygdrxgpsc63rd";
+ type = "gem";
+ };
+ version = "1.0.9";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/contrib/nix/ruby3.0-Gemfile.lock b/contrib/nix/ruby3.0-Gemfile.lock
@@ -2,8 +2,10 @@ GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
+ benchmark (0.4.0)
chronic (0.10.2)
coderay (1.1.3)
+ fiddle (1.1.6)
gpgme (2.0.24)
mini_portile2 (~> 2.7)
highline (3.0.1)
@@ -64,8 +66,10 @@ PLATFORMS
x86_64-linux
DEPENDENCIES
+ benchmark
bundler (>= 1.3, < 3)
chronic
+ fiddle
gpgme (>= 2.0.2)
highline
locale (~> 2.0)
diff --git a/contrib/nix/ruby3.0-gemset.nix b/contrib/nix/ruby3.0-gemset.nix
@@ -9,6 +9,16 @@
};
version = "2.4.2";
};
+ benchmark = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+ type = "gem";
+ };
+ version = "0.4.0";
+ };
chronic = {
groups = ["default"];
platforms = [];
@@ -29,6 +39,16 @@
};
version = "1.1.3";
};
+ fiddle = {
+ groups = ["default"];
+ platforms = [];
+ source = {
+ remotes = ["https://rubygems.org"];
+ sha256 = "1as92bp6pgkab73kj3mh5d1idjr9wykczz7r9i1pkn82wq4xks3r";
+ type = "gem";
+ };
+ version = "1.1.6";
+ };
gpgme = {
dependencies = ["mini_portile2"];
groups = ["default"];
diff --git a/sup.gemspec b/sup.gemspec
@@ -61,6 +61,8 @@ SUP: please note that our old mailing lists have been shut down,
s.add_runtime_dependency "unicode", "~> 0.4.4"
s.add_runtime_dependency "unicode-display_width"
s.add_runtime_dependency "string-scrub" if /^2\.0\./ =~ RUBY_VERSION
+ s.add_runtime_dependency "benchmark"
+ s.add_runtime_dependency "fiddle"
s.add_development_dependency "bundler", ">= 1.3", "< 3"
s.add_development_dependency "rake"