<!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>[137931] branches/gsoc15-portfile/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/137931">137931</a></dd>
<dt>Author</dt> <dd>chunyang@macports.org</dd>
<dt>Date</dt> <dd>2015-06-23 01:21:16 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use more procedures</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15portfilegithub2portbitbucket2port">branches/gsoc15-portfile/github2port/bitbucket2port</a></li>
<li><a href="#branchesgsoc15portfilegithub2portgithub2port">branches/gsoc15-portfile/github2port/github2port</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15portfilegithub2portbitbucket2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-portfile/github2port/bitbucket2port (137930 => 137931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/github2port/bitbucket2port 2015-06-23 08:20:46 UTC (rev 137930)
+++ branches/gsoc15-portfile/github2port/bitbucket2port 2015-06-23 08:21:16 UTC (rev 137931)
</span><span class="lines">@@ -44,9 +44,6 @@
</span><span class="cx"> set project [lindex $path 1]
</span><span class="cx"> set tarball [lindex $path end]
</span><span class="cx">
</span><del>- set version "version"
- set tag_prefix ""
-
</del><span class="cx"> return [concat $author $project [parse_tarball_name $tarball]]
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesgsoc15portfilegithub2portgithub2port"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-portfile/github2port/github2port (137930 => 137931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-portfile/github2port/github2port 2015-06-23 08:20:46 UTC (rev 137930)
+++ branches/gsoc15-portfile/github2port/github2port 2015-06-23 08:21:16 UTC (rev 137931)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><del>-#!/usr/bin/env tclsh
</del><ins>+#!/usr/bin/env port-tclsh
</ins><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span class="cx"> #
</span><span class="cx"> # Generate a github group template Portfile given tarball or project URL
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+package require uri
+
</ins><span class="cx"> proc usage {{channel stderr}} {
</span><span class="cx"> global argv0
</span><span class="cx"> puts $channel "Usage: $argv0 URL"
</span><span class="lines">@@ -20,61 +22,46 @@
</span><span class="cx"> expr {$val ne "" ? $val : $def}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {$argc != 1} {
- usage
- exit 1
-}
</del><ins>+proc parse_tarball_name {v} {
+ set version ""
+ set tag_prefix ""
</ins><span class="cx">
</span><del>-set url [lindex $argv 0]
-
-set author author
-set project project
-set version 1.0
-set tag_prefix ""; # tag_prefix, usually is empty or "v"
-
-set tarball_from ""; # tarball type, including release and others
-
-# 2.0, v0.3.8, release-v1.5.8, v0.8.5.tar.gz => version and tag_prefix if has
-proc parse_fancy_version {v} {
- global version
- global tag_prefix
</del><span class="cx"> if {[regexp {[0-9]+([.-][0-9]+)+} $v version]} {
</span><span class="cx"> if {[string length $version] < [string length $v]} {
</span><span class="cx"> set tag_prefix [string range $v 0 [expr [string first $version $v] -1]]
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ return [list $version $tag_prefix]
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[string match */releases/download/* $url]} {
- set tarball_from releases
</del><ins>+proc parse_github_url {url} {
+ array set urlparts [uri::split $url]
</ins><span class="cx">
</span><del>- set tmp [split $url /]
- set author [lindex $tmp 3]
- set project [lindex $tmp 4]
- # 2.0, v0.3.0
- set github_version [lindex $tmp 7]
- parse_fancy_version $github_version
-} elseif {[string match */archive/* $url]} {
- set tarball_from ""
</del><ins>+ if {![string equal $urlparts(host) github.com]} {
+ return -code error \
+ "expected github url but got \"$url\""
+ }
</ins><span class="cx">
</span><del>- set tmp [split $url /]
- set author [lindex $tmp 3]
- set project [lindex $tmp 4]
- # v0.8.5.tar.gz
- set tarball [lindex $tmp 6]
- parse_fancy_version $tarball
-} elseif {[string match *github* $url]} {
- set tmp [split $url /]
- set author [lindex $tmp 3]
- set project [lindex $tmp 4]
-} else {
- usage
- exit 1
</del><ins>+ set path [split $urlparts(path) /]
+ set author [lindex $path 0]
+ set project [lindex $path 1]
+ set tarball [lindex $path end]
+
+ set tarball_from [expr {[string match */releases/download/* $url] ? "release" : ""}]
+
+ return [concat $author $project [parse_tarball_name $tarball] $tarball_from]
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-set description replaceme
-set homepage ""
</del><ins>+proc request_github {author project} {
+ set json "/tmp/${author}-${project}.json"
+ set api "https://api.github.com/repos/${author}/${project}"
+ exec curl --silent --max-time 5 --output $json $api
</ins><span class="cx">
</span><ins>+ set description [val_or_def [parse_json .description $json] $description]
+ set homepage [val_or_def [parse_json .description $json] $homepage]
+ return [list description homepage]
+}
+
</ins><span class="cx"> proc parse_json {query json} {
</span><span class="cx"> set tmp [exec jq $query $json]
</span><span class="cx"> set tmp [string range $tmp 1 end-1]
</span><span class="lines">@@ -86,18 +73,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc request_github {} {
- global author project
- global description homepage
</del><ins>+if {$argc != 1} {
+ usage
+ exit 1
+}
</ins><span class="cx">
</span><del>- set json "/tmp/${author}-${project}.json"
- set api "https://api.github.com/repos/${author}/${project}"
- exec curl --silent --max-time 5 --output $json $api
</del><ins>+set url [lindex $argv 0]
+set tmp [parse_github_url $url]
</ins><span class="cx">
</span><del>- set description [val_or_def [parse_json .description $json] $description]
- set homepage [val_or_def [parse_json .description $json] $homepage]
-}
</del><ins>+set author [val_or_def [lindex $tmp 0] "author"]
+set project [val_or_def [lindex $tmp 1] "project"]
+set version [val_or_def [lindex $tmp 2] "version"]
+set tag_prefix [val_or_def [lindex $tmp 3] "tag_prefix"]
+set tarball_from [val_or_def [lindex $tmp 4] ""]
</ins><span class="cx">
</span><ins>+set description replaceme
+set homepage ""
+
</ins><span class="cx"> # request_github
</span><span class="cx">
</span><span class="cx"> puts "# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4"
</span><span class="lines">@@ -109,7 +101,6 @@
</span><span class="cx"> puts ""
</span><span class="cx"> puts "github.setup ${author} ${project} ${version} ${tag_prefix}"
</span><span class="cx">
</span><del>-# TODO: 6. (optional) Query categories, license etc from other Package Manager
</del><span class="cx"> puts "categories replaceme"
</span><span class="cx"> puts "platforms darwin"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>