Merge pull request #165 from roskoff/master

Set configuration file ownership

diff --git a/MANIFEST.in b/MANIFEST.in
index 5c3747f..71ef396 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
-include README.rst
+include README.rst LICENSE.txt
 include rainbowstream/image.c
 recursive-include rainbowstream/colorset *

diff --git a/README.rst b/README.rst
index 4dafa85..ddcdf30 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ Rainbow Stream
 .. image:: http://img.shields.io/pypi/v/rainbowstream.svg?style=flat-square\r
    :target: https://pypi.python.org/pypi/rainbowstream\r
 \r
-Terminal-based Twitter Client. Realtime tweetstream, compose, search ,\r
+Terminal-based Twitter Client. Realtime tweetstream, compose, search,\r
 favorite … and much more fun directly from terminal.\r
 \r
 This package is built on the top of `Python Twitter Tool`_ and `Twitter API`_,\r
@@ -60,6 +60,12 @@ For debian-based distros, these can be installed with
 \r
     sudo apt-get install python-dev libjpeg-dev libfreetype6 libfreetype6-dev zlib1g-dev\r
 \r
+For CentOS:\r
+\r
+.. code:: bash\r
+\r
+    sudo yum install python-devel libjpeg-devel\r
+\r
 Besides, Mac OSX Maverick with Xcode 5.1 has a well-known `clang unknown argument`_ problem with\r
 the ``Pillow`` package installation - a dependency of this app.\r
 If you are in this case, I recommend taking a look at `Issue #10`_ and let me know if this workaround doesn't work for you.\r

diff --git a/rainbowstream/draw.py b/rainbowstream/draw.py
index 756604e..b9373d3 100644 (file)
--- a/rainbowstream/draw.py
+++ b/rainbowstream/draw.py
@@ -273,7 +273,8 @@ def draw(t, keyword=None, humanize=True, noti=False, fil=[], ig=[]):
     if favorited:
         fav = color_func(c['TWEET']['favorited'])(u'\u2605')
 
-    tweet = text.split()
+    tweet = text.split(' ')
+    tweet = [x for x in tweet if x != '']
     # Replace url
     if expanded_url:
         for index in xrange(len(expanded_url)):
@@ -289,17 +290,18 @@ def draw(t, keyword=None, humanize=True, noti=False, fil=[], ig=[]):
         else x,
         tweet)
     # Highlight screen_name
-    tweet = lmap(lambda x: cycle_color(x) if x[0] == '@' else x, tweet)
+    tweet = lmap(
+        lambda x: cycle_color(x) if x.lstrip().startswith('@') else x, tweet)
     # Highlight link
     tweet = lmap(
         lambda x: color_func(c['TWEET']['link'])(x)
-        if x.startswith('http')
+        if x.lstrip().startswith('http')
         else x,
         tweet)
     # Highlight hashtag
     tweet = lmap(
         lambda x: color_func(c['TWEET']['hashtag'])(x)
-        if x.startswith('#')
+        if x.lstrip().startswith('#')
         else x,
         tweet)
     # Highlight my tweet
@@ -308,11 +310,12 @@ def draw(t, keyword=None, humanize=True, noti=False, fil=[], ig=[]):
                  for x in tweet
                  if not any([
                      x == 'RT',
-                     x.startswith('http'),
-                     x.startswith('#')])
+                     x.lstrip().startswith('http'),
+                     x.lstrip().startswith('#')])
                  ]
     # Highlight keyword
     tweet = ' '.join(tweet)
+    tweet = '\n  '.join(tweet.split('\n'))
     if keyword:
         roj = re.search(keyword, tweet, re.IGNORECASE)
         if roj:

diff --git a/setup.py b/setup.py
index fe06534..8bfd891 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ setup(name='rainbowstream',
           "Programming Language :: Python :: 3.2",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
+          "Programming Language :: Python :: 3.5",
           "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
           "Topic :: Utilities",
           "License :: OSI Approved :: MIT License",