clean up

Author: evshvarov

Dockerfile

@@ -2,11 +2,7 @@ ARG IMAGE=intersystemsdc/irishealth-community
 ARG IMAGE=intersystemsdc/iris-community
 FROM $IMAGE
 
-USER root   
-## add git
-RUN apt update && apt-get -y install git
-        
-USER ${ISC_PACKAGE_MGRUSER}
+WORKDIR /home/irisowner/irisbuild
 
 ARG TESTS=0
 ARG MODULE="objectscript-template"

dev.md

@@ -11,7 +11,7 @@ docker rm -f $(docker ps -qa)
 
 ## build container with no cache
 ```
-docker-compose build --no-cache
+docker-compose build --no-cache --progress=plain
 ```
 ## start iris container
 ```
@@ -20,9 +20,20 @@ docker-compose up -d
 
 ## open iris terminal in docker
 ```
-docker-compose exec iris iris session iris -U IRISAPP
+docker-compose exec iris iris session iris -U USER
 ```
 
+## map iris key from Mac home directory to IRIS in container
+- ~/iris.key:/usr/irissys/mgr/iris.key
+
+## install git in the docker image
+## add git in dockerfile
+USER root
+RUN apt update && apt-get -y install git
+
+USER ${ISC_PACKAGE_MGRUSER}
+
+
 ## install docker-compose
 ```
 sudo curl -L "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
@@ -61,5 +72,27 @@ zn "%SYS" \
   write "Web application "_webName_" has been created!",! 
 ```
 
-zw ##class(community.csvgen).GenerateFromURL("https://github.com/h2oai/h2o-tutorials/raw/master/h2o-world-2017/automl/data/product_backorders.csv")
 
+
+```
+do $SYSTEM.OBJ.ImportDir("/opt/irisbuild/src",, "ck") 
+```   
+
+
+### run tests described in the module
+
+IRISAPP>zpm
+IRISAPP:zpm>load /irisrun/repo
+IRISAPP:zpm>test package-name
+
+### install ZPM with one line
+    // Install ZPM
+    set $namespace="%SYS", name="DefaultSSL" do:'##class(Security.SSLConfigs).Exists(name) ##class(Security.SSLConfigs).Create(name) set url="https://pm.community.intersystems.com/packages/zpm/latest/installer" Do ##class(%Net.URLParser).Parse(url,.comp) set ht = ##class(%Net.HttpRequest).%New(), ht.Server = comp("host"), ht.Port = 443, ht.Https=1, ht.SSLConfiguration=name, st=ht.Get(comp("path")) quit:'st $System.Status.GetErrorText(st) set xml=##class(%File).TempFilename("xml"), tFile = ##class(%Stream.FileBinary).%New(), tFile.Filename = xml do tFile.CopyFromAndSave(ht.HttpResponse.Data) do ht.%Close(), $system.OBJ.Load(xml,"ck") do ##class(%File).Delete(xml)
+
+
+## add git
+USER root   
+
+RUN apt update && apt-get -y install git
+        
+USER ${ISC_PACKAGE_MGRUSER}

iris.script

@@ -4,5 +4,5 @@
     Do ##class(Security.Users).UnExpireUserPasswords("*")
 
     zn "USER"
-    zpm "load /opt/irisbuild/ -v":1:1
+    zpm "load /home/irisowner/irisbuild/ -v":1:1
     halt

module.xml

@@ -6,7 +6,7 @@
       <Version>1.1.2</Version>
       <Packaging>module</Packaging>
       <SourcesRoot>src</SourcesRoot>
-      <Resource Name="dc.PackageSample.PKG"/>
+      <Resource Name="dc.sample.PKG"/>
     </Module>
   </Document>
 </Export>

src/dc/PackageSample/ObjectScript.cls

@@ -0,0 +1,11 @@
+Class dc.sample.ObjectScript
+{
+
+ClassMethod Test() As %Status
+{
+    set a=42 
+    write "It works!",!
+    return a
+}
+
+}

src/dc/sample/ObjectScript.cls

@@ -1,13 +1,26 @@
-Class dc.PackageSample.PersistentClass Extends %Persistent
+Class dc.sample.PersistentClass Extends %Persistent
 {
 
 Property Test As %VarString;
 
-ClassMethod CreateRecord() As %Status
+ClassMethod CreateRecord(ByRef id As %Integer) As %Status
 {
-    s objPC=..%New()
-    s objPC.Test="Test string"
-    return objPC.%Save()
+    set sc=$$$OK
+    set objPC=..%New()
+    set objPC.Test="Test string"
+    set sc=objPC.%Save()
+    set id=objPC.%Id()
+    return sc
+}
+
+/// opens the record by id and reads its property
+ClassMethod ReadProperty(id As %Integer) As %Status
+{
+    Set sc = $$$OK
+    #dim obj as dc.sample.PersistentClass
+    set obj=..%OpenId(id,,.sc)
+    if $ISOBJECT(obj) write obj.Test
+    Return sc
 }
 
 Storage Default

src/dc/PackageSample/PersistentClass.cls renamed to src/dc/sample/PersistentClass.cls

@@ -0,0 +1,11 @@
+Class dc.sample.unittests.TestObjectScript Extends %UnitTest.TestCase
+{
+
+Method Test42()
+{
+	Set tExpected=42
+    set tResults= ##class(dc.sample.ObjectScript).Test()
+	Do $$$AssertEquals(tResults,tExpected,tExpected_" = "_tResults)
+}
+
+}

tests/dc/sample/unittests/TestObjectScript.cls

@@ -0,0 +1,16 @@
+Class dc.sample.unittests.TestCreateRecord Extends %UnitTest.TestCase
+{
+
+Method TestCreateRecord()
+{
+	Set tExpected="Test string"
+	set status=##class(dc.sample.PersistentClass).CreateRecord(.id)
+	do $$$AssertStatusOK(status,"CreateRecord")
+	set obj=##class(dc.sample.PersistentClass).%OpenId(id)
+    if $IsObject(obj) {
+        set tResults=obj.Test}
+    else {set tResults="There is no such record with id="_id}
+    Do $$$AssertEquals(tResults,tExpected,tExpected_" = "_tResults)
+}
+
+}