February 2014 - macports-changes - lists.macosforge.org

[116807] trunk/dports/devel/git-core
by ciserlohn＠macports.org 07 Feb '14

07 Feb '14

Revision: 116807 https://trac.macports.org/changeset/116807 Author: ciserlohn(a)macports.org Date: 2014-02-07 12:45:14 -0800 (Fri, 07 Feb 2014) Log Message: ----------- git-core: update to version 1.8.5.4 Modified Paths: -------------- trunk/dports/devel/git-core/Portfile trunk/dports/devel/git-core/files/git-subtree.1.diff Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2014-02-07 20:37:33 UTC (rev 116806) +++ trunk/dports/devel/git-core/Portfile 2014-02-07 20:45:14 UTC (rev 116807) @@ -4,7 +4,7 @@ PortSystem 1.0 name git-core -version 1.8.5.3 +version 1.8.5.4 description A fast version control system long_description Git is a fast, scalable, distributed open source version \ control system focusing on speed and efficiency. @@ -19,11 +19,11 @@ git-manpages-${version}${extract.suffix} checksums git-${version}${extract.suffix} \ - rmd160 4f0ca2e7ccdd534812651bbdaef3eb6978a6ef7f \ - sha256 3148ee4eab459fe9caf145c1a9b8b27c6a81c66c1868f790f58896054cdfe3a7 \ + rmd160 9bf3c366ad95f069997eb70633a7d977b879e5dc \ + sha256 93ce88ae2fabfa72188145a23d89771bafed7556bf0adde7a6cd410789245f18 \ git-manpages-${version}${extract.suffix} \ - rmd160 df04faa09c5971e70204fb1242a6e5a0fce68ab9 \ - sha256 8c0b49dae6b0108a069dd91a2fe114d13642df45095d861c207c1e3f8e715366 \ + rmd160 3121dd371399d356b45464220c0d5493036f5777 \ + sha256 a29b07ae8375540023654e0dccaace9b0840bf0c82cb12bb64f231cec987041a \ depends_run port:rsync @@ -157,8 +157,8 @@ variant doc description {Install HTML and plaintext documentation} { distfiles-append git-htmldocs-${version}${extract.suffix} checksums-append git-htmldocs-${version}${extract.suffix} \ - rmd160 28efc50194fba139f12ce6973a8e33a9c07ccb42 \ - sha256 75cf533b8326af7c4a0c38d79040fcff14a0e29a80d37db030412f150421feb5 + rmd160 117726c231b1068c3c968924b7b0d40ff3843081 \ + sha256 b63f2af9a86d05fbc409a26fc144e8bda2af5e42d9df70b4b25e4a34ec0b5acb patchfiles-append git-subtree.html.diff Modified: trunk/dports/devel/git-core/files/git-subtree.1.diff =================================================================== --- trunk/dports/devel/git-core/files/git-subtree.1.diff 2014-02-07 20:37:33 UTC (rev 116806) +++ trunk/dports/devel/git-core/files/git-subtree.1.diff 2014-02-07 20:45:14 UTC (rev 116807) @@ -5,12 +5,12 @@ +.\" Title: git-subtree +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -+.\" Date: 10/21/2013 ++.\" Date: 02/07/2014 +.\" Manual: Git Manual -+.\" Source: Git 1.8.5.3 ++.\" Source: Git 1.8.5.4 +.\" Language: English +.\" -+.TH "GIT\-SUBTREE" "1" "08/23/2013" "Git 1\&.8\&.5\&.3" "Git Manual" ++.TH "GIT\-SUBTREE" "1" "02/07/2014" "Git 1\&.8\&.5\&.4" "Git Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" -----------------------------------------------------------------

1 0

[116806] users/jmr/mpstats
by jmr＠macports.org 07 Feb '14

07 Feb '14

