From a1527325d566b8bdcb7da189dd2a016bc683e8a3 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Tue, 13 Jul 2010 15:15:37 -0400
Subject: [PATCH] hmmmm

---
 tabbed/cli.py     | 27 +++++++++++++++------------
 tabbed/core.py    |  2 +-
 tabbed/helpers.py |  3 +++
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tabbed/cli.py b/tabbed/cli.py
index dc8a03e..47c6df7 100644
--- a/tabbed/cli.py
+++ b/tabbed/cli.py
@@ -1,26 +1,32 @@
 #!/usr/bin/env python
 # encoding: utf-8
 
+""" Tabbed CLI Inteface Application
+"""
+
 import io
 import sys
 
 from helpers import *
 import tabbed.core
 
-
 from packages import opster
 
-opts = [('v', 'version', False, 'Report tabbed version')]
 
-formats = ('json', 'yaml', 'xls', 'csv', 'html')
+FORMATS = ('json', 'yaml', 'xls', 'csv', 'html')
 
-for format in formats:
+opts = []
+
+opts.append(('v', 'version', False, 'Report tabbed version'))
+
+for format in FORMATS:
 	opts.append(('', format, False, 'Output to %s' % (format.upper())))
 
 
+
 @opster.command(options=opts, usage='[FILE] [--FORMAT | FILE]')
 def start(in_file=None, out_file=None, **opts):
-	""" Converts dataset formats """
+	"""Covertly convert dataset formats"""
 	
 	opts = Object(**opts)
 	
@@ -35,29 +41,26 @@ def start(in_file=None, out_file=None, **opts):
 	
 	elif in_file:
 		
-		in_file = io.open(in_file, 'r')
-		
-		print in_file.read()
 		try:
-			in_file = io.open(in_file)
+			in_file = io.open(in_file, 'r')
 		except Exception, e:
 			print(' %s cannot be read.' % in_file)
 			exit(65)
 		
-		
 		file_ext = in_file.name.split('.')[-1]
 		
-		if file_ext.lower() in formats:
+		if file_ext.lower() in FORMATS:
 			setattr(opts, file_ext, True)
 		else:
 			print('Import format not supported.')
 			exit(65)
 	else:
 		print('Please provide input.')
+		exit(65)
 		
 
 	
-	_formats_sum = sum(opts[f] for f in formats)
+	_formats_sum = sum(opts[f] for f in FORMATS)
 	
 	# Multiple output formats given
 	if _formats_sum > 1:
diff --git a/tabbed/core.py b/tabbed/core.py
index 4df9ae1..6a0bae4 100644
--- a/tabbed/core.py
+++ b/tabbed/core.py
@@ -6,7 +6,7 @@
 # / /_  / /_/ / _  /_/ /_  /_/ //  __// /_/ /  
 # \__/  \__,_/  /_.___/ /_.___/ \___/ \__,_/   
 
-__version__ = '0.0.1'
+__version__ = '0.0.2'
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2010 Kenneth Reitz'
diff --git a/tabbed/helpers.py b/tabbed/helpers.py
index a80b574..3425934 100644
--- a/tabbed/helpers.py
+++ b/tabbed/helpers.py
@@ -2,13 +2,16 @@
 
 import sys
 
+
 class Object(object):
 	"""Your attributes are belong to us."""
+	
 	def __init__(self, **entries): 
 		self.__dict__.update(entries)
 	def __getitem__(self, key):
 		return getattr(self, key)
 
+
 def piped():
 	"""Returns piped input via stdin, else False"""