Commit Graph

9880 Commits

Author SHA1 Message Date
Valentin Lorentz
0a9d6469f0 Make dependency on python-mock optional. 2014-07-12 10:01:59 +02:00
Valentin Lorentz
6f19088724 Merge remote-tracking branch 'supybot/master' into testing
Conflicts:
	.gitignore
	plugins/Alias/plugin.py
	plugins/Anonymous/plugin.py
	plugins/Anonymous/test.py
	setup.py
	src/callbacks.py
2014-07-12 09:48:27 +02:00
Valentin Lorentz
a3941d1ee5 Merge pull request #773 from Mkaysi/patch-1
Ctcp: fix README.md
2014-07-10 22:38:28 +02:00
Mikaela Suomalainen
8f0c07cdb4 Ctcp: fix README.md
* Fix quoting
* Remove prefix, quoting should tell that it's a bot command

[SKIP CI]
2014-07-10 23:07:35 +03:00
James McCoy
a629f51328 Anonymous: Move "say $nick" functionality to new tell command
Allowing Anonymous.say to send a message to either a nick or an
(implicit) channel through the use of first('nick', 'inChannel') changed
the behavior of the command by making it impossible for 'inChannel' to
take effect.

This meant that any previous users of the command that expected "say
some text" to send "some text" to the current channel would instead try
to send "text" to the user "some".  Depending on the value of
conf.plugins.Anonymous.allowPrivateTarget, this would result in either
an error or a strange message to a random user.

Creating a new tell command solves this issue as Anonymous.channel now
goes back to its simple 'inChannel' wrapper.

Signed-off-by: James McCoy <vega.james@gmail.com>
2014-07-09 21:03:26 -04:00
Valentin Lorentz
da4a1c1a32 80 columns. 2014-07-09 07:50:32 +02:00
Mikaela Suomalainen
20f8c5c56a src/conf.py reword help text for supybot.user
and supybot.networks.<network>.user
2014-07-09 07:50:32 +02:00
Valentin Lorentz
d0c53d9c00 Merge pull request #768 from Mkaysi/clean-travis
fix .travis.runonce.bash
2014-07-05 11:58:57 +02:00
Mikaela Suomalainen
ef77116d68 fix .travis.runonce.bash
* msgcheck now doesn't cause false-alarms with Limnoria specific things.
* remove the broken if which never gets executed by Travis
* These commits have already been build invidually so [SKIP CI]
2014-07-05 11:26:48 +03:00
Valentin Lorentz
42689c446b travis: Install sphinx and msgcheck only for the build running runonce.
Squashed commit of the following:

commit 3b528b5f103500d9cfa62e3442d7c977ee7c6259
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 10:24:02 2014 +0300

    .travis.runonce.bash: fix travis check

    * Install sphinx & msgcheck on same line.
    * Don't install sphinx twice.

commit aca2040807b082a1b1f74be4f8f3917407dd4e3c
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 01:12:10 2014 +0300

    .travis.runonce.bash: use sudo in travis

commit 00b8d9d0b269679867d3ef2d730274d6b0d1701b
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 01:08:51 2014 +0300

    Revert ".travis.runonce.bash: improvising"

    This reverts commit 373471845cd2a1ebfc615fe0eb253ac5f169ec67.

commit 373471845cd2a1ebfc615fe0eb253ac5f169ec67
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 01:00:52 2014 +0300

    .travis.runonce.bash: improvising

    I hope this also works with Travis, but I have no idea does whereis
    usually check $HOME/.local/bin …

commit 1a8f54f337455dbb3e5643ce8fa9735183edcd79
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:46:16 2014 +0300

    Revert ".travis.runonce.bash: adjust $PATH"

    This reverts commit dc096462798499270e78ed7aa596dade938796a4.

commit dc096462798499270e78ed7aa596dade938796a4
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:37:13 2014 +0300

    .travis.runonce.bash: adjust $PATH

    If something is already installed elsewhere, pip won't reinstall it.

commit bd34aae08a8a739c7f6ecd8db685dc81ac3acf7d
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:25:56 2014 +0300

    .travis.runonce.bash: use full paths

    for applications installed to $HOME/.local

commit 643878c2f94cbe9f7244a4d8df7463ed25af2275
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:24:20 2014 +0300

    Fix Python 2.6 build

    Move msgcheck & sphinx to .travis.runonce.bash so 2.6 doesn't fail to
    msgcheck requiring Python 2.6.

commit 2fbb279ac2
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:19:30 2014 +0300

    fix .travis.yml

commit cc1ccb15a0
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:08:12 2014 +0300

    .travis.runonce.bash: add msgcheck

    && requirements.txt: add msgcheck & forgotten sphinx.

commit a2d910d2f5
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:03:41 2014 +0300

    .travis.runonce.bash: add forgotten sphinx

