Update min version to 0.4.10, and make the version parser more general.

Author: ianopolous

src/main/java/io/ipfs/api/IPFS.java

@@ -11,7 +11,7 @@
 
 public class IPFS {
 
-    public static final String MIN_VERSION = "0.4.5";
+    public static final String MIN_VERSION = "0.4.10";
     public enum PinType {all, direct, indirect, recursive}
     public List<String> ObjectTemplates = Arrays.asList("unixfs-dir");
     public List<String> ObjectPatchTypes = Arrays.asList("add-link", "rm-link", "set-data", "append-data");

src/main/java/io/ipfs/api/Version.java

@@ -0,0 +1,52 @@
+package io.ipfs.api;
+
+public class Version implements Comparable<Version> {
+
+    public final int major, minor, patch;
+    public final String suffix;
+
+    public Version(int major, int minor, int patch, String suffix) {
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        this.suffix = suffix;
+    }
+
+    public String toString() {
+        return major + "." + minor + "." + patch + (suffix.length() > 0 ? "-" + suffix : "");
+    }
+
+    public boolean isBefore(Version other) {
+        return this.compareTo(other) < 0;
+    }
+
+    @Override
+    public int compareTo(Version other) {
+        int major = Integer.compare(this.major, other.major);
+        if (major != 0)
+            return major;
+        int minor = Integer.compare(this.minor, other.minor);
+        if (minor != 0)
+            return minor;
+        int patch = Integer.compare(this.patch, other.patch);
+        if (patch != 0)
+            return patch;
+        if (suffix.length() == 0)
+            return 1;
+        if (other.suffix.length() == 0)
+            return -1;
+        return suffix.compareTo(other.suffix);
+    }
+
+    public static Version parse(String version) {
+        int first = version.indexOf(".");
+        int second = version.indexOf(".", first + 1);
+        int third = version.contains("-") ? version.indexOf("-") : version.length();
+
+        int major = Integer.parseInt(version.substring(0, first));
+        int minor = Integer.parseInt(version.substring(first + 1, second));
+        int patch = Integer.parseInt(version.substring(second + 1, third));
+        String suffix = third < version.length() ? version.substring(third + 1) : "";
+        return new Version(major, minor, patch, suffix);
+    }
+}

src/test/java/io/ipfs/api/APITest.java

@@ -237,27 +237,23 @@ public void rawLeafNodePinUpdate() {
         try {
             MerkleNode child1 = ipfs.block.put("some data".getBytes(), Optional.of("raw"));
             Multihash hashChild1 = child1.hash;
-            System.out.println("child1: " + hashChild1);
+            System.out.println("child1: " + hashChild1.type);
 
             CborObject.CborMerkleLink root1 = new CborObject.CborMerkleLink(hashChild1);
             MerkleNode root1Res = ipfs.block.put(Collections.singletonList(root1.toByteArray()), Optional.of("cbor")).get(0);
             System.out.println("root1: " + root1Res.hash);
             ipfs.pin.add(root1Res.hash);
 
-            CborObject.CborList root2 = new CborObject.CborList(Arrays.asList(new CborObject.CborMerkleLink(hashChild1), new CborObject.CborLong(42)));
-            MerkleNode root2Res = ipfs.block.put(Collections.singletonList(root2.toByteArray()), Optional.of("cbor")).get(0);
-            List<MultiAddress> update = ipfs.pin.update(root1Res.hash, root2Res.hash, true);
+            MerkleNode child2 = ipfs.block.put("G'day new tree".getBytes(), Optional.of("raw"));
+            Multihash hashChild2 = child2.hash;
 
-            Map<Multihash, Object> ls = ipfs.pin.ls(IPFS.PinType.all);
-            boolean childPresent = ls.containsKey(hashChild1);
-            if (!childPresent)
-                throw new IllegalStateException("Child not present!");
-
-            ipfs.repo.gc();
-            Map<Multihash, Object> ls2 = ipfs.pin.ls(IPFS.PinType.all);
-            boolean childPresentAfterGC = ls2.containsKey(hashChild1);
-            if (!childPresentAfterGC)
-                throw new IllegalStateException("Child not present!");
+            CborObject.CborList root2 = new CborObject.CborList(Arrays.asList(
+                    new CborObject.CborMerkleLink(hashChild1),
+                    new CborObject.CborMerkleLink(hashChild2),
+                    new CborObject.CborLong(42))
+            );
+            MerkleNode root2Res = ipfs.block.put(Collections.singletonList(root2.toByteArray()), Optional.of("cbor")).get(0);
+            List<MultiAddress> update = ipfs.pin.update(root1Res.hash, root2Res.hash, false);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/test/java/io/ipfs/api/Versions.java

@@ -0,0 +1,19 @@
+package io.ipfs.api;
+
+import org.junit.*;
+
+import java.util.*;
+import java.util.stream.*;
+
+public class Versions {
+
+    @Test
+    public void sorting(){
+        List<String> original = Arrays.asList("1.0.3", "0.4.9", "0.4.10", "0.5.1-rc1", "0.5.1-rc2", "0.5.1-rc2+meta");
+        List<Version> versions = original.stream().map(Version::parse).collect(Collectors.toList());
+        Collections.sort(versions);
+        List<String> sorted = versions.stream().map(Object::toString).collect(Collectors.toList());
+        List<String> correct = Arrays.asList("0.4.9", "0.4.10", "0.5.1-rc1", "0.5.1-rc2", "0.5.1-rc2+meta", "1.0.3");
+        Assert.assertTrue("Correct version sorting", sorted.equals(correct));
+    }
+}