removed service credentials CLI arg

Author: condad

google_objects/cli.py

@@ -18,25 +18,13 @@ class SheetsCLI(object):
     """Command line tool for fetching tabular data
     and redirecting it to STDOUT."""
 
-    def __init__(self, key=None, service_account=False, user=None):
-        """Authenticate the Google API Client and loads the Specified Spreadsheet"""
-
-        try:
-            if service_account:
-                self.client = SheetsClient.from_service_account(user=user)
-            else:
-                self.client = SheetsClient.from_api_key(key)
-
-        except ValueError as exception:
-            sys.stderr.write(str(exception))
-            sys.exit(1)
-
-    def get_spreadsheet(self, spreadsheet_id):
+    def get_spreadsheet(self, spreadsheet_id, key=None):
         """Return a Google Sheet as a list of dictionaries in the 'records' attribute
         of the outputted json"""
 
         try:
-            spreadsheet = self.client.get_spreadsheet(spreadsheet_id)
+            client = SheetsClient.from_api_key(key)
+            spreadsheet = client.get_spreadsheet(spreadsheet_id)
             output = {
                 'title': spreadsheet.title,
                 'id': spreadsheet.id,
@@ -48,18 +36,20 @@ def get_spreadsheet(self, spreadsheet_id):
 
         except ValueError as exception:
             sys.stderr.write(str(exception))
-            sys.exit(2)
+            sys.exit(1)
 
         #  sys.stdout.write(dataframe.to_json(orient='records'))
         sys.stdout.write(json.dumps(output))
 
-    def create_spreadsheet(self, file_path=None):
-        """Create a new Google Spreadsheet. 
+    def create_spreadsheet(self, file_path=None, user=None):
+        """Create a new Google Spreadsheet.
 
         :file_name: JSON File name
         :returns: URL of newly created Google Sheet.
 
         """
+        client = SheetsClient.from_service_account(user=user)
+
         if file_path:
             with open(file_path, 'r') as f:
                 json_data = f.read()
@@ -72,10 +62,11 @@ def create_spreadsheet(self, file_path=None):
 
         df = pd.DataFrame(input_data)
         try:
-            spreadsheet = self.client.create_spreadsheet_from_dataframe(df)
+            spreadsheet = client.create_spreadsheet_from_dataframe(df)
             sys.stdout.write(spreadsheet.url)
         except Exception as e:
             sys.stdout.write(e)
+            sys.exit(1)
 
 
 def main():