Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -12,7 +12,7 @@
 MANIFEST
 _trial_temp*
 dist
-build
+/build
 .build
 *.egg-info
 master/docs/buildbot.html
@@ -36,4 +36,6 @@ common/googlecode_upload.py
 master/docs/tutorial/_build
 _build
 .tox
-/www
+master/setuptools_trial*
+master/buildbot/www/static/js/default/
+sandbox

.travis.yml

@@ -40,13 +40,37 @@ matrix:
     - python: "2.7"
       env: TWISTED=12.0.0 SQLALCHEMY=latest SQLALCHEMY_MIGRATE=0.7.2
 
+before_install:
+  # Disable SSH host key checking. Otherwize ssh will ask confirmation from
+  # command prompt.
+  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+
+  # Install fresh Node.js from PPA
+  - sudo add-apt-repository -y ppa:chris-lea/node.js
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq nodejs
+
 # Dependencies installation commands
 install:
+  # Fetch objects and tags from upstream git repository.
+  # Required for proper work of `git describe`.
+  - git describe || true
+  - git remote add upstream git://github.com/buildbot/buildbot.git
+  - git fetch upstream --tags
+  - git fetch origin --tags
+  - |
+    DEPTH=300;
+    while [ "$(git describe 2> /dev/null)" == "" ]; do
+      DEPTH=$(($DEPTH+200));
+      git fetch origin --depth=$DEPTH --quiet;
+    done
+
   - "echo 'travis_fold:start:tw'; [ $TWISTED = latest ] || pip install Twisted==$TWISTED; echo 'travis_fold:end:tw'"
   - "echo 'travis_fold:start:sa'; [ $SQLALCHEMY = latest ] || pip install sqlalchemy==$SQLALCHEMY; echo 'travis_fold:end:sa'"
-  - "echo 'travis_fold:start:sa'; [ $SQLALCHEMY_MIGRATE = latest ] || pip install sqlalchemy-migrate==$SQLALCHEMY_MIGRATE; echo 'travis_fold:end:sam'"
+  - "echo 'travis_fold:start:sam'; [ $SQLALCHEMY_MIGRATE = latest ] || pip install sqlalchemy-migrate==$SQLALCHEMY_MIGRATE; echo 'travis_fold:end:sam'"
   - (cd master; python setup.py develop)
   - (cd slave;  python setup.py develop)
+  - (cd www;    python setup.py develop)
   # mock is preinstalled on Travis
   # txgithub requires Twisted >= 12.3.0
   - pip install txgithub

MAINTAINERS.txt

@@ -149,7 +149,9 @@ Fink
 
 FreeBSD
     S: Maintained
-    U: http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/buildbot/
+    M: Kubilay Kocak <irc://chat.freenode.net/koobs,isnick>
+    U: http://www.freshports.org/devel/buildbot
+    U: http://www.freshports.org/devel/buildbot-slave
 
 OpenBSD
     S: Maintained
@@ -202,7 +204,7 @@ Metabuildbot Slave Donors
     M: Mozilla <dustin@mozilla.com>
     M: Marc-Antoine Ruel <maruel@chromium.org>
     M: Tom Prince <tom.prince@ualberta.net> (irc:tomprince)
-    M: Kubilay Kocak <koobs.freebsd@gmail.com> (irc: koobs)
+    M: Kubilay Kocak  <irc://chat.freenode.net/koobs,isnick> 
     M: STE||AR Group, Center for Computation and Science, LSU / Bryce Lelbach <blelbach@cct.lsu.edu> (irc:wash)
     U: http://buildbot.buildbot.net
 

Makefile

@@ -17,4 +17,7 @@ pyflakes:
 	pyflakes master/buildbot slave/buildslave
 
 pep8:
-	pep8 --config=common/pep8rc master slave
+	pep8 --config=common/pep8rc master/buildbot slave/buildslave www/buildbot_*.py www/setup.py www/*/buildbot_*.py www/*/setup.py
+
+gruntci:
+	cd www; node_modules/.bin/grunt ci

common/pylintrc

@@ -29,116 +29,102 @@ load-plugins=
 
 # Following are the checks we don't care about, and thus should remain disabled
 #
