updates to get the package into an installable state

    - failed unless M2Crypto was already installed
    - no package or module was actually installed because
      the setup metadata included neither a `packages` nor
      a `py_modules` argument

5 files changed, 42 insertions, 22 deletions

diff --git a/.hgignore b/.hgignore
index a26d142..5998a36 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,2 +1 @@
-syntax:glob
-*.pyc
+^.*\.(pyc|egg-info)$
diff --git a/hgsshsign/__init__.py b/hgsshsign/__init__.py
index 7134ca9..e2cb8c1 100644
--- a/hgsshsign/__init__.py
+++ b/hgsshsign/__init__.py
@@ -1,4 +1,4 @@
-# vim: set filencoding=utf8
+# vim: set filencoding=utf-8
 """
 SSH Key Signing
 
@@ -7,15 +7,12 @@ SSH Key Signing
 @date: May 03, 2010
 """
 
-__version__ = "0.0.1dev"
-
 
 import os
 import binascii
 
-import keys
-from keymanifest import KeyManifest
-from sshagent import SSHAgent
+from hgsshsign._meta import __version__
+from hgsshsign.sshagent import SSHAgent
 
 from mercurial.i18n import _
 from mercurial import util, commands, match
@@ -26,6 +23,9 @@ class SSHAuthority(object):
 
     @classmethod
     def from_ui(cls, ui):
+        import hgsshsign.keys as keys
+        from hgsshsign.keymanifest import KeyManifest
+
         public_key = absolute_path(ui.config("sshsign", "public_key"))
         public_key = keys.PublicKey.from_file(public_key)
 
@@ -62,6 +62,8 @@ class SSHAuthority(object):
         return key.verify(data, signature)
 
     def sign(self, data):
+        import hgsshsign.keys as keys
+
         return keys.sign_like_agent(data, self.private_key)
 
 
diff --git a/hgsshsign/_meta.py b/hgsshsign/_meta.py
new file mode 100644
index 0000000..53bc8be
--- /dev/null
+++ b/hgsshsign/_meta.py
@@ -0,0 +1,17 @@
+# vim:filetype=python:fileencoding=utf-8
+
+__version__ = "0.1.0"
+
+SETUP_ARGS = dict(
+    name="hg-sshsign",
+    description="ssh signing for mercurial commits",
+    author="Mike Crute",
+    author_email="mcrute@gmail.com",
+    url="http://code.google.com/p/hg-sshsign",
+    license="Apache 2.0",
+    version=__version__,
+    packages=['hgsshsign'],
+    install_requires=[
+        "M2Crypto",
+    ],
+)
diff --git a/hgsshsign/keys.py b/hgsshsign/keys.py
index d15af08..aa291eb 100644
--- a/hgsshsign/keys.py
+++ b/hgsshsign/keys.py
@@ -8,10 +8,12 @@ Key Loader Functions
 """
 
 import os
+
 from M2Crypto import RSA, DSA
 from M2Crypto.EVP import MessageDigest
 from M2Crypto.RSA import RSAError
 from M2Crypto.DSA import DSAError
+
 from structutils import unpack_string, get_packed_mp_ints, int_to_bytes
 
 
diff --git a/setup.py b/setup.py
index 2f9dd82..f845a44 100755
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,15 @@
+#!/usr/bin/env python
+# vim:filetype=python:fileencoding=utf-8
+import sys
+
 from setuptools import setup
-from hgsshsign import __version__
-
-
-setup(
-    name="hg-sshsign",
-    description="ssh signing for mercurial commits",
-    author="Mike Crute",
-    author_email="mcrute@gmail.com",
-    url="http://code.google.com/p/hg-sshsign",
-    license="Apache 2.0",
-    version=__version__,
-    install_requires=[
-        "M2Crypto",
-    ])
+from hgsshsign._meta import SETUP_ARGS
+
+
+def main():
+    setup(**SETUP_ARGS)
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())