commit cdd564f115
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Sat Jul 5 00:01:14 2014 +0300

    Break .travis.yml to two files

    * .travis.yml = the primary Travis config file.
    * .travis.runonce.bash = the script which we want to run only once per
    build.

commit 6c3d2dfcd2
Merge: ebf2442 37d8a54
Author: Valentin Lorentz <progval+github@progval.net>
Date:   Fri Jul 4 19:06:47 2014 +0200

    Merge pull request #755 from Mkaysi/services

    Services: default NickServ and ChanServ to NickServ and ChanServ.

commit ebf2442dbc
Merge: 3f9b10c c534e82
Author: Valentin Lorentz <progval+github@progval.net>
Date:   Mon Jun 30 13:27:34 2014 +0200

    Merge pull request #762 from Mkaysi/nickauth

    NickAuth: update l10n-fi & messages.pot .

commit c534e824f0
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Mon Jun 30 14:22:34 2014 +0300

    NickAuth: update l10n-fi & messages.pot .

    [SKIP CI]

commit 3f9b10cc59
Merge: 607e5e0 38b933a
Author: Valentin Lorentz <progval+github@progval.net>
Date:   Mon Jun 30 13:17:13 2014 +0200

    Merge pull request #761 from nyuszika7h/fix-nickauth-nick-list-error

    NickAuth: fix error message in !list

commit 38b933aee9
Author: nyuszika7h <nyuszika7h@gmail.com>
Date:   Mon Jun 30 09:50:43 2014 +0200

    NickAuth: fix previous commit

    I'm too used to JavaScript.

commit 8e97ad3707
Author: nyuszika7h <nyuszika7h@gmail.com>
Date:   Mon Jun 30 09:47:55 2014 +0200

    NickAuth: fix error message in !list

commit 37d8a545e9
Author: Mikaela Suomalainen <mikaela.suomalainen@outlook.com>
Date:   Fri Jun 6 13:54:26 2014 +0300

    Services: default NickServ and ChanServ to NickServ and ChanServ.

    * Most of networks have services with this name.
        * I can only name QuakeNet from those that don't, but the default
        configuration exludes it.
    * If this plugin is loaded in Supybot-wizard, it asks for nicknames of
    NickServ and ChanServ.

    [SKIP CI] because this is `git commit --amend` and the build already
    passed.
2014-07-05 09:33:45 +02:00
Valentin Lorentz
d9a581efa2 Merge pull request #765 from Mkaysi/runonce
Break .travis.yml to two files
2014-07-04 23:24:23 +02:00
Mikaela Suomalainen
2fbb279ac2 fix .travis.yml 2014-07-05 00:19:30 +03:00
Mikaela Suomalainen
cc1ccb15a0 .travis.runonce.bash: add msgcheck
&& requirements.txt: add msgcheck & forgotten sphinx.
2014-07-05 00:08:12 +03:00
Mikaela Suomalainen
a2d910d2f5 .travis.runonce.bash: add forgotten sphinx 2014-07-05 00:03:41 +03:00
Mikaela Suomalainen
cdd564f115 Break .travis.yml to two files
* .travis.yml = the primary Travis config file.
* .travis.runonce.bash = the script which we want to run only once per
build.
2014-07-05 00:01:14 +03:00
Valentin Lorentz
6c3d2dfcd2 Merge pull request #755 from Mkaysi/services
Services: default NickServ and ChanServ to NickServ and ChanServ.
2014-07-04 19:06:47 +02:00
Valentin Lorentz
ebf2442dbc Merge pull request #762 from Mkaysi/nickauth
NickAuth: update l10n-fi & messages.pot .
2014-06-30 13:27:34 +02:00
Mikaela Suomalainen
c534e824f0 NickAuth: update l10n-fi & messages.pot .
[SKIP CI]
2014-06-30 14:23:23 +03:00
Valentin Lorentz
3f9b10cc59 Merge pull request #761 from nyuszika7h/fix-nickauth-nick-list-error
NickAuth: fix error message in !list
2014-06-30 13:17:13 +02:00
nyuszika7h
38b933aee9 NickAuth: fix previous commit
I'm too used to JavaScript.
2014-06-30 09:50:43 +02:00
nyuszika7h
8e97ad3707 NickAuth: fix error message in !list 2014-06-30 09:47:55 +02:00
James McCoy
3d993a0cab callbacks: Properly handle nested command errors
Using Raise=True was only papering over the real problem in the nested
command error handling.  The actual issue is that we were trying to
return an IrcMsg from NestedCommandsIrcProxy.__init__.  Dropping
Raise=True and moving return to its own line is the correct fix and
resolves the test failure in testMaximumNestingDepth.

This commit reverts 7838cae3bc

