Merge pull request #44 from worldbank/v2.1-hotfix

V2.1 hotfix
worldbank · May 20, 2024 · 672f841 · 672f841
2 parents ef8524a + 0b79a70
commit 672f841
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Currently, this toolkit has the following commands:
 | Command | Description |
 | --- | --- |
 | [repado](https://worldbank.github.io/repkit/reference/repado.html) | Command used to manage project ado command dependencies. This command provides a way to make sure that all team members as well as future reproducers of the projects code use the exact same version of all command dependencies. |
+| [repadolog](https://worldbank.github.io/repkit/reference/repadolog.html) | Outputs a report of what commands are installed in the PLUS folder. |
 | [repkit](https://worldbank.github.io/repkit/reference/repkit.html) | Command named the same as the package. Most important purpose is that this command makes the code `which repkit` work. |
 | [reproot](https://worldbank.github.io/repkit/reference/reproot.html) | This command allows teams to dynamically set root-paths with no manual user-specific set-up, in both single-rooted and multi-rooted projects. |
 | [reprun](https://worldbank.github.io/repkit/reference/reprun.html) | This command is used to automate reproducibility checks by running a do-file or a set of do-files and compare all state values (RNG-value, datasignature etc.) between the two runs. This command is currently only release as a beta-version. |

diff --git a/src/ado/repado.ado b/src/ado/repado.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   repado
     program define repado, rclass

diff --git a/src/ado/repadolog.ado b/src/ado/repadolog.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   repadolog
     program define repadolog
@@ -91,7 +91,7 @@ qui {
     * Create a frame to store all pkg info and command info
     tempname pkg_frame
     frame create `pkg_frame' ///
-      str500(package_name distribution_date download_date command_name checksum notes) str2000(commands source) byte(is_cmd)
+      str500(package_name distribution_date download_date command_name checksum) strL(notes commands source) byte(is_cmd)
 
     * Read the trk file
     tempname trk_read
@@ -137,7 +137,7 @@ qui {
             local commands "`commands', `r(command_name)'"
             local cmd_name_`cmd_count' = "`r(command_name)'"
             local cmd_chck_`cmd_count' = "`r(checksum)'"
-            local cmd_note_`cmd_count' = "`r(notes)'"
+            local cmd_note_`cmd_count' = `"`r(notes)'"'
           }
         }
 
@@ -158,7 +158,7 @@ qui {
 
           * Write command line to the data frame
           forvalues i = 1/`cmd_count' {
-            frame post `pkg_frame' ("`pkgname'") ("`distdate'") ("`downdate'") ("`cmd_name_`i''") ("`cmd_chck_`i''") ("`cmd_note_`i''") ("") ("`source'") (1)
+            frame post `pkg_frame' ("`pkgname'") ("`distdate'") ("`downdate'") ("`cmd_name_`i''") ("`cmd_chck_`i''") (`"`cmd_note_`i''"') ("") ("`source'") (1)
           }
 
           * Resetting all locals
@@ -267,7 +267,7 @@ qui {
         }
 
         * Clean up notes
-        local notes = trim(subinstr(`"`macval(notes)'"',",","",1))
+        local notes =trim(itrim(subinstr(`"`macval(notes)'"',",","",1)))
       }
 
       * Return dofile locals

diff --git a/src/ado/repkit.ado b/src/ado/repkit.ado
@@ -1,13 +1,13 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   repkit
     program define repkit, rclass
 
     version 14.1
 
     * UPDATE THESE LOCALS FOR EACH NEW VERSION PUBLISHED
-    local version "2.0" 
-    local versionDate "20240509" 
+    local version "2.1" 
+    local versionDate "20240516" 
     local cmd    "repkit"
 
   	syntax [anything]

diff --git a/src/ado/reproot.ado b/src/ado/reproot.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   reproot
     program define reproot, rclass

diff --git a/src/ado/reproot_parse.ado b/src/ado/reproot_parse.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   reproot_parse
     program define reproot_parse, rclass

diff --git a/src/ado/reproot_search.ado b/src/ado/reproot_search.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   reproot_search
     program define reproot_search, rclass

diff --git a/src/ado/reprun.ado b/src/ado/reprun.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 cap program drop   reprun
     program define reprun, rclass

diff --git a/src/ado/reprun_dataline.ado b/src/ado/reprun_dataline.ado
@@ -1,4 +1,4 @@
-*! version 2.0 20240509 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
+*! version 2.1 20240516 - DIME Analytics & LSMS Team, The World Bank - [email protected], [email protected]
 
 * Command intended to exclusively be run from the run files
 * that the command iedorep is generating

diff --git a/src/repkit.pkg b/src/repkit.pkg
@@ -1,6 +1,6 @@
 * This package file is generated in the adodown workflow. Do not edit directly.
 *** version
-v 2.0
+v 2.1
 *** title
 d 'REPKIT': a module facilitating collaboration and computational reproducibility
 *** description
@@ -21,7 +21,7 @@ d Contact: dimeanalytics@@worldbank.org, lsms@@worldbank.org
 d URL: https://github.com/worldbank/repkit
 d
 *** date
-d Distribution-Date: 20240509
+d Distribution-Date: 20240516
 d
 *** adofiles
 f ado/repadolog.ado

diff --git a/src/sthlp/repado.sthlp b/src/sthlp/repado.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* *! version 2.0 20240509}{...}
+{* *! version 2.1 20240516}{...}
 {hline}
 {pstd}help file for {hi:repado}{p_end}
 {hline}

diff --git a/src/sthlp/repadolog.sthlp b/src/sthlp/repadolog.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* *! version 2.0 20240509}{...}
+{* *! version 2.1 20240516}{...}
 {hline}
 {pstd}help file for {hi:repadolog}{p_end}
 {hline}

diff --git a/src/sthlp/repkit.sthlp b/src/sthlp/repkit.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* *! version 2.0 20240509}{...}
+{* *! version 2.1 20240516}{...}
 {hline}
 {pstd}help file for {hi:repkit}{p_end}
 {hline}

diff --git a/src/sthlp/reproot.sthlp b/src/sthlp/reproot.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* *! version 2.0 20240509}{...}
+{* *! version 2.1 20240516}{...}
 {hline}
 {pstd}help file for {hi:reproot}{p_end}
 {hline}

diff --git a/src/sthlp/reprun.sthlp b/src/sthlp/reprun.sthlp
@@ -1,5 +1,5 @@
 {smcl}
-{* *! version 2.0 20240509}{...}
+{* *! version 2.1 20240516}{...}
 {hline}
 {pstd}help file for {hi:reprun}{p_end}
 {hline}