groovy

Enhance GrapeIvy to support ext

Details

  • Type: Improvement Improvement
  • Status: Closed Closed
  • Priority: Minor Minor
  • Resolution: Fixed
  • Affects Version/s: None
  • Fix Version/s: 1.8-rc-4
  • Component/s: Grape
  • Labels:
    None
  • Number of attachments :
    0

Description

From the mailing list:

I would like to suggest a patch for this defect:

Could you please review it?

Thanks,
Sergey
—

Index: GrapeIvy.groovy
===================================================================
--- GrapeIvy.groovy (revision 21815)
+++ GrapeIvy.groovy (working copy)
@@ -197,6 +197,7 @@
         }
 
         String groupId = deps.group ?: deps.groupId ?: deps.organisation ?: deps.organization ?: deps.org ?: ''
+        String ext = deps.ext ?: deps.type ?: ''
 
         //TODO accept ranges and decode them?  except '1.0.0'..<'2.0.0' won't work in groovy
         String version     = deps.version ?: deps.revision ?: deps.rev ?: '*'
@@ -214,7 +215,7 @@
         }
         def classifier = deps.classifier ?: null
 
-        return new IvyGrabRecord(mrid:mrid, conf:conf, changing:changing, transitive:transitive, force:force, classifier:classifier)
+        return new IvyGrabRecord(mrid:mrid, conf:conf, changing:changing, transitive:transitive, force:force, classifier:classifier, ext:ext)
     }
 
     public grab(String endorsedModule) {

Activity

Ascending order - Click to sort in descending order
Paul King made changes -
Field Original Value New Value
Component/s Grape [ 13810 ]
Hide
Permalink
Paul King added a comment - - edited

Use case from mailing list:

@Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3')
import groovy.grape.Grape
import com.jacob.com.LibraryLoader
classifier = LibraryLoader.shouldLoad32Bit() ? 'x86' : 'x64'
jacobUrl = Grape.resolve([:], [group:'net.sf.jacob-project', module:'jacob', version:'1.14.3', type:'dll', classifier:classifier])[0]
System.setProperty('jacob.dll.path', new File(jacobUrl).absolutePath)
LibraryLoader.loadJacobLibrary()
Show
Paul King added a comment - - edited Use case from mailing list: @Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3') import groovy.grape.Grape import com.jacob.com.LibraryLoader classifier = LibraryLoader.shouldLoad32Bit() ? 'x86' : 'x64' jacobUrl = Grape.resolve([:], [group:'net.sf.jacob-project', module:'jacob', version:'1.14.3', type:'dll', classifier:classifier])[0] System .setProperty('jacob.dll.path', new File(jacobUrl).absolutePath) LibraryLoader.loadJacobLibrary()
Hide
Permalink
Paul King added a comment -

In trunk, the following script (2nd line) will cause the jacob-1.14.3-x64.dll artifact to be downloaded into a dlls directory in the local cached artifact repo. And the first line downloads the normal jar artifact.

@Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3')
@Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3', classifier='x64', type='dll')
import groovy.grape.Grape
println 'done'

Currently there is no provision to get back the URI of the downloaded artifact using @Grab.

Show
Paul King added a comment - In trunk, the following script (2nd line) will cause the jacob-1.14.3-x64.dll artifact to be downloaded into a dlls directory in the local cached artifact repo. And the first line downloads the normal jar artifact. @Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3') @Grab(group='net.sf.jacob-project', module='jacob', version='1.14.3', classifier='x64', type='dll') import groovy.grape.Grape println 'done' Currently there is no provision to get back the URI of the downloaded artifact using @Grab .
Hide
Permalink
Paul King added a comment -

Added support for 'ext' and 'type'

Show
Paul King added a comment - Added support for 'ext' and 'type'
Paul King made changes -
Status Open [ 1 ] Resolved [ 5 ]
Assignee Paul King [ paulk ]
Fix Version/s 1.8-rc-4 [ 17245 ]
Resolution Fixed [ 1 ]
Paul King made changes -
Status Resolved [ 5 ] Closed [ 6 ]

People

  • Assignee:
    Paul King
    Reporter:
    Paul King
Vote (0)
Watch (0)

Dates

  • Created:
    Updated:
    Resolved: