Merge branch 'develop'

HISTORY.rst

@@ -1,10 +1,28 @@
 History
 -------
 
-0.1.0 (2011-03-20)
+0.2.1 (2011-03-24)
 ++++++++++++++++++
 
-* Initial Release!
+* Python 2.5 Support
+* List of available colors
+
+
+0.2.0 (2011-03-23)
+++++++++++++++++++
+
+* Column Printing!!!
+* (Auto/Manual) Disabling of Colors
+* Smarter Colors
+* max_width, min_width
+* Strip cli colors
+* bug fixes
+
+
+0.1.2 (2011-03-21)
+++++++++++++++++++
+
+* Bugfixes
 
 
 0.1.1 (2011-03-20)
@@ -16,7 +34,9 @@ History
 * Lots of Examples
 
 
-0.1.2 (2011-03-21)
+
+0.1.0 (2011-03-20)
 ++++++++++++++++++
 
-* Bugfixes
+* Initial Release!
+

NOTICE

@@ -1,4 +1,4 @@
-Clint includes some vendorized python libraries: appdirs, colorama, ordereddict.
+Clint includes some vendorized python libraries: appdirs, applib, colorama, ordereddict.
 
 AppDirs License
 ===============
@@ -25,6 +25,33 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
+AppLib License (console width detection functions are from this library)
+==============
+
+# This is the MIT license
+
+# Copyright (c) 2010 ActiveState Software Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
 
 Colorama License
 ================

clint/__init__.py

@@ -19,8 +19,8 @@ from .pipes import piped_in
 
 
 __title__ = 'clint'
-__version__ = '0.1.2'
+__version__ = '0.2.1'
-__build__ = 0x000102
+__build__ = 0x000201
 __author__ = 'Kenneth Reitz'
 __license__ = 'ISC'
 __copyright__ = 'Copyright 2011 Kenneth Reitz'

clint/pipes.py

@@ -9,6 +9,7 @@ This module contains the helper functions for dealing with unix pipes.
 """
 
 from __future__ import absolute_import
+from __future__ import with_statement
 
 import sys
 

clint/resources.py

@@ -10,6 +10,7 @@ This module contains all the application resource features of clint.
 
 
 from __future__ import absolute_import
+from __future__ import with_statement
 
 import errno
 from os import remove, removedirs

clint/textui/__init__.py

@@ -8,8 +8,6 @@ This module provides the text output helper system.
 
 """
 
-from __future__ import absolute_import
-
 
 from . import colored
-from .core import *
+from core import *

clint/textui/colored.py

@@ -16,18 +16,18 @@ import sys
 
 from ..packages import colorama
 
-DISABLE_COLOR = False
-
-if sys.stdout.isatty():
-    colorama.init(autoreset=True)
-
-
 __all__ = (
     'red', 'green', 'yellow', 'blue',
     'black', 'magenta', 'cyan', 'white',
     'clean', 'disable'
 )
 
+COLORS = __all__[:-2]
+DISABLE_COLOR = False
+
+if sys.stdout.isatty():
+    colorama.init(autoreset=True)
+
 
 class ColoredString(object):
     """Enhanced string for __len__ operations on Colored output."""
@@ -58,12 +58,10 @@ class ColoredString(object):
         return self.color_str
         
     def __add__(self, other):
-        self.s += other
+        return str(self.color_str) + str(other)
-        return self
         
     def __radd__(self, other):
-        self.s = other + self.s
+        return str(other) + str(self.color_str)
-        return self
         
     def __mul__(self, other):
         return (self.color_str * other)

clint/textui/core.py

@@ -15,10 +15,11 @@ import sys
 
 from .progress import progressbar
 from .formatters import max_width, min_width
+from .cols import columns
 from ..utils import tsplit
 
 
-__all__ = ('puts', 'puts_err', 'indent', 'progressbar', 'max_width', 'min_width')
+__all__ = ('puts', 'puts_err', 'indent', 'progressbar', 'columns', 'max_width', 'min_width')
 
 
 STDOUT = sys.stdout.write

clint/utils.py

@@ -9,6 +9,7 @@ Various Python helpers used within clint.
 """
 
 from __future__ import absolute_import
+from __future__ import with_statement
 
 import sys
 import errno
@@ -28,7 +29,7 @@ def mkdir_p(path):
     """Emulates `mkdir -p` behavior."""
     try:
         makedirs(path)
-    except OSError as exc: # Python >2.5
+    except OSError, exc: # Python >2.5
         if exc.errno == errno.EEXIST:
             pass
         else:

examples/colors_all.py

@@ -12,5 +12,5 @@ text = 'THIS TEXT IS COLORED %s!'
 
 if __name__ == '__main__':
 
-	for color in colored.__all__:
+	for color in colored.COLORS:
 		print getattr(colored, color)(text % color.upper())

examples/colors_indent.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
+
 import sys
 import os
 

examples/indents.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 import sys
 import os
 

examples/newline_indent.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+from __future__ import with_statement
+
 import sys
 import os
 

examples/piped.py

@@ -4,6 +4,8 @@
 import sys
 import os
 
+from __future__ import with_statement
+
 sys.path.insert(0, os.path.abspath('..'))
 
 from clint import piped_in

examples/text_width.py

@@ -7,7 +7,7 @@ import os
 sys.path.insert(0, os.path.abspath('..'))
 
 from clint.textui import puts, colored
-from clint.textui.columns import columns
+from clint.textui import columns
 
 lorem = 'Lorem ipsum dolor sit amet, consehdfhdfhdfhdfhdfhctetur adi pisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
 

setup.py

@@ -6,6 +6,9 @@ import sys
 
 from distutils.core import setup
 
+import clint
+
+
 
 def publish():
     """Publish to PyPi"""
@@ -19,7 +22,7 @@ required = []
 
 setup(
     name='clint',
-    version='0.1.2',
+    version=clint.__version__,
     description='Python Command-line Application Tools',
     long_description=open('README.rst').read() + '\n\n' +
                      open('HISTORY.rst').read(),
@@ -29,7 +32,6 @@ setup(
     packages= [
         'clint',
         'clint.textui',
-
         'clint.packages', 'clint.packages.colorama'
     ],
     install_requires=required,
@@ -40,7 +42,7 @@ setup(
         'Natural Language :: English',
         'License :: OSI Approved :: ISC License (ISCL)',
         'Programming Language :: Python',
-        # 'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         # 'Programming Language :: Python :: 3.0',