Merge branch 'next'

Author: nygrenh

.gitignore

@@ -28,4 +28,7 @@ dependency-reduced-pom.xml
 # our tmc-cli log files
 /logs/
 
-tmc-langs.logl
+tmc-langs.log
+/.classpath
+/.project
+/.settings

README.md

@@ -81,9 +81,14 @@ Once installation is complete, you can log in using `tmc login`. This saves your
 server address:
 username:
 password:
-Login successful.
+Choose organization by writing its slug:
+Do you want to send crash reports for client development? (Y/n)
+Do you want to send analytics data for research? (Y/n)
 ```
 
+You can change your organization with the command `organization`. Use the option `-o` and give the slug of an organization as an argument. Otherwise all available organizations will be listed.
+You can inspect and change your settings such as sending data with the command `config`. Use the option `-l` to see your current settings and give `[KEY]=[NEW VALUE]` as arguments to change them.
+
 ## Listing courses
 
 Once you have logged in, you can list all the available courses on the server with `tmc courses`.
@@ -96,7 +101,7 @@ c-mooc
 javascript-for-lazy-hipsters
 ```
 
-Note that you can only submit exercises on courses for which you have enrolled.
+Note that you can only exercises on courses for which you have enrolled.
 
 ## Downloading courses
 
@@ -127,7 +132,7 @@ All tests passed! Submit to server with 'tmc submit'
 
 ## Submitting exercises
 