Revision: 116806 https://trac.macports.org/changeset/116806 Author: jmr(a)macports.org Date: 2014-02-07 12:37:33 -0800 (Fri, 07 Feb 2014) Log Message: ----------- mpstats port: generate uuid on first activation rather than during destroot Modified Paths: -------------- users/jmr/mpstats/mpstats.conf users/jmr/mpstats/port/Portfile Modified: users/jmr/mpstats/mpstats.conf =================================================================== --- users/jmr/mpstats/mpstats.conf 2014-02-07 20:36:56 UTC (rev 116805) +++ users/jmr/mpstats/mpstats.conf 2014-02-07 20:37:33 UTC (rev 116806) @@ -4,5 +4,8 @@ # Where to submit usage data stats_url localhost -# Unique identifier for usage statistics +# Unique identifier for usage statistics - should be of the form produced by +# `uuidgen`. Note that mpstats.conf.default has a placeholder value here, as +# the id needs to be unique for each installation and so can't be generated +# in advance or included in the archive. stats_id @STATS_UUID@ Modified: users/jmr/mpstats/port/Portfile =================================================================== --- users/jmr/mpstats/port/Portfile 2014-02-07 20:36:56 UTC (rev 116805) +++ users/jmr/mpstats/port/Portfile 2014-02-07 20:37:33 UTC (rev 116806) @@ -19,12 +19,11 @@ master_sites sourceforge:macports use_bzip2 yes -checksums rmd160 8fae2cb42569278cca5ea631a3805802de634971 \ - sha256 cd3f54df954e8091f01cf358af54090ac27bc8af8db259f42dee5875caf5a6ca +checksums rmd160 6411865c289d95f15eec870fd3aa8d1ffa7c4502 \ + sha256 43a7c0e5956acf96f6a3e9c913229c6decbeabb5a4e5645a829a7fca7878a7ef configure { reinplace "s|set prefix /opt/local|set prefix ${prefix}|" ${worksrcpath}/mpstats.tcl - reinplace "s|@STATS_UUID@|[exec uuidgen]|" ${worksrcpath}/mpstats.conf } build {} destroot { @@ -36,6 +35,7 @@ post-activate { if {![file exists ${prefix}/etc/mpstats.conf]} { copy ${prefix}/etc/mpstats.conf.default ${prefix}/etc/mpstats.conf + reinplace "s|@STATS_UUID@|[exec uuidgen]|" ${prefix}/etc/mpstats.conf } }

1 0

[116805] trunk/dports/devel/git-core/Portfile
by ciserlohn＠macports.org 07 Feb '14

07 Feb '14

Revision: 116805 https://trac.macports.org/changeset/116805 Author: ciserlohn(a)macports.org Date: 2014-02-07 12:36:56 -0800 (Fri, 07 Feb 2014) Log Message: ----------- git-core: install emacs .el files (closes #42219) Modified Paths: -------------- trunk/dports/devel/git-core/Portfile Modified: trunk/dports/devel/git-core/Portfile =================================================================== --- trunk/dports/devel/git-core/Portfile 2014-02-07 20:34:46 UTC (rev 116804) +++ trunk/dports/devel/git-core/Portfile 2014-02-07 20:36:56 UTC (rev 116805) @@ -125,6 +125,10 @@ file delete -force ${share_path}/contrib copy ${worksrcpath}/contrib ${share_path} + xinstall -m 755 -d ${destroot}${prefix}/share/emacs/site-lisp/ + eval xinstall -m 644 [glob ${worksrcpath}/contrib/emacs/*.el] \ + ${destroot}${prefix}/share/emacs/site-lisp/ + } if {![variant_isset python26] && ![variant_isset python27]} {

1 0

[116804] trunk/dports/lang/gambit-c/Portfile
by snc＠macports.org 07 Feb '14

07 Feb '14

Revision: 116804 https://trac.macports.org/changeset/116804 Author: snc(a)macports.org Date: 2014-02-07 12:34:46 -0800 (Fri, 07 Feb 2014) Log Message: ----------- gambit-c: update to 4.7.2 Modified Paths: -------------- trunk/dports/lang/gambit-c/Portfile Modified: trunk/dports/lang/gambit-c/Portfile =================================================================== --- trunk/dports/lang/gambit-c/Portfile 2014-02-07 19:53:50 UTC (rev 116803) +++ trunk/dports/lang/gambit-c/Portfile 2014-02-07 20:34:46 UTC (rev 116804) @@ -4,7 +4,7 @@ PortSystem 1.0 name gambit-c -version 4.7.1 +version 4.7.2 set branch [join [lrange [split ${version} .] 0 1] .] categories lang license {LGPL-2.1+ Apache-2} @@ -33,8 +33,8 @@ distname gambc-v[strsed ${version} {g/\./_/}]-devel extract.suffix .tgz -checksums rmd160 6fb26a0ee96815d8d2c9e39d8a236a923832246e \ - sha256 3f600024c1e7e1fcedac96ec033c70183481135555dfd7a62d78477842c01869 +checksums rmd160 f1460b6c0cb80db50c9b420edd2dad16cf5d1249 \ + sha256 d72f6adc234f9369e1791db3e7a35b5ea035f8078f277b931c26e027587939d5 configure.args --infodir=${prefix}/share/info \ --libdir=${prefix}/lib/gambit-c \

