Merge pull request #374 from tmc-cli/updater-check-juha

Abort if couldn't fetch binary

Author: mikkomaa

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

@@ -78,7 +78,9 @@ public boolean run() {
         File destination = new File(currentBinLocation + binName);
 
         io.println("Downloading...");
-        fetchTmcCliBinary(dlUrl, destination);
+        if (!fetchTmcCliBinary(dlUrl, destination)) {
+            return false;
+        }
 
         io.println("Running " + destination.getAbsolutePath());
         return runNewTmcCliBinary(destination.getAbsolutePath());
@@ -136,16 +138,18 @@ protected String fetchLatestReleaseJson() {
      * Downloads a binary file from downloadUrl and saves it to destination
      * file.
      */
-    protected void fetchTmcCliBinary(String downloadUrl, File destination) {
+    protected boolean fetchTmcCliBinary(String downloadUrl, File destination) {
         byte[] content = fetchHttpEntity(downloadUrl);
         if (content == null) {
             io.println("Failed to download tmc-cli.");
-            return;
+            return false;
         }
         try {
             FileUtils.writeByteArrayToFile(destination, content);
+            return true;
         } catch (IOException ex) {
             io.println("Failed to write the new version into \'" + destination + "\'.");
+            return false;
         }
     }
 

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

@@ -107,7 +107,7 @@ public void downloadsAndRunsNewBinaryIfOk() {
         TmcCliUpdater updater = spy(new TmcCliUpdater(io, "0.1.0", false));
         doReturn(latestJson).when(updater).fetchLatestReleaseJson();
         //when(updater.fetchLatestReleaseJson()).thenReturn(latestJson);
-        doNothing().when(updater).fetchTmcCliBinary(any(String.class), any(File.class));
+        doReturn(true).when(updater).fetchTmcCliBinary(any(String.class), any(File.class));
         when(updater.runNewTmcCliBinary(any(String.class))).thenReturn(true);
         updater.run();
         assertThat(io.out(), containsString("A new version of tmc-cli is available!"));