-You have now completed your first exercise! To submit your exercise, run `tmc submit`. The syntax is the same as for running tests.
+You have now completed your first exercise! To submit your exercise, run `tmc submit [exercise-name]` or run `tmc submit` in an exercise directory. The syntax is the same as for running tests.
 
 ```
 ~/tmc-courses/test-course/exercise1 $ tmc submit

docs/HACKING.md

@@ -105,14 +105,14 @@ public class ExampleCommandTest {
 
 If you are doing tests for any other class, simply create normal unit tests that don't depend on any command.
 
-##Adding properties
+## Adding properties
 
 Properties are saved as a Java `HashMap<String, String>`. They are read from ~/.config/tmc-cli/properties.json on initialisation. The purpose of the properties file is to provide a backwards- and forwards-compatible method of storing user preferences and internal data. Properties can be accessed via the `CliContext` class method getProperties(). Remember to store any changes to the properties with saveProperties(). Feel free to create new properties, but please document *all* properties in the 'COMMAND: PROP'-section of MANUAL.md.
 
-##Updating the documentation
+## Updating the documentation
 
 Please document any new features or revisions in MANUAL.md and HISTORY.md as well as README.md, if the affected feature is already documented there.
 
 If you make changes to MANUAL.md, please rebuild tmc.1 with [md2man](https://github.com/sunaku/md2man) before you push your changes. Use `md2man-roff docs/MANUAL.md > docs/tmc.1` to build the manpage.
 
-There are no strict guidelines for README.md or MANUAL.md, but please try not to deviate from the original style (eg. new command sections should follow the same pattern). 
+There are no strict guidelines for README.md or MANUAL.md, but please try not to deviate from the original style (eg. new command sections should follow the same pattern).

docs/MANUAL.md

@@ -40,62 +40,59 @@ OPTIONS
 ---
 COMMANDS
 ---
-  
+
 ---
 
 COMMAND: LOGIN
 -----
 
-`tmc` `login` [`-s` *server address*] [`-u` *username*] [`-p` *password*]
+`tmc` `login` [`-u` *username*] [`-p` *password*]
 
 Login to TMC server. If credentials are not given as options, the user will
 be asked to input any missing credentials. You will have to be logged in
 in order to use certain commands.
-  
-`-s` `--server`
-  Specify which server to connect to.
-    
+
 `-u` `--user`
   Specify username.
-    
+
 `-p` `--password`
   Specify password.
-  
+
 COMMAND: LOGOUT
 ---------------
 
 `tmc` `logout`
 
 Delete login credentials from configurations.
- 
+
 COMMAND: COURSES
 ----------------
 
 `tmc` `courses`
 
 List all available courses on the server.
-  
+
 COMMAND: DOWNLOAD
 -----------------
-  
+
 `tmc` `download` [`-a`] *course*
 
 Download a course from the server.
-  
+
 `-a` `--all`
   Download all exercises, including completed ones.
-  
+
 COMMAND: EXERCISES
 ------------------
 
 `tmc` `exercises` [`-n`] [`-i`]
 
 List the status of all of the course's exercises. Exercises are grouped by
 their deadlines. On Unix, the list is displayed on a pager.
-  
+
 `-n` `--no-pager`
   Print the list directly to the terminal.
-  
+
 `-i` `--internet`
   Fetch exercises' statuses from the server, as opposed to reading from the
   local cache.
@@ -106,7 +103,7 @@ COMMAND: UPDATE
 `tmc` `update`
 
 Update the course cache and download newly available exercises.
-  
+
 COMMAND: TEST
 -------------
 
@@ -116,7 +113,7 @@ Run tests for the specified exercise. If no *path* is given, tests will be
 run in the current working directory. Several exercises can be tested at once.
 If the current work directory is the course root directory or the course root
 directory was given as a *path*, then all exercises will be tested.
-  
+
 `-a` `--all`
   Display all test results, instead of only the failed tests.
 
@@ -129,23 +126,21 @@ COMMAND: SUBMIT
 `tmc` `submit` [`-a`] [`-d`] [`-c`] [*path*] ...
 
 Submit exercises to the server. If no *path* is given, the exercise in the
-current working directory will be submitted. Several exercises can be submitted
-at once. If the current work directory is the course root directory or the
-course root directory was given as a *path*, then all exercises will be submitted.
+current working directory will be submitted. The submittable exercise(s) must be given as an argument.
 
 For every successful submission, you'll be prompted to send feedback for the
-exercise if the course has enabledfeedback questions. Sending feedback is
+exercise if the course has enabled feedback questions. Sending feedback is
 always optional.
-  
+
 `-a` `--all`
   Display all test results, instead of only the failed tests.
-  
+
 `-d` `--details`
   Display more detailed error messages.
-  
+
 `-c` `--completed`
   Submit all exercises in the current course which have passed local tests.
-  
+
 COMMAND: INFO
 -------------
 
@@ -154,7 +149,7 @@ COMMAND: INFO
 Display the current status of a course or an exercise. If used for a course,
 shows the total amount of available, completed and locked exercises. If used
 for an exercise, shows the exercise's status and deadline.
-  
+
 `-a` `--all`
   Displays all information for given course and exercises.
 
@@ -174,30 +169,55 @@ Once submission is successful, a shareable link will be printed.
 
 `-n` `--no-message`
   Do not send a message alongside the paste.
-  
+
 `-m` `--message`
   Give the message as an argument instead of opening a text editor.
 
-COMMAND: PROP
+COMMAND: CONFIG
 -------------
 
-`tmc` `prop` [*KEY*] [*VALUE*] ...
-      `prop` `-u` *KEY* ... 
+`tmc` `config` `[-q]`[*KEY=VALUE*] ...
+      `config` `-d` `[-q]` [*KEY*] ...
+      `config` `-l`
+      `config` `-g` [*KEY*] or `-g`=[*KEY*]
 
-Set or unset TMC-CLI properties. Invoke without any arguments to display all
-current properties. If more than a single property is added or removed, the user
-will be asked to confirm the changes.
-  
-`-u` `--unset`
+Set or unset TMC-CLI properties. Only accepts certain keys. If not invoked with the option `quiet` will ask to confirm changes.
+
+`-d` `--delete`
   Unset given properties.
-  
-List of properties:
-  
+
+`-q` `--quiet`
+  Do not ask for confirmations or print out set values.
+
+`-l` `--list`
+  List all current settings.
+
+`-g` `--get=KEY` or `--get KEY`
+  Get the value of a specific key.
+
+List of configurable settings:
+
 * *update-date*
-  Scheduled time for the next version check.
+  Scheduled time for the next version check. Stored in properties.
 * *testresults-left* *testresults-right* *progressbar-left* *progressbar-right*
   Change progress bar colours. Recognised values: black, red, green, yellow,
-  blue, purple, cyan, white, none.
+  blue, purple, cyan, white, none. Stored in properties.
+* *send-diagnostics*
+  Allow sending crash reports and analytics for client development. Stored with account.
+* *send-analytics*
+  Allow sending analytics data of commands run. Stored in account.
+* *server-address*
+  Address to fetch courses from and submit to. Defaults to `https://tmc.mooc.fi`. Stored with account. Changing the server address will log the user out and prompt a new login.
+
+COMMAND: ORGANIZATION
+---------------
+
+`tmc` `organization` [`-o`][*slug*] ...
+
+Change organization, which determines the downloadable courses. If no slug is given, or the slug is invalid, all available organizations are listed, and the user will be prompted to choose one.
+
+`-o` `--organization`
+Change organization to slug given as an argument without the listing of all organizations.
 
 ---
 
@@ -207,17 +227,17 @@ FILES
 `[course directory]/.tmc.json`
   Course configuration and cache file. Saves the status of the username, server
   address and course's exercises. Manually editing this file may have adverse
-  effects.  
+  effects.
 
 `~/.config/tmc-cli/properties.json`
   User configuration file. Use `tmc prop` to edit properties.
 
 `~/.config/tmc-cli/accounts.json`
   User login credentials. Use `tmc logout` to safely delete.
-  
+
 `~/.config/tmc-cli/logs/tmc-cli.log`
   Debug logging.
-  
+
 For more on config locations, see `ENVIRONMENT` -> `XDG_CONFIG_HOME` and `APPDATA`.
 
 ENVIRONMENT
@@ -230,10 +250,10 @@ ENVIRONMENT
 `PAGER`
   Pager for displaying text files. If unset, defaults to `less -R` on Unix.
   This functionality is broken on Windows, but defaults to `more`.
-  
+
 `XDG_CONFIG_HOME`
   If set on Unix, *~/.config/* in config file paths is replaced with its value.
-  
+
 `APPDATA`
   On Windows, *~/.config/* is replaced with the value of `%APPDATA%`, usually
   *C:\\Users\\Username\\AppData\\Roaming\\.* If `%APPDATA%` is unset, user's home