Merge lp:~jml/udd/less-in-top-level into lp:udd

[Jonathan Lange]

The top-level of lp:udd is a little bit intimidating. There are a lot of files there, and the beginner will not know which are which. This branch moves all of the scripts to a bin/ directory, and renames them to have dashes instead of underscores and to not have '.py' extensions.

I thought about creating two script directories – one for production scripts and the other for development scripts – but I didn't feel confident enough about the distinction.

Haven't tested this in any way yet. Not exactly sure how, since the most likely issue is PYTHONPATH related.

[Martin Packman (gz)]

Yeah, the first thing I did after branching lp:udd the other day was look in one of the top level files then close it again and go and find the actual module.

Given my heritage, I dislike the bin/no-extension style but it's clearly the right thing now you've made scripts to run as separate files from python modules.

Having some kind of division between the scripts might be useful (cron vs. manual tool seems relevant) but could be done later anyway.

review: Approve

=== modified file 'README'
--- README	2011-10-20 09:49:53 +0000
+++ README	2011-10-21 10:21:30 +0000
@@ -15,7 +15,7 @@
 Overview
 ********
 
-``list_packages`` gets a list of all source packages in interesting releases
+``list-packages`` gets a list of all source packages in interesting releases
 from Launchpad.
 
 Deployment
@@ -35,7 +35,7 @@
 ``lp:udd`` after approval but deployment is done when time and circumstances
 permit.
 
-mass_import
+mass-import
 -----------
 
 The ``etc-init.d-mass-import`` script, installed into
@@ -58,10 +58,10 @@
 
 but don't forget to requeue the killed imports later.
 
-import_package
+import-package
 --------------
 
-The ``import_package.py`` script is generally called in a subprocess by
+The ``import-package`` script is generally called in a subprocess by
 ``mass-import``.
 
 For debug purposes, it can also be run locally with additional options:

=== added directory 'bin'
=== renamed file 'add_import_jobs.py' => 'bin/add-import-jobs'
=== renamed file 'analyze_log.py' => 'bin/analyze-log'
=== renamed file 'branch_branches_from_lp.py' => 'bin/branch-branches-from-lp'
=== renamed file 'categorise_failures.py' => 'bin/categorise-failures'
=== renamed file 'count_outstanding_jobs.py' => 'bin/count-outstanding-jobs'
=== renamed file 'cricket.py' => 'bin/cricket'
=== renamed file 'delete_branches_from_lp.py' => 'bin/delete-branches-from-lp'
=== renamed file 'email_failures.py' => 'bin/email-failures'
=== renamed file 'graph_failures.py' => 'bin/graph-failures'
=== renamed file 'import_package.py' => 'bin/import-package'
=== renamed file 'list_packages.py' => 'bin/list-packages'
=== renamed file 'logrotate.py' => 'bin/logrotate'
=== renamed file 'mass_import.py' => 'bin/mass-import'
=== renamed file 'requeue_package.py' => 'bin/requeue-package'
=== renamed file 'set_official.py' => 'bin/set-official'
=== renamed file 'show_failure.py' => 'bin/show-failure'
=== modified file 'etc-init.d-mass-import'
--- etc-init.d-mass-import	2011-07-19 09:48:17 +0000
+++ etc-init.d-mass-import	2011-10-21 10:21:30 +0000
@@ -3,7 +3,7 @@
 export BASEDIR=/srv/package-import.canonical.com/new
 PATH=${BASEDIR}/scripts:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=mass-import
-DAEMON=${BASEDIR}/scripts/mass_import.py
+DAEMON=${BASEDIR}/scripts/bin/mass-import
 PIDFILE=${BASEDIR}/mass-import.pid
 STOPFILE=${BASEDIR}/STOP_PLEASE
 USER=pkg_import

=== modified file 'fixit.sh'
--- fixit.sh	2011-07-19 09:48:17 +0000
+++ fixit.sh	2011-10-21 10:21:30 +0000
@@ -12,7 +12,7 @@
 # ones in a better place.
 
 export BASEDIR=/srv/package-import.canonical.com/new
-export PATH=${BASEDIR}/scripts:${PATH}
+export PATH=${BASEDIR}/scripts/bin:${PATH}
 export BZR_PLUGIN_PATH=${BASEDIR}/scripts/plugins
 export LANG="en_GB.UTF-8"
 export BZR_EMAIL="Package Import Robot <[e-mail]>"
@@ -63,5 +63,5 @@
 }
 
 requeue() {
-    requeue_package.py "$@"
+    requeue-package "$@"
 }

=== modified file 'importer.crontab'
--- importer.crontab	2011-07-19 09:48:17 +0000
+++ importer.crontab	2011-10-21 10:21:30 +0000
@@ -1,8 +1,8 @@
-SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts
+SCRIPTS_DIR=/srv/package-import.canonical.com/new/scripts/bin
 # m h  dom mon dow   command
-17 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate.py
-*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise_failures.py
-*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/add_import_jobs.py
-17 07 * * * /usr/bin/python ${SCRIPTS_DIR}/list_packages.py
-30 03 * * * /usr/bin/python ${SCRIPTS_DIR}/email_failures.py
-21 * * * * /usr/bin/python ${SCRIPTS_DIR}/graph_failures.py
+17 * * * * /usr/bin/python ${SCRIPTS_DIR}/logrotate
+*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/categorise-failures
+*/5 * * * * /usr/bin/python ${SCRIPTS_DIR}/add-import-jobs
+17 07 * * * /usr/bin/python ${SCRIPTS_DIR}/list-packages
+30 03 * * * /usr/bin/python ${SCRIPTS_DIR}/email-failures
+21 * * * * /usr/bin/python ${SCRIPTS_DIR}/graph-failures

=== modified file 'pkgimport.conf'
--- pkgimport.conf	2011-10-06 14:21:18 +0000
+++ pkgimport.conf	2011-10-21 10:21:30 +0000
@@ -19,10 +19,10 @@
 
 # Script that imports the package. Must be executable and take a single
 # argument: the name of the package to import.
-pkgimport.import_script = /srv/package-import.canonical.com/new/scripts/import_package.py
+pkgimport.import_script = /srv/package-import.canonical.com/new/scripts/bin/import-package
 
 # Which distributions to operate on.  Normally "ubuntu, debian".  No default.
-# Affects behaviour of add_import_jobs.py and list_packages.py.
+# Affects behaviour of add-import-jobs and list-packages.
 pkgimport.distributions = ubuntu,debian
 
 # Whether or not to retry all failed jobs. 'true' means to retry all failed