close #204 - switch to semVer

cesetup/cesetup.coedit

@@ -84,5 +84,5 @@ object CurrentProject: TCENativeProject
     'cesetup.d'
   )
   ConfigurationIndex = 2
-  version = '3update5'
+  version = '3.6.0-alpha.0'
 end

cesetup/cesetup.d

@@ -57,7 +57,7 @@ immutable Resource[] oldResources =
 
 struct Formater
 {
-    private enum width = 48;
+    private enum width = 54;
     private static __gshared char[] separator;
     
     static this()
@@ -78,7 +78,7 @@ struct Formater
         static if (A == 'L') 
             writeln("| ",  leftJustify(s, width, ' '), " |");
         else static if (A == 'C') 
-            writeln("| ",  center(s, width, ' '), " |");
+            writeln("| ",  center(s, width), " |");
         else static if (A == 'R') 
             writeln("| ",  rightJustify(s, width, ' '), " |");  
         else static assert(0, "invalid justification, L|C|R expected");      
@@ -164,7 +164,7 @@ void main(string[] args)
     }
 
     if (!uninstall) Formater.justify!'C'(format("Coedit %s - setup",
-        import("version.txt").split('_').join(" ")));
+        import("version.txt")[1..$].chomp));
     else Formater.justify!'C'("Coedit uninstaller");
     
     Formater.separate;

cesetup/deb.sh

@@ -1,7 +1,5 @@
 ver=`cat version.txt`
