Skip to content

Commit

Permalink
Fix highlighting for command line examples
Browse files Browse the repository at this point in the history
Highlight as "bash".
  • Loading branch information
rutsky committed Jun 25, 2013
1 parent 92e8357 commit f415653
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 26 deletions.
4 changes: 3 additions & 1 deletion master/docs/manual/cfg-changesources.rst
Expand Up @@ -343,7 +343,9 @@ Configuration of CVS and buildbot_cvs_mail.py
CVS must be configured to invoke the buildbot_cvs_mail.py script when files
are checked in. This is done via the CVS loginfo configuration file.

To update this, first do::
To update this, first do:

.. code-block:: bash
cvs checkout CVSROOT
Expand Down
4 changes: 3 additions & 1 deletion master/docs/manual/cfg-statustargets.rst
Expand Up @@ -836,7 +836,9 @@ And you configure your WebStatus to enable this hook::
))

Then you will be able to trigger a poll of the SVN repository by poking the
``/change_hook/poller`` URL from a commit hook like this::
``/change_hook/poller`` URL from a commit hook like this:

.. code-block:: bash
curl http://yourbuildbot/change_hook/poller?poller=https%3A%2F%2Famanda.svn.sourceforge.net%2Fsvnroot%2Famanda%2Famanda
Expand Down
4 changes: 3 additions & 1 deletion master/docs/relnotes/0.8.6.rst
Expand Up @@ -210,7 +210,9 @@ Details
-------

For a more detailed description of the changes made in this version, see the
Git log itself::
Git log itself:

.. code-block:: bash
git log buildbot-0.8.5..buildbot-0.8.6
Expand Down
4 changes: 3 additions & 1 deletion master/docs/relnotes/0.8.7.rst
Expand Up @@ -252,7 +252,9 @@ Details
-------

For a more detailed description of the changes made in this version, see the
Git log itself::
Git log itself:

.. code-block:: bash
git log v0.8.6..v0.8.7
Expand Down
4 changes: 3 additions & 1 deletion master/docs/relnotes/0.8.8.rst
Expand Up @@ -132,6 +132,8 @@ Details
-------

For a more detailed description of the changes made in this version, see the
git log itself::
git log itself:

.. code-block:: bash
git log v0.8.7..v0.8.8
4 changes: 3 additions & 1 deletion master/docs/relnotes/index.rst
Expand Up @@ -82,7 +82,9 @@ Details
-------

For a more detailed description of the changes made in this version, see the
git log itself::
git log itself:

.. code-block:: bash
git log v0.8.8..master
Expand Down
36 changes: 27 additions & 9 deletions master/docs/tutorial/firstrun.rst
Expand Up @@ -49,7 +49,9 @@ easy_install will need to download other projects from the Internet.
Buildbot does not require root access. Run the commands in this tutorial
as a normal, unprivileged user.

Let's dive in by typing at the terminal::
Let's dive in by typing at the terminal:

.. code-block:: bash
cd
mkdir -p tmp/buildbot
Expand All @@ -66,12 +68,16 @@ Let's dive in by typing at the terminal::
Creating a master
-----------------

At the terminal, type::
At the terminal, type:

.. code-block:: bash
buildbot create-master master
mv master/master.cfg.sample master/master.cfg
Now start it::
Now start it:

.. code-block:: bash
buildbot start master
tail -f master/twistd.log
Expand All @@ -95,31 +101,43 @@ You should see lines like this:
Creating a slave
----------------

Open a new terminal and enter the same sandbox you created before::
Open a new terminal and enter the same sandbox you created before:

.. code-block:: bash
cd
cd tmp/buildbot
source sandbox/bin/activate
Install the ``buildslave`` command::
Install the ``buildslave`` command:

.. code-block:: bash
easy_install buildbot-slave
Now, create the slave::
Now, create the slave:

.. code-block:: bash
buildslave create-slave slave localhost:9989 example-slave pass
The user:host pair, username, and password should be the same as the ones in
master.cfg; verify this is the case by looking at the section for ``c['slaves']``
and ``c['slavePortnum']``::
and ``c['slavePortnum']``:

.. code-block:: bash
cat master/master.cfg
Now, start the slave::
Now, start the slave:

.. code-block:: bash
buildslave start slave
Check the slave's log::
Check the slave's log:

