Make Expand JSON an optional feature, as originally requested.

.pylintrc

@@ -68,7 +68,7 @@ disable=import-star-module-level,old-octal-literal,oct-method,print-statement,un
 # Set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html. You can also give a reporter class, eg
 # mypackage.mymodule.MyReporterClass.
-output-format=text
+output-format=colorized
 
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
@@ -231,7 +231,7 @@ notes=FIXME,XXX,TODO
 [SIMILARITIES]
 
 # Minimum lines number of a similarity.
-min-similarity-lines=4
+min-similarity-lines=10
 
 # Ignore comments when computing similarities.
 ignore-comments=yes
@@ -320,14 +320,14 @@ exclude-protected=_asdict,_fields,_replace,_source,_make
 [DESIGN]
 
 # Maximum number of arguments for function / method
-max-args=5
+max-args=10
 
 # Argument names that match this expression will be ignored. Default to name
 # with leading underscore
 ignored-argument-names=_.*
 
 # Maximum number of locals for function / method body
-max-locals=15
+max-locals=20
 
 # Maximum number of return / yield for function / method body
 max-returns=6

.travis.yml

@@ -2,4 +2,4 @@ language: python
 python:
   - "2.7"
 install: "pip install -r dev-requirements.pip"
-script: py.test tests
+script: pylint lecli && py.test tests

README.md

@@ -137,7 +137,7 @@ The user and account management functionality of the CLI can only be used with a
 It is worth noting that if your account does not have a specific owner set then some user management functions may fail with a 500 error; to check if an owner is set the 'getowner' command below can be used. If no owner is set then you must regenerate the owner API key, at which point you will be asked to set an account owner.
 
 ####List Users
-The 'userlist' command will return a list of all users that have access to the account for which the CLI has been configured. The command will return the users first and last name, email address, user ID and the last time they logged in. The 'userlist' command does not accept any arguments.
+The 'userlist' command will return a list of all users that have access to the account for which the CLI has been configured. The command will return the users first and last name, email address, user key and the last time they logged in. The 'userlist' command does not accept any arguments.
 
 Example usage:
 ```
@@ -148,14 +148,14 @@ lecli userlist
 The 'useradd' command allows you to add a user to your account. There are two ways to add users, depending on whether they are a new or existing user. 
 A new user is a user that has no Logentries account. 
 
-To add a new user you must provide their first and last name, and email address. If successfully added the CLI will print the users account information, including their newly generated user Id. A user added via the CLI must then go to https://logentries.com/user/password-reset/ and enter their email address. They will then be sent a link that they can use to setup the password for their new account.
+To add a new user you must provide their first and last name, and email address. If successfully added the CLI will print the users account information, including their newly generated user key. A user added via the CLI must then go to https://logentries.com/user/password-reset/ and enter their email address. They will then be sent a link that they can use to setup the password for their new account.
 
 A new user can be added using the following command
 ```
 lecli useradd -f John -l Smith -e john.smith@email.com
 ```
 
-To add an existing user (i.e. a user that already has a Logentries account, even if not associated with your account), you must first obtain their user Id. The user can obtain their user Id from the account management page of the Logentries application at https://logentries.com
+To add an existing user (i.e. a user that already has a Logentries account, even if not associated with your account), you must first obtain their user key. The user can obtain their user key from the account management page of the Logentries application at https://logentries.com
 
 An existing user can be added to your account use the following command
 ```
@@ -210,9 +210,9 @@ Rename a team with the given UUID to given name.
 ####Add User to a Team
 Add a new user to a team with the given UUID and user UUID respectively.
 
-    lecli addusertoteam <team id> <user id>
+    lecli addusertoteam <team id> <user key>
 
 ####Delete User from a Team
 Add a new user to a team with the given UUID and user UUID respectively.
 
-    lecli deleteuserfromteam <team id> <user id>
+    lecli deleteuserfromteam <team id> <user key>

dev-requirements.pip

@@ -7,4 +7,5 @@ requests==2.9.1
 pytz==2016.4
 termcolor==1.1.0
 tabulate==0.7.5
-appdirs==1.4.0
+appdirs==1.4.0
+pylint==1.6.4

lecli/__init__.py

@@ -1,2 +1,6 @@
+"""
+lecli __init__.py
+"""
+
 from lecli._version import __version__
 __author__ = 'Logentries by Rapid7'

lecli/_version.py

@@ -1 +1,4 @@
-__version__ = '0.3.2'
+"""
+Version module. We should change the version here when we need to.
+"""
+__version__ = '0.4.0'