[gentoo-dev] [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend

[gentoo-dev] [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend

[Sam James]

From: konsolebox <konsolebox@gmail.com>

Closes: https://bugs.gentoo.org/909529
Signed-off-by: Sam James <sam@gentoo.org>
---
 eclass/ruby-utils.eclass | 52 ++--------------------------------------
 1 file changed, 2 insertions(+), 50 deletions(-)

diff --git a/eclass/ruby-utils.eclass b/eclass/ruby-utils.eclass
index c4b6f1502f8a9..8a2b7720c951a 100644
--- a/eclass/ruby-utils.eclass
+++ b/eclass/ruby-utils.eclass
@@ -44,57 +44,9 @@ _ruby_implementation_depend() {
 	local rubyslot=
 
 	case $1 in
-		ruby18)
+		ruby1[89]|ruby2[0-7]|ruby3[0-2])
 			rubypn="dev-lang/ruby"
-			rubyslot=":1.8"
-			;;
-		ruby19)
-			rubypn="dev-lang/ruby"
-			rubyslot=":1.9"
-			;;
-		ruby20)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.0"
-			;;
-		ruby21)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.1"
-			;;
-		ruby22)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.2"
-			;;
-		ruby23)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.3"
-			;;
-		ruby24)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.4"
-			;;
-		ruby25)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.5"
-			;;
-		ruby26)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.6"
-			;;
-		ruby27)
-			rubypn="dev-lang/ruby"
-			rubyslot=":2.7"
-			;;
-		ruby30)
-			rubypn="dev-lang/ruby"
-			rubyslot=":3.0"
-			;;
-		ruby31)
-			rubypn="dev-lang/ruby"
-			rubyslot=":3.1"
-			;;
-		ruby32)
-			rubypn="dev-lang/ruby"
-			rubyslot=":3.2"
+			rubyslot=":${1:4:1}.${1:5}"
 			;;
 		ree18)
 			rubypn="dev-lang/ruby-enterprise"
-- 
2.41.0

[gentoo-dev] Re: [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend

[Sam James]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]


Sam James <sam@gentoo.org> writes:

> From: konsolebox <konsolebox@gmail.com>
>
> Closes: https://bugs.gentoo.org/909529
> Signed-off-by: Sam James <sam@gentoo.org>

ftr, while I find the case really repetitive, I'm not sure if this
crosses the line into unreadable bash or not, so I feel on the fence.

But I wanted it reviewed on ML in any case, rather than us forgetting
it on BZ.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 377 bytes --]

Re: [gentoo-dev] Re: [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend

[Hans de Graaff]

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

On Thu, 1970-01-01 at 00:00 +0000, Sam James wrote:
> 
> Sam James <sam@gentoo.org> writes:
> 
> > From: konsolebox <konsolebox@gmail.com>
> > 
> > Closes: https://bugs.gentoo.org/909529
> > Signed-off-by: Sam James <sam@gentoo.org>
> 
> ftr, while I find the case really repetitive, I'm not sure if this
> crosses the line into unreadable bash or not, so I feel on the fence.

I don't have a strong preference either way. We only need to change
this once a year anyway.

Perhaps not having the large case statement makes the whole file a bit
more readable at the expense of a more difficult expression.

Hans

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [gentoo-dev] Re: [PATCH] ruby-utils.eclass: Simplify _ruby_implementation_depend

[Arthur Zamarin]

[-- Attachment #1.1: Type: text/plain, Size: 887 bytes --]

On 14/07/2023 11.37, Sam James wrote:
> 
> Sam James <sam@gentoo.org> writes:
> 
>> From: konsolebox <konsolebox@gmail.com>
>>
>> Closes: https://bugs.gentoo.org/909529
>> Signed-off-by: Sam James <sam@gentoo.org>
> 
> ftr, while I find the case really repetitive, I'm not sure if this
> crosses the line into unreadable bash or not, so I feel on the fence.
> 
> But I wanted it reviewed on ML in any case, rather than us forgetting
> it on BZ.
> 

I agree the code isn't easy to read, but it isn't too hard. I do want to
suggest you add a simple comment on the same line bringing an example
value for the rubyslot. With an example comment, it becomes trivial to
understand (and if someone needs to change it, he know beforehand what
format to expect).

-- 
Arthur Zamarin
arthurzam@gentoo.org
Gentoo Linux developer (Python, pkgcore stack, Arch Teams, GURU)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]