Merge branch 'master' into improvements-aleksi

Author: Aleksi Salmela

.travis.yml

@@ -1,7 +1,26 @@
 language: java
-
 script:
-- mvn checkstyle:check cobertura:cobertura test
-
+- mvn -Dsurefire.rerunFailingTestsCount=3 cobertura:cobertura test
+- mvn checkstyle:check
 after_success:
 - mvn coveralls:report
+- mvn clean package
+jdk:
+- oraclejdk8
+- oraclejdk7
+cache:
+  directories:
+  - "$HOME/.m2"
+deploy:
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: i6ROBH72AVNV6ywsYdgMdVyAGGp6kSTTVMqBT/ZUwbSUrRhNYowbfT2MeBcoeIZNbCl8AC8EWOtqmyTKseQp2bMP1nIl+5TwjXwqmdxsV+/Ldq14z1fH5iZzF+KDF/gQvXRbqJvHzfBxw9l/R8jbgRCjD7GNmn+J7fbQz2yV/fTw9R+LBpMDdE6EDCCndsbsIFmug1/EOSzgagkEQMbyJ99+FiKsp+HvcHYX5ToRXeYfGibX+YGGNeMpiktNZUdmatK0LoryTv9iO3SGVWT+x9Hy2/Ckj7VmRYwcgw+3Iao4pnxaLJxqQ2G8I82KuZZ5+NfOysClmxnZh7EqOOOodUUWdW+CnkeiHkIgpfobBIQUb4LA0d26KJ6nJJpal5ae/DxagrhFR9Oac4BNiRmpBZc6lg25gUo9JHwlZssCVii+43ftF6our9x5rm4T/6h/KWCzRx1MHOoiq7t2UUa0nQ2kI1bISyogwPj8kECyvG6otp/G/MBlfmwTd3yHfe/1qig4QKd0K8hgdkPLAR1e/9ImILeIG/cbK1zDthdoUi1623MBxP7SXyIfcLlX2SKqSjZgCV1iZEeFRmzecwJYEHQE4Cy7sozcGUEzkLz76jOOWleECVKSp97/RfblK7V9lEfV1A8gk1u6rbxhbsMhQcAkiw+cQbl9uPTLTafYsnM=
+  file_glob: true
+  file:
+    - tmc
+    - target/tmc-cli-*.jar
+  on:
+    repo: testmycode/tmc-cli
+    tags: true
+    jdk: oraclejdk8

README.md

@@ -1,11 +1,11 @@
 
