diff options
Diffstat (limited to 'dev-ruby')
18 files changed, 172 insertions, 325 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz Binary files differindex 3f0e58b4baf9..8ce3f53e23c6 100644 --- a/dev-ruby/Manifest.gz +++ b/dev-ruby/Manifest.gz diff --git a/dev-ruby/deckar01-task_list/Manifest b/dev-ruby/deckar01-task_list/Manifest index 33f72f461b37..3d16a19e98ef 100644 --- a/dev-ruby/deckar01-task_list/Manifest +++ b/dev-ruby/deckar01-task_list/Manifest @@ -1,3 +1,5 @@ DIST deckar01-task_list-2.3.2.gem 20480 BLAKE2B 1fe3c658abf7ba63305f3760d4baf6e1bd2e1f4fbe6161c592b1aaf628b323ad0e5327c7df2cc73c2297cf230eec7aca85eca10dc5bae45b3f4f7164c343610c SHA512 f2f755d31780d89dfcc276750526caadaea56bebc580798879a49871ecce88c78921a35b8c92afb2b10d4b4c7440d1cf7ea60d08f2ac703bca60304fd3564dc6 +DIST deckar01-task_list-2.3.3.gem 66560 BLAKE2B 3423a2b18e27fb44dcedb9df786430033c8d6f314b9995193d91ab8d35f569210b3189b55b4a77bbba8d93b7316e6d2a04e2b605ba74adac776f716fcc236b0f SHA512 3331b9e1f5e110b4777da5887cf5f8691f156203ae62e8f5c5bad92c9bc60fb441bdd41f71bce2dbee94bc19c6943f6c21eaad1348ce4094148a6cb2ec98d148 EBUILD deckar01-task_list-2.3.2.ebuild 528 BLAKE2B c7d6220fee4f4b6199426981d48ae1924e505fcec0b3d90feb22e82f80a0e386e212d6de2e92e5a60be24b2586187e609e6b7ef742d2f6067323c6b6883822cf SHA512 4c7a8e2debeb67404d289fa0392074e4d1d727551b578d51e8b4544225caf2cfed9eefc1daf6c3157d7088198b0daf8e197ec41bd40cc023df5cb4244af52501 +EBUILD deckar01-task_list-2.3.3.ebuild 521 BLAKE2B aa48ce7a20c17cb96598c212c1097a3730f63acb427cf83f04bcc16a234ba5dbdafa7132c946f9599220b56663b127d5c681129941d26a4ca1583d6a001aded5 SHA512 592f275f501c9a4095f2160a1349d1d0c374967066e3c007ff5b51e9bf533d973dc59c1d1726723dbaeb9c369f9bd6f7b55a86e7a6abfc1ab53e048fd69568ab MISC metadata.xml 335 BLAKE2B 9ef7e7ba43a177e6d1229326cfb00ec970eb41ced1131f11ba1a4fc27cd0049ecb0534c922e6d747b98d677b1b2362e66a880ad118cc29a53487f0697a310f4a SHA512 0944f24b6722f3aee42c008aa7f81824bef9f96fbb1b7d5e374ff77da585bf60eb15097687f2d8a98b36591955363642d4f89acecfa8c064f62e78b4a348a7de diff --git a/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.ebuild b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.ebuild new file mode 100644 index 000000000000..731f5450ae4c --- /dev/null +++ b/dev-ruby/deckar01-task_list/deckar01-task_list-2.3.3.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem + +DESCRIPTION="Markdown TaskList components" +HOMEPAGE="https://github.com/deckar01/task_list" + +LICENSE="MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend " + dev-ruby/html-pipeline +" + +ruby_add_bdepend "test? ( + dev-ruby/commonmarker + dev-ruby/coffee-script + dev-ruby/json + dev-ruby/rack + dev-ruby/sprockets +)" diff --git a/dev-ruby/faraday-follow_redirects/Manifest b/dev-ruby/faraday-follow_redirects/Manifest new file mode 100644 index 000000000000..5d20f553dde7 --- /dev/null +++ b/dev-ruby/faraday-follow_redirects/Manifest @@ -0,0 +1,3 @@ +DIST faraday-follow_redirects-0.3.0.tar.gz 9884 BLAKE2B 463cfb9e797f21355fea5318f0a647936194b671828e55c6ad6dff1c3e853b15ed0facac28e2f59c0cccf8db5d9f11f3bd66c1c877d9a9538d5deea832c4d3d2 SHA512 357b9618f203749f806b7882b39dfd1b90a403c9a76734f4d3ae59ef2a70430254e616be66fb5a0ec74e770e2ee9df6e0f805b00f70a6f99de12ff70fa4d2bda +EBUILD faraday-follow_redirects-0.3.0.ebuild 833 BLAKE2B db194006e156c72e2281b47abef6a5045be29893bbef78a0cfd55491c4cf50ed94bdd7008d65233d2db5cbe676fd0ba51f4e67bb954d4e3ac6029a5e195efcc5 SHA512 041fb0943ab383613105f290c7b2e34c13eea7e5833a086043f67342efdf401338f209213ae1699ef8cd5e1dbf8822a33cae2b1a9ea545cafdff72180c3d7e7b +MISC metadata.xml 357 BLAKE2B e193eef844776fcdd109a71f7cfbdd86c37b0370df4c2a99342d3fa941ce5112363ca33b62eb84f44bf894398546333da4a028b7cba4b4ce03f248f33efa26d6 SHA512 e7b067fd887074207600f88d36b939c949a40b8c63a990c46f9bede03b1e34aa8eeeb40b773b1cf87a8c07f7e98af6d5bcc97cbb050f1a0c3f2a8d955ede581e diff --git a/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild b/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild new file mode 100644 index 000000000000..78e79967c84a --- /dev/null +++ b/dev-ruby/faraday-follow_redirects/faraday-follow_redirects-0.3.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_BINWRAP="" +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Perform multipart-post requests using Faraday" +HOMEPAGE="https://github.com/tisba/faraday-follow-redirects" +SRC_URI="https://github.com/tisba/faraday-follow-redirects/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +RUBY_S="faraday-follow-redirects-${PV}" + +LICENSE="MIT" +SLOT="$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +ruby_add_rdepend "|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )" + +ruby_add_bdepend "test? ( dev-ruby/webmock )" + +all_ruby_prepare() { + sed -i -e "s:_relative ':'./:" ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/faraday-follow_redirects/metadata.xml b/dev-ruby/faraday-follow_redirects/metadata.xml new file mode 100644 index 000000000000..42a21a64fc14 --- /dev/null +++ b/dev-ruby/faraday-follow_redirects/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ruby@gentoo.org</email> + <name>Gentoo Ruby Project</name> + </maintainer> + <upstream> + <remote-id type="github">tisba/faraday-follow-redirects</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest index bf097ba6ad4a..9d56cdc98892 100644 --- a/dev-ruby/puppet_forge/Manifest +++ b/dev-ruby/puppet_forge/Manifest @@ -1,3 +1,8 @@ +AUX puppet_forge-5.0.1-typhoeus.patch 626 BLAKE2B 6eb5f313a792cff16a5ca7ad6719f5e3e0d1900dc761234631b963e79cd9fb1577a2113654ea1f52a6eff962a59b4633c0f66595cdbfdda410ab639ce327781c SHA512 f002f898207f82053431d997dd751f1d4e6bdce341ee275ef0adfeb0308bbfc46c578df1715152d796ad213e8a45a99086d7c96efe753a2ecb67a4becc73ec02 DIST puppet_forge-3.2.0.gem 771072 BLAKE2B dd304297aa65dc0f36f837e27abf255a0474fc2216fa72ac3203febeb4085024f4d155e93a91646d1e7828fe67a5a421b2c75bb638deb846c5d337dfe11eafc9 SHA512 dfa82d96f44fb8247f39155c942bf20aec6a4a2833959c877ec98b150553076dd72112b6d1230fa7ae1acef7f648017a8446c3e952680f8d4a6411d2fc8055dc +DIST puppet_forge-4.1.0.gem 772096 BLAKE2B 2d6f0af8baa067f79eb113f0de9596c562cdda678587fdd1cb14960535ded5fdbafb2b5ff0ebbd6ae676fb10d766f949b599b43c9b04dac55fc28b8163ef1383 SHA512 f752069d8b1998b3d27745abe3e6ad87a24ef614a68b52af2235a0587f98c69d8e39d2637640431f64d5c91ce468e3a2e2452b6ce8fa91d83b00c20ad047ae33 +DIST puppet_forge-5.0.1.gem 774144 BLAKE2B 2770c0609d93b3518017b36344025dbd7ab51360fea4af8f7ee610f4117f31de25698ad192ab00755564f0a57d9e6b041a7568440dbc5b47e2830a8cb00cd8f8 SHA512 3d29c166e1c22d7b4d45251866fbd8e6756a3026be5e17b1abe8cd6baaa7af4ddde7f2d07b75c21c5716c545cc6df82e36b1070a43a3d3c363214d3a5102843b EBUILD puppet_forge-3.2.0.ebuild 911 BLAKE2B 6b22c70ceaa8ed7c9665e0b536e54aaeb74ab3e45d7c0a3ef4c30d2d7aefc2db09368d150ae6769c5d92111887b6da01986d5acccff3ec390de49e142478f3a4 SHA512 68380ca4dc36573584837d089043f0265b801615004753516832dd7c95a7ed278ebe2f462bed4799e1de53c347c8b659726735bf7d6d67fe38b337634faecf4c +EBUILD puppet_forge-4.1.0.ebuild 1006 BLAKE2B ef82783f38d4b71c5637a847281d5c2a9eab2b30c26f4293302b7d84824f175b0fb1cef2a56deaa624729110126235f2a5d5802bac562e2b07b15e69071a25b3 SHA512 50ed51eaabccb9289af072403b879d3a49bae7536708b13f27399610205aed9987cf428df4556e627eca5e1ac1eb6a6d00aab4d8ba0b98bdea7573e5b912f131 +EBUILD puppet_forge-5.0.1-r1.ebuild 910 BLAKE2B b6a2ffc63738119760fb0648b69f1a73bbde470aebc17406ae363b965957e6f99d706dd1ba5c576cb59c8cf688621f728933ff0b6b9539cafa4cbe5508f30b21 SHA512 1d2afddf375238a48cc1e8a6f9af97b456abb978d784ba0b0199c0aa558cfe733932fcf16b44831d469e9c693c7d8ee8563498d5df02e9423f6fd1a682d0f832 MISC metadata.xml 570 BLAKE2B 34720e4ded1a16b1d177684f1241999043eb3c15bac2c5463be03ba38dfd0d61b769251f598a80a707947d325fc4a8f86227e6a60d2b40c83ffae8a70b0ca276 SHA512 f28a1e45ea6a5acdf6180d18c732717e348d1077fa43752721778a7b203c071592c91bbddfc5f4d867ce3d4c81f6384e844fc6ae31d46fec9786d5c091481f5a diff --git a/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch b/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch new file mode 100644 index 000000000000..3f39e97afe8c --- /dev/null +++ b/dev-ruby/puppet_forge/files/puppet_forge-5.0.1-typhoeus.patch @@ -0,0 +1,14 @@ +Typhoeus support only works then the faraday-typhoeus package is installed. +https://github.com/typhoeus/typhoeus/issues/709 + +--- a/lib/puppet_forge/connection.rb 2023-09-09 09:02:03.981164238 +0200 ++++ b/lib/puppet_forge/connection.rb 2023-09-09 09:03:56.506144279 +0200 +@@ -82,7 +82,7 @@ + + begin + # Use Typhoeus if available. +- Gem::Specification.find_by_name('typhoeus', '~> 1.4') ++ Gem::Specification.find_by_name('typhoeus', '~> 1.4') && Gem::Specification.find_by_name('faraday-typhoeus') + require 'typhoeus/adapters/faraday' + adapter = :typhoeus + rescue Gem::LoadError diff --git a/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild b/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild new file mode 100644 index 000000000000..ff6f1063b086 --- /dev/null +++ b/dev-ruby/puppet_forge/puppet_forge-4.1.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases" +HOMEPAGE="https://github.com/puppetlabs/forge-ruby" + +LICENSE="Apache-2.0" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend " + dev-ruby/faraday:2 + >=dev-ruby/faraday-follow_redirects-0.3.0:0.3 + dev-ruby/minitar + =dev-ruby/semantic_puppet-1* +" + +all_ruby_prepare() { + # Avoid integration and user specs since they all require network access + rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die + + sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die + + # Avoid specs that are broken when typhoeus is installed + rm -f spec/unit/forge/connection_spec.rb spec/unit/forge/v3/{base,release}_spec.rb || die +} diff --git a/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild new file mode 100644 index 000000000000..dc80c18aca40 --- /dev/null +++ b/dev-ruby/puppet_forge/puppet_forge-5.0.1-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +USE_RUBY="ruby31 ruby32" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" + +RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases" +HOMEPAGE="https://github.com/puppetlabs/forge-ruby" + +LICENSE="Apache-2.0" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64" +IUSE="" + +PATCHES=( "${FILESDIR}/${P}-typhoeus.patch" ) + +ruby_add_rdepend " + dev-ruby/faraday:2 + >=dev-ruby/faraday-follow_redirects-0.3.0:0.3 + dev-ruby/minitar + =dev-ruby/semantic_puppet-1* +" + +all_ruby_prepare() { + # Avoid integration and user specs since they all require network access + rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die + + sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die +} diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest index df83c098ecd4..eabc82c5b9fa 100644 --- a/dev-ruby/rack-test/Manifest +++ b/dev-ruby/rack-test/Manifest @@ -1,4 +1,3 @@ -AUX backport-b1084c1-issue-323.patch 869 BLAKE2B a43d83c09ac9b0bafda3a6a49fb71446425d4f5eb5e4fa9ac006ebf94c84c61aae3baef674d811c86f183cee61c814f8a88406fc7b8720d96d211e04076f25da SHA512 9d4f3ac4a592a811f603a3401ad07ce703620d2b2dfe25c2f37fc3ec1a952e7ab708b321e817edf63452d72bfa0ed2738c69b0a4063f8ac1dd0b0584c4d4b274 DIST rack-test-2.1.0.tar.gz 30099 BLAKE2B 212f23cf1d65f8840e04bc895d511b1b35e0344e5074e7ef3a15c5184a55285cb495b54489512ba7757cfbbe4ce9886db9f6dd36e092f5653c3c5bc8fb84ea7a SHA512 0d9d1e2b74ff8acca1c97d08c068022345556758c3c0dcf81b87c2f7caa8ca5730af2adc89e5c2bcf8f598f08df056c39f7c348f13a1ce44c4bcf0f84fe2bc11 EBUILD rack-test-2.1.0.ebuild 881 BLAKE2B 78420eb443f4e7c182978584f522c754308053ce5f24e0e1a9770954d9a1de7b1bf1e79978fe940a12162065a26e1770b75b746944d58fb2819fe77c3f33034b SHA512 c55363a44728e4aee7aa429a444bae4d30c2d1aca9e8ec44a73a98e6586a215a8d3c6fe4dcca301a902bfe98c1b6bc73e335aabbaa5607e2497df66976cc196c MISC metadata.xml 341 BLAKE2B 2db1720ecae8856de4660cace2a721f49f56c27c3aa4a0f86bd4a90416ce613c67d419e96d89d145c7307c79f12ec48b1938b21cf53fe6339424f4a1b2ce174a SHA512 08ff82252f63ea763cd855d306a08f31450973d0ab5eeb943a32e34c1ea13afc95a12097a6e788484d59e7f8bdad40c9e1961d4912712598ba821644ea43d63e diff --git a/dev-ruby/rack-test/files/backport-b1084c1-issue-323.patch b/dev-ruby/rack-test/files/backport-b1084c1-issue-323.patch deleted file mode 100644 index 84b3b2307aeb..000000000000 --- a/dev-ruby/rack-test/files/backport-b1084c1-issue-323.patch +++ /dev/null @@ -1,29 +0,0 @@ -https://github.com/rack/rack-test/issues/323 - -From b1084c1f7b04f6bdaad73c9d1ffc1b279af55e78 Mon Sep 17 00:00:00 2001 -From: Jeremy Evans <code@jeremyevans.net> -Date: Wed, 28 Sep 2022 18:33:43 -0700 -Subject: [PATCH] Make the UploadedFile GC finalizer test more reliable on - CRuby - ---- - spec/rack/test/uploaded_file_spec.rb | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/spec/rack/test/uploaded_file_spec.rb b/spec/rack/test/uploaded_file_spec.rb -index 2cb56ac..67bfbc5 100644 ---- a/spec/rack/test/uploaded_file_spec.rb -+++ b/spec/rack/test/uploaded_file_spec.rb -@@ -69,8 +69,10 @@ def file_path - System.gc - end - else -- c.new(file_path) -- GC.start -+ 50.times do |_i| -+ c.new(file_path) -+ GC.start -+ end - end - - # Due to CRuby's conservative garbage collection, you can never guarantee diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest index 5029d0b4f930..6b4a32cc2006 100644 --- a/dev-ruby/redis/Manifest +++ b/dev-ruby/redis/Manifest @@ -1,4 +1,3 @@ -AUX redis-4.7.1-local-redis-server.patch 1475 BLAKE2B 46a5703b463372ef30184a1108b3128672bcd2bb7c77b9b268ae336199d113ccdd439718ede4ec066f1659d262ad2404f2c01419efec08c214a2c045f68ac118 SHA512 6271610c96a006c26e2e1a4a7ea272ff3feac94f86538ee206e83ed8fde5082334b8c8a0decf584084a38b31551456ab80fd6b8ae1cc5ad3660e6a447f70878e AUX redis-4.8.0-local-redis-server.patch 1720 BLAKE2B e0142b0ee528a5e7ce82340802d6bb17b4ddb6dd7d191cb751a01532fbd9a76279294bf6bbdbee3e629506140d7c66d1a7da6f928cf77b9582e7fc14d18cc14d SHA512 09cc4678a5af4638dc694c9d2a2ab0b3a153e74a1bcf5f9289498a90bc1769d0c547bfe04ab5f78c353e8fffd1b23e5c2ebf45c94edd9e0cb1ef0f2052c28de4 DIST redis-rb-4.8.0.tar.gz 143136 BLAKE2B 6d70985d5e2a749b931e5bf1f74f04d1e748a9b65cc1b1e644d9ecfa633978bef9c6418308425b6996779ff65fbbb66cacbf464cdf6d00e2736b20089aa0889c SHA512 e9d454d0416091d0c5629b6ed826e70879ea2f93501bae7db19570bfbf4bdae2ed36b357390afcfca427531d997acc7f5ae004d55d0e87ddb67c909db2b181d5 EBUILD redis-4.8.0.ebuild 1109 BLAKE2B a42d164f377ff616cc73663eaddbc271a57752d872ea5aa65b51805fe29fe033adf543723dd1bc853ce5d07200eb3b5c8c18032b1c89c440837a8cf507ef334a SHA512 11fa785610b65a202ceed9082bfd8cf7524aa258ac57498f5c30814ed5cb5846fd453200d87ca473ed0a9f51f13ad51d21e448cce833392572906d8bb3638f33 diff --git a/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch b/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch deleted file mode 100644 index e220d62e35db..000000000000 --- a/dev-ruby/redis/files/redis-4.7.1-local-redis-server.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/makefile b/makefile -index c803066..d50ee93 100644 ---- a/makefile -+++ b/makefile -@@ -1,16 +1,15 @@ - REDIS_BRANCH ?= 6.2 --TMP := tmp - BUILD_DIR := ${TMP}/cache/redis-${REDIS_BRANCH} - TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz --BINARY := ${BUILD_DIR}/src/redis-server --REDIS_CLIENT := ${BUILD_DIR}/src/redis-cli -+BINARY := /usr/sbin/redis-server -+REDIS_CLIENT := /usr/bin/redis-cli - REDIS_TRIB := ${BUILD_DIR}/src/redis-trib.rb --PID_PATH := ${BUILD_DIR}/redis.pid --SOCKET_PATH := ${BUILD_DIR}/redis.sock -+PID_PATH := ${TMP}/redis.pid -+SOCKET_PATH := ${TMP}/redis.sock - PORT := 6381 - SLAVE_PORT := 6382 --SLAVE_PID_PATH := ${BUILD_DIR}/redis_slave.pid --SLAVE_SOCKET_PATH := ${BUILD_DIR}/redis_slave.sock -+SLAVE_PID_PATH := ${TMP}/redis_slave.pid -+SLAVE_SOCKET_PATH := ${TMP}/redis_slave.sock - HA_GROUP_NAME := master1 - SENTINEL_PORTS := 6400 6401 6402 - SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS})) -@@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster - ${TMP}: - @mkdir -p $@ - --${BINARY}: ${TMP} -- @bin/build ${REDIS_BRANCH} $< -+#${BINARY}: ${TMP} -+# @bin/build ${REDIS_BRANCH} $< - - test: -- @env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test -+ @env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test - - stop: - @$(call kill-redis,${PID_PATH}) diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest index 3370f3e6e215..a2eaa1a13238 100644 --- a/dev-ruby/slim/Manifest +++ b/dev-ruby/slim/Manifest @@ -1,4 +1,3 @@ -AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1586e0d3eb3581ece3fc398035bb4c6b32082a7366b946d29054ccdafa61b38adac5ff782991c070e161738aa1 SHA512 db3d64781003830fb98e331248fdaade0ee9076c6e452b06195d2cbbc6bbe7ed55c1da6c41e8ac0df9341f9c637e5cdc79142b7444f832eff870b8ea1a2b1dcb DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50 DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4 EBUILD slim-5.1.0-r1.ebuild 2236 BLAKE2B 7507a967daeb1f4eb8c0d7beb8ded4d51d57c81b902dd98b45e4fb79dda227f6edf00874fb17023189b374f4747acccc964bb8d6cf4bf284a535255e4e0c9e03 SHA512 c7f67bc8b78a1749dacd0e039f1ab0016e7b834ddc6bddbde2a539ebad7643dc33d09016945cef51430bb8ec45796154cd657bc178562080003bd69292cf7bdf diff --git a/dev-ruby/slim/files/slim-4.1.0-temple.patch b/dev-ruby/slim/files/slim-4.1.0-temple.patch deleted file mode 100644 index c8c939cd6933..000000000000 --- a/dev-ruby/slim/files/slim-4.1.0-temple.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 45a8087bbdde309703db3860a160bab3fdb8c14a Mon Sep 17 00:00:00 2001 -From: Takashi Kokubun <takashikkbn@gmail.com> -Date: Tue, 25 Oct 2022 09:25:18 -0700 -Subject: [PATCH] Support temple 0.9.1+ (#894) - ---- - slim.gemspec | 2 +- - test/core/test_commands.rb | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/slim.gemspec b/slim.gemspec -index 0bbc7ae4..095dafd5 100644 ---- a/slim.gemspec -+++ b/slim.gemspec -@@ -19,6 +19,6 @@ Gem::Specification.new do |s| - - s.required_ruby_version = '>=2.0.0' - -- s.add_runtime_dependency('temple', ['>= 0.7.6', '< 0.9']) -+ s.add_runtime_dependency('temple', ['>= 0.7.6', '!= 0.9.0']) - s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.1']) - end -diff --git a/test/core/test_commands.rb b/test/core/test_commands.rb -index 7cf8e838..15a77dd7 100644 ---- a/test/core/test_commands.rb -+++ b/test/core/test_commands.rb -@@ -58,7 +58,11 @@ def test_rails - prepare_common_test DYNAMIC_TEMPLATE, '--rails' do |out, err| - assert err.empty? - -- assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;} -+ if Gem::Version.new(Temple::VERSION) >= Gem::Version.new('0.9') -+ assert out.include? %Q{@output_buffer = output_buffer || ActionView::OutputBuffer.new;} -+ else -+ assert out.include? %Q{@output_buffer = ActiveSupport::SafeBuffer.new;} -+ end - assert out.include? %Q{@output_buffer.safe_concat(("<p>Hello "#{STRING_FREEZER}));} - assert out.include? %Q{@output_buffer.safe_concat(((::Temple::Utils.escape_html((name))).to_s));} - assert out.include? %Q{@output_buffer.safe_concat(("!</p>"#{STRING_FREEZER}));} diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest index 962923f756b2..e56e5dfcd8cf 100644 --- a/dev-ruby/thor/Manifest +++ b/dev-ruby/thor/Manifest @@ -1,4 +1,3 @@ -AUX thor-1.2.1-tests.patch 13418 BLAKE2B 13d3fdde30676171abe62b8fb7acc0a0564eb2041658e520a0838b6fb272303db9c0fad60170707b0676a9c39950ebcab778abaaf683716dd8546620e60e1a6e SHA512 a08e95e3df2c338b7bc7f700dcf04801fa743f0dc04abf5fde1030f306b78c536da1554e06736604acfaf6bd98622b4258dcec1791339727a57384cb226f8dcf AUX thor-1.2.2-no-coverage.patch 752 BLAKE2B 936e3ef4ba494a8e1b221fbf2688c9487c127fbf5991ae53baf5c33e12033de17c48bfd6dbf0460f952b5db4d4a0139befe7ad683e3bffa8b9a978a0dda27825 SHA512 c8b8e833f8d133e3d2c8e507820b054245ae119a766ba7ef4009ca235d64d0f763733aac719b6c5df521b23a80c43068cfdb747659fdda514a74dcb3d330f347 DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7 EBUILD thor-1.2.2.ebuild 2157 BLAKE2B 18f1befd80e7fdc1647f72a0177db32b28831f5b95742a7aab052246ff00e7c85909c04890d0808af6182836acef0c6ef9bca2f95514e1c3445da9edb99a54ce SHA512 0ec3d98a34b9be07b5893400c42d2e511fa4dddcc75f28a27348cd2a8e0a8469b6cf2aa73cd9d7c15b078557d1501bec33e85da11a6f4d0689584b50fade37bf diff --git a/dev-ruby/thor/files/thor-1.2.1-tests.patch b/dev-ruby/thor/files/thor-1.2.1-tests.patch deleted file mode 100644 index bd59deda2338..000000000000 --- a/dev-ruby/thor/files/thor-1.2.1-tests.patch +++ /dev/null @@ -1,211 +0,0 @@ -https://github.com/rails/thor/issues/817 -https://github.com/rails/thor/commit/0def4cfba5bf470f76877eb3b8a8895f0018e574 -https://github.com/rails/thor/commit/46d1422902e1c66b31fae79be7dca79ff8b2e81b - -From 0def4cfba5bf470f76877eb3b8a8895f0018e574 Mon Sep 17 00:00:00 2001 -From: Tim Diggins <tim@red56.uk> -Date: Fri, 4 Mar 2022 12:16:58 +0000 -Subject: [PATCH] fix expectations for ruby 3 treatment of hash arg - ---- a/spec/line_editor_spec.rb -+++ b/spec/line_editor_spec.rb -@@ -13,7 +13,7 @@ - describe ".readline" do - it "uses the Readline line editor" do - editor = double("Readline") -- expect(Thor::LineEditor::Readline).to receive(:new).with("Enter your name ", :default => "Brian").and_return(editor) -+ expect(Thor::LineEditor::Readline).to receive(:new).with("Enter your name ", {:default => "Brian"}).and_return(editor) - expect(editor).to receive(:readline).and_return("George") - expect(Thor::LineEditor.readline("Enter your name ", :default => "Brian")).to eq("George") - end -@@ -35,7 +35,7 @@ - describe ".readline" do - it "uses the Basic line editor" do - editor = double("Basic") -- expect(Thor::LineEditor::Basic).to receive(:new).with("Enter your name ", :default => "Brian").and_return(editor) -+ expect(Thor::LineEditor::Basic).to receive(:new).with("Enter your name ", {:default => "Brian"}).and_return(editor) - expect(editor).to receive(:readline).and_return("George") - expect(Thor::LineEditor.readline("Enter your name ", :default => "Brian")).to eq("George") - end ---- a/spec/shell/basic_spec.rb -+++ b/spec/shell/basic_spec.rb -@@ -70,80 +70,80 @@ def shell - - it "prints a message to the user with the available options, expects case-sensitive matching, and determines the correctness of the answer" do - flavors = %w(strawberry chocolate vanilla) -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', :limited_to => flavors).and_return("chocolate") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', {:limited_to => flavors}).and_return("chocolate") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :limited_to => flavors)).to eq("chocolate") - end - - it "prints a message to the user with the available options, expects case-sensitive matching, and reasks the question after an incorrect response" do - flavors = %w(strawberry chocolate vanilla) - expect($stdout).to receive(:print).with("Your response must be one of: [strawberry, chocolate, vanilla]. Please try again.\n") -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', :limited_to => flavors).and_return("moose tracks", "chocolate") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', {:limited_to => flavors}).and_return("moose tracks", "chocolate") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :limited_to => flavors)).to eq("chocolate") - end - - it "prints a message to the user with the available options, expects case-sensitive matching, and reasks the question after a case-insensitive match" do - flavors = %w(strawberry chocolate vanilla) - expect($stdout).to receive(:print).with("Your response must be one of: [strawberry, chocolate, vanilla]. Please try again.\n") -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', :limited_to => flavors).and_return("cHoCoLaTe", "chocolate") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', {:limited_to => flavors}).and_return("cHoCoLaTe", "chocolate") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :limited_to => flavors)).to eq("chocolate") - end - - it "prints a message to the user with the available options, expects case-insensitive matching, and determines the correctness of the answer" do - flavors = %w(strawberry chocolate vanilla) -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', :limited_to => flavors, :case_insensitive => true).and_return("CHOCOLATE") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', {:limited_to => flavors, :case_insensitive => true}).and_return("CHOCOLATE") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :limited_to => flavors, :case_insensitive => true)).to eq("chocolate") - end - - it "prints a message to the user with the available options, expects case-insensitive matching, and reasks the question after an incorrect response" do - flavors = %w(strawberry chocolate vanilla) - expect($stdout).to receive(:print).with("Your response must be one of: [strawberry, chocolate, vanilla]. Please try again.\n") -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', :limited_to => flavors, :case_insensitive => true).and_return("moose tracks", "chocolate") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] ', {:limited_to => flavors, :case_insensitive => true}).and_return("moose tracks", "chocolate") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :limited_to => flavors, :case_insensitive => true)).to eq("chocolate") - end - - it "prints a message to the user containing a default and sets the default if only enter is pressed" do -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? (vanilla) ', :default => "vanilla").and_return("") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? (vanilla) ', {:default => "vanilla"}).and_return("") - expect(shell.ask('What\'s your favorite Neopolitan flavor?', :default => "vanilla")).to eq("vanilla") - end - - it "prints a message to the user with the available options and reasks the question after an incorrect response and then returns the default" do - flavors = %w(strawberry chocolate vanilla) - expect($stdout).to receive(:print).with("Your response must be one of: [strawberry, chocolate, vanilla]. Please try again.\n") -- expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] (vanilla) ', :default => "vanilla", :limited_to => flavors).and_return("moose tracks", "") -+ expect(Thor::LineEditor).to receive(:readline).with('What\'s your favorite Neopolitan flavor? [strawberry, chocolate, vanilla] (vanilla) ', {:default => "vanilla", :limited_to => flavors}).and_return("moose tracks", "") - expect(shell.ask("What's your favorite Neopolitan flavor?", :default => "vanilla", :limited_to => flavors)).to eq("vanilla") - end - end - - describe "#yes?" do - it "asks the user and returns true if the user replies yes" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("y") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("y") - expect(shell.yes?("Should I overwrite it?")).to be true - end - - it "asks the user and returns false if the user replies no" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("n") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("n") - expect(shell.yes?("Should I overwrite it?")).not_to be true - end - - it "asks the user and returns false if the user replies with an answer other than yes or no" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("foobar") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("foobar") - expect(shell.yes?("Should I overwrite it?")).to be false - end - end - - describe "#no?" do - it "asks the user and returns true if the user replies no" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("n") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("n") - expect(shell.no?("Should I overwrite it?")).to be true - end - - it "asks the user and returns false if the user replies yes" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("Yes") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("Yes") - expect(shell.no?("Should I overwrite it?")).to be false - end - - it "asks the user and returns false if the user replies with an answer other than yes or no" do -- expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", :add_to_history => false).and_return("foobar") -+ expect(Thor::LineEditor).to receive(:readline).with("Should I overwrite it? ", {:add_to_history => false}).and_return("foobar") - expect(shell.no?("Should I overwrite it?")).to be false - end - end -@@ -431,13 +431,13 @@ def #456 Lanç... - expect(content).to eq(<<-TABLE) - Name Number Color - Erik 1234567890123 green --TABLE -+ TABLE - end - end - - describe "#file_collision" do - it "shows a menu with options" do -- expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqh] ', :add_to_history => false).and_return("n") -+ expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqh] ', {:add_to_history => false}).and_return("n") - shell.file_collision("foo") - end - -@@ -478,7 +478,7 @@ def #456 Lanç... - end - - it "always returns true if the user chooses always" do -- expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqh] ', :add_to_history => false).and_return("a") -+ expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqh] ', {:add_to_history => false}).and_return("a") - - expect(shell.file_collision("foo")).to be true - -@@ -488,7 +488,7 @@ def #456 Lanç... - - describe "when a block is given" do - it "displays diff and merge options to the user" do -- expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqdhm] ', :add_to_history => false).and_return("s") -+ expect(Thor::LineEditor).to receive(:readline).with('Overwrite foo? (enter "h" for help) [Ynaqdhm] ', {:add_to_history => false}).and_return("s") - shell.file_collision("foo") {} - end - -From 46d1422902e1c66b31fae79be7dca79ff8b2e81b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net> -Date: Wed, 15 Jun 2022 19:35:27 +0200 -Subject: [PATCH] Reimplement did_you_mean suggestions to keep behaviour - accross rubies - -Ruby 3.2 will introduce `Exception#detailed_message` and `did_you_mean` -has been already updated in Ruby 3.2 to use that. - -The new behaviour means not changing the original `Exception#message`. -That means it is hard to get the previous error output, because -`Exception#detailed_message` includes not only `did_you_mean` -decorations, but also additional information like the exception class. - -To fix this, I bring the old did_you_mean behavior into Thor, so that -the above changes do not affect us. ---- a/lib/thor/error.rb -+++ b/lib/thor/error.rb -@@ -11,7 +11,15 @@ def initialize(dictionary) - end - end - -- DidYouMean::Correctable -+ Module.new do -+ def to_s -+ super + DidYouMean.formatter.message_for(corrections) -+ end -+ -+ def corrections -+ @corrections ||= self.class.const_get(:SpellChecker).new(self).corrections -+ end -+ end - end - - # Thor::Error is raised when it's caused by wrong usage of thor classes. Those -@@ -100,16 +108,4 @@ class RequiredArgumentMissingError < InvocationError - - class MalformattedArgumentError < InvocationError - end -- -- if Correctable -- if DidYouMean.respond_to?(:correct_error) -- DidYouMean.correct_error(Thor::UndefinedCommandError, UndefinedCommandError::SpellChecker) -- DidYouMean.correct_error(Thor::UnknownArgumentError, UnknownArgumentError::SpellChecker) -- else -- DidYouMean::SPELL_CHECKERS.merge!( -- 'Thor::UndefinedCommandError' => UndefinedCommandError::SpellChecker, -- 'Thor::UnknownArgumentError' => UnknownArgumentError::SpellChecker -- ) -- end -- end - end |