Merge branch 'refactor-launcher' into integration

run-sonata

@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import sonata.launcher
+
+if __name__ == '__main__':
+    sonata.launcher.run()

run-tests

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python setup.py test

setup.py

@@ -2,7 +2,7 @@
 
 import os, glob, shutil
 
-from distutils.core import setup, Extension
+from setuptools import setup, Extension
 
 from sonata.version import version
 
@@ -46,16 +46,19 @@ def rmgeneric(path, __func__):
     print "generating", mofile
     os.system("msgfmt %s -o %s" % (pofile, mofile))
 
-# Copy script "sonata" file to sonata dir:
-shutil.copyfile("sonata.py", "sonata/sonata")
-
 versionfile = open("sonata/genversion.py","wt")
 versionfile.write("""
 # generated by setup.py
 VERSION = 'v%s'
 """ % version)
 versionfile.close()
 
+
+tests_require = [
+    'unittest2',
+]
+
+
 setup(name='Sonata',
         version=version,
         description='GTK+ client for the Music Player Daemon (MPD).',
@@ -78,7 +81,6 @@ def rmgeneric(path, __func__):
         extra_compile_args=capture("pkg-config --cflags gtk+-2.0 pygtk-2.0").split(),
         extra_link_args=capture("pkg-config --libs gtk+-2.0 pygtk-2.0").split()
          ),],
-        scripts = ['sonata/sonata'],
         data_files=[('share/sonata', ['README', 'CHANGELOG', 'TODO', 'TRANSLATORS']),
                     ('share/applications', ['sonata.desktop']),
                     ('share/pixmaps', glob.glob('sonata/pixmaps/*')),
@@ -107,7 +109,17 @@ def rmgeneric(path, __func__):
                     ('share/locale/sl/LC_MESSAGES', ['mo/sl/sonata.mo']),
                     ('share/locale/zh_TW/LC_MESSAGES', ['mo/zh_TW/sonata.mo']),
                     ('share/locale/uk/LC_MESSAGES', ['mo/uk/sonata.mo'])],
-        )
+      entry_points={
+          'console_scripts': [
+              'sonata=sonata.launcher:run',
+          ]
+      },
+    test_suite='sonata.tests',
+    tests_require=tests_require,
+    extras_require={
+        'test': tests_require,
+    },
+)
 
 # Cleanup (remove /build, /mo, and *.pyc files:
 print "Cleaning up..."
@@ -128,10 +140,6 @@ def rmgeneric(path, __func__):
                 os.remove(f)
 except:
     pass
-try:
-    os.remove("sonata/sonata")
-except:
-    pass
 try:
     os.remove("sonata/genversion.py")
     os.remove("sonata/genversion.pyc")