reorg of files, added traditional setup.py and removed pavement files

17 files changed, 220 insertions, 138 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 4e3618d..f40b39b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,3 @@
 include setup.py
-include pavement.py
-include paver-minilib.zip
 include LICENSE
 prune test
diff --git a/README b/README
index cc8e664..ed50ecc 100644
--- a/README
+++ b/README
@@ -1,10 +1,9 @@
 DODAI
 
-A Python module to help with writing command line scripts
-
-This module is to be a foundation to your command line python
-scripts. This module provides for quick access to logger, configparser,
-optionparse and databases via sqlalchemy.
+Module code for quick easy access to parsed text based config file data
+and configured database engines.  All config file data is returned ordered
+and transformed to unicode objects and database connections are returned as
+sqlalchemy or couchdb objects.
 
 
 INSTALLATION
@@ -22,18 +21,3 @@ There are three ways to install dodai
         tar zxvf dodai-*
         cd dodai-*
         python setup.py install
-
-3.  If you have Paver installed then download compressed file from
-    http://code.google.com/p/dodai/downloads/list
-
-        tar zxvf dodai-*
-        cd dodai-*
-        paver install
-
-
-The installation will also install sqlalchemy.  This installation will not
-install the required system and python libs needed to get sqlalchemy to work
-with your desired database.  This includes things like: cx_Oracle, psycopg2,
-pyodbc, mysql-python etc.  For more information on installing these check out
-the docs at http://code.google.com/p/dodai
-
diff --git a/dodai/__init__.py b/lib/dodai/__init__.py
index 55bb57d..55bb57d 100644
--- a/dodai/__init__.py
+++ b/lib/dodai/__init__.py
diff --git a/dodai/config/__init__.py b/lib/dodai/config/__init__.py
index e849f8e..e849f8e 100644
--- a/dodai/config/__init__.py
+++ b/lib/dodai/config/__init__.py
diff --git a/dodai/config/databases/__init__.py b/lib/dodai/config/databases/__init__.py
index c91e77f..c91e77f 100644
--- a/dodai/config/databases/__init__.py
+++ b/lib/dodai/config/databases/__init__.py
diff --git a/dodai/config/databases/sa.py b/lib/dodai/config/databases/sa.py
index eaf35ea..eaf35ea 100644
--- a/dodai/config/databases/sa.py
+++ b/lib/dodai/config/databases/sa.py
diff --git a/dodai/config/files.py b/lib/dodai/config/files.py
index a27e4a2..a27e4a2 100644
--- a/dodai/config/files.py
+++ b/lib/dodai/config/files.py
diff --git a/dodai/config/log.py b/lib/dodai/config/log.py
index fdb5c93..fdb5c93 100644
--- a/dodai/config/log.py
+++ b/lib/dodai/config/log.py
diff --git a/dodai/config/option.py b/lib/dodai/config/option.py
index 0561881..0561881 100644
--- a/dodai/config/option.py
+++ b/lib/dodai/config/option.py
diff --git a/dodai/config/sections.py b/lib/dodai/config/sections.py
index d789a24..d789a24 100644
--- a/dodai/config/sections.py
+++ b/lib/dodai/config/sections.py
diff --git a/dodai/db.py b/lib/dodai/db.py
index 5cbe605..5cbe605 100644
--- a/dodai/db.py
+++ b/lib/dodai/db.py
diff --git a/dodai/exception.py b/lib/dodai/exception.py
index 23302c7..23302c7 100644
--- a/dodai/exception.py
+++ b/lib/dodai/exception.py
diff --git a/dodai/tools/__init__.py b/lib/dodai/tools/__init__.py
index bcef547..bcef547 100644
--- a/dodai/tools/__init__.py
+++ b/lib/dodai/tools/__init__.py
diff --git a/dodai/tools/himo.py b/lib/dodai/tools/himo.py
index f56eaf8..f56eaf8 100644
--- a/dodai/tools/himo.py
+++ b/lib/dodai/tools/himo.py
diff --git a/dodai/tools/odict.py b/lib/dodai/tools/odict.py
index 2c8391d..2c8391d 100644
--- a/dodai/tools/odict.py
+++ b/lib/dodai/tools/odict.py
diff --git a/pavement.py b/pavement.py
deleted file mode 100644
index b880183..0000000
--- a/pavement.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) 2010  Leonard Thomas
-#
-# This file is part of Dodai.
-#
-# Dodai 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 3 of the License, or
-# (at your option) any later version.
-#
-# Dodai 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 Dodai.  If not, see <http://www.gnu.org/licenses/>.
-
-PACKAGE = 'dodai'
-LICENSE='GPLv3'
-VERSION = '0.3'
-AUTHOR='Leonard Thomas'
-AUTHOR_EMAIL='six@choushi.net'
-URL='http://code.google.com/p/dodai'
-DOWNLOAD_URL = 'http://code.google.com/p/dodai/downloads/list'
-PY_VERSION_LOW = '2.6.0'
-PY_VERSION_HIGH = '3.0.0'
-PLATFORMS = ['Linux']
-SETUP_REQUIRES=['sqlalchemy', 'chardet']
-CLASSIFIERS = [
-    'Development Status :: 4 - Beta',
-    'Environment :: Console',
-    'Intended Audience :: Developers',
-    'License :: OSI Approved :: GNU Affero General Public License v3',
-    'Natural Language :: English',
-    'Operating System :: POSIX',
-    'Operating System :: POSIX :: Linux',
-    'Programming Language :: Python',
-    'Programming Language :: Python :: 2.6',
-    'Topic :: Database',
-    'Topic :: Software Development',
-    'Topic :: Software Development :: Libraries',
-    'Topic :: Software Development :: Libraries :: Application Frameworks',
-    'Topic :: Software Development :: Libraries :: Python Modules',]
-DESCRIPTION = 'Tools for writing python scripts'
-LONG_DESCRIPTION = "This module is to be a foundation to your command line "\
-    "python scripts. This module provides for quick access to logger, "\
-    "configparser, optionparse and databases via sqlalchemy."\
-
-
-
-import sys
-import platform
-import paver
-import paver.setuputils
-from paver.easy import options
-from paver.easy import Bunch
-from paver.easy import task
-from paver.easy import needs
-from paver.misctasks import generate_setup
-from paver.misctasks import minilib
-from setuptools import setup
-from setuptools import find_packages
-
-#from paver.easy import *
-#from paver.misctasks import generate_setup, minilib
-#from setuptools import setup, find_packages
-#import paver.setuputils
-paver.setuputils.install_distutils_tasks()
-
-options(
-    setup=Bunch(
-    name=PACKAGE,
-    version=VERSION,
-    zip_safe=False,
-    description=DESCRIPTION,
-    author=AUTHOR,
-    author_email=AUTHOR_EMAIL,
-    url=URL,
-    download_url=DOWNLOAD_URL,
-    packages=find_packages(),
-    classifiers=CLASSIFIERS,
-    long_description=LONG_DESCRIPTION,
-    license=LICENSE,
-    setup_requires=SETUP_REQUIRES,
-    install_requires=['sqlalchemy', 'chardet'],
-    platforms = PLATFORMS
-
-))
-
-
-def is_valid_version():
-    if sys.version >= PY_VERSION_LOW and sys.version < PY_VERSION_HIGH:
-        return True
-    else:
-        return False
-
-def is_valid_platform():
-    if platform.system() in PLATFORMS:
-        return True
-    else:
-        return False
-
-@task
-def build():
-    if not is_valid_version():
-        raise Exception('Invalid Python version')
-    if not is_valid_platform():
-        error='{0} not install on: {1}'.format(PACKAGE, platform.system())
-        raise Exception(error)
-
-
-@task
-@needs('build', 'generate_setup', 'minilib', 'setuptools.command.sdist')
-def sdist():
-    """Overrides sdist to make sure that our setup.py is generated."""
-    pass
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..7cae721
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,216 @@
+#
+#    Copyright 2010 Leonard Thomas
+#
+#    This file is part of Dodai.
+#
+#    Dodai 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 3 of the License, or
+#    (at your option) any later version.
+#
+#    Dodai 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 Dodai.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import platform
+from setuptools import setup
+from setuptools import find_packages
+from ctypes.util import find_library
+from ctypes.util import _findLib_ldconfig as find_library_ldconfig
+from subprocess import Popen, PIPE
+from copy import deepcopy
+
+ARGS = {
+    'name': 'dodai',
+    'version': '0.4.1',
+    'install_requires': [
+        'sqlalchemy',
+        'chardet',
+        'couchdb',
+        'ordereddict',
+        'psycopg2',
+        'mysql-python',
+        'cx_oracle'
+    ],
+    'platforms': [
+        'Linux',
+        'Darwin',
+    ],
+    'author': 'Leonard Thomas',
+    'author_email': 'six@choushi.net',
+    'url': 'http://code.google.com/p/dodai',
+    'download_url': 'http://code.google.com/p/dodai/downloads/list',
+    'license': 'GPLv3',
+    'classifiers': [
+        'Development Status :: 4 - Beta',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU Affero General Public License v3',
+        'Natural Language :: English',
+        'Operating System :: POSIX',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: MacOS',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Topic :: Database',
+        'Topic :: Software Development',
+        'Topic :: Software Development :: Libraries',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+    ],
+    'description': "Module code for quick easy access to parsed text based "\
+        "config file data and configured database engines.",
+    'long_description': "This module provides code for quick easy access to "\
+        "parsed text based config file data and configured database "\
+        "engines.  All config file data is returned ordered and transformed "\
+        "to unicode objects and database connections are returned as "\
+        "sqlalchemy objects.",
+    'entry_points': {
+        'distutils.commands': [
+            'devstrap = dodai.build:devstrap',
+        ]
+    },
+    'zip_safe': False,
+    'packages': find_packages('lib'),
+    'package_dir': {'':'lib'},
+}
+PYTHON_VERSION_LOW = '2.6'
+PYTHON_VERSION_HIGH = '3.0'
+
+class BaseLibCheck(object):
+
+    def _has_library(self, lib):
+        if find_library(lib):
+            return True
+        return False
+
+    def _which(self, name):
+        cmd = ['which', name]
+        return Popen(cmd, stdout=PIPE).communicate()[0]
+
+
+class PostgressLibCheck(BaseLibCheck):
+
+    PACKAGE = 'psycopg2'
+    LIB = 'pq'
+
+    def __call__(self, package):
+        if package.lower().startswith(self.PACKAGE):
+            if self._has_library(self.LIB):
+                return True
+            return False
+
+
+class MysqlLibCheck(BaseLibCheck):
+
+    PACKAGE = 'mysql-python'
+    LIB = 'mysqlpp'
+
+    def __call__(self, package):
+        if package.lower().startswith(self.PACKAGE):
+            if self._has_library(self.LIB):
+                if self._which('mysql_config'):
+                    return True
+            return False
+
+
+class OracleLibCheck(BaseLibCheck):
+
+    PACKAGE = 'cx_oracle'
+    LIB = 'clntsh'
+
+    def __call__(self, package):
+        if package.lower().startswith(self.PACKAGE):
+            if 'ORACLE_HOME' in os.environ:
+                if os.environ['ORACLE_HOME']:
+                    return True
+            else:
+                if self._has_library(self.LIB):
+                    self._set_oracle_home()
+                    return True
+            return False
+
+    def _set_oracle_home(self):
+        path = find_library_ldconfig(self.LIB)
+        os.environ['ORACLE_HOME'] = os.path.dirname(path)
+
+
+class OrderedDictLibCheck(BaseLibCheck):
+
+    PACKAGE = 'ordereddict'
+
+    def __call__(self, package):
+        if package.lower().startswith(self.PACKAGE):
+            if sys.version < '2.7':
+                return True
+            return False
+
+
+class ArgparseLibCheck(BaseLibCheck):
+
+    PACKAGE = 'argparse'
+
+    def __call__(self, package):
+        if package.lower().startswith(self.PACKAGE):
+            if sys.version < '2.7':
+                return True
+            return False
+
+
+class PassLibCheck(BaseLibCheck):
+
+    def __init__(self, chain):
+        self._packages = []
+        for obj in chain:
+            self._packages.append(obj.PACKAGE.lower())
+
+    def __call__(self, package):
+        if package.lower() not in self._packages:
+            return True
+
+def get_install_requires():
+    out = []
+    chain = [
+        PostgressLibCheck(),
+        MysqlLibCheck(),
+        OracleLibCheck(),
+        OrderedDictLibCheck(),
+        ArgparseLibCheck(),
+    ]
+    chain.append(PassLibCheck(chain))
+    for package in ARGS['install_requires']:
+        for can_install in chain:
+            if can_install(package):
+                out.append(package)
+    return out
+
+def valid_python_version():
+    if sys.version < PYTHON_VERSION_LOW:
+        return False
+    if sys.version >= PYTHON_VERSION_HIGH:
+        return False
+    return True
+
+def build_args():
+    args = deepcopy(ARGS)
+    args['install_requires'] = get_install_requires()
+    return args
+
+if not valid_python_version():
+    message = """
+        {package} is not able to install:  Because the version of
+        Python that is being used, '{version}', is not compatable
+        with {package}.  {package} will only install with Python
+        versions {low} through {high}\n
+    """.format(package=ARGS['name'].lower().capitalize(),
+               low=PYTHON_VERSION_LOW, high=PYTHON_VERSION_HIGH)
+    sys.stderr.write(message)
+    sys.exit(1)
+else:
+    setup(**build_args())
+