add support for building python package from pypi directly

examples/django/index.yaml

@@ -0,0 +1,7 @@
+---
+default:
+  name: python2-django
+  version: 1.5
+  pypi: Django
+  summary: Django
+  python: /home/tops/bin/python

examples/http_load/index.yaml

@@ -0,0 +1,7 @@
+default:
+  name: httpload
+  git: git://github.com/timbunce/http_load.git
+  git-branch: master
+  summary: a http load tester
+  version: 1.0
+

examples/http_load/scripts/build

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mkdir -p $DESTDIR/usr/{bin,share/man/man1}
+make install BINDIR=$DESTDIR/usr/bin MANDIR=$DESTDIR/usr/share/man/man1

examples/nginx/index.yaml

@@ -0,0 +1,6 @@
+default:
+  name: nginx
+  http: http://nginx.org/download/nginx-1.2.6.tar.gz
+  version: 1.2.6 
+
+# cpan-module will fetch directly from CPAN

examples/nginx/scripts/build

@@ -0,0 +1,3 @@
+#!/bin/sh
+./configure --prefix=/opt/nginx --without-pcre --without-http_gzip_module --without-http_rewrite_module
+make install DESTDIR=$DESTDIR

index.yaml

@@ -1,6 +1,6 @@
 default:
     name: multipkg
-    version: '1.2'
+    version: '1.3.4'
     summary: Automation for package builds (supports RPM, deb)
     buildprefix: /usr
 rpm:
@@ -14,6 +14,7 @@ rpm:
         - subversion-perl
         - perl-Git
         - perl-Error
+        - perl-JSON
 deb:
     arch: all
     provides:
@@ -24,3 +25,4 @@ deb:
         - libyaml-syck-perl
         - libsvn-perl
         - liberror-perl
+        - libjson-perl

install.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+multipkg=$(which multipkg)
+
+if [ -z "$multipkg" ]; then
+  cp -v source/lib/Seco/Multipkg.pm Multipkg.pm.orig
+
+  echo "Installing buildrequires. It may require sudo privileges."
+
+  if which yum; then
+    sudo yum groupinstall -y 'Development Tools'
+    sudo yum install -y perl-YAML-Syck perl-ExtUtils-MakeMaker
+    rm -v -f multipkg-*.rpm
+  elif which dpkg; then
+    sudo apt-get -y install build-essential
+    rm -v -f multipkg_*.deb
+  fi
+
+  PREFIX=./root PKGVERID=0 INSTALLDIR=source scripts/transform
+  perl -I ./source/lib root/usr/bin/multipkg -t .
+
+  if which yum; then
+    sudo yum install -y multipkg-*rpm
+    rm -v multipkg-*rpm
+  elif which dpkg; then
+    sudo dpkg -i multipkg_*deb
+    rm -v multipkg_*deb
+  fi
+
+  unset PREFIX PKGVERID INSTALLDIR
+  mv -v Multipkg.pm.orig source/lib/Seco/Multipkg.pm
+
+fi
+
+multipkg -t .
+
+# remove temporarily installed multipkg
+if [ -z "$multipkg" ]; then
+  if which yum; then
+    sudo yum remove -y multipkg
+  elif which dpkg; then
+    sudo dpkg -P multipkg
+  fi
+fi
+echo ======================
+echo == package build ok ==
+echo ======================
+ls -alh multipkg*

root/usr/bin/hg-multipkg

