From 572204c7d25c0b442763b7e4577052b54c0fa303 Mon Sep 17 00:00:00 2001 From: Jamie Nguyen Date: Mar 15 2014 10:10:57 +0000 Subject: Update to upstream release 1.17.1 --- diff --git a/.gitignore b/.gitignore index 30755b4..3214013 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /tests-1.11.0.tar.bz2 /mocha-1.12.0.tgz /tests-1.12.0.tar.bz2 +/mocha-1.17.1.tar.gz diff --git a/dl-tests.sh b/dl-tests.sh deleted file mode 100644 index 99b67e4..0000000 --- a/dl-tests.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -tag=1.12.0 - -set -e - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) - -pushd "$tmp" -git clone https://github.com/visionmedia/mocha.git -cd mocha -git archive --prefix="test/" --format=tar tags/${tag}:test/ \ - | bzip2 > "$pwd"/tests-${tag}.tar.bz2 -popd diff --git a/mocha.1 b/mocha.1 deleted file mode 100644 index f699ad2..0000000 --- a/mocha.1 +++ /dev/null @@ -1,91 +0,0 @@ -.TH MOCHA "1" "March 2013" "mocha 1.8.2" "User Commands" -.SH NAME -mocha \- A feature-rich JavaScript test framework for Node.js -.SH SYNOPSIS -Usage: mocha [debug] [options] [files] -.SH DESCRIPTION -Mocha is a feature-rich JavaScript test framework running on node and the -browser, making asynchronous testing simple and fun. Mocha tests run serially, -allowing for flexible and accurate reporting, while mapping uncaught -exceptions to the correct test cases. -.SH COMMANDS -.TP -init -initialize a client\-side mocha setup at -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -output usage information -.TP -\fB\-V\fR, \fB\-\-version\fR -output the version number -.TP -\fB\-r\fR, \fB\-\-require\fR -require the given module -.TP -\fB\-R\fR, \fB\-\-reporter\fR -specify the reporter to use -.TP -\fB\-u\fR, \fB\-\-ui\fR -specify user\-interface (bdd|tdd|exports) -.TP -\fB\-g\fR, \fB\-\-grep\fR -only run tests matching -.TP -\fB\-i\fR, \fB\-\-invert\fR -inverts \fB\-\-grep\fR matches -.TP -\fB\-t\fR, \fB\-\-timeout\fR -set test\-case timeout in milliseconds [2000] -.TP -\fB\-s\fR, \fB\-\-slow\fR -"slow" test threshold in milliseconds [75] -.TP -\fB\-w\fR, \fB\-\-watch\fR -watch files for changes -.TP -\fB\-c\fR, \fB\-\-colors\fR -force enabling of colors -.TP -\fB\-C\fR, \fB\-\-no\-colors\fR -force disabling of colors -.TP -\fB\-G\fR, \fB\-\-growl\fR -enable growl notification support -.TP -\fB\-d\fR, \fB\-\-debug\fR -enable node's debugger, synonym for node \fB\-\-debug\fR -.TP -\fB\-b\fR, \fB\-\-bail\fR -bail after first test failure -.TP -\fB\-A\fR, \fB\-\-async\-only\fR -force all tests to take a callback (async) -.TP -\fB\-\-recursive\fR -include sub directories -.TP -\fB\-\-debug\-brk\fR -enable node's debugger breaking on the first line -.TP -\fB\-\-globals\fR -allow the given comma\-delimited global [names] -.TP -\fB\-\-ignore\-leaks\fR -ignore global variable leaks -.TP -\fB\-\-interfaces\fR -display available interfaces -.TP -\fB\-\-reporters\fR -display available reporters -.TP -\fB\-\-compilers\fR :,... -use the given module(s) to compile files -.SH AUTHORS -The main author of mocha is TJ Holowaychuk <\fBtj@vision-media.ca\fR>. -For a more complete list of contributors, see the GitHub page at -<\fBhttps://github.com/visionmedia/mocha\fR> -.SH REPORTING BUGS -Please report bugs on the GitHub issue tracker: -<\fBhttps://github.com/visionmedia/mocha/issues\fR> diff --git a/mocha.spec b/mocha.spec index 8339c4a..f546f76 100644 --- a/mocha.spec +++ b/mocha.spec @@ -1,23 +1,18 @@ %{?nodejs_find_provides_and_requires} +%global commit 7fc565ee3e225cb7a66bf39ae9c2c05b346675c1 + %global enable_tests 1 Name: mocha -Version: 1.12.0 +Version: 1.17.1 Release: 1%{?dist} Summary: A simple, flexible, fun test framework for Node.js License: MIT Group: System Environment/Libraries URL: https://github.com/visionmedia/mocha -Source0: http://registry.npmjs.org/mocha/-/mocha-%{version}.tgz -# The test files are not included in the npm tarball. -# Source1 is generated by running Source10, which pulls from the upstream -# version control repository. -Source1: tests-%{version}.tar.bz2 -# This is a custom manual page for mocha. Pull request sent upstream: -# https://github.com/visionmedia/mocha/pull/758 -Source2: mocha.1 -Source10: dl-tests.sh +# Use GitHub as the NPM tarball is missing several useful files/folders. +Source0: https://github.com/visionmedia/mocha/archive/%{commit}/%{name}-%{version}.tar.gz BuildArch: noarch %if 0%{?fedora} >= 19 @@ -39,7 +34,6 @@ BuildRequires: npm(glob) BuildRequires: npm(growl) BuildRequires: npm(jade) BuildRequires: npm(mkdirp) -BuildRequires: npm(ms) BuildRequires: npm(should) %endif @@ -51,17 +45,13 @@ exceptions to the correct test cases. %prep -%setup -q -n package -%setup -T -D -a 1 -q -n package +%setup -q -n mocha-%{commit} %patch0 -p1 -%nodejs_fixdep commander '~1.0' +%nodejs_fixdep commander '~2.0' %nodejs_fixdep diff '1.0.x' %nodejs_fixdep glob '3.x' -%nodejs_fixdep jade '~0.26' +%nodejs_fixdep jade '>=0.26.3' %nodejs_fixdep mkdirp '~0.3' -%nodejs_fixdep ms '~0.3' -# Remove bundled diff.js -rm -f lib/browser/diff.js %build @@ -70,7 +60,7 @@ rm -f lib/browser/diff.js %install mkdir -p %{buildroot}%{nodejs_sitelib}/mocha -cp -pr package.json index.js lib/ mocha.css mocha.js _mocha.js \ +cp -pr package.json index.js lib/ mocha.css mocha.js \ %{buildroot}%{nodejs_sitelib}/mocha rm -f %{buildroot}%{nodejs_sitelib}/mocha/lib/template.html @@ -82,10 +72,6 @@ install -p -D -m0755 bin/_mocha %{buildroot}%{nodejs_sitelib}/mocha/bin/_mocha mkdir -p %{buildroot}%{_bindir} ln -sf %{nodejs_sitelib}/mocha/bin/mocha %{buildroot}%{_bindir}/mocha -# Install the custom manual page. -mkdir -p %{buildroot}%{_mandir}/man1 -install -p -D -m0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/mocha.1 - # Use system diff.js instead. ln -sf %{nodejs_sitelib}/diff/diff.js \ %{buildroot}%{nodejs_sitelib}/mocha/lib/browser/diff.js @@ -111,7 +97,7 @@ ln -sf %{_datadir}/mocha/templates \ %if 0%{?enable_tests} %check %nodejs_symlink_deps --check -./bin/mocha --reporter dot test/acceptance/*.js test/*.js +./bin/mocha --reporter dot test/acceptance/*.js --growl test/*.js %endif @@ -120,10 +106,12 @@ ln -sf %{_datadir}/mocha/templates \ %{nodejs_sitelib}/mocha %{_bindir}/mocha %{_datadir}/mocha -%{_mandir}/man1/mocha.1* %changelog +* Sun Mar 02 2014 Jamie Nguyen - 1.17.1-1 +- update to upstream release 1.17.1 + * Sun Aug 18 2013 Jamie Nguyen - 1.12.0-1 - update to upstream release 1.12.0 - add ExclusiveArch logic diff --git a/sources b/sources index f27005b..05cc96d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -38345645f9fb6a3a1f48e62dd5fa951c mocha-1.12.0.tgz -c228ea818607299002e77b4f19e7e286 tests-1.12.0.tar.bz2 +a25a19b0156293d9d5ddfbf4636df7b0 mocha-1.17.1.tar.gz