[PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Pjotr Prins]

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

Introducing gem-flags in preparation of ruby-nokogiri package

* guix/build-system/ruby.scm (build): add 'gem-flags' key
* guix/build/ruby-build-system.scm (build): use 'gem-flags' key

(this looks clean to me...)


[-- Attachment #2: 0001-build-ruby-Add-gem-flags-key-to-ruby-build-system.patch --]
[-- Type: text/x-diff, Size: 2257 bytes --]

From ce8cfeadc8a661ff0fe0b96dc241d0063ed49ba3 Mon Sep 17 00:00:00 2001
From: pjotrp <pjotr.public01@thebird.nl>
Date: Mon, 13 Jul 2015 15:32:36 +0200
Subject: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

* guix/build-system/ruby.scm (build): add 'gem-flags' key
* guix/build/ruby-build-system.scm (build): use 'gem-flags' key
---
 guix/build-system/ruby.scm       |    2 ++
 guix/build/ruby-build-system.scm |   11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm
index e4fda30..d601700 100644
--- a/guix/build-system/ruby.scm
+++ b/guix/build-system/ruby.scm
@@ -71,6 +71,7 @@
 
 (define* (ruby-build store name inputs
                      #:key
+                     (gem-flags ''())
                      (test-target "test")
                      (tests? #t)
                      (phases '(@ (guix build ruby-build-system)
@@ -95,6 +96,7 @@
                                (source
                                 source))
                    #:system ,system
+                   #:gem-flags ,gem-flags
                    #:test-target ,test-target
                    #:tests? ,tests?
                    #:phases ,phases
diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
index fce39b8..9cbc8a5 100644
--- a/guix/build/ruby-build-system.scm
+++ b/guix/build/ruby-build-system.scm
@@ -63,7 +63,8 @@ directory."
       (zero? (system* "rake" test-target))
       #t))
 
-(define* (install #:key source inputs outputs #:allow-other-keys)
+(define* (install #:key source inputs outputs (gem-flags '())
+                  #:allow-other-keys)
   (let* ((ruby-version
           (match:substring (string-match "ruby-(.*)\\.[0-9]$"
                                          (assoc-ref inputs "ruby"))
@@ -73,9 +74,11 @@ directory."
     (setenv "GEM_HOME" gem-home)
     (mkdir-p gem-home)
     (zero? (system* "gem" "install" "--local"
-                    "--bindir" (string-append out "/bin")))))
+                    "--bindir" (string-append out "/bin") "--"
+                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))
 
 (define %standard-phases
   (modify-phases gnu:%standard-phases
-- 
1.7.10.4

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Pjotr Prins]

Can this patch go in? I sent it 4 days ago. It allows building
extensions for Ruby gems, by passing in flags to gem, as shown in the
Nokogiri patch. Even without accepting Nokogiri, this is valuable for 
building and installing gems.

Pj.

On Mon, Jul 13, 2015 at 03:44:51PM +0200, Pjotr Prins wrote:
> Introducing gem-flags in preparation of ruby-nokogiri package
> 
> * guix/build-system/ruby.scm (build): add 'gem-flags' key
> * guix/build/ruby-build-system.scm (build): use 'gem-flags' key
> 
> (this looks clean to me...)
> 

> From ce8cfeadc8a661ff0fe0b96dc241d0063ed49ba3 Mon Sep 17 00:00:00 2001
> From: pjotrp <pjotr.public01@thebird.nl>
> Date: Mon, 13 Jul 2015 15:32:36 +0200
> Subject: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system
> 
> * guix/build-system/ruby.scm (build): add 'gem-flags' key
> * guix/build/ruby-build-system.scm (build): use 'gem-flags' key
> ---
>  guix/build-system/ruby.scm       |    2 ++
>  guix/build/ruby-build-system.scm |   11 +++++++----
>  2 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm
> index e4fda30..d601700 100644
> --- a/guix/build-system/ruby.scm
> +++ b/guix/build-system/ruby.scm
> @@ -71,6 +71,7 @@
>  
>  (define* (ruby-build store name inputs
>                       #:key
> +                     (gem-flags ''())
>                       (test-target "test")
>                       (tests? #t)
>                       (phases '(@ (guix build ruby-build-system)
> @@ -95,6 +96,7 @@
>                                 (source
>                                  source))
>                     #:system ,system
> +                   #:gem-flags ,gem-flags
>                     #:test-target ,test-target
>                     #:tests? ,tests?
>                     #:phases ,phases
> diff --git a/guix/build/ruby-build-system.scm b/guix/build/ruby-build-system.scm
> index fce39b8..9cbc8a5 100644
> --- a/guix/build/ruby-build-system.scm
> +++ b/guix/build/ruby-build-system.scm
> @@ -63,7 +63,8 @@ directory."
>        (zero? (system* "rake" test-target))
>        #t))
>  
> -(define* (install #:key source inputs outputs #:allow-other-keys)
> +(define* (install #:key source inputs outputs (gem-flags '())
> +                  #:allow-other-keys)
>    (let* ((ruby-version
>            (match:substring (string-match "ruby-(.*)\\.[0-9]$"
>                                           (assoc-ref inputs "ruby"))
> @@ -73,9 +74,11 @@ directory."
>      (setenv "GEM_HOME" gem-home)
>      (mkdir-p gem-home)
>      (zero? (system* "gem" "install" "--local"
> -                    "--bindir" (string-append out "/bin")))))
> +                    "--bindir" (string-append out "/bin") "--"
> +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))
>  
>  (define %standard-phases
>    (modify-phases gnu:%standard-phases
> -- 
> 1.7.10.4
> 


-- 

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Ludovic Courtès]

Pjotr Prins <pjotr.public12@thebird.nl> skribis:

> From ce8cfeadc8a661ff0fe0b96dc241d0063ed49ba3 Mon Sep 17 00:00:00 2001
> From: pjotrp <pjotr.public01@thebird.nl>
> Date: Mon, 13 Jul 2015 15:32:36 +0200
> Subject: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system
>
> * guix/build-system/ruby.scm (build): add 'gem-flags' key
> * guix/build/ruby-build-system.scm (build): use 'gem-flags' key

[...]

>      (zero? (system* "gem" "install" "--local"
> -                    "--bindir" (string-append out "/bin")))))
> +                    "--bindir" (string-append out "/bin") "--"
> +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))

The ‘cond’ form is syntactically invalid, and ‘gem-flags’ is not a
procedure so it cannot be called.  So I’ve changed that, also removing
the “--”.  Pushed as 6e9f291.

Thanks!

Ludo’.

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Pjotr Prins]

On Sat, Jul 18, 2015 at 05:20:28PM +0200, Ludovic Courtès wrote:
> >      (zero? (system* "gem" "install" "--local"
> > -                    "--bindir" (string-append out "/bin")))))
> > +                    "--bindir" (string-append out "/bin") "--"
> > +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))
> 
> , and ‘gem-flags’ is not a procedure so it cannot be called.  So
> I’ve changed that, also removing the “--”.  Pushed as 6e9f291.

The "--" is required when gem-flags is passed in. It is optional when
gem-flags is empty. Do you think gem authors should always prepend the
"--" in front of the other options? I would think it is a builder
thing if we can abstract it away. Right? If that is so, we can leave it
there since it is harmless if gem-flags is empty.

Pj.

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Ludovic Courtès]

Pjotr Prins <pjotr.public12@thebird.nl> skribis:

> On Sat, Jul 18, 2015 at 05:20:28PM +0200, Ludovic Courtès wrote:
>> >      (zero? (system* "gem" "install" "--local"
>> > -                    "--bindir" (string-append out "/bin")))))
>> > +                    "--bindir" (string-append out "/bin") "--"
>> > +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))
>> 
>> , and ‘gem-flags’ is not a procedure so it cannot be called.  So
>> I’ve changed that, also removing the “--”.  Pushed as 6e9f291.
>
> The "--" is required when gem-flags is passed in. It is optional when
> gem-flags is empty. Do you think gem authors should always prepend the
> "--" in front of the other options? I would think it is a builder
> thing if we can abstract it away. Right? If that is so, we can leave it
> there since it is harmless if gem-flags is empty.

My guess is that there are options like --bindir (maybe “--docdir”?) for
which “--” does not need to be added, and others for which it is
needed.  That’s why I left it out (also: users can easily add “--” but
cannot remove it if it’s hard-coded.)

Now, Dave and you definitely know this better than me, so I’ll rely on
your judgment.  Thoughts?

Ludo’.

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Pjotr Prins]

On Sun, Jul 19, 2015 at 10:44:18PM +0200, Ludovic Courtès wrote:
> > On Sat, Jul 18, 2015 at 05:20:28PM +0200, Ludovic Courtès wrote:
> >> >      (zero? (system* "gem" "install" "--local"
> >> > -                    "--bindir" (string-append out "/bin")))))
> >> > +                    "--bindir" (string-append out "/bin") "--"
> >> > +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))