@@ -0,0 +1,189 @@
+#!/usr/bin/perl -w
+
+# Modified from Noah Meyerhans' git-multipkg, written by Jianing YANG
+# <jianingy.yang at gmail dot com>.
+
+# Copyright (c) 2011 Noah Meyerhans <[email protected]> All rights reserved.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either:
+
+# a) the GNU General Public License as published by the Free
+#    Software Foundation, version 2, found in the included file GPLv2.
+# b) the Perl "Artistic License," found in the included file PERLARTISTIC.
+
+use strict;
+use Data::Dumper;
+use File::Temp;
+use File::Basename;
+use File::Spec;
+use Getopt::Long;
+
+Getopt::Long::Configure("bundling");
+
+my $opt = {
+    'b' => '',
+    'r' => 'tip',
+    'B' => 'default',
+};
+
+my %options = (
+    'h|help'      => 'show usage information',
+    'b|baseurl=s' => 'base URI for the mercurial repo',
+    'B|branch=s'  => 'branch to build from',
+    'r|rev=s'     => 'revision to build (default=HEAD)',
+    'k|keep'      => 'do not delete the working directory',
+    'v|verbose'   => 'verbose output',
+    'f|force'     => 'Force through multipkg errors',
+);
+
+usage() unless GetOptions( $opt, keys %options );
+my $package = shift;
+
+usage() if( $opt->{h} );
+usage() unless( $opt->{b} );
+usage() unless( $package );
+
+my $verbose = $opt->{v};
+
+sub usage {
+  print <<EOF;
+
+   Usage: $0 [options] <package>
+   Options:
+    -c, changelog      include changelog (NOT IMPLEMENTED)
+    -m, mtime          set mtime on files from last revision (NOT IMPLEMENTED)
+    -b, baseuri=s      base URI for Mercurial repo
+    -r, rev=s          revision to checkout
+    -B, branch=s       branch to build from (default=default)
+    -k, keep           keep the temporary directory
+    -v, verbose        verbose
+    -p, platform=s     platform
+    -s, set=s          List of variables to set
+    -f, force          Force through multipkg errors
+
+EOF
+  exit(0);
+}
+
+sub info { print "info: @_ \n" if ($verbose); }
+sub fatal { print "fatal: @_ \n"; exit 111; }
+
+# Clone the source repository to a local directory
+sub clone {
+    my ($repo, $target, $opts) = @_;
+    info("Cloning from $repo to $target");
+    my $out = qx(hg clone -u $opts->{B} $repo $target);
+    info($out);
+}
+
+# Call multipkg
+sub pkg {
+    my ($opts, $pkg, $srcdir, $build, $ts) = @_;
+    info("Invoking multipkg on $srcdir");
+    # options to pass through to multipkg
+    my @multipkg_opts = map { ("-$_") } grep { $opts->{$_} } (qw/k v f/);
+    my $vars = "release=$ts,srcurl=$opts->{b},srcdir=$srcdir";
+    print "BUILD:$build\n";
+    system("multipkg", '-s', $vars, @multipkg_opts, $build);
+}
+
+# Copy the contents of the hg repository to the build directory
+sub archive {
+    my ($src, $dest, $opts) = @_;
+    my $cwd = $ENV{PWD};
+    info("archiving $src to $dest");
+    my $cmd = "hg archive -p . -t tar -r $opts->{r} - | (cd $dest && tar xf -)";
+    info("Running $cmd");
+    chdir($src);
+    mkdir($dest);
+    system($cmd);
+    chdir($cwd);
+}
+
+sub get_timestamp {
+    my ($dir, $rev) = @_;
+    my $ts = 0;
+    my $oldPWD = $ENV{PWD};
+    info("Gathering revision timestamp information for $dir\@$rev");
+    chdir($dir) or die;
+    $ts = qx(hg log -r $rev --template '{date|hgdate}');
+    ($ts) = split /\s+/, $ts;
+    chdir($oldPWD);
+    die "Did not get a meaningful timestamp for $dir at $rev\n" unless($ts > 0);
+    return $ts;
+}
+
+sub getrepo {
+    my $path = shift;
+    return [ split '/', $path ]->[0];
+}
+
+sub getpkg {
+    my $path = shift;
+    return File::Basename::basename($path);
+}
+
+sub getpkgpath {
+    my $path = shift;
+    my $repo = getrepo($path);
+
+    my $pkgpath = $path;
+    $pkgpath =~ s{^$repo/?}{};
+    return $pkgpath;
+}
+
+sub main {
+    my ($opts, $path) = @_;
+
+    # Prepare the package, base and repo from the provided base URI
+
+    # Package name is always the same
+    my $pkg = getpkg($path);
+
+    # $pkgbase is contrived from the base uri and package path provided
+    # $repo is fed to hg clone
+    my ($pkgbase, $repo);
+
+    if ($opts->{b} =~ /^http/) {
+        # can't use File::Spec->catdir for these because it'll destory the two
+        # slashes in http://whatever.com/repo
+        my $repoid = getrepo($path);
+        $repoid =~ s{^/+}{};
+        my $base = $opts->{b};
+        $base =~ s{/+$}{};
+
+        $repo = "${base}/${repoid}";
+        $pkgbase = getpkgpath($path);
+    }
+    elsif ($opts->{b} =~ /\.hg$/){
+        $repo = $opts->{b};
+
+        # if $path is just a repo name, not a full path...
+        if ( File::Basename::basename( $path ) eq $path ) {
+            $pkgbase = '';
+        }
+        else {
+            #otherwise, shave off the first part of the path
+            $pkgbase = $path;
+            $pkgbase =~ s{^[^/]+/}{};
+        }
+    }
+    else {
+        # -b was not provided
+        # SHOULD NEVER BE REACHED
+        die "unsupported base";
+    }
+
+    my $dir = File::Temp::tempdir(CLEANUP => ( !defined($opts->{k}) ));
+    my $build = "$dir/build";
+    my $clonedir = "$dir/clone";
+    clone($repo, $clonedir, $opts);
+
+    my $srcdir = File::Spec->catdir($dir, 'src');
+    symlink File::Spec->catdir($clonedir, $pkgbase), $srcdir;
+    archive($srcdir, $build, $opts);
+    my $ts = get_timestamp($clonedir, $opts->{r});
+    pkg($opts, $pkg, $srcdir, $build, $ts);
+}
+
+main($opt, $package);

