Fix issue #8 version awfullness

.gitignore

@@ -5,3 +5,4 @@
 /build/
 /cdiff.egg-info/
 /dist/
+/__pycache__/

CHANGES

@@ -2,10 +2,14 @@
 Change log
 ==========
 
+Version 0.2 (2013-02-06)
+
+  - Move cdiff.py to top dir for better meta info management
+
 Version 0.1 (2013-02-05)
 
-    - New --version option
-    - setup.py now read version from source code
+  - New --version option
+  - setup.py now read version from source code
 
 Version 0.0.4 (2013-02-04)
 

README.rst

@@ -43,13 +43,13 @@ Download directly
 
 Both ``pip`` and ``setup.py`` installs cdiff to system wide directory, if you
 want a minimal tool without the boring external dependencies (like me), just
-save `src/cdiff.py <https://raw.github.com/ymattw/cdiff/master/src/cdiff.py>`_
-to whatever directory which is in your ``$PATH``, for example, ``$HOME/bin`` is
-in my ``$PATH``, so I save the script there and name as ``cdiff``.
+save `cdiff.py <https://raw.github.com/ymattw/cdiff/master/cdiff.py>`_ to
+whatever directory which is in your ``$PATH``, for example, ``$HOME/bin`` is in
+my ``$PATH``, so I save the script there and name as ``cdiff``.
 
 .. code:: sh
 
-    curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
+    curl -ksS https://raw.github.com/ymattw/cdiff/master/cdiff.py > ~/bin/cdiff
     chmod +x ~/bin/cdiff
 
 Usage

src/cdiff.py → cdiff.py

@@ -3,14 +3,21 @@
 
 """
 Term based tool to view **colored**, **incremental** diff in *git/svn/hg*
-workspace, or diff from given file or stdin, with **side by side** and **auto
-pager** support.  Requires python (>= 2.5.0) and ``less``.
-
-AUTHOR  : Matthew Wang <mattwyl(@)gmail(.)com>
-LICENSE : BSD-3
-HOMEPAGE: https://github.com/ymattw/cdiff
+workspace, given file or stdin, with **side by side** and **auto pager**
+support.  Requires python (>= 2.5.0) and ``less``.
 """
 
+META_INFO = {
+    'version'     : '0.2',
+    'license'     : 'BSD-3',
+    'author'      : 'Matthew Wang',
+    'email'       : 'mattwyl(@)gmail(.)com',
+    'url'         : 'https://github.com/ymattw/cdiff',
+    'keywords'    : 'colored incremental side-by-side diff',
+    'description' : ('View colored, incremental diff in workspace, given file '
+                     'or from stdin, with side by side and auto pager support')
+}
+
 import sys
 
 if sys.hexversion < 0x02050000:
@@ -25,9 +32,6 @@ import errno
 import difflib
 
 
-# REMEMBER UPDATE ``CHANGES``
-__version__ = '0.1'
-
 
 COLORS = {
     'reset'         : '\x1b[0m',
@@ -566,7 +570,7 @@ def main():
                   'pager support') % '/'.join(supported_vcs)
 
     parser = optparse.OptionParser(usage=usage, description=description,
-            version='%%prog %s' % __version__)
+            version='%%prog %s' % META_INFO['version'])
     parser.add_option('-s', '--side-by-side', action='store_true',
             help=('show in side-by-side mode'))
     parser.add_option('-w', '--width', type='int', default=80, metavar='N',

setup.py

@@ -3,22 +3,13 @@
 from __future__ import with_statement
 from distutils.core import setup
 import os
+from cdiff import META_INFO as _meta
 
 # Create symlink so that to use 'scripts' w/o '.py'
 link_name = 'cdiff'
 if os.path.exists(link_name):
     os.unlink(link_name)
-os.symlink('src/cdiff.py', link_name)
-
-# This awfulness is all in aid of grabbing the version number out
-# of the source code, rather than having to repeat it here.  Basically,
-# we parse out firt line starts with "__version__" and execute it
-#
-with open('cdiff') as script:
-    for line in script:
-        if line.startswith('__version__ = '):
-            exec(line)
-            break
+os.symlink('cdiff.py', link_name)
 
 with open('README.rst') as doc:
     long_description = doc.read()
@@ -27,15 +18,14 @@ with open('CHANGES') as changes:
 
 setup(
     name = 'cdiff',
-    version = __version__,
-    author = 'Matthew Wang',
-    author_email = 'mattwyl(@)gmail(.)com',
-    license = 'BSD-3',
-    description = ('View colored, incremental diff in workspace, or given '
-                   'file from stdin, with side by side and auto pager support'),
+    version = _meta['version'],
+    author = _meta['author'],
+    author_email = _meta['email'],
+    license = _meta['license'],
+    description = _meta['description'],
     long_description = long_description,
-    keywords = 'colored incremental side-by-side diff',
-    url = 'https://github.com/ymattw/cdiff',
+    keywords = _meta['keywords'],
+    url = _meta['url'],
     classifiers = [
         'Development Status :: 4 - Beta',
         'Topic :: Utilities',
@@ -47,8 +37,7 @@ setup(
         'Operating System :: Unix',
         'Programming Language :: Python',
     ],
-    package_dir = {'': 'src'},
-    packages = [''],
+    packages = [],
     py_modules = ['cdiff'],
     scripts = [link_name],
 )