> My guess is that there are options like --bindir (maybe “--docdir”?) for
> which “--” does not need to be added, and others for which it is
> needed.  That’s why I left it out (also: users can easily add “--” but
> cannot remove it if it’s hard-coded.)

OK. Makes sense. Arguably, in that case the default options (--local,
--bindir) should be overridable too. But, as they are sensible, let's
leave it the way it is now. We'll just add "--" for every gem (it is
actually a pass-through of options to the underlying build system, so
I could have named it ext-flags, or something, and have a separate
gem-flags).

But I think the current version is fine. Next up the ruby-nokogiri
package.

Pj.

Re: [PATCH] build: ruby: Add 'gem-flags' key to ruby build system

[Thompson, David]

On Sun, Jul 19, 2015 at 4:44 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Pjotr Prins <pjotr.public12@thebird.nl> skribis:
>
>> On Sat, Jul 18, 2015 at 05:20:28PM +0200, Ludovic Courtès wrote:
>>> >      (zero? (system* "gem" "install" "--local"
>>> > -                    "--bindir" (string-append out "/bin")))))
>>> > +                    "--bindir" (string-append out "/bin") "--"
>>> > +                    (string-join (cond (null? gem-flags)('())(gem-flags)))))))
>>>
>>> , and ‘gem-flags’ is not a procedure so it cannot be called.  So
>>> I’ve changed that, also removing the “--”.  Pushed as 6e9f291.
>>
>> The "--" is required when gem-flags is passed in. It is optional when
>> gem-flags is empty. Do you think gem authors should always prepend the
>> "--" in front of the other options? I would think it is a builder
>> thing if we can abstract it away. Right? If that is so, we can leave it
>> there since it is harmless if gem-flags is empty.
>
> My guess is that there are options like --bindir (maybe “--docdir”?) for
> which “--” does not need to be added, and others for which it is
> needed.  That’s why I left it out (also: users can easily add “--” but
> cannot remove it if it’s hard-coded.)
>
> Now, Dave and you definitely know this better than me, so I’ll rely on
> your judgment.  Thoughts?

I don't really use the 'gem' tool directly most of the time, but not
hardcoding '--' sounds reasonable based on your thoughts above.

- Dave