-maj=${ver:0:1}
+ver=${ver:1:100}
-min1=${ver//_}
-min=${min1:1}
 dte=$(LC_TIME='en_EN.UTF-8' date -u +"%a %b %d %Y")
 
 arch=`uname -m`
@@ -11,7 +9,7 @@ else
     arch="i386"
 fi
 
-name=coedit-$maj-$min.$arch
+name=coedit-$ver.$arch
 
 basdir=$HOME/$name/
 cfgdir=$basdir/DEBIAN
@@ -42,7 +40,7 @@ Type=Application" > $shcdir/coedit.desktop
  
 cd $cfgdir 
 echo "Package: coedit
-Version: $maj$min
+Version: $ver
 Section: devel
 Priority: optional
 Date: $dte

cesetup/rpm.sh

@@ -1,12 +1,37 @@
 ver=`cat version.txt`
 maj=${ver:0:1}
-min1=${ver//_}
+ver=${ver:1:100}
-min=${min1:1}
 dte=$(LC_TIME='en_EN.UTF-8' date -u +"%a %b %d %Y")
 arch=`uname -m`
 specname=coedit-$arch.spec
 
-buildroot=$HOME/rpmbuild/BUILDROOT/coedit-$maj-$min.$arch
+semver_regex() {
+  local VERSION="([0-9]+)[.]([0-9]+)[.]([0-9]+)"
+  local INFO="([0-9A-Za-z-]+([.][0-9A-Za-z-]+)*)"
+  local PRERELEASE="(-${INFO})"
+  local METAINFO="([+]${INFO})"
+  echo "^${VERSION}${PRERELEASE}?${METAINFO}?$"
+}
+
+SEMVER_REGEX=`semver_regex`
+unset -f semver_regex
+
+semver_parse() {
+  echo $ver | sed -E -e "s/$SEMVER_REGEX/\1 \2 \3 \5 \8/" -e 's/  / _ /g' -e 's/ $/ _/'
+}
+
+string=
+IFS=' ' read -r -a array <<< `semver_parse`
+maj="${array[0]}"
+min="${array[1]}"
+pch="${array[2]}"
+lbl="${array[3]}"
+
+if [ $lbl == '_' ]; then
+    lbl='0'
+fi
+
+buildroot=$HOME/rpmbuild/BUILDROOT/coedit-$maj.$min.$pch-$lbl.$arch
 bindir=$buildroot/usr/bin
 pixdir=$buildroot/usr/share/pixmaps
 shcdir=$buildroot/usr/share/applications
@@ -33,8 +58,8 @@ Type=Application" > $shcdir/coedit.desktop
 
 cd $HOME/rpmbuild/SPECS
 echo "Name: coedit
-Version: $maj
+Version: $maj.$min.$pch
-Release: $min
+Release: $lbl
 Summary: IDE for the D programming language
 License: Boost
 URL: www.github.com/BBasile/Coedit

cesetup/version.txt

@@ -1 +1 @@
-3_update_5
+v3.6.0-alpha.0

lazproj/coedit.lpi

@@ -247,7 +247,7 @@
         <PackageName Value="LCL"/>
       </Item8>
     </RequiredPackages>
-    <Units Count="58">
+    <Units Count="59">
       <Unit0>
         <Filename Value="coedit.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -550,6 +550,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit57>
+      <Unit58>
+        <Filename Value="..\src\ce_semver.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit58>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

lazproj/coedit.lpr

@@ -13,7 +13,7 @@ uses
   ce_processes, ce_dialogs, ce_dubprojeditor, ce_controls, ce_dfmt,
   ce_lcldragdrop, ce_stringrange, ce_dlangmaps, ce_projgroup, ce_projutils,
   ce_d2synpresets, ce_dastworx, ce_dbgitf, ce_ddemangle, ce_dubproject,
-  ce_halstead, ce_diff, ce_profileviewer;
+  ce_halstead, ce_diff, ce_profileviewer, ce_semver;
 
 {$R *.res}
 

src/ce_infos.pas

@@ -194,7 +194,7 @@ begin
   try
     len := read(ver[1], ver.length);
     setLength(ver, len);
-    Label1.Caption := 'Coedit - ' + replaceStr(ver, '_', ' ');
+    Label1.Caption := 'Coedit - ' + ver[1..ver.length];
   finally
     free;
   end;

src/ce_main.pas

@@ -16,7 +16,7 @@ uses
   ce_toolseditor, ce_procinput, ce_optionseditor, ce_symlist, ce_mru, ce_processes,
   ce_infos, ce_dubproject, ce_dialogs, ce_dubprojeditor,{$IFDEF UNIX} ce_gdb,{$ENDIF}
   ce_dfmt, ce_lcldragdrop, ce_projgroup, ce_projutils, ce_stringrange, ce_dastworx,
-  ce_halstead, ce_profileviewer;
+  ce_halstead, ce_profileviewer, ce_semver;
 
 type
 
@@ -1745,17 +1745,11 @@ var
   tgg: TJSONData = nil;
   url: TJSONData = nil;
   str: string;
-  mn0: byte = 0;
-  mj0: byte;
-  kd0: string;
-  mn1: byte = 0;
-  mj1: byte;
-  kd1: string;
-  can: boolean = false;
-  rng: TStringRange = (ptr:nil; pos:0; len: 0);
   cli: TFPHTTPClient;
   lst: TStringList = nil;
   res: TResourceStream = nil;
+  svo: TSemVer;
+  sva: TSemVer;
 begin
   result := '';
   cli := TFPHTTPClient.Create(nil);
@@ -1775,37 +1769,10 @@ begin
           lst := TstringList.Create;
           lst.LoadFromStream(res);
           str := lst.Text;
-          if str.length < 6 then
+          sva.init(str, false);
-            raise Exception.Create('');
-
-          rng.init(str);
-          mj0 := rng.takeWhile(['0'..'9']).yield.toIntNoExcept;
-          rng.popWhile('_');
-          kd0 := rng.takeWhile(['a'..'z']).yield;
-          rng.popWhile('_');
-          mn0 := rng.takeWhile(['0'..'9']).yield.toIntNoExcept;
-
           str := tgg.AsString;
-          rng.init(str);
+          svo.init(str, false);
-          mj1 := rng.takeWhile(['0'..'9']).yield.toIntNoExcept;
+          if svo.valid and sva.valid and (svo > sva) then
-          rng.popWhile('_');
-          kd1 := rng.takeWhile(['a'..'z']).yield;
-          rng.popWhile('_');
-          mn1 := rng.takeWhile(['0'..'9']).yield.toIntNoExcept;
-
-          if mj1 > mj0 then
-            can := true
-          else if mj1 < mj0 then
-            can := false
-          else if kd0 = kd1 then
-            can := (mj1 = mj0) and (mn1 > mn0)
-          else if (kd0 = 'alpha') and (kd1 <> 'alpha') then
-            can := (mj1 = mj0) and (mn1 > mn0)
-          else if (kd0 = 'beta') and (kd1 <> 'alpha') and (kd1 <> 'beta') then
-            can := (mj1 = mj0) and (mn1 > mn0)
-          else if (kd0 = 'gold') and (kd1 = 'update') and (kd1 <> 'beta') then
-            can := (mj1 = mj0) and (mn1 > mn0);
-          if can then
             result := url.AsString;
         end;
       end;

src/ce_semver.pas

@@ -0,0 +1,170 @@
+unit ce_semver;
+
+{$I ce_defines.inc}
+
+interface
+
+uses
+  SysUtils, ce_stringrange;
+
+type
+
+  // Record used to split the text of a semantic version into components.
+  // Special helpers exit for the additional labels "alpha", "beta" or
+  // "rc" as used.
+  TSemVer = record
+  strict private
+    fAdditional: string;
+    fMajor, fMinor, fPatch: byte;
+    fValid: boolean;
+  public
+    // Initializes with the semVer text.
+    // When throw is set to true an Exception is  raised if the format is not compliant.
+    procedure init(const text: string; throw: boolean = true);
+
+    // Indicates wether the version is not a final release.
+    function isPreRelease: boolean;
+    // Indicates wether the version is an alpha ("v1.0.0-alpha", "v1.0.0-alpha.1").
+    function isAlpha: boolean;
+    // Indicates wether the version is a beta ("v1.0.0-beta", "v1.0.0-beta.1").
+    function isBeta: boolean;
+    // Indicates wether the version is a release candidate ("v1.0.0-rc", "v1.0.0-rc.1").
+    function isRc: boolean;
+
+    // The major version.
+    property major: byte read fMajor;
+    // The minor version.
+    property minor: byte read fMinor;
+    // The patch.
+    property patch: byte read fPatch;
+    // The additional labels.
+    property additional: string read fAdditional;
+    // Indicates if the init has succeeded.
+    property valid: boolean read fValid;
+  end;
+
+  operator > (constref lhs, rhs: TSemVer): boolean;
+  operator = (constref lhs, rhs: TSemVer): boolean;
+
+implementation
+
+{$IFDEF DEBUG}
+var v1, v2: TSemVer;
+{$ENDIF}
+
+procedure TSemVer.init(const text: string; throw: boolean = true);
+
+  procedure error(const message: string);
+  begin
+    fMajor := 0;
+    fMinor := 0;
+    fPatch := 0;
+    fAdditional := '';
+    fValid := false;
+    raise Exception.Create(message);
+  end;
+
+var
+  r: TStringRange = (ptr:nil; pos:0; len: 0);
+begin
+  if throw and (text.length < 6) then
+    error('Invalid semVer format, at least 6 characters expected');
+  r.init(text);
+  if throw and (r.front <> 'v') then
+    error('Invalid semVer format, the text must start with "v"');
+  r.popFront;
+  fMajor := r.takeUntil('.').yield.ToInteger;
+  if throw and r.empty then
+    error('Invalid semVer format, minor and patch miss');
+  fMinor := r.popFront^.takeUntil('.').yield.ToInteger;
+  if throw and r.empty then
+    error('Invalid semVer format, the patch misses');
+  fPatch := r.popFront^.takeWhile(['0'..'9']).yield.ToInteger;
+  if not r.empty then
+    fAdditional := r.popFront^.takeUntil(#0).yield;
+  fValid := true;
+end;
+
+function TSemVer.isPreRelease: boolean;
+begin
+  result := isAlpha() or isBeta() or isRc();
+end;
+
+function TSemVer.isAlpha: boolean;
+begin
+  result := (additional = 'alpha') or (additional.StartsWith('alpha.'));
+end;
+
+function TSemVer.isBeta: boolean;
+begin
+  result := (additional = 'beta') or (additional.StartsWith('beta.'));
+end;
+
+function TSemVer.isRc: boolean;
+begin
+  result := (additional = 'rc') or (additional.StartsWith('rc.'));
+end;
+
+operator > (constref lhs, rhs: TSemVer): boolean;
+begin
+  result := (lhs.major > rhs.major) or
+            ((lhs.major = rhs.major) and (lhs.minor > rhs.minor)) or
+            ((lhs.major = rhs.major) and (lhs.minor = rhs.minor)
+              and (lhs.patch > rhs.patch)) or
+            ((lhs.major = rhs.major) and (lhs.minor = rhs.minor)
+              and (lhs.patch = rhs.patch) and (lhs.additional > rhs.additional));
+end;
+
+operator = (constref lhs, rhs: TSemVer): boolean;
+begin
+  result := (lhs.major = rhs.major) and (lhs.minor = rhs.minor)
+              and (lhs.patch = rhs.patch) and (lhs.additional = rhs.additional);
+end;
+
+
+{$IFDEF DEBUG}
+begin
+  v1.init('v1.0.0');
+  v2.init('v1.0.0');
+  assert(v1 = v2);
+
+  v1.init('v2.0.0');
+  v2.init('v1.0.0');
+  assert(v1 > v2);
+
+  v1.init('v1.1.0');
+  v2.init('v1.0.0');
+  assert(v1 > v2);
+
+  v1.init('v1.1.1');
+  v2.init('v1.1.0');
+  assert(v1 > v2);
+
+  v1.init('v1.1.1');
+  v2.init('v1.0.1');
+  assert(v1 > v2);
+
+  v1.init('v1.1.1-alpha.2');
+  v2.init('v1.1.1-alpha.1');
+  assert(v1 > v2);
+  assert(v1.isAlpha);
+  assert(v2.isAlpha);
+
+  v1.init('v1.1.1-beta.1');
+  v2.init('v1.1.1-alpha.8');
+  assert(v1 > v2);
+  assert(v1.isBeta);
+  assert(v2.isAlpha);
+  assert(v1.isPreRelease);
+
+  v1.init('v1.2.3');
+  v2.init('v1.22.33');
+  assert(v1.major = 1);
+  assert(v1.minor = 2);
+  assert(v1.patch = 3);
+  assert(v2.major = 1);
+  assert(v2.minor = 22);
+  assert(v2.patch = 33);
+  {$ENDIF}
+end.
+