-# C0102: Black listed name "%s"
-# C0111: Missing docstring
-# C0302: Too many lines in module (%s)*
-# R0201: Method could be a function*
-# R0801: Similar lines in %s files*
-# R0901: Too many ancestors (%s/%s)*
-# R0902: Too many instance attributes (%s/%s)*
-# R0903: Too few public methods (%s/%s)*
-# R0904: Too many public methods (%s/%s)*
-# R0911: Too many return statements (%s/%s)*
-# R0912: Too many branches (%s/%s)*
-# R0913: Too many arguments (%s/%s)*
-# R0914: Too many local variables (%s/%s)*
-# R0915: Too many statements (%s/%s)*
-# R0921: Abstract class not referenced*
-# R0922: Abstract class is only
-# W0122: Use of the exec statement*
-# W0142: Used * or ** magic
-# W0402: Uses of a deprecated module %r
-# W0511: FIXME or XXX is detected
-# W0601: Global variable %r undefined at the module level
-# W0613: Unused argument %r
-# W0633: Attempting to unpack a non-sequence
-# E1103: %s %r has no %r member (but some types could not be inferred)
+# blacklisted-name
+# missing-docstring
+# too-many-lines
+# no-self-use
+# duplicate-code
+# too-many-ancestors
+# too-many-instance-attributes
+# too-few-public-methods
+# too-many-public-methods
+# too-many-return-statements
+# too-many-branches
+# too-many-arguments
+# too-many-locals
+# too-many-statements
+# abstract-class-not-used
+# abstract-class-little-used
+# exec-used
+# star-args
+# deprecated-module
+# fixme
+# global-variable-undefined
+# unused-argument
+# unpacking-non-sequence
+# maybe-no-member
 
 disable=
-  C0102,
-  C0103,
-  C0111,
-  C0302,
-  R0201,
-  R0801,
-  R0901,
-  R0902,
-  R0903,
-  R0904,
-  R0911,
-  R0912,
-  R0913,
-  R0914,
-  R0915,
-  R0921,
-  R0922,
-  W0402,
-  W0511,
-  W0601,
-  W0613,
-  E1103,
-  I0011,
-  C0202,
-  C0301,
-  C0303,
-  C0304,
-  C0321,
-  C0322,
-  C0323,
-  C0324,
-  C1001,
-  E0202,
-  E0611,
-  E1002,
-  E1101,
-  E1102,
-  E1121,
-  E1123,
-  E1124,
-  F0401,
-  R0401,
-  W0121,
-  W0122,
-  W0142,
-  W0101,
-  W0102,
-  W0104,
-  W0105,
-  W0106,
-  W0107,
-  W0108,
-  W0110,
-  W0120,
-  W0141,
-  W0201,
-  W0212,
-  W0221,
-  W0222,
-  W0223,
-  W0231,
-  W0232,
-  W0233,
-  W0301,
-  W0311,
-  W0312,
-  W0333,
-  W0403,
-  W0406,
-  W0603,
-  W0611,
-  W0612,
-  W0621,
-  W0622,
-  W0631,
-  W0632,
-  W0633,
-  W0701,
-  W0702,
-  W0703,
-  W0710,
-  W1001,
-  W1402,
-  W1501,
+  blacklisted-name,
+  invalid-name,
+  missing-docstring,
+  too-many-lines,
+  no-self-use,
+  duplicate-code,
+  too-many-ancestors,
+  too-many-instance-attributes,
+  too-few-public-methods,
+  too-many-public-methods,
+  too-many-return-statements,
+  too-many-branches,
+  too-many-arguments,
+  too-many-locals,
+  too-many-statements,
+  abstract-class-not-used,
+  abstract-class-little-used,
+  deprecated-module,
+  fixme,
+  global-variable-undefined,
+  unused-argument,
+  maybe-no-member,
+  locally-disabled,
+  bad-classmethod-argument,
+  line-too-long,
+  old-style-class,
+  method-hidden,
+  no-name-in-module,
+  no-member,
+  not-callable,
+  too-many-function-args,
+  unexpected-keyword-arg,
+  redundant-keyword-arg,
+  import-error,
+  cyclic-import,
+  exec-used,
+  star-args,
+  unreachable,
+  dangerous-default-value,
+  pointless-statement,
+  pointless-string-statement,
+  expression-not-assigned,
+  unnecessary-pass,
+  unnecessary-lambda,
+  deprecated-lambda,
+  useless-else-on-loop,
+  bad-builtin,
+  attribute-defined-outside-init,
+  protected-access,
+  arguments-differ,
+  signature-differs,
+  abstract-method,
+  super-init-not-called,
+  no-init,
+  non-parent-init-called,
+  bad-indentation,
+  relative-import,
+  global-statement,
+  unused-variable,
+  redefined-outer-name,
+  redefined-builtin,
+  undefined-loop-variable,
+  unbalanced-tuple-unpacking,
+  unpacking-non-sequence,
+  raising-string,
+  bare-except,
+  broad-except,
+  nonstandard-exception,
+  anomalous-unicode-escape-in-string,
+  bad-open-mode,
   superfluous-parens
 
 [REPORTS]

