<!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>[137943] branches/gsoc15-portfile/github2port/github2port</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/137943">137943</a></dd>
<dt>Author</dt> <dd>chunyang@macports.org</dd>
<dt>Date</dt> <dd>2015-06-23 10:06:03 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>github2port: Simplify regexp use and use list rather than concat for making proc return</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15portfilegithub2portgithub2port">branches/gsoc15-portfile/github2port/github2port</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15portfilegithub2portgithub2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-portfile/github2port/github2port (137942 => 137943)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/github2port/github2port 2015-06-23 15:52:16 UTC (rev 137942)
+++ branches/gsoc15-portfile/github2port/github2port 2015-06-23 17:06:03 UTC (rev 137943)
</span><span class="lines">@@ -22,50 +22,61 @@
</span><span class="cx"> expr {$val ne "" ? $val : $def}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc parse_tarball_name {v} {
</del><ins>+# Extract version and tag_prefix from tarball name, e.g., v0.2.3.tar.gz and v_0.1.2.tar.gz
+proc parse_tarball_name {tarball_name} {
</ins><span class="cx"> set version ""
</span><span class="cx"> set tag_prefix ""
</span><span class="cx">
</span><del>- if {[regexp {[0-9]+([.-][0-9]+)+} $v version]} {
- if {[string length $version] < [string length $v]} {
- set tag_prefix [string range $v 0 [expr [string first $version $v] -1]]
- }
</del><ins>+ if {[regexp -indices {[0-9]+([.-][0-9]+)+} $tarball_name location]} {
+ set version [string range $tarball_name {*}$location]
+ set tag_prefix [string range $tarball_name 0 [expr [lindex $location 0]-1]]
</ins><span class="cx"> }
</span><span class="cx"> return [list $version $tag_prefix]
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc parse_github_url {url} {
</span><span class="cx"> array set urlparts [uri::split $url]
</span><del>-
</del><span class="cx"> if {![string equal $urlparts(host) github.com]} {
</span><span class="cx"> return -code error \
</span><span class="cx"> "expected github url but got \"$url\""
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ set res {}
+
</ins><span class="cx"> set path [split $urlparts(path) /]
</span><del>- set author [lindex $path 0]
- set project [lindex $path 1]
</del><ins>+ set author [lindex $path 0] ; lappend res $author
+ set project [lindex $path 1] ; lappend res $project
+
</ins><span class="cx"> set tarball [lindex $path end]
</span><ins>+ foreach i [parse_tarball_name $tarball] {
+ lappend res $i
+ }
</ins><span class="cx">
</span><span class="cx"> set tarball_from [expr {[string match */releases/download/* $url] ? "release" : ""}]
</span><ins>+ lappend res $tarball_from
</ins><span class="cx">
</span><del>- return [concat $author $project [parse_tarball_name $tarball] $tarball_from]
</del><ins>+ return $res
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc parse_bitbucket_url {url} {
</span><span class="cx"> array set urlparts [uri::split $url]
</span><del>-
</del><span class="cx"> if {![string equal $urlparts(host) bitbucket.org]} {
</span><span class="cx"> return -code error \
</span><span class="cx"> "expected bitbucket url but got \"$url\""
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ set res {}
+
</ins><span class="cx"> set path [split $urlparts(path) /]
</span><del>- set author [lindex $path 0]
- set project [lindex $path 1]
</del><ins>+ set author [lindex $path 0] ; lappend res $author
+ set project [lindex $path 1] ; lappend res $project
+
</ins><span class="cx"> set tarball [lindex $path end]
</span><ins>+ foreach i [parse_tarball_name $tarball] {
+ lappend res $i
+ }
</ins><span class="cx">
</span><del>- return [concat $author $project [parse_tarball_name $tarball]]
</del><ins>+ return $res
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc request_github {author project} {
</span></span></pre>
</div>
</div>
</body>
</html>