CLI: board manager install latest if version is not specified

Author: Federico Fissore

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java

@@ -29,16 +29,15 @@
 package cc.arduino.contributions.libraries.ui;
 
 import cc.arduino.contributions.VersionComparator;
-import cc.arduino.contributions.VersionHelper;
+import cc.arduino.contributions.filters.BuiltInPredicate;
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryComparator;
-import cc.arduino.contributions.filters.BuiltInPredicate;
 import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate;
+import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;
-import com.github.zafarkhaja.semver.Version;
 import com.google.common.base.Function;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
@@ -257,18 +256,19 @@ public Component getTableCellEditorComponent(JTable table, Object value,
       uninstalledReleases.addAll(installedBuiltIn);
     }
 
-    Collections.sort(uninstalledReleases, new ReverseComparator<ContributedLibrary>(new ContributedLibraryComparator()));
+    Collections.sort(uninstalledReleases, new ReverseComparator<DownloadableContribution>(new DownloadableContributionVersionComparator()));
 
     downgradeChooser.removeAllItems();
     downgradeChooser.addItem(_("Select version"));
 
     final List<ContributedLibrary> uninstalledPreviousReleases = Lists.newLinkedList();
     final List<ContributedLibrary> uninstalledNewerReleases = Lists.newLinkedList();
 
+    final VersionComparator versionComparator = new VersionComparator();
     Lists.newLinkedList(Lists.transform(uninstalledReleases, new Function<ContributedLibrary, ContributedLibrary>() {
       @Override
       public ContributedLibrary apply(ContributedLibrary input) {
-        if (installed == null || VersionComparator.VERSION_COMPARATOR.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
+        if (installed == null || versionComparator.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
           uninstalledPreviousReleases.add(input);
         } else {
           uninstalledNewerReleases.add(input);
@@ -319,7 +319,7 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     } else {
       installable = false;
       removable = !installed.isReadOnly() && !hasBuiltInRelease;
-      upgradable = new ContributedLibraryComparator().compare(selected, installed) > 0;
+      upgradable = new DownloadableContributionVersionComparator().compare(selected, installed) > 0;
     }
     if (installable) {
       installButton.setText(_("Install"));

app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java

@@ -29,12 +29,12 @@
 package cc.arduino.contributions.packages.ui;
 
 import cc.arduino.contributions.VersionComparator;
-import cc.arduino.contributions.VersionHelper;
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.filters.BuiltInPredicate;
 import cc.arduino.contributions.packages.ContributedBoard;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.contributions.packages.ContributedPlatformComparator;
+import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;
@@ -271,18 +271,19 @@ public Component getTableCellEditorComponent(JTable table, Object value,
       uninstalledReleases.addAll(installedBuiltIn);
     }
 
-    Collections.sort(uninstalledReleases, new ReverseComparator<ContributedPlatform>(new ContributedPlatformComparator()));
+    Collections.sort(uninstalledReleases, new ReverseComparator<DownloadableContribution>(new DownloadableContributionVersionComparator()));
 
     downgradeChooser.removeAllItems();
     downgradeChooser.addItem(_("Select version"));
 
     final java.util.List<ContributedPlatform> uninstalledPreviousReleases = Lists.newLinkedList();
     final java.util.List<ContributedPlatform> uninstalledNewerReleases = Lists.newLinkedList();
 
+    final VersionComparator versionComparator = new VersionComparator();
     Lists.newLinkedList(Lists.transform(uninstalledReleases, new Function<ContributedPlatform, ContributedPlatform>() {
       @Override
       public ContributedPlatform apply(ContributedPlatform input) {
-        if (installed == null || VersionComparator.VERSION_COMPARATOR.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
+        if (installed == null || versionComparator.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
           uninstalledPreviousReleases.add(input);
         } else {
           uninstalledNewerReleases.add(input);
@@ -333,7 +334,7 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     } else {
       installable = false;
       removable = !installed.isReadOnly() && !hasBuiltInRelease;
-      upgradable = new ContributedPlatformComparator().compare(selected, installed) > 0;
+      upgradable = new DownloadableContributionVersionComparator().compare(selected, installed) > 0;
     }
     if (installable) {
       installButton.setText(_("Install"));

app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java

@@ -44,10 +44,11 @@ public abstract class FilteredAbstractTableModel<T> extends AbstractTableModel {
 
   protected static <T extends DownloadableContribution> T getLatestOf(List<T> contribs) {
     contribs = new LinkedList<T>(contribs);
+    final VersionComparator versionComparator = new VersionComparator();
     Collections.sort(contribs, new Comparator<T>() {
       @Override
       public int compare(T contrib1, T contrib2) {
-        return VersionComparator.VERSION_COMPARATOR.compare(contrib1.getParsedVersion(), contrib2.getParsedVersion());
+        return versionComparator.compare(contrib1.getParsedVersion(), contrib2.getParsedVersion());
       }
     });
 

app/src/processing/app/Base.java

@@ -30,6 +30,7 @@
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionInstaller;
 import cc.arduino.contributions.packages.ContributionsIndexer;
+import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.packages.ui.ContributionManagerUI;
 import cc.arduino.packages.DiscoveryManager;
 import cc.arduino.utils.Progress;
@@ -322,7 +323,16 @@ protected void onProgress(Progress progress) {
 
       String[] boardToInstallParts = parser.getBoardToInstall().split(":");
 
-      ContributedPlatform selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], VersionHelper.valueOf(boardToInstallParts[2]).toString());
+      ContributedPlatform selected = null;
+      if (boardToInstallParts.length == 3) {
+        selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], VersionHelper.valueOf(boardToInstallParts[2]).toString());
+      } else if (boardToInstallParts.length == 2) {
+        List<ContributedPlatform> platformsByName = indexer.getIndex().findPlatforms(boardToInstallParts[0], boardToInstallParts[1]);
+        Collections.sort(platformsByName, new DownloadableContributionVersionComparator());
+        if (!platformsByName.isEmpty()) {
+          selected = platformsByName.get(platformsByName.size() - 1);
+        }
+      }
       if (selected == null) {
         System.out.println(_("Selected board is not available"));
         System.exit(1);

arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java

@@ -0,0 +1,21 @@
+package cc.arduino.contributions;
+
+import cc.arduino.contributions.packages.DownloadableContribution;
+
+import java.util.Comparator;
+
+public class DownloadableContributionVersionComparator implements Comparator<DownloadableContribution> {
+
+  private final VersionComparator versionComparator;
+
+  public DownloadableContributionVersionComparator() {
+    versionComparator = new VersionComparator();
+  }
+
+  @Override
+  public int compare(DownloadableContribution lib1, DownloadableContribution lib2) {
+    return versionComparator.compare(lib1.getParsedVersion(), lib2.getParsedVersion());
+  }
+
+
+}

arduino-core/src/cc/arduino/contributions/VersionComparator.java

@@ -34,9 +34,6 @@
 
 public class VersionComparator implements Comparator<String> {
 
-  // An handy pre-instatiated object
-  public static final VersionComparator VERSION_COMPARATOR = new VersionComparator();
-
   @Override
   public int compare(String a, String b) {
     // null is always less than any other value