vishapoberon/vipak
1
0
Fork 0
mirror of https://github.com/vishapoberon/vipak.git synced 2026-04-05 20:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

compiles, needs some cleanup

Browse source
This commit is contained in:
Norayr Chilingarian 2020-05-08 03:35:36 +04:00
parent 6011d9d401
commit 82d79b4647
7 changed files with 153 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

24
makefile
View file

@ -20,17 +20,18 @@ all: http
$(VOC) -s \ $(VOC) -s \
../src/vpkGit.Mod \ ../src/vpkGit.Mod \
../src/vpkFsHelper.Mod \ ../src/vpkFsHelper.Mod \
../src/vpkConf.Mod \
../src/vpkUserDetails.Mod \
../src/vpkSettings.Mod \ ../src/vpkSettings.Mod \
../src/vpkTime.Mod \ ../src/vpkConf.Mod \
../src/vpkLogger.Mod \ ../src/vpkFileManager.Mod \
../lists/src/Sys.Mod \ ../lists/src/Sys.Mod \
../lists/src/List.Mod \ ../lists/src/List.Mod \
../lists/src/strutils.Mod \ ../lists/src/strutils.Mod \
../src/vpkCharacterStack.Mod \ ../src/vpkCharacterStack.Mod \
../src/vpkJsonParser.Mod \ ../src/vpkJsonParser.Mod \
../src/vpkFileManager.Mod \ ../src/vpkSyncer.Mod \
../src/vpkUserDetails.Mod \
../src/vpkTime.Mod \
../src/vpkLogger.Mod \
../src/vpkPackageResolver.Mod \ ../src/vpkPackageResolver.Mod \
../src/vpkDependencyResolver.Mod \ ../src/vpkDependencyResolver.Mod \
../src/vpkPackageFileParser.Mod \ ../src/vpkPackageFileParser.Mod \
@ -51,17 +52,6 @@ http: clean
../Internet/src/Internet.Mod \ ../Internet/src/Internet.Mod \
../src/vpkHttp.Mod ../src/vpkHttp.Mod
json:
cd $(BUILDDIR) && \
$(VOC) -s \
../src/vpkTime.Mod \
../src/vpkLogger.Mod \
../lists/src/Sys.Mod \
../lists/src/List.Mod \
../lists/src/strutils.Mod \
../src/vpkCharacterStack.Mod \
../src/vpkJsonParser.Mod
clean: clean:
if [ -d "$(BUILDDIR)" ]; then rm -rf $(BUILDDIR); fi if [ -d "$(BUILDDIR)" ]; then rm -rf $(BUILDDIR); fi

130
src/vipack.Mod
View file

