From 675c3916c58947505d3bb24c480342f4dbfc979a Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Fri, 4 Jun 2010 22:34:48 -0500 Subject: [PATCH] rename bbslave to buildslave, add miscellaneous text files --- .gitignore | 2 +- COPYING => master/COPYING | 0 CREDITS => master/CREDITS | 0 MANIFEST.in => master/MANIFEST.in | 3 +- NEWS => master/NEWS | 0 README => master/README | 0 README.w32 => master/README.w32 | 0 UPGRADING => master/UPGRADING | 0 slave/COPYING | 339 ++++++++++++++++++ slave/MANIFEST.in | 1 + slave/NEWS | 6 + slave/README | 33 ++ slave/UPGRADING | 2 + slave/bin/buildbot | 4 + slave/{bbslave => buildslave}/__init__.py | 0 slave/{bbslave => buildslave}/bot.py | 14 +- .../commands/__init__.py | 0 .../{bbslave => buildslave}/commands/base.py | 6 +- .../commands/registry.py | 4 +- .../commands/transfer.py | 4 +- .../{bbslave => buildslave}/commands/utils.py | 0 slave/{bbslave => buildslave}/commands/vcs.py | 8 +- slave/{bbslave => buildslave}/interfaces.py | 0 slave/{bbslave => buildslave}/pbutil.py | 0 .../scripts/__init__.py | 0 .../scripts/checkconfig.py | 0 .../scripts/logwatcher.py | 0 .../scripts/reconfig.py | 0 .../{bbslave => buildslave}/scripts/runner.py | 0 .../scripts/sample.cfg | 0 .../scripts/startup.py | 0 .../{bbslave => buildslave}/test/__init__.py | 0 .../test/unit/__init__.py | 0 .../test/unit/test_slave_commands_base.py | 4 +- .../test/unit/test_slave_commands_utils.py | 2 +- slave/{bbslave => buildslave}/util.py | 0 slave/setup.py | 14 +- 37 files changed, 416 insertions(+), 30 deletions(-) rename COPYING => master/COPYING (100%) rename CREDITS => master/CREDITS (100%) rename MANIFEST.in => master/MANIFEST.in (91%) rename NEWS => master/NEWS (100%) rename README => master/README (100%) rename README.w32 => master/README.w32 (100%) rename UPGRADING => master/UPGRADING (100%) create mode 100644 slave/COPYING create mode 100644 slave/MANIFEST.in create mode 100644 slave/NEWS create mode 100644 slave/README create mode 100644 slave/UPGRADING create mode 100755 slave/bin/buildbot rename slave/{bbslave => buildslave}/__init__.py (100%) rename slave/{bbslave => buildslave}/bot.py (98%) rename slave/{bbslave => buildslave}/commands/__init__.py (100%) rename slave/{bbslave => buildslave}/commands/base.py (99%) rename slave/{bbslave => buildslave}/commands/registry.py (78%) rename slave/{bbslave => buildslave}/commands/transfer.py (98%) rename slave/{bbslave => buildslave}/commands/utils.py (100%) rename slave/{bbslave => buildslave}/commands/vcs.py (99%) rename slave/{bbslave => buildslave}/interfaces.py (100%) rename slave/{bbslave => buildslave}/pbutil.py (100%) rename slave/{bbslave => buildslave}/scripts/__init__.py (100%) rename slave/{bbslave => buildslave}/scripts/checkconfig.py (100%) rename slave/{bbslave => buildslave}/scripts/logwatcher.py (100%) rename slave/{bbslave => buildslave}/scripts/reconfig.py (100%) rename slave/{bbslave => buildslave}/scripts/runner.py (100%) rename slave/{bbslave => buildslave}/scripts/sample.cfg (100%) rename slave/{bbslave => buildslave}/scripts/startup.py (100%) rename slave/{bbslave => buildslave}/test/__init__.py (100%) rename slave/{bbslave => buildslave}/test/unit/__init__.py (100%) rename slave/{bbslave => buildslave}/test/unit/test_slave_commands_base.py (99%) rename slave/{bbslave => buildslave}/test/unit/test_slave_commands_utils.py (99%) rename slave/{bbslave => buildslave}/util.py (100%) diff --git a/.gitignore b/.gitignore index 3149d0dde2d..f2e3d9d4dfe 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,7 @@ _trial_temp* dist build .build -buildbot.egg-info +*.egg-info docs/buildbot.html docs/buildbot.info docs/buildbot.info-1 diff --git a/COPYING b/master/COPYING similarity index 100% rename from COPYING rename to master/COPYING diff --git a/CREDITS b/master/CREDITS similarity index 100% rename from CREDITS rename to master/CREDITS diff --git a/MANIFEST.in b/master/MANIFEST.in similarity index 91% rename from MANIFEST.in rename to master/MANIFEST.in index 47139ab9820..eb69f5bc0ec 100644 --- a/MANIFEST.in +++ b/master/MANIFEST.in @@ -1,5 +1,4 @@ - -include MANIFEST.in README README.w32 NEWS CREDITS COPYING UPGRADING +include MANIFEST.in README NEWS CREDITS COPYING UPGRADING include docs/examples/*.cfg include docs/*.texinfo docs/buildbot.info* docs/buildbot.html diff --git a/NEWS b/master/NEWS similarity index 100% rename from NEWS rename to master/NEWS diff --git a/README b/master/README similarity index 100% rename from README rename to master/README diff --git a/README.w32 b/master/README.w32 similarity index 100% rename from README.w32 rename to master/README.w32 diff --git a/UPGRADING b/master/UPGRADING similarity index 100% rename from UPGRADING rename to master/UPGRADING diff --git a/slave/COPYING b/slave/COPYING new file mode 100644 index 00000000000..d511905c164 --- /dev/null +++ b/slave/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/slave/MANIFEST.in b/slave/MANIFEST.in new file mode 100644 index 00000000000..04d4c4b52cb --- /dev/null +++ b/slave/MANIFEST.in @@ -0,0 +1 @@ +include MANIFEST.in README NEWS COPYING UPGRADING diff --git a/slave/NEWS b/slave/NEWS new file mode 100644 index 00000000000..38cc02d45b8 --- /dev/null +++ b/slave/NEWS @@ -0,0 +1,6 @@ +Major User visible changes in Buildslave. -*- outline -*- + (see ChangeLog for a detailed list of changes) + +* NEXT RELEASE + +** First release of buildslave as a separate package diff --git a/slave/README b/slave/README new file mode 100644 index 00000000000..458fe592259 --- /dev/null +++ b/slave/README @@ -0,0 +1,33 @@ + +BuildBot: build/test automation + http://buildbot.net + Brian Warner + + +Abstract: + +The BuildBot is a system to automate the compile/test cycle required by most +software projects to validate code changes. By automatically rebuilding and +testing the tree each time something has changed, build problems are +pinpointed quickly, before other developers are inconvenienced by the +failure. The guilty developer can be identified and harassed without human +intervention. By running the builds on a variety of platforms, developers +who do not have the facilities to test their changes everywhere before +checkin will at least know shortly afterwards whether they have broken the +build or not. Warning counts, lint checks, image size, compile time, and +other build parameters can be tracked over time, are more visible, and +are therefore easier to improve. + +The overall goal is to reduce tree breakage and provide a platform to run +tests or code-quality checks that are too annoying or pedantic for any human +to waste their time with. Developers get immediate (and potentially public) +feedback about their changes, encouraging them to be more careful about +testing before checkin. + + +Buildslave: + +This package contains only the buildslave implementation. The buildslave +package contains the buildmaster. + +See http://buildbot.net for more information. diff --git a/slave/UPGRADING b/slave/UPGRADING new file mode 100644 index 00000000000..1373e663641 --- /dev/null +++ b/slave/UPGRADING @@ -0,0 +1,2 @@ +For information on ugprading a buildslave, see the section "Upgrading an +Existing Buildslave" in the buildbot documentation. diff --git a/slave/bin/buildbot b/slave/bin/buildbot new file mode 100755 index 00000000000..7295b0074d2 --- /dev/null +++ b/slave/bin/buildbot @@ -0,0 +1,4 @@ +#!/usr/bin/env python + +from buildbot.scripts import runner +runner.run() diff --git a/slave/bbslave/__init__.py b/slave/buildslave/__init__.py similarity index 100% rename from slave/bbslave/__init__.py rename to slave/buildslave/__init__.py diff --git a/slave/bbslave/bot.py b/slave/buildslave/bot.py similarity index 98% rename from slave/bbslave/bot.py rename to slave/buildslave/bot.py index 051e6a3b8d1..44725cd3bd5 100644 --- a/slave/bbslave/bot.py +++ b/slave/buildslave/bot.py @@ -7,14 +7,14 @@ from twisted.application import service, internet from twisted.cred import credentials -import bbslave -from bbslave.util import now -from bbslave.pbutil import ReconnectingPBClientFactory -from bbslave.commands import registry +import buildslave +from buildslave.util import now +from buildslave.pbutil import ReconnectingPBClientFactory +from buildslave.commands import registry # make sure the standard commands get registered. This import is performed # for its side-effects. -from bbslave.commands import base, transfer, vcs +from buildslave.commands import base, transfer, vcs class NoCommandRunning(pb.Error): pass @@ -341,7 +341,7 @@ def remote_getSlaveInfo(self): def remote_getVersion(self): """Send our version back to the Master""" - return bbslave.version + return buildslave.version @@ -478,7 +478,7 @@ class BuildSlave(service.MultiService): def __init__(self, buildmaster_host, port, name, passwd, basedir, keepalive, usePTY, keepaliveTimeout=30, umask=None, maxdelay=300, debugOpts={}, unicode_encoding=None): - log.msg("Creating BuildSlave -- version: %s" % bbslave.version) + log.msg("Creating BuildSlave -- version: %s" % buildslave.version) service.MultiService.__init__(self) self.debugOpts = debugOpts.copy() bot = self.botClass(basedir, usePTY, unicode_encoding=unicode_encoding) diff --git a/slave/bbslave/commands/__init__.py b/slave/buildslave/commands/__init__.py similarity index 100% rename from slave/bbslave/commands/__init__.py rename to slave/buildslave/commands/__init__.py diff --git a/slave/bbslave/commands/base.py b/slave/buildslave/commands/base.py similarity index 99% rename from slave/bbslave/commands/base.py rename to slave/buildslave/commands/base.py index 05a04d4c15a..a782c2008da 100644 --- a/slave/bbslave/commands/base.py +++ b/slave/buildslave/commands/base.py @@ -8,9 +8,9 @@ from twisted.internet import reactor, defer, task from twisted.python import log, runtime -from bbslave.interfaces import ISlaveCommand -from bbslave.commands.registry import registerSlaveCommand -from bbslave import util +from buildslave.interfaces import ISlaveCommand +from buildslave.commands.registry import registerSlaveCommand +from buildslave import util # this used to be a CVS $-style "Revision" auto-updated keyword, but since I # moved to Darcs as the primary repository, this is updated manually each diff --git a/slave/bbslave/commands/registry.py b/slave/buildslave/commands/registry.py similarity index 78% rename from slave/bbslave/commands/registry.py rename to slave/buildslave/commands/registry.py index 21328da7e2e..394ca7968c5 100644 --- a/slave/bbslave/commands/registry.py +++ b/slave/buildslave/commands/registry.py @@ -7,9 +7,9 @@ def registerSlaveCommand(name, factory, version): @type name: string @param name: name under which the slave command will be registered; used - for L{bbslave.bot.SlaveBuilder.remote_startCommand} + for L{buildslave.bot.SlaveBuilder.remote_startCommand} - @type factory: L{bbslave.commands.Command} + @type factory: L{buildslave.commands.Command} @type version: string @param version: version string of the factory code """ diff --git a/slave/bbslave/commands/transfer.py b/slave/buildslave/commands/transfer.py similarity index 98% rename from slave/bbslave/commands/transfer.py rename to slave/buildslave/commands/transfer.py index 284f22f7cb9..1bf68b21d57 100644 --- a/slave/bbslave/commands/transfer.py +++ b/slave/buildslave/commands/transfer.py @@ -3,8 +3,8 @@ from twisted.python import log from twisted.internet import defer -from bbslave.commands.base import Command, command_version -from bbslave.commands.registry import registerSlaveCommand +from buildslave.commands.base import Command, command_version +from buildslave.commands.registry import registerSlaveCommand class SlaveFileUploadCommand(Command): """ diff --git a/slave/bbslave/commands/utils.py b/slave/buildslave/commands/utils.py similarity index 100% rename from slave/bbslave/commands/utils.py rename to slave/buildslave/commands/utils.py diff --git a/slave/bbslave/commands/vcs.py b/slave/buildslave/commands/vcs.py similarity index 99% rename from slave/bbslave/commands/vcs.py rename to slave/buildslave/commands/vcs.py index 46f0c3e68c2..2e5bd07e139 100644 --- a/slave/bbslave/commands/vcs.py +++ b/slave/buildslave/commands/vcs.py @@ -5,10 +5,10 @@ from twisted.python import log, failure, runtime from twisted.internet import defer -from bbslave.commands.base import Command, ShellCommand, AbandonChain, command_version, Obfuscated -from bbslave.commands.registry import registerSlaveCommand -from bbslave.commands.utils import getCommand, rmdirRecursive -from bbslave.util import remove_userpassword +from buildslave.commands.base import Command, ShellCommand, AbandonChain, command_version, Obfuscated +from buildslave.commands.registry import registerSlaveCommand +from buildslave.commands.utils import getCommand, rmdirRecursive +from buildslave.util import remove_userpassword class SourceBase(Command): """Abstract base class for Version Control System operations (checkout diff --git a/slave/bbslave/interfaces.py b/slave/buildslave/interfaces.py similarity index 100% rename from slave/bbslave/interfaces.py rename to slave/buildslave/interfaces.py diff --git a/slave/bbslave/pbutil.py b/slave/buildslave/pbutil.py similarity index 100% rename from slave/bbslave/pbutil.py rename to slave/buildslave/pbutil.py diff --git a/slave/bbslave/scripts/__init__.py b/slave/buildslave/scripts/__init__.py similarity index 100% rename from slave/bbslave/scripts/__init__.py rename to slave/buildslave/scripts/__init__.py diff --git a/slave/bbslave/scripts/checkconfig.py b/slave/buildslave/scripts/checkconfig.py similarity index 100% rename from slave/bbslave/scripts/checkconfig.py rename to slave/buildslave/scripts/checkconfig.py diff --git a/slave/bbslave/scripts/logwatcher.py b/slave/buildslave/scripts/logwatcher.py similarity index 100% rename from slave/bbslave/scripts/logwatcher.py rename to slave/buildslave/scripts/logwatcher.py diff --git a/slave/bbslave/scripts/reconfig.py b/slave/buildslave/scripts/reconfig.py similarity index 100% rename from slave/bbslave/scripts/reconfig.py rename to slave/buildslave/scripts/reconfig.py diff --git a/slave/bbslave/scripts/runner.py b/slave/buildslave/scripts/runner.py similarity index 100% rename from slave/bbslave/scripts/runner.py rename to slave/buildslave/scripts/runner.py diff --git a/slave/bbslave/scripts/sample.cfg b/slave/buildslave/scripts/sample.cfg similarity index 100% rename from slave/bbslave/scripts/sample.cfg rename to slave/buildslave/scripts/sample.cfg diff --git a/slave/bbslave/scripts/startup.py b/slave/buildslave/scripts/startup.py similarity index 100% rename from slave/bbslave/scripts/startup.py rename to slave/buildslave/scripts/startup.py diff --git a/slave/bbslave/test/__init__.py b/slave/buildslave/test/__init__.py similarity index 100% rename from slave/bbslave/test/__init__.py rename to slave/buildslave/test/__init__.py diff --git a/slave/bbslave/test/unit/__init__.py b/slave/buildslave/test/unit/__init__.py similarity index 100% rename from slave/bbslave/test/unit/__init__.py rename to slave/buildslave/test/unit/__init__.py diff --git a/slave/bbslave/test/unit/test_slave_commands_base.py b/slave/buildslave/test/unit/test_slave_commands_base.py similarity index 99% rename from slave/bbslave/test/unit/test_slave_commands_base.py rename to slave/buildslave/test/unit/test_slave_commands_base.py index cc41515bb11..2f3832668ac 100644 --- a/slave/bbslave/test/unit/test_slave_commands_base.py +++ b/slave/buildslave/test/unit/test_slave_commands_base.py @@ -3,9 +3,9 @@ from twisted.trial import unittest from twisted.internet import task, defer -from bbslave.commands.base import ShellCommand, Obfuscated, \ +from buildslave.commands.base import ShellCommand, Obfuscated, \ DummyCommand, WaitCommand, waitCommandRegistry, AbandonChain -from bbslave.commands.utils import getCommand +from buildslave.commands.utils import getCommand class FakeSlaveBuilder: debug = False diff --git a/slave/bbslave/test/unit/test_slave_commands_utils.py b/slave/buildslave/test/unit/test_slave_commands_utils.py similarity index 99% rename from slave/bbslave/test/unit/test_slave_commands_utils.py rename to slave/buildslave/test/unit/test_slave_commands_utils.py index b6fa124bcee..28ed5b5326e 100644 --- a/slave/bbslave/test/unit/test_slave_commands_utils.py +++ b/slave/buildslave/test/unit/test_slave_commands_utils.py @@ -4,7 +4,7 @@ from twisted.trial import unittest import twisted.python.procutils -from bbslave.commands import utils +from buildslave.commands import utils class GetCommand(unittest.TestCase): diff --git a/slave/bbslave/util.py b/slave/buildslave/util.py similarity index 100% rename from slave/bbslave/util.py rename to slave/buildslave/util.py diff --git a/slave/setup.py b/slave/setup.py index 58f771bc184..a74b6fefcc7 100644 --- a/slave/setup.py +++ b/slave/setup.py @@ -14,7 +14,7 @@ import os from distutils.core import setup -from bbslave import version +from buildslave import version # TODO: slave script scripts = ["bin/buildbot"] @@ -23,7 +23,7 @@ scripts.append("contrib/windows/buildbot_service.py") setup_args = { - 'name': "bbslave", + 'name': "buildslave", 'version': version, 'description': "BuildBot Slave Daemon", 'long_description': "See the 'buildbot' project for details", @@ -42,10 +42,12 @@ 'Topic :: Software Development :: Testing', ], - 'packages': ["bbslave", - "bbslave.commands", - # TODO: tests - ], + 'packages': [ + "buildslave", + "buildslave.commands", + "buildslave.test", + "buildslave.test.unit", + ], 'scripts': scripts, }