common/validate.sh

@@ -46,17 +46,41 @@ check_tabs() {
     git diff "$REVRANGE" | grep -q $'+.*\t'
 }
 
+check_long_lines() {
+    # only check python files
+    local long_lines=false
+    for f in $(git diff --name-only --stat "$REVRANGE" | grep '.py$'); do
+        # don't try to check removed files
+        [ ! -f "$f" ] && continue
+        if [ $(git diff "$REVRANGE" $f | grep -E -c '^\+.{80}') != 0 ]; then
+            echo " $f"
+            long_lines=true
+        fi
+    done
+    $long_lines
+}
+
+
+check_yield_defer_returnValue() {
+    local yields=false
+    if git diff "$REVRANGE" | grep '+.*yield defer.returnValue'; then
+        yields=true
+    fi
+    $yields
+}
+
 check_relnotes() {
     if git diff --exit-code "$REVRANGE" master/docs/relnotes/index.rst >/dev/null 2>&1; then
         return 1
     else
         return 0
     fi
 }
-
 run_tests() {
     if [ -n "${TRIALTMP}" ]; then
         TEMP_DIRECTORY_OPT="--temp-directory ${TRIALTMP}"
+    else
+        warning "please provide a TRIALTMP env variable pointing to a ramfs for 30x speed up of the integration tests"
     fi
     find . -name \*.pyc -exec rm {} \;
     trial --reporter text ${TEMP_DIRECTORY_OPT} ${TEST}
@@ -71,8 +95,8 @@ fi
 
 # get a list of changed files, used below; this uses a tempfile to work around
 # shell behavior when piping to 'while'
-tempfile=$(mktemp)
-trap 'rm -f ${tempfile}; exit 1' 1 2 3 15
+tempfile=$(mktemp -t tmp.XXXXXX)
+trap "rm -f ${tempfile}; exit 1" 1 2 3 15
 git diff --name-only $REVRANGE | grep '\.py$' | grep -v '\(^master/docs\|/setup\.py\)' > ${tempfile}
 py_files=()
 while read line; do
@@ -84,13 +108,26 @@ done < ${tempfile}
 echo "${MAGENTA}Validating the following commits:${NORM}"
 git log "$REVRANGE" --pretty=oneline || exit 1
 
+if $slow; then
+    for module in www www/console_view;
+    do
+        status "running 'setup.py develop' for $module"
+        (cd $module; python setup.py develop 2>&1 >/dev/null    ) || not_ok "$module/setup.py failed"
+        status "running 'grunt ci' for $module"
+        LOG=/dev/null
+        if [[ `uname` == "Darwin" ]] ;then LOG=/dev/stdout; fi  # grunt >/dev/null hangs on osx ?!
+        (cd $module; node_modules/.bin/grunt --no-color ci 2>&1  >$LOG ) || warning "grunt ci on $module failed (warning until #2700 is resolved)"
+    done
+fi
 if $slow; then
     status "running tests"
     run_tests || not_ok "tests failed"
 fi
 
 status "checking formatting"
 check_tabs && not_ok "$REVRANGE adds tabs"
+check_long_lines && warning "$REVRANGE adds long lines"
+check_yield_defer_returnValue && not_ok "$REVRANGE yields defer.returnValue"
 
 status "checking for release notes"
 check_relnotes || warning "$REVRANGE does not add release notes"

master/MANIFEST.in

@@ -22,8 +22,6 @@ include docs/relnotes/*
 
 include buildbot/scripts/sample.cfg
 include buildbot/scripts/buildbot_tac.tmpl
-include buildbot/status/web/files/*
-include buildbot/status/web/templates/*.html buildbot/status/web/templates/*.xml
 include buildbot/clients/debug.glade
 include buildbot/buildbot.png
 
@@ -32,3 +30,5 @@ include buildbot/db/migrate/README buildbot/db/migrate/migrate.cfg
 include contrib/* contrib/windows/* contrib/os-x/* contrib/css/* contrib/libvirt/*
 include contrib/trac/* contrib/trac/bbwatcher/* contrib/trac/bbwatcher/templates/*
 include contrib/init-scripts/* contrib/bash/* contrib/zsh/*
+
+include master/buildbot/www/index.html