Signed-off-by: James McCoy <vega.james@gmail.com>
2014-06-29 19:12:22 -04:00
Valentin Lorentz
607e5e0a68 Merge pull request #758 from Mkaysi/desymlink
Revert #714 & #657 && close #757
2014-06-26 09:49:58 +02:00
Mikaela Suomalainen
afdc8815f2 Revert "Merge pull request #657 from Mkaysi/links"
This reverts commit 497df2c14f, reversing
changes made to 21f75b8237.
2014-06-26 10:09:05 +03:00
Mikaela Suomalainen
f4714638ad Revert "Add manual pages for Limnoria* commands as we already have the commands."
This reverts commit d8cd749a86.
2014-06-26 10:07:08 +03:00
Valentin Lorentz
402b80cd01 Delete messages.pot 2014-06-24 19:18:06 +00:00
James McCoy
27ffff7ad6 release: Remove reference to freshmeat^Wfreecode
freecode.com, nee freshmeat.net, is now a completely static site.  Since
it is no longer allowing updates, no need to worry about pushing
information about Supybot releases to it.

Signed-off-by: James McCoy <vega.james@gmail.com>
2014-06-22 22:36:16 -04:00
Valentin Lorentz
1a2f720857 Merge pull request #754 from Mkaysi/patch-1
RSS: make more sense to default config
2014-06-20 22:52:07 +02:00
Mikaela Suomalainen
2caade8f7c RSS: make more sense to default config
* Change default separator to `|` as used by Topic plugin.
* Show links with manual calling and automatic announcement.
    * In most of cases we want to know where does new RSS feed title point to...
2014-06-20 22:09:30 +03:00
Valentin Lorentz
aad0f0c88c i18n: Don't strip spaces at the end of translated strings. Closes GH-750. 2014-06-19 10:28:08 +00:00
Valentin Lorentz
00c1c62346 Merge pull request #753 from Mkaysi/patch-1
INSTALL.md: add installing requirements under pip.
2014-06-18 20:35:14 +02:00
Mikaela Suomalainen
f1ebccb9f1 INSTALL: install requirements with pip before Limnoria itself.
[SKIP CI]
2014-06-18 21:31:19 +03:00
Mikaela Suomalainen
f9e8be5d0c INSTALL.md: add installing requirements under pip.
It seems that pip ignores `requirements.txt` unless it's installed separately.
2014-06-18 21:24:50 +03:00
Valentin Lorentz
9e74175566 schedule: Move the whole deletion of an event in the same critical section. 2014-06-17 21:19:07 +02:00
Valentin Lorentz
8ec9f1b496 Fill README of some plugins. Closes GH-747. Closes GH-749. 2014-06-14 13:23:06 +02:00
Valentin Lorentz
ddc37a7f4a Revert "Make supybot.reply.oneToOne not always true on channels."
This reverts commit 5881c97120.
2014-06-11 11:13:01 +00:00
James McCoy
f5df6695c0 Alias: Restore recursion limit and limit memory use
The (faulty) detection of recursive Aliases was removed in
a656fd0693, claiming that "our nesting
limit will catch issues now."  However, nested Aliases weren't actually
increasing the nesting level.

Actually increasing the nesting level when an alias is executed restores
the intended behavior.  Additionally, limiting the size of the
expanded arguments to an alias prevents exponential growth of memory
usage for certain malicious inputs/aliases.

Signed-off-by: James McCoy <vega.james@gmail.com>
2014-06-09 23:48:41 -04:00
James McCoy
7838cae3bc callbacks: Use Raise=True for nested limit errors
Signed-off-by: James McCoy <vega.james@gmail.com>
2014-06-09 23:44:25 -04:00
Mikaela Suomalainen
1762b8090a fix 2f723e809d 2014-06-09 20:41:04 +03:00
Mikaela Suomalainen
6d3198c2b3 src/conf.py: update help for drivers.module
This wording was suggested by @nyuszika7h .
2014-06-09 20:38:45 +03:00
Valentin Lorentz
a138722d73 src/log.py: Display warning instead of raising exception if there is no space left on defice (infinite loop…). 2014-06-09 16:41:58 +00:00
Mikaela Suomalainen
bc7b9c62a0 Scheduler: fix quoting & add plugins in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
91caae2e08 Relay: fix quoting & mention cmdall in README.md
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
91fcd704ce RSS: fix quoting & mention onetoone in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
decaa09fd6 Praise: fix quoting in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
6eb504325f Nickometer: fix quoting in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
c0b9e06d5c NickAuth: fix quoting and wording in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
4b630e8229 MoobotFactoids: fix quoting in README.md.
[SKIP CI]
2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
64acf863f0 Limiter: fix quoting in README.md. 2014-06-08 16:59:42 +02:00
Mikaela Suomalainen
aa73cbbd9e Later: fix topics and quoting in README.md.
Also updated to reflect our default settings.

[SKIP CI]
2014-06-08 16:59:42 +02:00