1 0

[116803] branches/gsoc11-statistics/stats-server
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116803 https://trac.macports.org/changeset/116803 Author: cal(a)macports.org Date: 2014-02-07 11:53:50 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: delete unneeded directories Removed Paths: ------------- branches/gsoc11-statistics/stats-server/tmp/ branches/gsoc11-statistics/stats-server/vendor/

1 0

[116802] branches/gsoc11-statistics/stats-server/public/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116802 https://trac.macports.org/changeset/116802 Author: cal(a)macports.org Date: 2014-02-07 11:52:56 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: ignore generated files in public Property Changed: ---------------- branches/gsoc11-statistics/stats-server/public/ Property changes on: branches/gsoc11-statistics/stats-server/public ___________________________________________________________________ Added: svn:ignore + categories categories.html ports ports.html

1 0

[116801] branches/gsoc11-statistics/stats-server/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116801 https://trac.macports.org/changeset/116801 Author: cal(a)macports.org Date: 2014-02-07 11:51:44 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: don't ignore public/, which is present in the repository Property Changed: ---------------- branches/gsoc11-statistics/stats-server/ Property changes on: branches/gsoc11-statistics/stats-server ___________________________________________________________________ Modified: svn:ignore - .git .bundle Gemfile.lock log public tmp vendor sync-timestamp + .git .bundle Gemfile.lock log tmp vendor sync-timestamp

1 0

[116800] branches/gsoc11-statistics/stats-server/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116800 https://trac.macports.org/changeset/116800 Author: cal(a)macports.org Date: 2014-02-07 11:49:11 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: ignore sync timestamp Property Changed: ---------------- branches/gsoc11-statistics/stats-server/ Property changes on: branches/gsoc11-statistics/stats-server ___________________________________________________________________ Modified: svn:ignore - .git .bundle Gemfile.lock log public tmp vendor + .git .bundle Gemfile.lock log public tmp vendor sync-timestamp

1 0

[116799] branches/gsoc11-statistics/bin/
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116799 https://trac.macports.org/changeset/116799 Author: cal(a)macports.org Date: 2014-02-07 11:47:55 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: delete directory moved to level below Removed Paths: ------------- branches/gsoc11-statistics/bin/

1 0

[116798] branches/gsoc11-statistics/stats-server
by cal＠macports.org 07 Feb '14

07 Feb '14

