euscan: Added remote-id handler

Signed-off-by: volpino <fox91@anche.no>

pym/euscan/handlers/url/cpan.py

@@ -81,12 +81,22 @@ def cpan_vercmp(cp, a, b):
 
 def scan(pkg, url):
     cp, ver, rev = portage.pkgsplit(pkg.cpv)
-    pkg = guess_package(cp, url)
+    remote_pkg = guess_package(cp, url)
 
-    orig_url = url
-    url = 'http://search.cpan.org/api/dist/%s' % pkg
+    output.einfo("Using CPAN API: %s", remote_pkg)
 
-    output.einfo("Using: " + url)
+    result = scan_remote(pkg, [remote_pkg])
+
+    ret = []
+    for url, pv in result:
+        ret.append((url, pv, HANDLER_NAME, CONFIDENCE))
+    return ret
+
+
+def scan_remote(pkg, remote_data):
+    remote_pkg = remote_data[0]
+    url = 'http://search.cpan.org/api/dist/%s' % remote_pkg
+    cp, ver, rev = portage.pkgsplit(pkg.cpv)
 
     try:
         fp = helpers.urlopen(url)
@@ -125,9 +135,6 @@ def scan(pkg, url):
             version['archive']
         )
 
-        if url == orig_url:
-            continue
-
-        ret.append((url, pv, HANDLER_NAME, CONFIDENCE))
+        ret.append((url, pv))
 
     return ret

pym/euscan/handlers/url/github.py

@@ -44,6 +44,7 @@ def scan(pkg, url):
                             (user, project))
     dls = json.load(dlreq)
 
+    ret = []
     for dl in dls:
         m = fnre.match(dl['name'])
 
@@ -51,4 +52,6 @@ def scan(pkg, url):
             pv = helpers.gentoo_mangle_version(m.group(1))
             if helpers.version_filtered(cp, ver, pv):
                 continue
-            yield (dl['html_url'], pv, HANDLER_NAME, CONFIDENCE)
+
+            ret.append((dl['html_url'], pv, HANDLER_NAME, CONFIDENCE))
+    return ret

pym/euscan/handlers/url/pypi.py

@@ -29,6 +29,15 @@ def scan(pkg, url):
 
     package = guess_package(pkg.cpv, url)
 
+    ret = []
+    for urls, pv in scan_remote(pkg, [package]):
+        ret.append((urls, pv, HANDLER_NAME, CONFIDENCE))
+    return ret
+
+
+def scan_remote(pkg, remote_data):
+    package = remote_data[0]
+
     output.einfo("Using PyPi XMLRPC: " + package)
 
     client = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
@@ -42,13 +51,11 @@ def scan(pkg, url):
     cp, ver, rev = portage.pkgsplit(pkg.cpv)
 
     ret = []
-
     for up_pv in versions:
         pv = helpers.gentoo_mangle_version(up_pv)
         if helpers.version_filtered(cp, ver, pv):
             continue
         urls = client.release_urls(package, up_pv)
         urls = " ".join([infos['url'] for infos in urls])
-        ret.append((urls, pv, HANDLER_NAME, CONFIDENCE))
-
+        ret.append((urls, pv))
     return ret

pym/euscan/handlers/url/rubygems.py

@@ -5,7 +5,7 @@ import urllib2
 
 from euscan import helpers, output
 
-HANDLER_NAME = "rubygem"
+HANDLER_NAME = "rubygems"
 CONFIDENCE = 100.0
 PRIORITY = 90
 
@@ -33,14 +33,23 @@ def scan(pkg, url):
     'http://guides.rubygems.org/rubygems-org-api/#gemversion'
 
     gem = guess_gem(pkg.cpv, url)
+
     if not gem:
         output.eerror("Can't guess gem name using %s and %s" % \
             (pkg.cpv, url))
         return []
 
-    url = 'http://rubygems.org/api/v1/versions/%s.json' % gem
+    output.einfo("Using RubyGem API: %s" % gem)
 
-    output.einfo("Using: " + url)
+    ret = []
+    for url, pv in scan_remote(pkg, [gem]):
+        ret.append(url, pv, HANDLER_NAME, CONFIDENCE)
+    return ret
+
+
+def scan_remote(pkg, remote_data):
+    gem = remote_data[0]
+    url = 'http://rubygems.org/api/v1/versions/%s.json' % gem
 
     try:
         fp = helpers.urlopen(url)
@@ -55,19 +64,14 @@ def scan(pkg, url):
     data = fp.read()
     versions = json.loads(data)
 
-    if not versions:
-        return []
-
     cp, ver, rev = portage.pkgsplit(pkg.cpv)
 
     ret = []
-
     for version in versions:
         up_pv = version['number']
         pv = helpers.gentoo_mangle_version(up_pv)
         if helpers.version_filtered(cp, ver, pv):
             continue
         url = 'http://rubygems.org/gems/%s-%s.gem' % (gem, up_pv)
-        ret.append((url, pv, HANDLER_NAME, CONFIDENCE))
-
+        ret.append((url, pv))
     return ret