@ -1,22 +1,6 @@
MODULE vipack; MODULE vipack;
IMPORT vpkFileManager,vpkJsonParser,vpkGit, vpkConf, vpkLogger, vpkPackageFileParser, Texts, Strings, In, Platform, Oberon, Out; IMPORT Texts, Strings, Oberon, Out,
vpkJsonParser, vpkGit, vpkConf, vpkLogger, vpkPackageFileParser, vpkSyncer;
PROCEDURE main();
CONST confFileName = "vipackConf.json";
CONST syncDirName = "vipackTree";
CONST quote = '"';
CONST startBracket = "{";
CONST endBracket = "}";
VAR user, str: ARRAY 32 OF CHAR;
vpkDirPath, treePath, confPath, jsonString : ARRAY 120 OF CHAR;
i : INTEGER;
ch : CHAR;
S: Texts.Scanner;
jsonData,string,defaultUrl,gitUrl,project,command, jsonPathLine : ARRAY 500 OF CHAR;
success: BOOLEAN;
jsonRecord: vpkJsonParser.JsonTypePointer;
PROCEDURE help(); PROCEDURE help();
BEGIN BEGIN
@ -26,94 +10,38 @@ BEGIN
Out.String("vipackTree path -> $HOME/.vipack/vipackTree") Out.String("vipackTree path -> $HOME/.vipack/vipackTree")
END help; END help;
PROCEDURE main();
VAR
user, str: ARRAY 32 OF CHAR;
i : INTEGER;
ch : CHAR;
S: Texts.Scanner;
project, command: ARRAY 500 OF CHAR;
jsonRecord: vpkJsonParser.JsonTypePointer;
BEGIN BEGIN
(* Getting 1 argument and outputting it *) (* Getting 1 argument and outputting it *)
Texts.OpenScanner(S, Oberon.Par.text, Oberon.Par.pos); Texts.OpenScanner(S, Oberon.Par.text, Oberon.Par.pos);
Texts.Scan(S); Texts.Scan(S);
Out.String(S.s); Out.Ln; Out.String(S.s); Out.Ln;
defaultUrl := "https://github.com/vishaps/vipackTree"; command := S.s;
command := S.s; IF Strings.Match(command, "") OR Strings.Match(command, "help")THEN
help;
ELSE
vpkConf.configure;
IF command = "sync" THEN
vpkSyncer.sync;
END;
IF Strings.Match(command, "") OR Strings.Match(command, "help")THEN IF command = "install" THEN
help; Texts.Scan(S);
ELSE project := S.s;
Out.String(project);Out.Ln;
vpkPackageFileParser.install();
END;
IF ~(vpkConf.varCheck("HOME", vpkDirPath)) THEN END;
Out.String("HOME variable is not found"); Out.Ln;
END;
Strings.Append("/.vipack/",vpkDirPath);
confPath := vpkDirPath;
treePath := vpkDirPath;
(* Checking if ~/.vipack directory already exists *)
IF vpkConf.makeDir(vpkDirPath) THEN
Out.String("Creating directory "); Out.String(vpkDirPath);Out.Ln;
ELSE Out.String(vpkDirPath); Out.String(" already exists or path is wrong");Out.Ln;
END;
(* Checking if vipack.conf already exists *)
Strings.Append(confFileName,confPath);
IF ~(vpkConf.confExists(confPath)) THEN
Out.String("Creating the configuration file "); Out.String(confPath);Out.Ln;
jsonPathLine := "";
vpkConf.makeFile(confPath);
Strings.Append(startBracket, jsonPathLine);
Strings.Append('"path" : ', jsonPathLine);
Strings.Append(quote, jsonPathLine);
Strings.Append(defaultUrl,jsonPathLine);
Strings.Append(quote, jsonPathLine);
Strings.Append(endBracket,jsonPathLine);
vpkConf.writeInFile(confPath,jsonPathLine,0);
ELSE
Out.String("File already exists");Out.Ln;
END;
IF command = "sync" THEN
treePath := vpkDirPath;
Strings.Append(syncDirName, treePath);
Strings.Append("/",treePath);
Out.String("*****************************************"); Out.Ln;
Out.String("TreePath = "); Out.String(treePath);
(* Check tree directory if doesn't exist create*)
IF vpkConf.makeDir(treePath) THEN
Out.String("Creating "); Out.String(treePath); Out.String("for syncing");Out.Ln;
ELSE Out.String("Some error occured or directory already exist");
END;
(* Syncing *)
success := vpkFileManager.Read(confPath,jsonData);
jsonRecord := vpkJsonParser.Create(jsonData);
success := vpkJsonParser.GetTerminal(jsonRecord,"path", jsonString);
Out.String("URL = ");
Out.String(jsonString);Out.Ln;
gitUrl := jsonString;
string := gitUrl;
Strings.Delete(string,19,Strings.Length(string)-17);
Out.String(string);Out.Ln;
(* Checking the URL of vipackConf.json path key *)
IF Strings.Match(string,"https://github.com/") OR Strings.Match(string,"git://github.com/") THEN
Out.String("YES"); Out.Ln;
vpkGit.pull(gitUrl,treePath);
END;
END;
IF command = "install" THEN
Texts.Scan(S);
project := S.s;
Out.String(project);Out.Ln;
vpkPackageFileParser.install();
END;
END;
END main; END main;

112
src/vpkConf.Mod
View file

@ -1,45 +1,97 @@
MODULE vpkConf; MODULE vpkConf;
IMPORT Out, Files, Strings, Platform, IMPORT Out, Files, Strings, Platform,
vpkFsHelper; vpkFsHelper, vpkSettings;
PROCEDURE confExists*(VAR confFile: ARRAY OF CHAR ):BOOLEAN; VAR
conf, confDir : ARRAY 256 OF CHAR;
PROCEDURE mkConfContent(VAR path: ARRAY OF CHAR);
BEGIN BEGIN
IF Files.Old(confFile) = NIL THEN RETURN FALSE; Strings.Append('{"path" : "', path);
ELSE RETURN TRUE; Strings.Append(vpkSettings.treeURL, path);
END; Strings.Append('"}, "type" : "git"}', path);
END mkConfContent;
END confExists; PROCEDURE makeFile(VAR confFilePath: ARRAY OF CHAR; VAR f: Files.File; VAR r: Files.Rider);
PROCEDURE makeFile*(VAR confFilePath: ARRAY OF CHAR);
VAR f : Files.File;
BEGIN BEGIN
f := Files.New(confFilePath); f := Files.New(confFilePath);
Files.Register(f); Files.Set(r, f, 0);
END makeFile; END makeFile;
PROCEDURE makeDir*(VAR confDirPath: ARRAY OF CHAR):BOOLEAN; PROCEDURE writeInFile(VAR f: Files.File; r: Files.Rider; VAR text : ARRAY OF CHAR);
BEGIN BEGIN
RETURN vpkFsHelper.mkDir(confDirPath); Files.WriteBytes(r, text, Strings.Length(text));
END makeDir;
PROCEDURE varCheck*(variable : ARRAY OF CHAR;VAR value : ARRAY OF CHAR): BOOLEAN;
BEGIN
RETURN Platform.getEnv(variable,value);
END varCheck;
PROCEDURE writeInFile*(VAR pathToFile : ARRAY OF CHAR;VAR text : ARRAY OF CHAR; posRider : INTEGER);
VAR f : Files.File;
r : Files.Rider;
BEGIN
f := Files.Old(pathToFile);
Files.Set(r,f,posRider);
Files.WriteBytes(r, text, Strings.Length(text));
Files.Close(f);
END writeInFile; END writeInFile;
PROCEDURE closeFile(VAR f: Files.File);
BEGIN
Files.Register(f);
Files.Close(f);
END closeFile;
PROCEDURE mkConfDirPath(home: ARRAY OF CHAR; VAR path: ARRAY OF CHAR);
BEGIN
confDir := home;
Strings.Append("/", path);
Strings.Append(vpkSettings.vpkConfDir, path);
END mkConfDirPath;
PROCEDURE setConfPath;
VAR
home: ARRAY 128 OF CHAR;
BEGIN
vpkSettings.getHome(home);
mkConfDirPath(home, confDir);
conf := confDir;
Strings.Append("/", conf);
Strings.Append(vpkSettings.vpkConfFile, conf);
END setConfPath;
PROCEDURE getConfPath*(VAR path: ARRAY OF CHAR);
BEGIN
COPY(conf, path);
END getConfPath;
PROCEDURE getConfDir*(VAR path: ARRAY OF CHAR);
BEGIN
COPY(confDir, path);
END getConfDir;
PROCEDURE configure*;
VAR
content: ARRAY 256 OF CHAR;
file : vpkFsHelper.fileInfo;
fd: Files.File;
rd: Files.Rider;
BEGIN
file.name := conf;
IF ~vpkFsHelper.Exists(file) THEN
(* Checking if ~/.vipack directory already exists *)
file.name := confDir;
IF ~vpkFsHelper.Exists(file) THEN (* exists!!! *)
Out.String("Creating directory "); Out.String(confDir);Out.Ln;
IF ~vpkFsHelper.mkDir(confDir) THEN
Out.String("failed to create "); Out.String(confDir); Out.String(" directory"); Out.Ln;
HALT(1);
END;
ELSE
IF ~(vpkFsHelper.dir IN file.attr) THEN
Out.String(confDir); Out.String(" exists, but is not a directory"); Out.Ln;
HALT(1);
END;
END;
(* create conf file *)
Out.String("Creating the configuration file "); Out.String(conf);Out.Ln;
content := "";
makeFile(conf, fd, rd);
mkConfContent(content);
writeInFile(fd, rd, content);
closeFile(fd);
ELSE
Out.String("File already exists");Out.Ln;
END;
END configure;
BEGIN BEGIN
setConfPath;
END vpkConf. END vpkConf.

2
src/vpkFsHelper.Mod
View file

@ -7,7 +7,7 @@ CONST
TYPE TYPE
fileInfo* = RECORD; fileInfo* = RECORD;
name* : ARRAY 64 OF CHAR; name* : ARRAY 256 OF CHAR;
attr- : SET attr- : SET
END; END;

24
src/vpkGit.Mod
View file

@ -1,20 +1,20 @@
MODULE vpkGit; MODULE vpkGit;
IMPORT Out,Strings, Platform; IMPORT Out, Strings, Platform;
PROCEDURE pull*(URL : ARRAY OF CHAR; dst : ARRAY OF CHAR); PROCEDURE pull*(URL : ARRAY OF CHAR; dst : ARRAY OF CHAR);
VAR i : INTEGER; VAR i : INTEGER;
cmd : ARRAY 120 OF CHAR; cmd : ARRAY 120 OF CHAR;
BEGIN BEGIN
cmd:= "git init "; cmd:= "git init ";
Strings.Append(dst, cmd); Strings.Append(dst, cmd);
i:=Platform.System(cmd); i:=Platform.System(cmd);
cmd := ""; cmd := "";
cmd := "git -C "; cmd := "git -C ";
Strings.Append(dst,cmd); Strings.Append(dst,cmd);
Strings.Append(" pull ",cmd); Strings.Append(" pull ",cmd);
Strings.Append(URL, cmd); Strings.Append(URL, cmd);
i := Platform.System(cmd); i := Platform.System(cmd);
Out.Int(i,0); Out.Int(i,0);
END pull; END pull;

2
src/vpkJsonParser.Mod
View file

@ -7,8 +7,8 @@ CONST
symbolBracketStart = "{"; symbolBracketStart = "{";
symbolBracketEnd = "}"; symbolBracketEnd = "}";
(* TODO: Reverse " and ' *) (* TODO: Reverse " and ' *)
quote = vpkSettings.quote;
coma = ","; coma = ",";
quote = '"';
TYPE TYPE
TString* = ARRAY ArrayMaxNumberChar OF CHAR; TString* = ARRAY ArrayMaxNumberChar OF CHAR;

26
src/vpkSettings.Mod
View file

@ -1,8 +1,24 @@
MODULE vpkSettings; MODULE vpkSettings;
IMPORT Platform, Out;
CONST CONST
packageFileName* = "VersionFile.json"; vpkConfDir* = ".vipack";
host* = "localhost"; vpkConfFile* = "vipackConf.json";
port* = "80"; vpkTreeDir* = "vipackTree";
installPath* = "dependencies"; treeURL* = "https://github.com/vishaps/vipackTree";
quote* = '"'; confTypGit* = "git";
confType* = "type";
confTermPath* = "path";
packageFileName* = "VersionFile.json";
host* = "localhost";
port* = "80";
installPath* = "dependencies";
PROCEDURE getHome*(VAR path: ARRAY OF CHAR);
BEGIN
IF ~(Platform.getEnv("HOME", path)) THEN
Out.String("HOME variable is not found"); Out.Ln;
HALT(1);
END;
END getHome;
END vpkSettings. END vpkSettings.