.. code-block:: bash
tail -f slave/twistd.log
Expand Down
4 changes: 3 additions & 1 deletion master/docs/tutorial/fiveminutes.rst
Expand Up @@ -69,7 +69,9 @@ although sometimes the resulting builders can be quite complex.

So to perform a manual build of our project we would type this from
the command line (assuming we are at the root of the local copy of
the repository)::
the repository):

.. code-block:: bash
$ make clean # clean remnants of previous builds
...
Expand Down
38 changes: 28 additions & 10 deletions master/docs/tutorial/tour.rst
Expand Up @@ -29,7 +29,9 @@ Let's start simple by looking at where you would customize the buildbot's projec

We continue where we left off in the :ref:`first-run-label` tutorial.

Open a new terminal, and first enter the same sandbox you created before (where ``$EDITOR`` is your editor of choice like vim, gedit, or emacs)::
Open a new terminal, and first enter the same sandbox you created before (where ``$EDITOR`` is your editor of choice like vim, gedit, or emacs):

.. code-block:: bash
cd
cd tmp/buildbot
Expand All @@ -49,7 +51,9 @@ Now, look for the section marked *PROJECT IDENTITY* which reads::

If you want, you can change either of these links to anything you want to see what happens when you change them.

After making a change go into the terminal and type::
After making a change go into the terminal and type:

.. code-block:: bash
buildbot reconfig master
Expand Down Expand Up @@ -98,7 +102,9 @@ single quote in the two lines you changed, so they read::
c['title'] = "Pyflakes"
c['titleURL'] = "http://divmod.org/trac/wiki/DivmodPyflakes"

This creates a Python SyntaxError. Now go ahead and reconfig the buildmaster::
This creates a Python SyntaxError. Now go ahead and reconfig the buildmaster:

.. code-block:: bash
buildbot reconfig master
Expand Down Expand Up @@ -178,7 +184,9 @@ below the WebStatus line in master.cfg::
c['status'].append(words.IRC(host="irc.freenode.org", nick="bbtest",
channels=["#buildbot-test"]))

Reconfigure the build master then do::
Reconfigure the build master then do:

.. code-block:: bash
grep -i irc master/twistd.log
Expand Down Expand Up @@ -291,7 +299,9 @@ exposes full access to the buildmaster's account (including the ability to
modify and delete files), so it should not be enabled with a weak or easily
guessable password.

To use this you will need to install an additional package or two to your virtualenv::
To use this you will need to install an additional package or two to your virtualenv:

.. code-block:: bash
cd
cd tmp/buildbot
Expand All @@ -309,21 +319,25 @@ Insert the following to enable debugging mode with manhole::
from buildbot import manhole
c['manhole'] = manhole.PasswordManhole("tcp:1234:interface=127.0.0.1","admin","passwd")

After restarting the master, you can ssh into the master and get an interactive Python shell::
After restarting the master, you can ssh into the master and get an interactive Python shell:

.. code-block:: bash
ssh -p1234 admin@127.0.0.1
# enter passwd at prompt
.. note::
The pyasn1-0.1.1 release has a bug which results in an exception similar to
this on startup:

.. code-block:: none
exceptions.TypeError: argument 2 must be long, not int
If you see this, the temporary solution is to install the previous version
of pyasn1::
of pyasn1:

.. code-block:: bash
pip install pyasn1-0.0.13b
Expand Down Expand Up @@ -354,14 +368,18 @@ To set this up, add the following lines to master.cfg::
Then you can submit changes using the :bb:cmdline:`try` command.

Let's try this out by making a one-line change to pyflakes, say,
to make it trace the tree by default::
to make it trace the tree by default:

.. code-block:: bash
git clone git://github.com/buildbot/pyflakes.git pyflakes-git
cd pyflakes-git/pyflakes
$EDITOR checker.py
# change "traceTree = False" on line 185 to "traceTree = True"
Then run buildbot's ``try`` command as follows::
Then run buildbot's ``try`` command as follows:

.. code-block:: bash
source ~/tmp/buildbot/sandbox/bin/activate
buildbot try --connect=pb --master=127.0.0.1:5555 --username=sampleuser --passwd=samplepass --vc=git
Expand Down

0 comments on commit f415653

Please sign in to comment.