alire/alire-index-community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Miscellaneous refactoring

Browse Source
This commit is contained in:
Jano at Zelda
2018-02-16 19:58:27 +01:00
parent 724359c0d1
commit ec00e07e79
13 changed files with 183 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/alire.ads
+2 -63
View File
@@ -1,20 +1,16 @@
private with Ada.Containers.Indefinite_Holders;
with Semantic_Versioning;
with Simple_Logging;
package Alire with Preelaborate is
File_Error : exception;
type URL is new String;
Max_Name_Length : constant := 72; -- Github maximum is 100 and bitbucket 128, but since Description is 72...
Max_Description_Length : constant := 72; -- Git line recommendation (although it's 50 for subject line)
-- Basics of projects: Name and Description
-- Rest of properties are grouped in the Index
subtype Project_Name is String with Dynamic_Predicate =>
Project_Name'Length >= 3 and then
@@ -22,30 +18,9 @@ package Alire with Preelaborate is
Project_Name (Project_Name'First) /= '_' and then
(for all C of Project_Name => C in 'a' .. 'z' | 'A' .. 'Z' | '0' .. '9' | '_');
subtype Project_Description is String with Dynamic_Predicate =>
Project_Description'Length <= Max_Description_Length;
type Dependency (<>) is tagged private;
function Project (Dep : Dependency) return Project_Name;
function Versions (Dep : Dependency) return Semantic_Versioning.Version_Set;
type Milestone (<>) is tagged private;
function "<" (L, R : Milestone) return Boolean;
function New_Milestone (Name : Project_Name;
Version : Semantic_Versioning.Version) return Milestone;
function Project (M : Milestone) return Project_Name;
function Version (M : Milestone) return Semantic_Versioning.Version;
---------------
-- LOGGING --
---------------
@@ -58,40 +33,4 @@ package Alire with Preelaborate is
procedure Log (S : String; Level : Simple_Logging.Levels := Info) renames Simple_Logging.Log;
private
use all type Semantic_Versioning.Version;
package Version_Holders is new Ada.Containers.Indefinite_Holders
(Semantic_Versioning.Version_Set, Semantic_Versioning."=");
type Version_Set_Holder is new Version_Holders.Holder with null record;
type Dependency (Name_Len : Positive) is tagged record
Project : Project_Name (1 .. Name_Len);
Versions_H : Version_Set_holder;
end record;
function Project (Dep : Dependency) return Project_Name is (Dep.Project);
function Versions (Dep : Dependency) return Semantic_Versioning.Version_Set is
(Dep.Versions_H.Element);
type Milestone (Name_Len : Positive) is tagged record
Name : Project_Name (1 .. Name_Len);
Version : Semantic_Versioning.Version;
end record;
function "<" (L, R : Milestone) return Boolean is
(L.Name < R.Name or else (L.Name = R.Name and then L.Version < R.Version));
function New_Milestone (Name : Project_Name;
Version : Semantic_Versioning.Version) return Milestone is
(Name'Length, Name, Version);
function Project (M : Milestone) return Project_Name is (M.Name);
function Version (M : Milestone) return Semantic_Versioning.Version is (M.Version);
end Alire;