From b7eacbfc22d058571dfeaf82cd24590971e429f0 Mon Sep 17 00:00:00 2001 From: dpedu Date: Thu, 18 Jun 2015 19:29:46 -0700 Subject: [PATCH] Convert to python module --- .gitignore | 5 ++++- pyircbot/main.py => bin/pyircbot | 3 ++- config.instance.yml => examples/config.instance.yml | 0 config.main.yml => examples/config.main.yml | 0 {data => examples/data}/config/BitcoinPrice.yml | 0 {data => examples/data}/config/Calc.yml | 0 {data => examples/data}/config/CryptoWalletRPC.yml | 0 {data => examples/data}/config/DogeDice.yml | 0 {data => examples/data}/config/DogeRPC.yml | 0 {data => examples/data}/config/DuckHunt.yml | 0 {data => examples/data}/config/GameBase.yml | 0 {data => examples/data}/config/Inventory.yml | 0 {data => examples/data}/config/LinkTitler.yml | 0 {data => examples/data}/config/MySQL.yml | 0 {data => examples/data}/config/NFLLive.yml | 0 {data => examples/data}/config/RandQuote.yml | 0 {data => examples/data}/config/Remind.yml | 0 {data => examples/data}/config/Scramble.yml | 0 {data => examples/data}/config/Seen.yml | 0 {data => examples/data}/config/Services.yml | 9 +++++---- {data => examples/data}/config/Tell.yml | 0 {data => examples/data}/config/Weather.yml | 0 {data => examples/data}/data/Scramble/words.txt | 0 examples/run-example.sh | 2 ++ pyircbot/{core => }/__init__.py | 5 +++++ pyircbot/{core => }/irccore.py | 0 pyircbot/{core => }/jsonrpc.py | 0 pyircbot/{core => }/modulebase.py | 0 pyircbot/modules/PingResponder.py | 2 +- pyircbot/modules/Services.py | 2 +- pyircbot/{core => }/pyircbot.py | 5 +++-- pyircbot/{core => }/rpc.py | 2 +- run-example.sh | 2 -- setup.py | 12 ++++++++++++ 34 files changed, 36 insertions(+), 13 deletions(-) rename pyircbot/main.py => bin/pyircbot (96%) rename config.instance.yml => examples/config.instance.yml (100%) rename config.main.yml => examples/config.main.yml (100%) rename {data => examples/data}/config/BitcoinPrice.yml (100%) rename {data => examples/data}/config/Calc.yml (100%) rename {data => examples/data}/config/CryptoWalletRPC.yml (100%) rename {data => examples/data}/config/DogeDice.yml (100%) rename {data => examples/data}/config/DogeRPC.yml (100%) rename {data => examples/data}/config/DuckHunt.yml (100%) rename {data => examples/data}/config/GameBase.yml (100%) rename {data => examples/data}/config/Inventory.yml (100%) rename {data => examples/data}/config/LinkTitler.yml (100%) rename {data => examples/data}/config/MySQL.yml (100%) rename {data => examples/data}/config/NFLLive.yml (100%) rename {data => examples/data}/config/RandQuote.yml (100%) rename {data => examples/data}/config/Remind.yml (100%) rename {data => examples/data}/config/Scramble.yml (100%) rename {data => examples/data}/config/Seen.yml (100%) rename {data => examples/data}/config/Services.yml (85%) rename {data => examples/data}/config/Tell.yml (100%) rename {data => examples/data}/config/Weather.yml (100%) rename {data => examples/data}/data/Scramble/words.txt (100%) create mode 100755 examples/run-example.sh rename pyircbot/{core => }/__init__.py (62%) rename pyircbot/{core => }/irccore.py (100%) rename pyircbot/{core => }/jsonrpc.py (100%) rename pyircbot/{core => }/modulebase.py (100%) mode change 100644 => 100755 pyircbot/modules/Services.py rename pyircbot/{core => }/pyircbot.py (99%) rename pyircbot/{core => }/rpc.py (99%) delete mode 100755 run-example.sh create mode 100755 setup.py diff --git a/.gitignore b/.gitignore index 2750f9f..ddcee96 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,7 @@ libs *__pycache__* docs/_build .DS_Store -botenv \ No newline at end of file +botenv +dist +build +pyircbot.egg-info \ No newline at end of file diff --git a/pyircbot/main.py b/bin/pyircbot similarity index 96% rename from pyircbot/main.py rename to bin/pyircbot index 42692c7..5898aa3 100755 --- a/pyircbot/main.py +++ b/bin/pyircbot @@ -4,7 +4,8 @@ import sys import logging import yaml from optparse import OptionParser -from core.pyircbot import PyIRCBot +from pyircbot import PyIRCBot + if __name__ == "__main__": " logging level and facility " diff --git a/config.instance.yml b/examples/config.instance.yml similarity index 100% rename from config.instance.yml rename to examples/config.instance.yml diff --git a/config.main.yml b/examples/config.main.yml similarity index 100% rename from config.main.yml rename to examples/config.main.yml diff --git a/data/config/BitcoinPrice.yml b/examples/data/config/BitcoinPrice.yml similarity index 100% rename from data/config/BitcoinPrice.yml rename to examples/data/config/BitcoinPrice.yml diff --git a/data/config/Calc.yml b/examples/data/config/Calc.yml similarity index 100% rename from data/config/Calc.yml rename to examples/data/config/Calc.yml diff --git a/data/config/CryptoWalletRPC.yml b/examples/data/config/CryptoWalletRPC.yml similarity index 100% rename from data/config/CryptoWalletRPC.yml rename to examples/data/config/CryptoWalletRPC.yml diff --git a/data/config/DogeDice.yml b/examples/data/config/DogeDice.yml similarity index 100% rename from data/config/DogeDice.yml rename to examples/data/config/DogeDice.yml diff --git a/data/config/DogeRPC.yml b/examples/data/config/DogeRPC.yml similarity index 100% rename from data/config/DogeRPC.yml rename to examples/data/config/DogeRPC.yml diff --git a/data/config/DuckHunt.yml b/examples/data/config/DuckHunt.yml similarity index 100% rename from data/config/DuckHunt.yml rename to examples/data/config/DuckHunt.yml diff --git a/data/config/GameBase.yml b/examples/data/config/GameBase.yml similarity index 100% rename from data/config/GameBase.yml rename to examples/data/config/GameBase.yml diff --git a/data/config/Inventory.yml b/examples/data/config/Inventory.yml similarity index 100% rename from data/config/Inventory.yml rename to examples/data/config/Inventory.yml diff --git a/data/config/LinkTitler.yml b/examples/data/config/LinkTitler.yml similarity index 100% rename from data/config/LinkTitler.yml rename to examples/data/config/LinkTitler.yml diff --git a/data/config/MySQL.yml b/examples/data/config/MySQL.yml similarity index 100% rename from data/config/MySQL.yml rename to examples/data/config/MySQL.yml diff --git a/data/config/NFLLive.yml b/examples/data/config/NFLLive.yml similarity index 100% rename from data/config/NFLLive.yml rename to examples/data/config/NFLLive.yml diff --git a/data/config/RandQuote.yml b/examples/data/config/RandQuote.yml similarity index 100% rename from data/config/RandQuote.yml rename to examples/data/config/RandQuote.yml diff --git a/data/config/Remind.yml b/examples/data/config/Remind.yml similarity index 100% rename from data/config/Remind.yml rename to examples/data/config/Remind.yml diff --git a/data/config/Scramble.yml b/examples/data/config/Scramble.yml similarity index 100% rename from data/config/Scramble.yml rename to examples/data/config/Scramble.yml diff --git a/data/config/Seen.yml b/examples/data/config/Seen.yml similarity index 100% rename from data/config/Seen.yml rename to examples/data/config/Seen.yml diff --git a/data/config/Services.yml b/examples/data/config/Services.yml similarity index 85% rename from data/config/Services.yml rename to examples/data/config/Services.yml index 824c544..0866e5c 100644 --- a/data/config/Services.yml +++ b/examples/data/config/Services.yml @@ -1,8 +1,9 @@ user: nick: - - pyircbot3 - - pyircbot3_ - - pyircbot3__ + - dave + - dave_ + - dave__ + - dave___ password: nickservpassword username: pyircbot3 hostname: pyircbot3.domain.com @@ -15,7 +16,7 @@ ident: ghost_to: nickserv ghost_cmd: ghost %(nick)s %(password)s channels: - - "#xmopx" + - "#dave2" privatechannels: to: chanserv command: invite %(channel)s diff --git a/data/config/Tell.yml b/examples/data/config/Tell.yml similarity index 100% rename from data/config/Tell.yml rename to examples/data/config/Tell.yml diff --git a/data/config/Weather.yml b/examples/data/config/Weather.yml similarity index 100% rename from data/config/Weather.yml rename to examples/data/config/Weather.yml diff --git a/data/data/Scramble/words.txt b/examples/data/data/Scramble/words.txt similarity index 100% rename from data/data/Scramble/words.txt rename to examples/data/data/Scramble/words.txt diff --git a/examples/run-example.sh b/examples/run-example.sh new file mode 100755 index 0000000..d45b74b --- /dev/null +++ b/examples/run-example.sh @@ -0,0 +1,2 @@ +#!/bin/sh +../bin/pyircbot -c config.main.yml -b config.instance.yml diff --git a/pyircbot/core/__init__.py b/pyircbot/__init__.py similarity index 62% rename from pyircbot/core/__init__.py rename to pyircbot/__init__.py index 4bfefa1..5266c3a 100644 --- a/pyircbot/core/__init__.py +++ b/pyircbot/__init__.py @@ -9,3 +9,8 @@ .. automodule:: core.rpc """ + +__all__ = ["PyIRCBot"] + +from pyircbot.pyircbot import PyIRCBot +from pyircbot.irccore import IRCCore \ No newline at end of file diff --git a/pyircbot/core/irccore.py b/pyircbot/irccore.py similarity index 100% rename from pyircbot/core/irccore.py rename to pyircbot/irccore.py diff --git a/pyircbot/core/jsonrpc.py b/pyircbot/jsonrpc.py similarity index 100% rename from pyircbot/core/jsonrpc.py rename to pyircbot/jsonrpc.py diff --git a/pyircbot/core/modulebase.py b/pyircbot/modulebase.py similarity index 100% rename from pyircbot/core/modulebase.py rename to pyircbot/modulebase.py diff --git a/pyircbot/modules/PingResponder.py b/pyircbot/modules/PingResponder.py index 25e1840..92249b4 100755 --- a/pyircbot/modules/PingResponder.py +++ b/pyircbot/modules/PingResponder.py @@ -7,7 +7,7 @@ """ -from modulebase import ModuleBase,ModuleHook +from pyircbot.modulebase import ModuleBase,ModuleHook class PingResponder(ModuleBase): def __init__(self, bot, moduleName): diff --git a/pyircbot/modules/Services.py b/pyircbot/modules/Services.py old mode 100644 new mode 100755 index 7e6e13e..a40fbda --- a/pyircbot/modules/Services.py +++ b/pyircbot/modules/Services.py @@ -7,7 +7,7 @@ """ -from modulebase import ModuleBase,ModuleHook +from pyircbot.modulebase import ModuleBase,ModuleHook from time import sleep class Services(ModuleBase): diff --git a/pyircbot/core/pyircbot.py b/pyircbot/pyircbot.py similarity index 99% rename from pyircbot/core/pyircbot.py rename to pyircbot/pyircbot.py index c94862d..759a3d1 100644 --- a/pyircbot/core/pyircbot.py +++ b/pyircbot/pyircbot.py @@ -9,8 +9,9 @@ import logging import time import sys -from core.rpc import BotRPC -from core.irccore import IRCCore +from pyircbot.rpc import BotRPC +from pyircbot.irccore import IRCCore +from pyircbot import modulebase import os.path class PyIRCBot: diff --git a/pyircbot/core/rpc.py b/pyircbot/rpc.py similarity index 99% rename from pyircbot/core/rpc.py rename to pyircbot/rpc.py index 2fec77d..96516dc 100644 --- a/pyircbot/core/rpc.py +++ b/pyircbot/rpc.py @@ -8,7 +8,7 @@ import traceback import logging -from core import jsonrpc +from pyircbot import jsonrpc from threading import Thread class BotRPC(Thread): diff --git a/run-example.sh b/run-example.sh deleted file mode 100755 index 44bca37..0000000 --- a/run-example.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./pyircbot/main.py -c config.main.yml -b config.instance.yml diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..f79510b --- /dev/null +++ b/setup.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 +from setuptools import setup + +setup(name='pyircbot', + version='4.0.0aa', + description='A modular python irc bot', + url='http://gitlab.xmopx.net/dave/pyircbot3/tree/master', + author='dpedu', + author_email='dave@davepedu.com', + packages=['pyircbot'], + scripts=['bin/pyircbot'], + zip_safe=False)