doublefint · Jan 23, 2018 · Jan 24, 2018 · Feb 9, 2018 · Feb 9, 2018 · Feb 18, 2018
Showing with 415 additions and 30 deletions.

+1 −0 .gitignore

+24 −5 README.md

+113 −25 sc.code.cls → cls/sc/code.cls

+108 −0 cls/sc/diff/gitHub.cls

+133 −0 cls/sc/diff/gitLocal.cls

+36 −0 cls/sc/diff/utils.cls
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS*
+.vscode
 
 dev.md
 
diff --git a/README.md b/README.md
@@ -4,7 +4,8 @@ Export/Import sources in UDL format for [ISC Caché 2016.2](http://www.intersyst
 # Installation
 Download code and run
 ```
-do $System.OBJ.ImportDir("/dir/cache-udl","*.xml;*.cls;*.mac;*.int;*.inc;*.dfi","ck",,1)
+set dir="/dir/cache-udl
+do $System.OBJ.ImportDir(dir,"*.xml;*.cls;*.mac;*.int;*.inc;*.dfi","ck",,1)
 ```
 or
 import the [release](https://github.com/intersystems-ru/cache-udl/releases) to the namespace.
@@ -26,13 +27,23 @@ NS> d ##class(sc.code).export()
 NS> d ##class(sc.code).import()
 ```
 
-## Compile and Release:
+## Compile, Release and Patch:
 
-Introduce cos.json file in the source root directory with settings for the code mask and for the name of the project. e.g.
+Introduce isc.json file in the source root directory with settings for the code mask, for the name of the project and for get the patch form local git or GitHub. e.g.
 ```
-cos.json
+"git": 0 - files diff from local git
+"git": 1 - files diff from GitHub
+```
+
+```
+isc.json
  "compileList": "Classes*.INC,classes*.CLS,*.DFI",
- "projectName": "myproject"
+ "projectName": "myproject",
+ "git": 0,
+ "owner": "owner",
+ "repository": "repository",
+ "user": "user",
+ "password": "password"
 ```
 Run init method to initialize project settings:
 ```
@@ -46,6 +57,14 @@ Or compile it whenever you want to compile all the proejct related resources.
 ```
 NS> d ##class(sc.code).compile()
 ```
+Get last changes from github or local git. Run patch to export the classes in comileList into one "patch.xml" patch file. It will export it into the default for current Namespace directory or you can choose where export. By default, makes a patch from the last commit if you do not specify `commitFrom` and `commitTo` e.g.
+```
+NS> s filename = "c:\patch.xml"
+NS> s commitFrom = 1
+NS> s commitTo = 5
+NS> d ##class(sc.code).patch(filename,commitFrom,commitTo)
+```
+
 
 
 

diff --git a/sc.code.cls → cls/sc/code.cls b/sc.code.cls → cls/sc/code.cls
@@ -5,7 +5,7 @@ Class sc.code [ Abstract ]
 {
 
 /// export all available code
-ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = "")
+ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = "", dfi = 0)
 {
 
 	#define export(%code, %file) s sc = $system.OBJ.ExportUDL(%code, %file,"/diffexport") ##continue
@@ -52,6 +52,7 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = ""
     	while rs.%Next() {
 
 	 		s code = rs.Name
+	 		w code,!
 	 		if ( 'generated && $$$isGenerated( code ) ) continue
 	 		if ( 'percent && $$$isPercented( code ) ) continue
 			if ( 'mapped && $$$isMapped( code ) ) continue
@@ -67,17 +68,29 @@ ClassMethod export(generated = 0, system = 0, percent = 0, mapped = 0, mask = ""
 
 
 	#; dfi
+	do ..fixDashIntoName()
 	#define export(%code,%file) s sc = ##class(%DeepSee.UserLibrary.Utils).%Export( %code, %file, 0 ) 
-
-	s sql = "Select fullName as Name From %DeepSee_UserLibrary.FolderItem"
+	
+	s sql = "Select id, fullName as Name, documentName From %DeepSee_UserLibrary.FolderItem"
     s rs = ##class(%SQL.Statement).%ExecDirect( .stm, sql )
     while rs.%Next() {
-		s code = rs.Name, filename = ..filename( code_".dfi" )
-		if ( '$find( code, mask ) ) continue
+		set code = rs.Name
+		set filename = ..filename( code_".dfi" )
+		set documentName = rs.documentName
+
+		if ( '$find($zcvt(documentName,"l"), mask ) ) continue
 		if ($L(code,"$TRASH")>1) continue
 		$$$mkdir( filename )
-		$$$log
-		$$$export(code,filename)
+
+		if dfi{
+			$$$log
+			$$$export( code, filename)
+		}
+		elseif ('dfi){
+			set documentName = $replace(documentName,"/","-")
+			set filename = $extract(filename,1,*-4)
+			do ..fixXMLLine(documentName,filename_".xml")
+		}
 
 	} s rs=""
 
@@ -111,10 +124,11 @@ ClassMethod import(filemask = "*.xml;*.cls;*.mac;*.int;*.inc;*.dfi", qspec = "ck
 			// check file filter
 			if ..inFilter(.fm,filename) continue
 
-			s ext = $p( filename, ".", * )
+			s ext = $zcvt($p( filename, ".", * ),"l")
 
-			if $zcvt( ext, "l" ) = "dfi" {
+			if (ext = "dfi") {
 				s sc = ##class(%DeepSee.UserLibrary.Utils).%Import( filename, 1, 0, 0, "", .dsloaded )
+
 			} else {
 				// load classes only
 				s sc = $system.OBJ.Load( filename, "k-d", .err, .loaded)
@@ -143,7 +157,53 @@ ClassMethod import(filemask = "*.xml;*.cls;*.mac;*.int;*.inc;*.dfi", qspec = "ck
 	Q sc
 }
 
-ClassMethod inFilter(ByRef filtermask,filename) as %Boolean
+ClassMethod patch(filename = "", commitFrom = "", commitTo = "") As %Status
+{
+	s gln = ..gln()
+	s git = @gln@("git")
+
+	set:commitTo="" commitTo=1
+	if (git = 0) {
+		set:(commitFrom="")||(commitFrom=1) commitFrom=0
+		set sc = ##class(sc.diff.gitLocal).buildDiff(..workdir(), "HEAD~"_commitTo, "HEAD~"_commitFrom, .items)
+		return:$$$ISERR(sc) sc
+	}elseif(git = 1) {
+		set owner = @gln@("owner")
+		set repository = @gln@("repository")
+		set user = @gln@("user")
+		set password = @gln@("password")
+		set:commitFrom="" commitFrom=1
+
+		set sc = ##class(sc.diff.gitHub).Get(.items, owner, repository, user, password, commitFrom, commitTo)
+		return:$$$ISERR(sc) sc	
+	}
+
+	if (filename="") {
+		set filename=$G(@gln@("projectName"),"patch")
+		set filename=filename_$p($zdt($h,8)," ")_$tr($p($p($zdt($h)," ",2),":",1,2),":")_".xml"	
+	}
+	zw filename
+	set sc = $system.OBJ.Export(.items,filename)
+
+	return sc
+}
+
+ClassMethod fixXMLLine(documentName, filename) As %Status
+{
+	set stream = ##class(%Stream.FileBinary).%New()
+	do stream.LinkToFile(filename)
+	do $system.OBJ.ExportToStream(documentName, .stream)
+
+	set matcher=##class(%Regex.Matcher).%New("<Export generator=.+>")
+	set matcher.Text = stream.Read(stream.Size)
+	set data = matcher.ReplaceFirst("<Export generator=""Cache"">")
+
+	do stream.Clear()
+	do stream.Write(data)
+	return stream.%Save()
+}
+
+ClassMethod inFilter(ByRef filtermask, filename) As %Boolean
 {
 	s result=0
 	for 
@@ -158,7 +218,7 @@ ClassMethod inFilter(ByRef filtermask,filename) as %Boolean
 
 /// get the filtermask for the repository.
 /// looks for .gitignore file and applies all the lines to filters
-ClassMethod setIgnore(ByRef filtermask) 
+ClassMethod setIgnore(ByRef filtermask)
 {
 
 	// working with .gitignore file
@@ -176,10 +236,9 @@ ClassMethod setIgnore(ByRef filtermask)
 	{
 		s filtermask($I(filtermask))=file.ReadLine()
 	}
-quit
+	quit
 }
 
-
 /// get or set working directory for export/import source
 ClassMethod workdir(workdir)
 {
@@ -195,23 +254,36 @@ ClassMethod gln() [ CodeMode = expression, Private ]
 "^"_$classname()
 }
 
-
-
-ClassMethod init()
+ClassMethod init(confile = "isc.json")
 {
-	#define confile "/cos.json"
 	set stream=##class(%Stream.FileCharacter).%New()
-	set sc=stream.LinkToFile(..workdir()_$$$confile)
+	set sc=stream.LinkToFile(..workdir()_"/"_confile)
 	s conf={}.%FromJSON(stream.Read($$$MaxCacheInt))
+
 	s gln=..gln()
+
 	s @gln@("compileList")=conf.compileList
 	s @gln@("projectName")=conf.projectName
+	s @gln@("owner")=conf.owner
+	s @gln@("repository")=conf.repository
+	s @gln@("user")=conf.user
+	s @gln@("password")=conf.password
+	s @gln@("git")=conf.git
+
 	w "compileList="_conf.compileList,!
-	w "projectName="_conf.projectName
+	w "projectName="_conf.projectName,!
+	w "owner="_conf.owner,!
+	w "repository="_conf.repository,!
+	w "user="_conf.user,!
+	w "password="_conf.password,!
+	w "git="_conf.git,!
+
+	quit $$$OK
 }
 
 /// export release file for list and project settings
-ClassMethod release() {
+ClassMethod release()
+{
 	s gln=..gln()
 	s list=$G(@gln@("compileList"))
 	if list="" w "Nothing to release. Run init method first" quit
@@ -222,7 +294,8 @@ ClassMethod release() {
 	w "All objects with mask "_list_" has been exported to "_release
 }
 
-ClassMethod compile() {
+ClassMethod compile()
+{
 	s gln=..gln()
 	s list=$G(@gln@("compileList"))
 	if list="" w "Nothing to compile. Run init method first" quit
@@ -303,10 +376,8 @@ ClassMethod importUpdated(filemask = "*.*", qspec = "cku-d", ByRef err = "", rec
 
 		   if ( filets '] codets ) continue
 
-		   if ext = "dfi" {
-
-			   s sc = ##class(%DeepSee.UserLibrary.Utils).%Import( filename, 1, 0, 0, "", .loaded )
-
+		   if (ext = "dfi"){
+				s sc = ##class(%DeepSee.UserLibrary.Utils).%Import( filename, 1, 0, 0, "", .dsloaded )
 		   } else {
 
 			   #; drop existing code before import ( purge DateModified )
@@ -354,6 +425,23 @@ ClassMethod codets(codename, ext)
 	Q $p( ts, "." ) ;remove ms
 }
 
+// fix "-" into dfi files
+
+ClassMethod fixDashIntoName()
+{
+	s sql = "Select id, fullName as Name, documentName From %DeepSee_UserLibrary.FolderItem"
+    s rs = ##class(%SQL.Statement).%ExecDirect( .stm, sql )
+    while rs.%Next() {
+		if $find(rs.Name, "-"){
+			w rs.Name," -> "
+			set item = ##class(%DeepSee.UserLibrary.FolderItem).%OpenId(rs.id)
+			set item.name = $replace(item.name,"-"," ")
+			w item.name,!
+			do item.%Save()
+		}
+    }
+    k rs
+}
 
 }
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     .DS*
+    .vscode
     dev.md