ignore some FORMAT on config command and display direct link in share function inside...

diff --git a/docs/conf.py b/docs/conf.py
index 481a9190bd7212f0721aed96150711febe97dd77..6f022e185dbfa54ea03cc89886dc038cff9cf182 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014, Vu Nhat Minh'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.9'
+version = '1.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.9'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 58f747de33cf8ab627f1227137cc9e30be5227bc..1573cce1f9a14ea184750469e577ae96ef72c412 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -49,6 +49,8 @@ def get_all_config():
         data.pop('ONLY_LIST', None)
         data.pop('IGNORE_LIST', None)
         data.pop('FORMAT', None)
+        data.pop('QUOTE_FORMAT', None)
+        data.pop('NOTIFY_FORMAT', None)
         return data
     except:
         return []

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index 49e3308f7fe70654b3a8c33ee4a1cd8b70f49280..765ce389d6eb03ff7841ffa5e0436d8e4551e32e 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -496,8 +496,12 @@ def share():
     tweet = t.statuses.show(id=tid)
     url = 'https://twitter.com/' + \
         tweet['user']['screen_name'] + '/status/' + str(tid)
-    os.system("echo '%s' | pbcopy" % url)
-    printNicely(green('Copied tweet\'s url to clipboard.'))
+    import platform
+    if platform.system().lower() == 'darwin':
+        os.system("echo '%s' | pbcopy" % url)
+        printNicely(green('Copied tweet\'s url to clipboard.'))
+    else:
+        printNicely('Direct link: ' + yellow(url))
 
 
 def delete():

diff --git a/setup.py b/setup.py
index 4cb4e697775df176d11391e3b011f5bd5c1625aa..5d1ff93efc880352de2fb67e92bfdb942a72caec 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import os
 import os.path
 
 # Bumped version
-version = '1.0.9'
+version = '1.1.0'
 
 # Require
 install_requires = [