Merge pull request #333 from worldbank/v7.2

Merging V7.2 to main
worldbank · Apr 10, 2023 · f8a161f · f8a161f
2 parents 903b2d8 + b6e45e9
commit f8a161f
Show file tree

Hide file tree

Showing 27 changed files with 196 additions and 121 deletions.
diff --git a/run/ieboilstart.do b/run/ieboilstart.do
@@ -2,20 +2,28 @@
 
     global rieboil "${runoutput}/ieboilstart"
 
-    //cap which iefieldkit
-    //if _rc == 111 ssc install iefieldkit
-
      * Load the command from file and utils
 	qui	do "${ietoolkit_clone}/src/ado_files/ieboilstart.ado"
     qui do "${ietoolkit_clone}/src/ado_files/ietoolkit.ado"
 
+
+    * Testing old "default" syntax
+    cap ieboilstart , version(13.1) adopath("${rieboil}/ado1")
+    assert _rc == 198
+
+    * Load the command from file and utils
+	qui	do "${ietoolkit_clone}/src/ado_files/ieboilstart.ado"
+    qui do "${ietoolkit_clone}/src/ado_files/ietoolkit.ado"  
+
 	* Set PERSONAL path
-	ieboilstart , version(13.1) adopath("${rieboil}/ado1")
+	ieboilstart , version(13.1) adopath("${rieboil}/ado1", nostrict)
 	`r(version)'
 
     *Test mock command in this ado path
     ado1
 
+    * NOTE THAT THIS LINE WILL CAUSE AN ERROR IF THIS RUN FILE IS RAN TWICE
+    * WITHOUT RESTARTING STATA INBETWEEN
     iefieldkit
 
 

diff --git a/src/ado_files/iebaltab.ado b/src/ado_files/iebaltab.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 	capture program drop   iebaltab,
 	        program define iebaltab, rclass

diff --git a/src/ado_files/ieboilstart.ado b/src/ado_files/ieboilstart.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
   capture program drop ieboilstart
   program ieboilstart , rclass
@@ -78,8 +78,14 @@
       local apath   = trim("`apath'")
       local aoption = trim(subinstr("`aoption'",",","",1))
 
-      if !missing("`aoption'") & "`aoption'" != "strict" {
-        noi di as error `"{phang}The suboption [`aoption'] in the option [`adopath'] is not a valid suboption. See help file for more details.{p_end}"'
+      if missing("`aoption'") | !inlist("`aoption'", "strict", "nostrict") {
+        if missing("`aoption'") {
+          local aopterr `"You did not provide any sub-option."'
+        }
+        else {
+          local aopterr `"You provided the sub-option [`aoption']."'
+        }
+        noi di as error `"{phang}The option [`adopath'] requires one of the sub-options [strict] or [nostrict]. `aopterr' See help file for more details.{p_end}"'
         error 198
       }
 
@@ -106,6 +112,9 @@
           if _rc local morepaths 0
         }
 
+        * Update the paths where mata search for commands to mirror adopath
+        mata: mata mlib index
+
         local aoutput `"`aoutput'PLUS adopath was set to [`apath']. All adopaths other than this and BASE have been removed. Only programs and ado-files in this PLUS folder are accessible to Stata until the end of this session."'
       }
       else {

diff --git a/src/ado_files/ieddtab.ado b/src/ado_files/ieddtab.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 cap program drop 	ieddtab
 	program define	ieddtab, rclass

diff --git a/src/ado_files/iedorep.ado b/src/ado_files/iedorep.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 cap  program drop  iedorep
   program define   iedorep, rclass

diff --git a/src/ado_files/iedropone.ado b/src/ado_files/iedropone.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 	capture program drop 	iedropone
 			program define 	iedropone ,

diff --git a/src/ado_files/iefolder.ado b/src/ado_files/iefolder.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 cap program drop 	iefolder
 	program define	iefolder

diff --git a/src/ado_files/iegitaddmd.ado b/src/ado_files/iegitaddmd.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 cap program drop   iegitaddmd
 	program define iegitaddmd

diff --git a/src/ado_files/iegraph.ado b/src/ado_files/iegraph.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 cap	program drop	iegraph
 	program define 	iegraph, rclass

diff --git a/src/ado_files/iekdensity.ado b/src/ado_files/iekdensity.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 	cap prog drop    iekdensity
 		prog define  iekdensity

diff --git a/src/ado_files/iematch.ado b/src/ado_files/iematch.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 	cap program drop 	iematch
 	    program define	iematch

diff --git a/src/ado_files/iesave.ado b/src/ado_files/iesave.ado
@@ -1,4 +1,4 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 capture program drop iesave
 		program      iesave , rclass

diff --git a/src/ado_files/ietoolkit.ado b/src/ado_files/ietoolkit.ado
@@ -1,11 +1,11 @@
-*! version 7.1 19JAN2023 DIME Analytics [email protected]
+*! version 7.2 04APR2023 DIME Analytics [email protected]
 
 capture program drop ietoolkit
 program ietoolkit, rclass
 
 	* UPDATE THESE LOCALS FOR EACH NEW VERSION PUBLISHED
-	local version "7.1"
-	local versionDate "19JAN2023"
+	local version "7.2"
+	local versionDate "04APR2023"
 
 	syntax [anything]
 

diff --git a/src/help_files/iebaltab.sthlp b/src/help_files/iebaltab.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* 19 Jan 2023}{...}
+{* 04 Apr 2023}{...}
 {hline}
 help for {hi:iebaltab}
 {hline}