Revision: 116798 https://trac.macports.org/changeset/116798 Author: cal(a)macports.org Date: 2014-02-07 11:46:31 -0800 (Fri, 07 Feb 2014) Log Message: ----------- macports stats: move bin directory from level above, adjust for deployment Added Paths: ----------- branches/gsoc11-statistics/stats-server/bin/ branches/gsoc11-statistics/stats-server/bin/add_ports branches/gsoc11-statistics/stats-server/bin/generate_portspy branches/gsoc11-statistics/stats-server/bin/generate_seed branches/gsoc11-statistics/stats-server/bin/new_ports branches/gsoc11-statistics/stats-server/bin/populate.py Property changes on: branches/gsoc11-statistics/stats-server/bin ___________________________________________________________________ Added: svn:ignore + bundler erubis rackup rails rake rdoc ri sprockets thor tilt tt uuid Added: branches/gsoc11-statistics/stats-server/bin/add_ports =================================================================== --- branches/gsoc11-statistics/stats-server/bin/add_ports (rev 0) +++ branches/gsoc11-statistics/stats-server/bin/add_ports 2014-02-07 19:46:31 UTC (rev 116798) @@ -0,0 +1,78 @@ +#!/usr/bin/env ruby +require 'rubygems' +require 'active_record' +require 'fileutils' +#require 'trac4r' + +ROOT = File.expand_path(File.dirname(__FILE__) + "/../") +TIME_FILE = "#{ROOT}/sync-timestamp" +NEW_PORTS = "#{ROOT}/bin/new_ports" +PORT_INDEX = "/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports" +RAILS_ROOT = "#{ROOT}" +MODE = 'production' + +require File.expand_path(RAILS_ROOT + '/app/models/category.rb', __FILE__) +require File.expand_path(RAILS_ROOT + '/app/models/port.rb', __FILE__) + + +if File.exists?(TIME_FILE) + $mtime = File.stat(TIME_FILE).mtime.to_i +else + $mtime = 0 +end + +FileUtils.touch(TIME_FILE) + +$ports = Array.new +$hashed_data = Hash.new + +db_info = YAML.load_file(File.expand_path(RAILS_ROOT + '/config/database.yml', __FILE__)) +#db_info['development']['database'] = RAILS_ROOT + "/" + db_info['development']['database'] +#puts db_info[MODE].to_yaml +ActiveRecord::Base.establish_connection(db_info[MODE]) +#trac = Trac.new(TRAC_URL, TRAC_USER, TRAC_PASS) + +fp = IO.popen("#{NEW_PORTS} -m #{$mtime} #{PORT_INDEX}") +new_ports = fp.read.split("\n") + +if new_ports.count > 0 + new_ports << "" #add last blank line +end + + +new_ports.each do |line| + unless (line == "") + data = line.match(/(\S+):\s+\{?(.+)\}?$/) + unless data.nil? #field missing, should record this if it happens + $hashed_data[data[1].to_sym] = data[2] + end + else + category_name = $hashed_data[:categories].try(:split, " ").try(:[], 0) + $category = Category.find_by_name(category_name) + if $category.nil? + $category = Category.new({:name => category_name}) + $category.save + end + + port = Port.find_by_name($hashed_data[:name]) + if port.nil? + port = Port.new + end + + port[:name] = $hashed_data[:name] + port[:path] = $hashed_data[:portdir] + port[:version] = $hashed_data[:version] + port[:description] = $hashed_data[:description] + port[:licenses] = $hashed_data[:license] + port[:category_id] = $category.id + port[:variants] = $hashed_data[:variants] + port[:maintainers] = $hashed_data[:maintainers] + port[:platforms] = $hashed_data[:platforms] + port[:categories] = $hashed_data[:categories] + + $ports << [$hashed_data, port] + port.save + puts "Saved #{port[:name]}, version #{port[:version]}" + $hashed_data = {} + end +end Property changes on: branches/gsoc11-statistics/stats-server/bin/add_ports ___________________________________________________________________ Added: svn:executable + * Added: branches/gsoc11-statistics/stats-server/bin/generate_portspy =================================================================== --- branches/gsoc11-statistics/stats-server/bin/generate_portspy (rev 0) +++ branches/gsoc11-statistics/stats-server/bin/generate_portspy 2014-02-07 19:46:31 UTC (rev 116798) @@ -0,0 +1,65 @@ +#!/usr/bin/env ruby + +### Generate a valid ports.py for use in populating the database with +### sample submissions. ports.py will be used by populate.py + +# This file adapted from generate_seed which is adapted from add_ports from MPWA + +# Note - this file must be executed from inside RAILS_ROOT +# otherwise it won't be able to connect to the database + +require 'rubygems' +require 'active_record' +require 'fileutils' + +ROOT = File.expand_path(File.dirname(__FILE__) + "/../") +BIN_ROOT = "#{ROOT}/bin" +RAILS_ROOT = "#{ROOT}/stats-server" +require File.expand_path(RAILS_ROOT + '/app/models/port.rb', __FILE__) + +$ports = Array.new +$hashed_data = Hash.new + +db_info = YAML.load_file(File.expand_path(RAILS_ROOT + '/config/database.yml', __FILE__)) +ActiveRecord::Base.establish_connection(db_info['development']) + + +class String + # Escape single quotes + def escape_single_quotes + self.gsub(/'/, "\\\\'") + end +end + +def esc(str) + if not str.nil? + str.escape_single_quotes + else + str + end +end + +path = "#{BIN_ROOT}/ports.py" +portfile = File.new(path, "w") + +if not portfile + puts "Unable to open #{path}" +end + +portfile.syswrite('port_list = [ ') + +# Output an array of dictionaries. Each dictionary represents a port +# The dicts have the keys name, version, variants. + +# Load all ports +ports = Port.all +ports.each do | port | + # Write the port + portfile.syswrite('{') + portfile.syswrite("\'name\': \'#{port.name}\', \'version\': \'#{port.version}\', \'variants\': \'#{port.variants}'") + portfile.syswrite('},') +end + +portfile.syswrite(']') + +portfile.close \ No newline at end of file Property changes on: branches/gsoc11-statistics/stats-server/bin/generate_portspy ___________________________________________________________________ Added: svn:executable + * Added: branches/gsoc11-statistics/stats-server/bin/generate_seed =================================================================== --- branches/gsoc11-statistics/stats-server/bin/generate_seed (rev 0) +++ branches/gsoc11-statistics/stats-server/bin/generate_seed 2014-02-07 19:46:31 UTC (rev 116798) @@ -0,0 +1,113 @@ +#!/usr/bin/env ruby + +### Generate a valid seeds.rb for use in seeding the database with +### valid ports and categories + +# Note - this file must be executed from inside RAILS_ROOT +# otherwise it won't be able to connect to the database + +require 'rubygems' +require 'active_record' +require 'fileutils' + +TIME_FILE = "/var/tmp/gsoc11-mpwa-sync" +ROOT = File.expand_path(File.dirname(__FILE__) + "/../") +NEW_PORTS = "#{ROOT}/bin/new_ports" +PORT_INDEX = "/opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports" +RAILS_ROOT = "#{ROOT}" +MODE = "production" + +require File.expand_path(RAILS_ROOT + '/app/models/category.rb', __FILE__) +require File.expand_path(RAILS_ROOT + '/app/models/port.rb', __FILE__) + + +if File.exists?(TIME_FILE) + $mtime = File.stat(TIME_FILE).mtime.to_i +else + $mtime = 0 +end + +FileUtils.touch(TIME_FILE) + +# Output encoding magic comment +puts "# coding: UTF-8" + +$ports = Array.new +$hashed_data = Hash.new + +db_info = YAML.load_file(File.expand_path(RAILS_ROOT + '/config/database.yml', __FILE__)) +ActiveRecord::Base.establish_connection(db_info[MODE]) + +fp = IO.popen("#{NEW_PORTS} -m #{$mtime} #{PORT_INDEX}") +new_ports = fp.read.split("\n") + +if new_ports.count > 0 + new_ports << "" #add last blank line +end + +class String + # Escape single quotes + def escape_single_quotes + self.gsub(/'/, "\\\\'") + end +end + +def esc(str) + if not str.nil? + str.escape_single_quotes + else + str + end +end + +new_ports.each do |line| + unless (line == "") + data = line.match(/(\S+):\s+\{?(.+)\}?$/) + unless data.nil? #field missing, should record this if it happens + $hashed_data[data[1].to_sym] = data[2] + end + else + category_name = $hashed_data[:categories].try(:split, " ").try(:[], 0) + $category = Category.find_by_name(category_name) + if $category.nil? + $category = Category.new({:name => category_name}) + puts "category = Category.new({:name => \'#{category_name}\'})" + puts "category.save" + $category.save + end + + port = Port.find_by_name($hashed_data[:name]) + if port.nil? + port = Port.new + end + + port[:name] = $hashed_data[:name] + port[:path] = $hashed_data[:portdir] + port[:version] = $hashed_data[:version] + port[:description] = $hashed_data[:description] + port[:licenses] = $hashed_data[:license] + port[:category_id] = $category.id + port[:variants] = $hashed_data[:variants] + port[:maintainers] = $hashed_data[:maintainers] + port[:platforms] = $hashed_data[:platforms] + port[:categories] = $hashed_data[:categories] + + $ports << [$hashed_data, port] + + puts "port = Port.new" + puts "port[:name] = \'#{esc($hashed_data[:name])}\'" + puts "port[:path] = \'#{esc($hashed_data[:portdir])}\'" + puts "port[:version] = \'#{esc($hashed_data[:version])}\'" + puts "port[:description] = \'#{esc($hashed_data[:description])}\'" + puts "port[:licenses] = \'#{esc($hashed_data[:license])}\'" + puts "port[:category_id] = #{$category.id}" + puts "port[:variants] = \'#{esc($hashed_data[:variants])}\'" + puts "port[:maintainers] = \'#{esc($hashed_data[:maintainers])}\'" + puts "port[:platforms] = \'#{esc($hashed_data[:platforms])}\'" + puts "port[:categories] = \'#{esc($hashed_data[:categories])}\'" + puts "port.save" + + port.save + $hashed_data = {} + end +end Property changes on: branches/gsoc11-statistics/stats-server/bin/generate_seed ___________________________________________________________________ Added: svn:executable + * Added: branches/gsoc11-statistics/stats-server/bin/new_ports =================================================================== --- branches/gsoc11-statistics/stats-server/bin/new_ports (rev 0) +++ branches/gsoc11-statistics/stats-server/bin/new_ports 2014-02-07 19:46:31 UTC (rev 116798) @@ -0,0 +1,140 @@ +#!/bin/sh +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 +# Run the Tcl interpreter \ +exec /usr/bin/tclsh "$0" "$@" + +catch {source \ + [file join "/opt/local/share/macports/Tcl" macports1.0 macports_fastload.tcl]} +package require macports +package require Pextlib + +# Globals +array set ui_options [list] +array set global_options [list] +array set global_variations [list] +set port_options [list] + +# Pass global options into mportinit +mportinit ui_options global_options global_variations + +# Standard procedures +proc print_usage args { + global argv0 + puts "Usage: $argv0 \[-d\] -m <time> \<directory\>" + puts "-d:\tOutput debugging information" + puts "-m:\tOutput ports newer than the given mtime" +} + +proc pindex {portdir} { + global target oldfd oldmtime qindex fd directory outdir \ + ui_options port_options + + # try to reuse the existing entry if it's still valid + if {[info exists qindex([string tolower [file tail $portdir]])]} { + try { + set mtime [file mtime [file join $directory $portdir Portfile]] + if {$oldmtime < $mtime} { + set offset $qindex([string tolower [file tail $portdir]]) + seek $oldfd $offset + gets $oldfd line + set name [lindex $line 0] + set len [lindex $line 1] + set line [read $oldfd $len] + array set portinfo $line + + if {[info exists ui_options(ports_debug)]} { + puts "Found entry for $portdir" + } + + foreach field [array names portinfo] { + puts $fd "${field}: $portinfo($field)" + } + puts $fd "" + + return + } + } catch {*} { + ui_warn "failed to open entry for ${portdir}" + } + } +} + +if {[expr $argc > 4]} { + print_usage + exit 1 +} + +for {set i 0} {$i < $argc} {incr i} { + set arg [lindex $argv $i] + switch -regex -- $arg { + {^-.+} { + if {$arg == "-d"} { # Turn on debug output + set ui_options(ports_debug) yes + } elseif {$arg == "-m"} { # output ports newer than mtime + incr i + set oldmtime [lindex $argv $i] + } else { + puts stderr "Unknown option: $arg" + print_usage + exit 1 + } + } + default { + set directory [file join [pwd] $arg] + } + } +} + +if {![info exists directory]} { + set directory . +} + +if {![info exists oldmtime]} { + set oldmtime 0 +} + +# cd to input directory +if {[catch {cd $directory} result]} { + puts stderr "$result" + exit 1 +} else { + set directory [pwd] +} + +# Set output directory to full path +if {[info exists outdir]} { + if {[catch {file mkdir $outdir} result]} { + puts stderr "$result" + exit 1 + } + if {[catch {cd $outdir} result]} { + puts stderr "$result" + exit 1 + } else { + set outdir [pwd] + } +} else { + set outdir $directory +} + +set outpath [file join $outdir PortIndex] +# open old index for comparison +if {[file isfile $outpath] && [file isfile ${outpath}.quick]} { + if {![catch {set oldfd [open $outpath r]}] && ![catch {set quickfd [open ${outpath}.quick r]}]} { + if {![catch {set quicklist [read $quickfd]}]} { + foreach entry [split $quicklist "\n"] { + set qindex([lindex $entry 0]) [lindex $entry 1] + } + } + close $quickfd + } +} else { + set newest 0 +} + +set fd stdout +mporttraverse pindex $directory +if {[info exists oldfd]} { + close $oldfd +} +close $fd Property changes on: branches/gsoc11-statistics/stats-server/bin/new_ports ___________________________________________________________________ Added: svn:executable + * Added: branches/gsoc11-statistics/stats-server/bin/populate.py =================================================================== --- branches/gsoc11-statistics/stats-server/bin/populate.py (rev 0) +++ branches/gsoc11-statistics/stats-server/bin/populate.py 2014-02-07 19:46:31 UTC (rev 116798) @@ -0,0 +1,149 @@ +#!/usr/bin/env python + +# populate.py +# Simulates multiple users submitting realistic data +# Uses curl to submit sample data and test rails submission code + +import random +import string +import uuid +import json +import subprocess +import time +from ports import port_list + +max_users = 250 +max_ports_per_user = 500 + +url_testdeploy = 'http://statsdeploy.heroku.com/submissions' +url_dev = 'http://127.0.0.1:3000/submissions' + +macports_versions = ['1.9.2', '1.9.99', '2.0'] +osx_versions = ['10.4', '10.5', '10.6'] +os_archs = ['i386', 'ppc'] +os_platforms = ['darwin'] +build_archs = ['x86_32', 'x86_64'] +gcc_versions = ['4.2.1', '4.3.6', '4.4.6', '4.5.3', '4.6.1'] +xcode_versions = ['2.5', '3.0', '3.1', '3.2', '4.0'] + +# Generated user ids +users = [] + +# The probability that a new user will be added starts at prob_new_user +prob_new_user = 95 # 95 % + +# Randomly choose entries for each category +def build_os(): + os = {} + os['macports_version'] = random.choice(macports_versions) + os['osx_version'] = random.choice(osx_versions) + os['os_arch'] = random.choice(os_archs) + os['os_platform'] = random.choice(os_platforms) + os['build_arch'] = random.choice(build_archs) + os['gcc_version'] = random.choice(gcc_versions) + os['xcode_version'] = random.choice(xcode_versions) + return os + +# Build up a space separated list of variants +# It selects a random number of variants to include from a list of valid variants +# for a port +def build_variants(variants): + varlist = variants.split() + + size = random.randint(0, len(varlist)) + randomlist = random.sample(varlist, size) + + return " ".join(randomlist) + +# Generate a list of ports for this user. +def build_ports(): + ports = [] + + # Choose a random number between 0 and max_ports_per_user + n_ports = random.randint(0, max_ports_per_user) + + # Generate n_port ports + for i in range(n_ports): + + # Choose a random port from the list of all ports + port = random.choice(port_list) + + # Generate random version strings by appending a digit to the existing version + # eg: 2.2 -> 2.2_6 + # Only append once, check if this port's version has already been modified + if not 'mod' in port: + append = ''.join(random.choice(string.digits) for i in xrange(1)) + port['version'] = port['version'] + '_' + append + port['mod'] = True # Flag that this port's version has been modified + + # Build up a list of variants from all valid variants for this port + port['variants'] = build_variants(port['variants']) + + # Append to the list of ports to submit for this user + ports.append(port) + return ports + +def decay_probability(): + global prob_new_user + + # Over time the probability that a new user will be added decreases as more users participate + decay_factor = 0.0001 + n_users = len(users) + prob_decay = n_users * decay_factor + prob = prob_new_user - prob_decay + + prob_new_user = prob + + # Always keep a minimum 5% chance of growth to simulate users new to + # macports users coming in and participating + if prob <= 5: + prob_new_user = 5 + +def generate_uuid(): + idstr = str(uuid.uuid4()) + users.append(idstr) + + return idstr + +def get_uuid(): + # Check if there are any available uuids + if len(users) == 0: + return generate_uuid() + + decay_probability() + + # Add a new user 'prob_new_user' percent of the time + # This simulates a new user deciding to participate + x = random.uniform(1,100) + print str(prob_new_user) + " n_users = " + str(len(users)) + if x <= prob_new_user: + return generate_uuid() + else: + # Get a random uuid from the list (simulate an existing user updating their info) + uuid = random.choice(users) + return uuid + +def submit(): + #url = url_testdeploy + url = url_dev + idstr = get_uuid() + + data = {} + + data['id'] = idstr + data['os'] = build_os() + data['active_ports'] = build_ports() + + json_enc = json.dumps(data) + args = "-d \'submission[data]=%s\'" % json_enc + pid = subprocess.Popen('curl ' + args + ' ' + url, shell=True) + pid.wait() + +def main(): + random.seed() + for x in range(max_users): + submit() + time.sleep(0.005) + +if __name__ == '__main__': + main() Property changes on: branches/gsoc11-statistics/stats-server/bin/populate.py ___________________________________________________________________ Added: svn:executable + *

1 0