-[![Build Status](https://travis-ci.org/tmc-cli/tmc-cli.svg?branch=master)](https://travis-ci.org/tmc-cli/tmc-cli)
-[![GitHub release](https://img.shields.io/badge/release-latest-brightgreen.svg?style=flat)](https://github.com/tmc-cli/tmc-cli/releases/latest)
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/tmc-cli/tmc-cli/master/LICENSE)
-[![Coverage Status](https://coveralls.io/repos/github/tmc-cli/tmc-cli/badge.svg?branch=master)](https://coveralls.io/github/tmc-cli/tmc-cli?branch=master)
-[![Build status](https://ci.appveyor.com/api/projects/status/np29sxc72y2f7d57?svg=true)](https://ci.appveyor.com/project/mikkomaa/tmc-cli)
+[![Build Status](https://travis-ci.org/testmycode/tmc-cli.svg?branch=master)](https://travis-ci.org/testmycode/tmc-cli)
+[![GitHub release](https://img.shields.io/badge/release-latest-brightgreen.svg?style=flat)](https://github.com/testmycode/tmc-cli/releases/latest)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/testmycode/tmc-cli/master/LICENSE)
+[![Coverage Status](https://coveralls.io/repos/github/tmc-cli/tmc-cli/badge.svg?branch=master)](https://coveralls.io/github/testmycode/tmc-cli?branch=master)
+[![Build status](https://ci.appveyor.com/api/projects/status/js9jr4ef4o7dnama?svg=true)](https://ci.appveyor.com/project/jamox/tmc-cli-08d2u)
 
-![tmc-cli logo](https://rawgit.com/tmc-cli/tmc-cli/master/docs/logo_plain.svg)
+![tmc-cli logo](https://rawgit.com/testmycode/tmc-cli/master/docs/logo_plain.svg)
 
 #tmc-cli
 
@@ -28,14 +28,14 @@ TMC-CLI is the command-line client for University of Helsinki's TestMyCode -fram
 `cd` into the directory where you wish to install TMC-CLI. Then, copy and paste the following command in your terminal:
 
 ```
-curl -0 https://raw.githubusercontent.com/tmc-cli/tmc-cli/master/scripts/install.sh | bash; source ~/.bashrc
+curl -0 https://raw.githubusercontent.com/testmycode/tmc-cli/master/scripts/install.sh | bash; source ~/.bashrc
 ```
 
 TMC-CLI should now be installed. You can try running it with `tmc`.
 
 ###Manual installation
 
-Download the latest [release](https://github.com/tmc-cli/tmc-cli/releases/latest). If you use Linux or OS X, choose "tmc". If you use Windows, choose "tmc-cli-[VERSION].jar".
+Download the latest [release](https://github.com/testmycode/tmc-cli/releases/latest). If you use Linux or OS X, choose "tmc". If you use Windows, choose "tmc-cli-[VERSION].jar".
 
 If you downloaded "tmc", navigate to the download directory on your terminal and make it executable with `chmod u+x ./tmc`.
 
@@ -173,8 +173,19 @@ https://link.to.paste/bin
 
 You cannot submit exercises that you have completed.
 
+# Contribute
+
+1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your own GitHub account and then [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device
+2. Install the dependencies: `mvn dependency:go-offline`
+3. Build the code : `mvn package`
+4. Run the tests : `mvn test`
+5. Run the checkstyle : `mvn checkstyle:check`
+
+## Crafting a release
+Releases are automatically built in Travis and pushed to GitHub releases. Once ready to release, update version in pom.xml and gat the commit accordingly. Once tests have passed a new release is uploaded to travis. Note: only travis runs with tag set are used for releases.
+
 ##Disclaimer
 
-This software is licensed under [the MIT license](https://raw.githubusercontent.com/tmc-cli/tmc-cli/instructions/LICENSE).
+This software is licensed under [the MIT license](https://raw.githubusercontent.com/testmycode/tmc-cli/instructions/LICENSE).
 
 This software comes with no warranty. University of Helsinki and the tmc-cli developers are not responsible for any damages caused by misuse or misbehaviour of this software.

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>fi.helsinki.cs.tmc.cli</groupId>
     <artifactId>tmc-cli</artifactId>
-    <version>0.7.1</version>
+    <version>0.7.6</version>
     <packaging>jar</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>fi.helsinki.cs.tmc</groupId>
             <artifactId>core</artifactId>
-            <version>0.5.2-SNAPSHOT</version>
+            <version>0.8.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

scripts/install.sh

@@ -31,7 +31,7 @@ if [ -f $HOME/.tmc-autocomplete.sh ]; then
 	fi
 fi
 echo "Fetching latest release URL"
-URL=$(curl -s https://api.github.com/repos/tmc-cli/tmc-cli/releases/latest | grep '"browser_download_url"' | grep '/tmc"' | head -n 1 | cut -d '"' -f 4)
+URL=$(curl -s https://api.github.com/repos/testmycode/tmc-cli/releases/latest | grep '"browser_download_url"' | grep '/tmc"' | head -n 1 | cut -d '"' -f 4)
 echo "Downloading TMC-CLI"
 curl -LO $URL > ./tmc
 if [ ! -f ./tmc ]; then

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -109,7 +109,7 @@ private String[] parseArgs(String[] args) {
                 runCommand("help", new String[0]);
                 return null;
             }
-            runCommand(commandName, new String[]{"-h"});
+            runCommand(commandName, new String[] {"-h"});
             return null;
         }
         if (showVersion) {
@@ -169,18 +169,16 @@ private boolean versionCheck() {
         }
 
         Date now = new Date();
-        if (previous != null && previous.getTime() + defaultUpdateInterval > now.getTime()) {
-            return false;
-        }
-
-        return runAutoUpdate();
+        return !(previous != null && previous.getTime() + defaultUpdateInterval > now.getTime())
+                && runAutoUpdate();
     }
 
     public boolean runAutoUpdate() {
         Map<String, String> properties = context.getProperties();
         Date now = new Date();
-        AutoUpdater update = AutoUpdater.createUpdater(io,
-                EnvironmentUtil.getVersion(), EnvironmentUtil.isWindows());
+        AutoUpdater update =
+                AutoUpdater.createUpdater(
+                        io, EnvironmentUtil.getVersion(), EnvironmentUtil.isWindows());
         boolean updated = update.run();
 
         long timestamp = now.getTime();
@@ -196,11 +194,16 @@ public Color getColor(String propertyName) {
         Color color = ColorUtil.getColor(propertyValue);
         if (color == null) {
             switch (propertyName) {
-                case "progressbar-left":    return Color.CYAN;
-                case "progressbar-right":   return Color.CYAN;
-                case "testresults-left":    return Color.GREEN;
-                case "testresults-right":   return Color.RED;
-                default:    return Color.NONE;
+                case "progressbar-left":
+                    return Color.CYAN;
+                case "progressbar-right":
+                    return Color.CYAN;
+                case "testresults-left":
+                    return Color.GREEN;
+                case "testresults-right":
+                    return Color.RED;
+                default:
+                    return Color.NONE;
             }
         }
         return color;

src/main/java/fi/helsinki/cs/tmc/cli/backend/Account.java

@@ -12,7 +12,7 @@ public class Account {
     private String password;
 
     // for gson
-    public Account() { }
+    public Account() {}
 
     public Account(String serverAddress, String username, String password) {
         this.serverAddress = serverAddress;

src/main/java/fi/helsinki/cs/tmc/cli/backend/AccountList.java

@@ -75,7 +75,7 @@ public int getAccountCount() {
         return this.accountArray.size();
     }
 
-    public List<Account> getAccountList() {
+    private List<Account> getAccountList() {
         return Collections.unmodifiableList(this.accountArray);
     }
 

src/main/java/fi/helsinki/cs/tmc/cli/backend/CourseInfoIo.java

@@ -44,7 +44,7 @@ public static CourseInfo load(Path courseInfoFile) {
             //Return null if file is not found, this is normal behaviour
             return null;
         }
-        Reader reader = null;
+        Reader reader;
         try {
             reader = Files.newBufferedReader(courseInfoFile, Charset.forName("UTF-8"));
         } catch (IOException e) {
@@ -56,9 +56,7 @@ public static CourseInfo load(Path courseInfoFile) {
     }
 
     public static void createNewCourse(Course course, Account account, Path parentDir) {
-        Path configFile = parentDir
-                .resolve(course.getName())
-                .resolve(CourseInfoIo.COURSE_CONFIG);
+        Path configFile = parentDir.resolve(course.getName()).resolve(CourseInfoIo.COURSE_CONFIG);
 
         CourseInfo info = new CourseInfo(account, course);
         info.setExercises(course.getExercises());

src/main/java/fi/helsinki/cs/tmc/cli/backend/Settings.java

@@ -116,10 +116,8 @@ public Path getConfigRoot() {
     }
 
     @Override
-    public void setCourse(Course course) {
-    }
+    public void setCourse(Course course) {}
 
     @Override
-    public void setConfigRoot(Path path) {
-    }
+    public void setConfigRoot(Path path) {}
 }

src/main/java/fi/helsinki/cs/tmc/cli/backend/SettingsIo.java

@@ -94,7 +94,7 @@ public static boolean savePropertiesTo(HashMap<String, String> properties, Path
      * Get the correct directory in which our config files go
      * ie /home/user/.config/tmc-cli/.
      */
-    protected static Path getConfigDirectory() {
+    static Path getConfigDirectory() {
         Path configPath;
         if (EnvironmentUtil.isWindows()) {
             String appdata = System.getenv("APPDATA");
@@ -110,8 +110,7 @@ protected static Path getConfigDirectory() {
             if (configEnv != null && configEnv.length() > 0) {
                 configPath = Paths.get(configEnv);
             } else {
-                configPath = Paths.get(System.getProperty("user.home"))
-                        .resolve(".config");
+                configPath = Paths.get(System.getProperty("user.home")).resolve(".config");
             }
         }
         return configPath.resolve(CONFIG_DIR);