Some changes allowing distribution

 * python-musicpd now available on pypi
 * better virtualenv management

diff --git a/INSTALL b/INSTALL
index 28aef94b66f45f689eb535ec166e6a88b17b3b1d..f93e22f2d385497543e918d916aa224a26e4bd6e 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,11 @@
 Virtualenv installation:
 
-run ./vinstall.sh to generate the pyton virtualenv and install requirements.
-It should also write a vlaunch sh wrapper to run sima whithin the virtualenv.
+Run ./vinstall.sh to generate the python virtualenv and install requirements.
+You might specify a python3 interpreter if the binary name defers from python3.3 :
+
+       PY3=/usr/bin/python ./vinstall.sh
+
+It should also write a vlaunch sh wrapper to run sima within the virtualenv.
 
        ./vlaunch --help
 

diff --git a/doc/examples/all_settings.cfg b/doc/examples/all_settings.cfg
index 31405fb3b899a805432f7fdcc25e266254815a94..87621e802ba1d7d5645fc55b16a28228c75a736d 100644 (file)
--- a/doc/examples/all_settings.cfg
+++ b/doc/examples/all_settings.cfg
@@ -44,7 +44,7 @@ port = 6600
 # type: string (file path)
 # description: file to log to. Usually used in daemon mode.
 # default: logging to stdin/stdout
-logfile =
+#logfile =
 ##
 
 ## VERBOSITY
@@ -78,7 +78,7 @@ flavour=pure
 
 [lastfm]
 
-depth = 3
+depth = 1
 
 ## QUEUE_MODE # NOT COMPLETED #
 # type: string

diff --git a/setup.py b/setup.py
index ee6c5f0ca1f78fc7e1cf90f83ffebe5210ea0402..7dd34aa14183a63cc05cf48077d643fa69b33fd4 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ classifiers = [
         ]
 
 setup(name='sima',
-      version='0.11.dev',
+      version='0.12.0.dev',
       download_url='http://codingteam.net/project/sima/download',
       url='http://codingteam.net/project/sima',
       description='Automagically add titles to MPD playlist',
@@ -49,12 +49,12 @@ setup(name='sima',
       long_description=DESCRIPTION,
       classifiers=classifiers,
       install_requires=['distribute', 'python-musicpd'],
-      packages=['sima','sima.lib', 'sima.utils', 'sima.plugins'],
+      packages=['sima','sima.lib', 'sima.utils', 'sima.plugins', 'sima.plugins.contrib'],
       include_package_data=True,
       data_files=data_files,
       scripts=['launch'],
       entry_points={
-          'console_scripts': ['sima = launch:main',]
+          'console_scripts': ['sima = launch:run',]
           },
 )
 

diff --git a/vinstall.sh b/vinstall.sh
index 5271a077fb154b082b86c5edbcd7eb3006131ab8..e249ae8db3588c09bdee2ea9af361fdfe70d1cd0 100755 (executable)
--- a/vinstall.sh
+++ b/vinstall.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-#   SCRIPT NAME
+#   vinstall.sh
 #
-#   version: 0.0 : Date: 1970/01/01 00:0:00
+#   version: 0.2 : Date: 2013/11/13
 #
 #   TODO:
 #           *
@@ -14,7 +14,6 @@ DEBUG=${DEBUG:-"0"}     #  Set to 1 in order to enable DEBUG message.
 
 
 PY3=${PY3:-$(which python3.3)}
-MUSICPD="http://media.kaliko.me/src/musicpd/dist/python-musicpd-0.3.1.tar.bz2"
 
 # Test virtualenv presence
 [ -x "$(which virtualenv)" ] || { echo "Cannot find virtualenv executable!"; exit 1; }
@@ -36,7 +35,7 @@ virtualenv $VENV_OPTIONS $INSTALL_DIR/venv || { echo "something went wrong gener
 PIP_OPTIONS=""
 [ "$DEBUG" = "0" ] && PIP_OPTIONS="$PIP_OPTIONS --quiet"
 
-pip $PIP_OPTIONS install $MUSICPD
+pip $PIP_OPTIONS install --pre python-musicpd || exit 1
 
 deactivate
 
@@ -47,7 +46,7 @@ SIMA_VLAUNCHER=$(readlink -f $(dirname $0))/vlaunch
 cat << EOF > $SIMA_VLAUNCHER
 #!/bin/sh
 . $INSTALL_DIR/venv/bin/activate
-python $SIMA_LAUNCHER $@
+python $SIMA_LAUNCHER "\$@"
 EOF
 chmod +x $SIMA_VLAUNCHER