diff --git a/plugins/FunCommands.py b/plugins/FunCommands.py index 8666fc353..fc760b870 100644 --- a/plugins/FunCommands.py +++ b/plugins/FunCommands.py @@ -47,11 +47,13 @@ import sha import time import math import cmath +import socket import string import random import urllib import inspect import binascii +import telnetlib import threading import mimetypes @@ -617,6 +619,44 @@ class FunCommands(callbacks.Privmsg): return irc.reply(msg, s) + def dns(self, irc, msg, args): + """""" + host = privmsgs.getArgs(args) + if ircutils.isIP(host): + hostname = socket.getfqdn(host) + if hostname == host: + irc.error(msg, 'Host not found.') + else: + irc.reply(msg, hostname) + else: + try: + ip = socket.gethostbyname(host) + irc.reply(msg, ip) + except socket.error: + irc.error(msg, 'Host not found.') + dns = privmsgs.thread(dns) + + def kernel(self, irc, msg, args): + """takes no arguments""" + try: + conn = telnetlib.Telnet('kernel.org', 79) + conn.write('\n') + text = conn.read_all() + except socket.error, e: + irc.error(msg, e.args[1]) + return + stable = 'unkown' + beta = 'unknown' + for line in text.splitlines(): + (name, version) = line.split(':') + if 'latest stable' in name: + stable = version.strip() + elif 'latest beta' in name: + beta = version.strip() + irc.reply(msg, 'The latest stable kernel is %s; ' \ + 'the latest beta kernel is %s.' % (stable, beta)) + kernel = privmsgs.thread(kernel) + Class = FunCommands diff --git a/plugins/ThreadedFunCommands.py b/plugins/ThreadedFunCommands.py deleted file mode 100644 index 2a24eabda..000000000 --- a/plugins/ThreadedFunCommands.py +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env python - -### -# Copyright (c) 2002, Jeremiah Fincher -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions, and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions, and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the author of this software nor the name of -# contributors to this software may be used to endorse or promote products -# derived from this software without specific prior written consent. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -### - -""" -Provides fun/useless commands that require threads. -""" - -from baseplugin import * - -import socket -import telnetlib - -import ircutils -import privmsgs -import callbacks - -class ThreadedFunCommands(callbacks.Privmsg): - threaded = True - def dns(self, irc, msg, args): - """""" - host = privmsgs.getArgs(args) - if ircutils.isIP(host): - hostname = socket.getfqdn(host) - if hostname == host: - irc.error(msg, 'Host not found.') - else: - irc.reply(msg, hostname) - else: - try: - ip = socket.gethostbyname(host) - irc.reply(msg, ip) - except socket.error: - irc.error(msg, 'Host not found.') - - def kernel(self, irc, msg, args): - """takes no arguments""" - try: - conn = telnetlib.Telnet('kernel.org', 79) - conn.write('\n') - text = conn.read_all() - except socket.error, e: - irc.error(msg, e.args[1]) - return - stable = 'unkown' - beta = 'unknown' - for line in text.splitlines(): - (name, version) = line.split(':') - if 'latest stable' in name: - stable = version.strip() - elif 'latest beta' in name: - beta = version.strip() - irc.reply(msg, 'The latest stable kernel is %s; ' \ - 'the latest beta kernel is %s.' % (stable, beta)) - -Class = ThreadedFunCommands -# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: diff --git a/test/test_FunCommands.py b/test/test_FunCommands.py index 837e572a6..763ee7b50 100644 --- a/test/test_FunCommands.py +++ b/test/test_FunCommands.py @@ -84,4 +84,11 @@ class FunCommandsTest(PluginTestCase): i = ord(c) self.assertResponse('ord %s' % utils.dqrepr(c), str(i)) + def testDns(self): + self.assertNotError('dns slashdot.org') + + def testKernel(self): + self.assertNotError('kernel') + + # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: diff --git a/test/test_ThreadedFunCommands.py b/test/test_ThreadedFunCommands.py deleted file mode 100644 index e822aac41..000000000 --- a/test/test_ThreadedFunCommands.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python - -### -# Copyright (c) 2002, Jeremiah Fincher -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright notice, -# this list of conditions, and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions, and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# * Neither the name of the author of this software nor the name of -# contributors to this software may be used to endorse or promote products -# derived from this software without specific prior written consent. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -### - -from test import * - -class ThreadedFunCommandsTestCase(PluginTestCase): - plugins = ('ThreadedFunCommands',) - def testDns(self): - self.assertNotError('dns slashdot.org') - - def testKernel(self): - self.assertNotError('kernel') - - -# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: -