Merge branch 'master' into validatoin-results-in-submit-juha

Author: mikkomaa

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

@@ -113,8 +113,8 @@ public void printHelp(String description) {
     public void run(String[] args) {
         context.setApp(this);
 
-        if (!context.inTests()) {
-            versionCheck();
+        if (!context.inTests() && versionCheck()) {
+            return;
         }
 
         String[] commandArgs = parseArgs(args);
@@ -134,7 +134,7 @@ public static void main(String[] args) {
         app.run(args);
     }
 
-    private void versionCheck() {
+    private boolean versionCheck() {
         Map<String, String> properties = context.getProperties();
         String previousTimestamp = properties.get(previousUpdateDateKey);
         Date previous = null;
@@ -146,23 +146,25 @@ private void versionCheck() {
             } catch (NumberFormatException ex) {
                 io.println("The previous update date isn't number.");
                 logger.warn("The previous update date isn't number.", ex);
-                return;
+                return false;
             }
             previous = new Date(time);
         }
 
         Date now = new Date();
         if (previous != null && previous.getTime() + defaultUpdateInterval > now.getTime()) {
-            return;
+            return false;
         }
 
         TmcCliUpdater update = new TmcCliUpdater(io, EnvironmentUtil.getVersion(),
                 EnvironmentUtil.isWindows());
-        update.run();
+        boolean updated = update.run();
 
         long timestamp = now.getTime();
         properties.put(previousUpdateDateKey, Long.toString(timestamp));
         context.saveProperties();
+
+        return updated;
     }
 
     //TODO rename this as getColorProperty

src/main/java/fi/helsinki/cs/tmc/cli/command/core/CommandFactory.java

@@ -20,8 +20,9 @@ public class CommandFactory {
     private static final Map<String, Class<Command>> commands = new HashMap<>();
 
     static {
-        /* force load the CommandList so that it's static initialization block is executed
-           this is used instead of import so that the ide's won't cry about the nonexistent class
+        /* Force load the CommandList so that it's static initialization block is executed.
+         * This hack is used instead of import so that the IDEs won't cry about the nonexistent
+         * class.
          */
         try {
             Class.forName("fi.helsinki.cs.tmc.cli.command.core.CommandList");

src/main/java/fi/helsinki/cs/tmc/cli/io/ExternalsUtil.java

@@ -97,16 +97,19 @@ public static void showFileInPager(Path file) {
         }
     }
 
-    public static void runUpdater(Io io, String pathToNewBinary) {
-        if (!execExternal("chmod u+x", pathToNewBinary, true)) {
+    public static boolean runUpdater(Io io, String pathToNewBinary) {
+        if (!ExternalsUtil.execExternal("chmod u+x " + pathToNewBinary, true)) {
             logger.error("Failed to set execution permissions to the new binary");
-            return;
+            io.println("Failed to set execution permissions to the new binary");
+            return false;
         }
-        if (!execExternal(pathToNewBinary, "++internal-update", true)) {
+        if (!ExternalsUtil.execExternal(pathToNewBinary + " ++internal-update", true)) {
             io.println("Failed to run the tmc-cli at " + pathToNewBinary);
             io.println("Run it with ++internal-update argument or contact the help desk");
             logger.error("Failed to run the new tmc");
+            return false;
         }
+        return true;
     }
 
     /**

src/main/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdater.java

@@ -10,16 +10,15 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
+import java.io.InputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 
 public class TmcCliUpdater {
 
@@ -46,73 +45,73 @@ public TmcCliUpdater(Io io, String currentVersion, boolean isWindows) {
      * Checks if there's a newer tmc-cli version released on Github and asks if
      * the user wants to download it. TODO: split it up
      */
-    public void run() {
+    public boolean run() {
         JsonObject release = toJsonObject(fetchLatestReleaseJson());
         if (release == null || !isNewer(release)) {
-            return;
+            return false;
         }
 
         JsonObject binAsset = findCorrectAsset(release, isWindows);
         if (binAsset == null || !binAsset.has("name") || !binAsset.has("browser_download_url")) {
             logger.warn("The JSON does not contain necessary information for update.");
-            return;
+            return false;
         }
 
         io.println("A new version of tmc-cli is available!");
 
         if (isWindows) { //just show a link for Windows users now, todo...
             io.println("Download: https://github.com/tmc-cli/tmc-cli/releases/latest");
-            return;
+            return false;
         }
 
         if (! io.readConfirmation("Do you want to download it?", true)) {
-            return;
+            return false;
         }
 
         String binName = binAsset.get("name").getAsString() + ".new";
         String dlUrl = binAsset.get("browser_download_url").getAsString();
         String currentBinLocation = getJarLocation();
         if (currentBinLocation == null) {
             io.println("Unable to find current program location, aborting update.");
-            return;
+            return false;
         }
         File destination = new File(currentBinLocation + binName);
 
         io.println("Downloading...");
         fetchTmcCliBinary(dlUrl, destination);
 
         io.println("Running " + destination.getAbsolutePath());
-        runNewTmcCliBinary(destination.getAbsolutePath());
+        return runNewTmcCliBinary(destination.getAbsolutePath());
     }
 
-    protected byte[] fetchHttpEntity(String url) {
-        CloseableHttpClient httpClient = HttpClients.createDefault();
-        HttpGet httpGet = new HttpGet(url);
-        httpGet.addHeader("User-Agent", "tmc-cli (https://github.com/tmc-cli/tmc-cli)");
+    protected byte[] fetchHttpEntity(String urlAddress) {
+        URL url;
 
-        HttpEntity entity;
-        byte[] content;
         try {
-            CloseableHttpResponse httpResponse = httpClient.execute(httpGet);
-            entity = httpResponse.getEntity();
-            if (entity == null) {
-                logger.warn("Failed to get http request content.");
-                httpGet.releaseConnection();
-                return null;
-            }
+            url = new URL(urlAddress);
+        } catch (MalformedURLException ex) {
+            logger.warn("Url formatting failed", ex);
+            return null;
+        }
 
+        InputStream inputStream;
+        try {
+            URLConnection connection = url.openConnection();
+            connection.setRequestProperty("User-Agent", "tmc-cli (https://github.com/tmc-cli/tmc-cli)");
+            inputStream = connection.getInputStream();
         } catch (IOException ex) {
-            logger.warn("Failed to create http connection to github.", ex);
+            logger.warn("Failed to fetch page", ex);
             io.println("Failed to create https connection to github.");
             return null;
         }
+
+        byte[] content;
         try {
-            content = IOUtils.toByteArray(entity.getContent());
+            content = IOUtils.toByteArray(inputStream);
         } catch (IOException ex) {
             logger.warn("Failed to fetch data from github", ex);
             content = null;
         }
-        httpGet.releaseConnection();
         return content;
     }
 
@@ -153,8 +152,8 @@ protected void fetchTmcCliBinary(String downloadUrl, File destination) {
     /**
      * Finish the update by running downloaded binary.
      */
-    protected void runNewTmcCliBinary(String pathToNewBinary) {
-        ExternalsUtil.runUpdater(io, pathToNewBinary);
+    protected boolean runNewTmcCliBinary(String pathToNewBinary) {
+        return ExternalsUtil.runUpdater(io, pathToNewBinary);
     }
 
     /**

src/test/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdaterTest.java

@@ -12,6 +12,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 
@@ -107,7 +108,7 @@ public void downloadsAndRunsNewBinaryIfOk() {
         doReturn(latestJson).when(updater).fetchLatestReleaseJson();
         //when(updater.fetchLatestReleaseJson()).thenReturn(latestJson);
         doNothing().when(updater).fetchTmcCliBinary(any(String.class), any(File.class));
-        doNothing().when(updater).runNewTmcCliBinary(any(String.class));
+        when(updater.runNewTmcCliBinary(any(String.class))).thenReturn(true);
         updater.run();
         assertThat(io.out(), containsString("A new version of tmc-cli is available!"));
         assertThat(io.out(), containsString("Downloading..."));