<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[120523] branches/gsoc14-pip2port/tester.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/120523">120523</a></dd>
<dt>Author</dt> <dd>gaurav@macports.org</dd>
<dt>Date</dt> <dd>2014-05-31 10:17:58 -0700 (Sat, 31 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Compiled with fetch and updated to remove traceback</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc14pip2porttesterpy">branches/gsoc14-pip2port/tester.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc14pip2porttesterpy"></a>
<div class="modfile"><h4>Modified: branches/gsoc14-pip2port/tester.py (120522 => 120523)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc14-pip2port/tester.py 2014-05-31 10:03:32 UTC (rev 120522)
+++ branches/gsoc14-pip2port/tester.py 2014-05-31 17:17:58 UTC (rev 120523)
</span><span class="lines">@@ -7,12 +7,11 @@
</span><span class="cx"> # -*- coding: utf-8 -*-
</span><span class="cx"> #! /usr/bin/env python
</span><span class="cx">
</span><del>-import urllib2
-#import urllib
-import hashlib
</del><span class="cx"> import argparse
</span><span class="cx"> import sys
</span><span class="cx"> import os
</span><ins>+import urllib2
+import hashlib
</ins><span class="cx"> import zipfile
</span><span class="cx"> from progressbar import *
</span><span class="cx"> try:
</span><span class="lines">@@ -35,42 +34,29 @@
</span><span class="cx"> print key,'-->',value[key]
</span><span class="cx"> print "\n"
</span><span class="cx">
</span><del>-def data(pkg_name,pkg_versions=None):
</del><ins>+def release_data(pkg_name,pkg_version=None):
</ins><span class="cx"> print "\n"
</span><del>- if not pkg_versions:
- version = client.search({'name':pkg_name})[0]['version']
- values = client.release_data(pkg_name,version)
-# print values
- if values:
- for key in values.keys():
- print key,'-->',values[key]
- else:
- print "No such package found."
- print "Please specify the exact package name."
</del><ins>+ values = client.release_data(pkg_name,pkg_version)
+ if values:
+ for key in values.keys():
+ print key,'-->',values[key]
</ins><span class="cx"> else:
</span><del>- for version in pkg_versions:
- values = client.release_data(pkg_name,version)
-# print values
- if values:
- for key in values.keys():
- print key,'-->',values[key]
- else:
- print "No such package found."
- print "Please specify the exact package name."
</del><ins>+ print "No such package found."
+ print "Please specify the exact package name."
</ins><span class="cx"> print "\n"
</span><span class="cx">
</span><del>-def fetch(pkg_name,url):
- checksum_md5 = url.split('#')[-1].split('=')[-1]
- parent_dir = './sources/'
- src_dir = parent_dir + "/"+pkg_name+"/"
</del><ins>+def fetch(pkg_name,dict):
+ checksum_md5 = dict['md5_digest']
+ parent_dir = './sources'
+ src_dir = parent_dir + '/' + pkg_name
</ins><span class="cx"> if not os.path.exists(parent_dir):
</span><span class="cx"> os.makedirs(parent_dir)
</span><span class="cx"> if not os.path.exists(src_dir):
</span><span class="cx"> os.makedirs(src_dir)
</span><span class="cx">
</span><del>- file_name = src_dir + url.split('/')[-1].split('#')[0]
</del><ins>+ url = dict['url']
+ file_name = src_dir + '/' + dict['filename']
</ins><span class="cx">
</span><del>-# urllib.urlretrieve(url,file_name)
</del><span class="cx"> u = urllib2.urlopen(url)
</span><span class="cx"> f = open(file_name,'wb')
</span><span class="cx"> meta = u.info()
</span><span class="lines">@@ -96,64 +82,16 @@
</span><span class="cx"> f.close()
</span><span class="cx">
</span><span class="cx"> checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
</span><del>- if str(checksum_md5_calc) == str(checksum_md5):
</del><ins>+ if str(checksum_md5) == str(checksum_md5_calc):
</ins><span class="cx"> print 'Successfully fetched\n'
</span><del>- else:
- print 'Aborting due to inconsistency on checksums\n'
- try:
- os.remove(file_name)
- except OSError, e:
- print "Error: %s - %s." % (e.filename,e.strerror)
</del><ins>+ ext = file_name.split('.')[-1]
+ if ext == 'egg':
+ zip = zipfile.ZipFile(file_name)
+ for name in zip.namelist():
+ if name.split("/")[0] == "EGG-INFO":
+# print name
+ zip.extract(name,src_dir)
</ins><span class="cx">
</span><del>-
-
-def fetch_egg(url):
- checksum_md5 = url.split('#')[-1].split('=')[-1]
- parent_dir = './sources/'
- pkg_name = url.split('/')[-2]
- src_dir = parent_dir +pkg_name+"/"
- if not os.path.exists(parent_dir):
- os.makedirs(parent_dir)
- if not os.path.exists(src_dir):
- os.makedirs(src_dir)
-
- file_name = src_dir + url.split('/')[-1].split('#')[0]
- print file_name
-
-
- u = urllib2.urlopen(url)
- f = open(file_name,'wb')
- meta = u.info()
- file_size = int(meta.getheaders("Content-Length")[0])
-
- widgets = ['Fetching: ', Percentage(), ' ', Bar(marker=RotatingMarker(),left='[',right=']'), ' ', ETA(), ' ', FileTransferSpeed()]
- pbar = ProgressBar(widgets=widgets, maxval=int(file_size))
- pbar.start()
-
- file_size_dl = 0
- block_sz = 1024
- while True:
- buffer = u.read(block_sz)
- if not buffer:
- break
-
- file_size_dl += len(buffer)
- f.write(buffer)
- pbar.update(file_size_dl)
-
- pbar.finish()
- print
- f.close()
-
- checksum_md5_calc = hashlib.md5(open(file_name).read()).hexdigest()
- if str(checksum_md5_calc) == str(checksum_md5):
- print 'Successfully fetched\n'
- zip = zipfile.ZipFile(file_name)
- for name in zip.namelist():
- if name.split("/")[0] == "EGG-INFO":
- print name
- zip.extract(name,src_dir)
-
</del><span class="cx"> else:
</span><span class="cx"> print 'Aborting due to inconsistency on checksums\n'
</span><span class="cx"> try:
</span><span class="lines">@@ -161,90 +99,64 @@
</span><span class="cx"> except OSError, e:
</span><span class="cx"> print "Error: %s - %s." % (e.filename,e.strerror)
</span><span class="cx">
</span><del>- return
</del><span class="cx">
</span><ins>+def fetch_url(pkg_name,pkg_version=None):
+ print "\n"
+ values = client.release_urls(pkg_name,pkg_version)
+ for value in values:
+ fetch(pkg_name,value)
+ print "\n"
</ins><span class="cx">
</span><span class="cx">
</span><del>-def main():
- parser = argparse.ArgumentParser(description='pip2port tester script.')
-
- parser.add_argument('package_name',
- metavar='package_name', type=str, nargs='?',
- help='Package_Name')
-# parser.add_argument('package_version',
-# metavar='package_version', type=str, nargs='*',
-# help='Package_Version(s)')
- parser.add_argument('package_url',
- metavar='package_url', type=str, nargs='?',
- help='Package_Url')
- parser.add_argument('-l', '--list_packages', action='store_const',
- dest='action', const='list_packages', required=False,
- help='List all packages')
- parser.add_argument('-s', '--search', action='store_const',
- dest='action', const='search', required=False,
- help='Search for a package by <package_name>')
- parser.add_argument('-d', '--data', action='store_const',
- dest='action', const='data', required=False,
- help='Releases data for a package by <package_name>')
- parser.add_argument('-f', '--fetch', action='store_const',
- dest='action', const='fetch', required=False,
- help='Fetches distfile for a package by <package_url>')
- parser.add_argument('-fe', '--fetch_egg', action='store_const',
- dest='action', const='fetch_egg', required=False,
- help='Fetches distfile for a package by <package_url>')
-
-
- options=parser.parse_args()
</del><ins>+def main(argv):
+ parser = argparse.ArgumentParser(description="Pypi2Port Tester")
+ parser.add_argument('-l', '--list', action='store_true', dest='list',
+ default=False, required=False,
+ help='List all packages')
+ parser.add_argument('-s', '--search', action='store', type=str,
+ dest='packages_search', nargs='*', required=False,
+ help='Search for a package by <package_name>')
+ parser.add_argument('-d', '--data', action='store',
+ dest='packages_data', nargs='*', type=str,
+ help='Releases data for a package by <package_name>')
+ parser.add_argument('-f', '--fetch', action='store', type=str,
+ dest='package_fetch', nargs=2, required=False,
+ help='Fetches distfiles for a package by <package_name> and <package_version>')
+ options = parser.parse_args()
</ins><span class="cx"> # print options
</span><span class="cx">
</span><del>- if options.action == 'list_packages':
</del><ins>+ if options.list == True:
</ins><span class="cx"> list_all()
</span><span class="cx"> return
</span><span class="cx">
</span><del>- if options.action == 'search':
- if options.package_name == None:
- parser.error("No package name specified")
- else:
- search(options.package_name)
</del><ins>+ if options.packages_search:
+ for pkg_name in options.packages_search:
+ search(pkg_name)
</ins><span class="cx"> return
</span><span class="cx">
</span><del>- if options.action == 'data':
- if options.package_name == None:
- parser.error("No package name specified")
</del><ins>+ if options.packages_data:
+ pkg_name = options.packages_data[0]
+ if len(options.packages_data) > 1:
+ pkg_version = options.packages_data[1]
</ins><span class="cx"> else:
</span><del>-# if options.package_version == None:
-# data(options.package_name)
-# else:
-# data(options.package_name,options.package_version)
- data(options.package_name)
</del><ins>+ if client.package_releases(pkg_name):
+ pkg_version = client.package_releases(pkg_name)[0]
+ release_data(pkg_name,pkg_version)
</ins><span class="cx"> return
</span><span class="cx">
</span><del>- if options.action == 'fetch':
-# print options,"\n"
- if options.package_name == None:
- if options.package_url == None:
- parser.error("No package name and url specified")
- else:
- parser.error("No package name specified")
- elif options.package_url == None:
- parser.error("No url specified")
</del><ins>+ if options.package_fetch:
+ pkg_name = options.package_fetch[0]
+ if len(options.package_fetch) > 1:
+ pkg_version = options.package_fetch[1]
+ fetch_url(pkg_name,pkg_version)
</ins><span class="cx"> else:
</span><del>-# print options
- fetch(options.package_name,options.package_url)
</del><ins>+ if client.package_releases(pkg_name):
+ pkg_version = client.packages_releases(pkg_name)[0]
+ fetch_url(pkg_name,pkg_version)
</ins><span class="cx"> return
</span><span class="cx">
</span><del>- if options.action == 'fetch_egg':
-# print options,"\n"
- if options.package_name == None:
- parser.error("No <package>.egg url specified")
- else:
-# print options
- fetch_egg(options.package_name)
- return
- else:
- parser.print_help()
- parser.error("No input specified")
</del><ins>+ parser.print_help()
+ parser.error("No input specified")
</ins><span class="cx">
</span><del>-
</del><span class="cx"> if __name__ == "__main__":
</span><del>- main()
</del><ins>+ main(sys.argv[1:])
</ins></span></pre>
</div>
</div>
</body>
</html>