root/usr/bin/multipkg

@@ -102,7 +102,7 @@ sub usage {
   }
 
   print sort @array;
-
+  print "\nVERSION: ", MULTIPKG_VERSION, "\n";
   die "$msg\n";
 }
 

root/usr/bin/web-multipkg

@@ -0,0 +1,81 @@
+#!/usr/bin/perl
+
+use strict;
+use JSON;
+use Getopt::Long;
+
+use constant {
+  VCS_SUBVERSION => 0,
+  VCS_GIT => 1,
+  VCS_MERCURIAL => 2,
+};
+
+Getopt::Long::Configure("bundling"); 
+my $opt = {
+    's' => 'http://multipkg.in',
+};
+
+my %options = (
+    'h|help'      => 'show usage information',
+    's|source'    => 'multipkg admin site url',
+    'v|verbose'   => 'show verbose information',
+);
+
+usage() unless GetOptions( $opt, keys %options );
+my $package = shift;
+my $verbose = '-v' if $opt->{v};
+
+usage() if( $opt->{h} );
+usage() unless( $package );
+
+sub usage
+{
+  print <<EOF;
+
+   Usage: $0 [options] <package>
+   Options:
+    -s, source=s          URL of multipkg admin site
+
+   Examples:
+   multipkg-install multipkg
+   multipkg-install -s http://multipkg.in/ multipkg
+
+EOF
+  exit(0);
+}
+
+sub error 
+{
+   my $msg = shift;
+   print STDERR "ERROR: $msg\n";
+   exit(111);
+}
+
+sub main
+{
+    my $json = qx#curl -s '$opt->{s}/multipkg/api/1/search/?format=json\&name=$package'#;
+    error "admin server error" unless $json;
+
+    my $result = JSON->new->utf8->decode($json);
+    error "package not found" unless $result->{meta}->{total_count} > 0;
+
+    my $package = $result->{'objects'}[0];
+    my @split = split m#/#, $package->{vcs_address};
+    my $name = pop @split;
+    my $base = join "/", @split;
+    $name = join "/", ($name, $package->{vcs_subdir});
+    $name =~ s/\/$//g;
+
+    if ($package->{vcs_type} eq VCS_SUBVERSION) {
+        print("svn-multipkg $verbose -b $base $name\n");
+        system("svn-multipkg $verbose -b $base $name");
+    } elsif ($package->{vcs_type} eq VCS_GIT) {
+        system("git-multipkg $verbose -b $base $name");
+    } elsif ($package->{vcs_type} eq VCS_MERCURIAL) {
+        system("hg-multipkg $verbose -b $base $name");
+    } else {
+        die "UNKNOWN VCS TYPE!";
+    }
+}
+
+main();

root/usr/share/multipkg/default.yaml

@@ -2,9 +2,12 @@ default:
   buildprefix: '/usr/local'
   prefix: '/'
   perl: '/usr/bin/perl'
+  python: '/usr/bin/python'
   version: '0.0001'
   shebangmunge: 1
   os_specific: no
+  xfercmd: '/usr/bin/curl -s -o %s %u'
+  git-branch: master
 
 rpm:
   autoreqprov: no