diff --git a/README.md b/README.md index ef9ad5f..a12b126 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Don't forget to give the repository a **STAR** and become [stargazer](https://gi ### Current version: -**The latest version** of the **SAS Packages Framework** is **`20260126`**. +**The latest version** of the **SAS Packages Framework** is **`20260202`**. --- diff --git a/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf b/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf index 002f75c..204d9fd 100644 Binary files a/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf and b/SPF/Documentation/SAS(r) packages - the way to share (a how to)- Paper 4725-2020 - extended.pdf differ diff --git a/SPF/Macros/bundlePackages.sas b/SPF/Macros/bundlePackages.sas index ebed5bf..c8bec1d 100644 --- a/SPF/Macros/bundlePackages.sas +++ b/SPF/Macros/bundlePackages.sas @@ -8,7 +8,7 @@ ,packagesRef=packages ,ods= /* data set for report file */ )/ -des='Macro to create a bundle of SAS packages, version 20260126. Run %bundlePackages(HELP) for help info.' +des='Macro to create a bundle of SAS packages, version 20260202. Run %bundlePackages(HELP) for help info.' secure minoperator ; @@ -25,7 +25,7 @@ secure minoperator %put ### This is short help information for the `bundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *create bundles* of SAS packages, version `20260126` #; + %put # Macro to *create bundles* of SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/extendpackagesfileref.sas b/SPF/Macros/extendpackagesfileref.sas index ad7cafb..2c258e5 100644 --- a/SPF/Macros/extendpackagesfileref.sas +++ b/SPF/Macros/extendpackagesfileref.sas @@ -6,7 +6,7 @@ when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20260126. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20260202. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -22,7 +22,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20260126 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20260126` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/generatepackage.sas b/SPF/Macros/generatepackage.sas index d335920..1caf4f2 100644 --- a/SPF/Macros/generatepackage.sas +++ b/SPF/Macros/generatepackage.sas @@ -3,7 +3,7 @@ Macro to generate SAS packages. - Version 20260126 + Version 20260202 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -53,7 +53,7 @@ when empty takes buildLocation */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20260126. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20260202. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -68,7 +68,7 @@ des = 'Macro to generate SAS packages, version 20260126. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #------------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20260126` #; + %put # Macro to generate SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -444,10 +444,10 @@ options NOquotelenmax NOstimer NOfullstimer; */ data _null_; call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); -run; +/*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* test if version is a number */ -data _null_; +/*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ v = "&packageVersion."; version = coalesce(input(scan(v,1,".","M"), ?? best32.),0)*1e8 + coalesce(input(scan(v,2,".","M"), ?? best32.),0)*1e4 @@ -950,7 +950,7 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title&_titleNumber_. "Package ZIP file location is: &buildLocation."; %end; -footnote1 "SAS Packages Framework, version 20260126"; +footnote1 "SAS Packages Framework, version 20260202"; proc print data = &filesWithCodes.(drop=base build folderRef fileRef rc folderid _abort_ fileId additionalContent) @@ -1775,7 +1775,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' - / ' !! '' %put with the SAS Packages Framework version 20260126.;''' + / ' !! '' %put with the SAS Packages Framework version 20260202.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -1939,7 +1939,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !! ' / - ''' %put with the SAS Packages Framework version 20260126.; '' !! ' / + ''' %put with the SAS Packages Framework version 20260202.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -2810,7 +2810,7 @@ data _null_; %end; put 'put " " / @3 "---------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20260126`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20260202`*";' / "put @3 '*under `&sysscp.`(`&sysscpl.`) operating system,*';" / "put @3 '*using SAS release: `&sysvlong4.`.*';" / 'put " " / @3 "---------------------------------------------------------------------";'; diff --git a/SPF/Macros/helppackage.sas b/SPF/Macros/helppackage.sas index 44e0acf..5b10ca9 100644 --- a/SPF/Macros/helppackage.sas +++ b/SPF/Macros/helppackage.sas @@ -28,7 +28,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20260202. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -43,7 +43,7 @@ des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20260126` #; + %put # Macro to get help about SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -133,18 +133,20 @@ des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); diff --git a/SPF/Macros/installpackage.sas b/SPF/Macros/installpackage.sas index b77f7ad..bbb8673 100644 --- a/SPF/Macros/installpackage.sas +++ b/SPF/Macros/installpackage.sas @@ -1,5 +1,5 @@ /*+installPackage+*/ -/* Macros to install SAS packages, version 20260126 */ +/* Macros to install SAS packages, version 20260202 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by @@ -26,7 +26,7 @@ /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20260126. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20260202. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -41,7 +41,7 @@ des = 'Macro to install SAS package, version 20260126. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20260126` #; + %put # Macro to install SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/ispackagesfilerefok.sas b/SPF/Macros/ispackagesfilerefok.sas index fb35d85..23ae1f3 100644 --- a/SPF/Macros/ispackagesfilerefok.sas +++ b/SPF/Macros/ispackagesfilerefok.sas @@ -4,7 +4,7 @@ vERRb /* indicates if macro should be verbose and report errors */ ) / minoperator PARMBUFF -des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260126.' +des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260202.' ; /*** HELP END ***/ %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then @@ -20,7 +20,7 @@ des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFile %put ### This is short help information for the `isPackagesFilerefOK` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to check if the `packages` fileref is "correct", version `20260126` #; + %put # Macro to check if the `packages` fileref is "correct", version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/listpackages.sas b/SPF/Macros/listpackages.sas index 6890beb..29d2202 100644 --- a/SPF/Macros/listpackages.sas +++ b/SPF/Macros/listpackages.sas @@ -3,7 +3,7 @@ Macro to list SAS packages in packages folder. - Version 20260126 + Version 20260202 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -25,7 +25,7 @@ listDataSet /* Name of a data set to save results */ , quiet = 0 /* Indicate if results should be printed in log */ )/secure parmbuff -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260126.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260202.' ; %if (%QUPCASE(&listDataSet.) = HELP) %then %do; @@ -40,7 +40,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20260126` #; + %put # Macro to list available SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -250,7 +250,7 @@ run; %if 0=&quiet. %then %do; %put %str( ); - %put # Results ptovided in the &listDataSet. data set. #; + %put # Results provided in the &listDataSet. data set. #; %put %str( ); %end; %end; diff --git a/SPF/Macros/loadpackage.sas b/SPF/Macros/loadpackage.sas index 304ad40..9566965 100644 --- a/SPF/Macros/loadpackage.sas +++ b/SPF/Macros/loadpackage.sas @@ -36,7 +36,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20260126. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20260202. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -52,7 +52,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20260126` #; + %put # Macro to *load* SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -180,30 +180,34 @@ minoperator %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); - run; + /*run;*/ /* moved to line 272 */ /* convert cherryPick to lower case if needed */ %if NOT (%str(*) = %superq(cherryPick)) %then %do; - data _null_; + /*data _null_;*/ call symputX("cherryPick",lowcase(compbl(compress(symget("cherryPick"),". _","KDA"))),"L"); - run; + /*run;*/ %end; + run; + /* empty list is equivalent to "*" */ %if %superq(cherryPick)= %then %do; diff --git a/SPF/Macros/loadpackageaddcnt.sas b/SPF/Macros/loadpackageaddcnt.sas index 3be553c..6b29fac 100644 --- a/SPF/Macros/loadpackageaddcnt.sas +++ b/SPF/Macros/loadpackageaddcnt.sas @@ -19,7 +19,7 @@ is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20260126. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20260202. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -35,7 +35,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20260126` #; + %put # Macro to *load* additional content for a SAS package, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -116,20 +116,22 @@ minoperator options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc; %local _PackageFileref_; - data _null_; - call symputX("_PackageFileref_", "A" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - call symputX("_TargetFileref_", "T" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + data _null_; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "A" !! put(MD5(strip(packageName)), hex7. -L), "L"); + call symputX("_TargetFileref_", "T" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); diff --git a/SPF/Macros/loadpackages.sas b/SPF/Macros/loadpackages.sas index b72987c..4fb2f25 100644 --- a/SPF/Macros/loadpackages.sas +++ b/SPF/Macros/loadpackages.sas @@ -11,7 +11,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20260126. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20260202. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -27,7 +27,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20260126` #; + %put # Macro wrapper for the loadPackage macro, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/previewpackage.sas b/SPF/Macros/previewpackage.sas index d9913de..26b1a96 100644 --- a/SPF/Macros/previewpackage.sas +++ b/SPF/Macros/previewpackage.sas @@ -23,7 +23,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20260126. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20260202. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -38,7 +38,7 @@ des = 'Macro to preview content of a SAS package, version 20260126. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20260126` #; + %put # Macro to get preview of a SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -119,18 +119,20 @@ des = 'Macro to preview content of a SAS package, version 20260126. Run %preview %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); diff --git a/SPF/Macros/relocatepackage.sas b/SPF/Macros/relocatepackage.sas index d130379..dcfb842 100644 --- a/SPF/Macros/relocatepackage.sas +++ b/SPF/Macros/relocatepackage.sas @@ -15,7 +15,7 @@ ,psMAX=MAX /* pageSise in case executed inside DoSubL() */ ,ods= /* a data set for results, e.g., work.relocatePackageReport */ ) -/ des = 'Utility macro that locally Copies or Moves Packages, version 20260126. Run %relocatePackage() for help info.' +/ des = 'Utility macro that locally Copies or Moves Packages, version 20260202. Run %relocatePackage() for help info.' secure minoperator ; @@ -33,7 +33,7 @@ %put ### This is short help information for the `relocatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260126` #; + %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/saspackagesframeworknotes.sas b/SPF/Macros/saspackagesframeworknotes.sas index c4efc7f..88503b2 100644 --- a/SPF/Macros/saspackagesframeworknotes.sas +++ b/SPF/Macros/saspackagesframeworknotes.sas @@ -5,7 +5,7 @@ SPFmacroName /* space separated list of names */ / minoperator secure -des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260126. Run %SasPackagesFrameworkNotes(HELP) for help info.' +des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260202. Run %SasPackagesFrameworkNotes(HELP) for help info.' ; %local list N i element; %let list= @@ -51,7 +51,7 @@ SasPackagesFrameworkNotes %put ### This is short help information for the `SasPackagesFrameworkNotes` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro prints help notes for SAS Packages Framework macros, version `20260126` #; + %put # Macro prints help notes for SAS Packages Framework macros, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; diff --git a/SPF/Macros/spfint_gnpckg_arch.sas b/SPF/Macros/spfint_gnpckg_arch.sas index 2bf5622..591a50b 100644 --- a/SPF/Macros/spfint_gnpckg_arch.sas +++ b/SPF/Macros/spfint_gnpckg_arch.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_arch+*/ %macro SPFint_gnPckg_arch()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; diff --git a/SPF/Macros/spfint_gnpckg_markdown.sas b/SPF/Macros/spfint_gnpckg_markdown.sas index 6dc7532..9c62cbb 100644 --- a/SPF/Macros/spfint_gnpckg_markdown.sas +++ b/SPF/Macros/spfint_gnpckg_markdown.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_markdown+*/ %macro SPFint_gnPckg_markdown()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -112,7 +112,7 @@ data &filesWithCodes.markdown; %end; put " " / "---------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20260126`,*" + / "*SAS package generated by SAS Package Framework, version `20260202`,*" / "*under `&sysscp.`(`&sysscpl.`) operating system,*" / "*using SAS release: `&sysvlong4.`.*" / " " / "---------------------------------------------------------------------" / " "; diff --git a/SPF/Macros/spfint_gnpckg_tests.sas b/SPF/Macros/spfint_gnpckg_tests.sas index d4693db..7f24c9a 100644 --- a/SPF/Macros/spfint_gnpckg_tests.sas +++ b/SPF/Macros/spfint_gnpckg_tests.sas @@ -1,6 +1,6 @@ /*+SPFint_gnPckg_tests+*/ %macro SPFint_gnPckg_tests()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -85,6 +85,10 @@ run; @n '%put >>>%'"&packageName."'META(P)<<<;'/ @n '%put >>>%'"&packageName."'META(S)<<<;'/; + /* verify */ + put @n '%verifyPackage'"(&packageName.,"; + put @n " path=&buildLocation.)" /; + /* help */ put @n '%helpPackage'"(&packageName.,"; put @n " path=&buildLocation.)" /; @@ -317,6 +321,10 @@ data _null_; '%put >>req packages>%'"&packageName."'META(P)<<<;'/ '%put >>req SAS >%'"&packageName."'META(S)<<<;'/; + /* verify */ + put '%verifyPackage'"(&packageName.,"; + put " path=&buildLocation.)" /; + /* help */ put '%helpPackage'"(&packageName.," / " path=&buildLocation.)" /; diff --git a/SPF/Macros/splitcodeforpackage.sas b/SPF/Macros/splitcodeforpackage.sas index 2258ad3..db8728c 100644 --- a/SPF/Macros/splitcodeforpackage.sas +++ b/SPF/Macros/splitcodeforpackage.sas @@ -8,7 +8,7 @@ ,nobs=0 /* technical parameter */ ) /*** HELP END ***/ -/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260126. Run %splitCodeForPackage() for help info.' +/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260202. Run %splitCodeForPackage() for help info.' ; %if (%superq(codeFile) = ) OR (%qupcase(&codeFile.) = HELP) %then %do; @@ -24,7 +24,7 @@ %put #-------------------------------------------------------------------------------#; %put # #; %put # Utility macro to *split* single file with SAS package code into multiple #; - %put # files with separate snippets, version `20260126` #; + %put # files with separate snippets, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -400,7 +400,7 @@ options nomprint nosymbolgen nomlogic notes source ls=MAX ps=MAX msglevel=N ; */ if firstLine[j] then do; - put '/* File generated with help of SAS Packages Framework, version 20260126. */'; + put '/* File generated with help of SAS Packages Framework, version 20260202. */'; firstLine[j]=0; end; put _infile_; diff --git a/SPF/Macros/unbundlePackages.sas b/SPF/Macros/unbundlePackages.sas index 98057a4..97d2116 100644 --- a/SPF/Macros/unbundlePackages.sas +++ b/SPF/Macros/unbundlePackages.sas @@ -8,7 +8,7 @@ ,ods= /* data set for report file */ ,verify=0 )/ -des='Macro to extract a bundle of SAS packages, version 20260126. Run %unbundlePackages(HELP) for help info.' +des='Macro to extract a bundle of SAS packages, version 20260202. Run %unbundlePackages(HELP) for help info.' secure minoperator ; @@ -26,7 +26,7 @@ minoperator %put ### This is short help information for the `unbundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *extract* SAS packages from a bundle, version `20260126` #; + %put # Macro to *extract* SAS packages from a bundle, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -128,11 +128,10 @@ minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; -data _null_ ; +data _null_; datetime=symgetn('datetime'); length packagesList $ 32767 bundleName $ 128; - bundleName = compress(symget('bundleName'),"_.","KAD"); /* bundle name is letters, digits, and underscore, up to 128 symbols */ if bundleName NE symget('bundleName') then /* warn about illegal characters */ @@ -140,12 +139,12 @@ if bundleName NE symget('bundleName') then /* warn about illegal characters */ put "ERROR: Bundle name contains illegal characters. Exiting"; stop; end; - bundleName=lowcase(bundleName); +lbn = length(bundleName); /* to cover lengths < 7 & 11 */ /* if there is ".bundle.zip" extension added, remove it */ -if substr(strip(reverse(bundleName)),1,11) = 'piz.eldnub.' then bundleName=scan(bundleName,-3,"."); +if substr(strip(reverse(bundleName)),1,min(11,lbn)) = 'piz.eldnub.' then bundleName=scan(bundleName,-3,"."); else /* if there is ".bundle" extension added, remove it */ -if substr(strip(reverse(bundleName)),1,7) = 'eldnub.' then bundleName=scan(bundleName,-2,"."); +if substr(strip(reverse(bundleName)),1,min(7,lbn)) = 'eldnub.' then bundleName=scan(bundleName,-2,"."); put / "INFO: Bundle name is: " bundleName / ; @@ -153,7 +152,6 @@ length packagesPath $ 32767 packagesRef $ 8; packagesPath = dequote(symget('packagesPath')); packagesRef = upcase(strip(symget('packagesRef'))); - /* organize target path (location for packages) */ if " "=packagesPath then do; @@ -281,7 +279,6 @@ label package="Package name" hash="SHA256 for the Package"; /*--------------------------------------------------*/ - if 0=Q.NUM_ITEMS then /* ... if empty then exit */ do; put "WARNING: No packages to unbundle. Exiting!"; @@ -320,7 +317,6 @@ put / "INFO: The " bundleName "bundle extraction ended."; rc = doSubL(code2); put / "INFO: The " bundleName "bundle verification ended."; %end; - put " "; rc=sleep(1,1); diff --git a/SPF/Macros/unloadpackage.sas b/SPF/Macros/unloadpackage.sas index 7b73d35..5d614f2 100644 --- a/SPF/Macros/unloadpackage.sas +++ b/SPF/Macros/unloadpackage.sas @@ -20,7 +20,7 @@ */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20260202. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -35,7 +35,7 @@ des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20260126` #; + %put # Macro to unload SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -115,18 +115,20 @@ des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for h %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); diff --git a/SPF/Macros/verifypackage.sas b/SPF/Macros/verifypackage.sas index c643734..1df1aa3 100644 --- a/SPF/Macros/verifypackage.sas +++ b/SPF/Macros/verifypackage.sas @@ -8,12 +8,12 @@ , path = %sysfunc(pathname(packages)) /* location of a package, by default it looks for location of "packages" fileref */ -, hash = /* The SHA256 hash digest for +, hash = F* /* The SHA256 hash digest for the package generated by hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20260126. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20260202. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -28,7 +28,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20260126` #; + %put # Macro to verify SAS package with it hash digest, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -48,7 +48,9 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put # If empty displays this help information. #; %put # #; %put # - `hash=` A value of the package `SHA256` hash. #; - %put # Provided by the user. #; + %put # Provided by the user. When the value is not provided #; + %put # then macro calculates `SHA256`, `SHA1`, and `MD5` #; + %put # digests and display then in the log. #; %put # #; %put # - `path=` Location of a package. By default it looks for #; %put # location of the "packages" fileref, i.e. #; @@ -76,7 +78,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put ; %put %nrstr( %%installPackage(SQLinDS) %%* install the package from the Internet; ); %put %nrstr( %%verifyPackage%(SQLinDS, %%* verify the package with provided hash; ); - %put %nrstr( hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4%) ); + %put %nrstr( hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4%) ); %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~; %put #################################################################################; %put ; @@ -97,19 +99,21 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc; %local _PackageFileref_ checkExist; - data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + data _null_; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".zip")); /* check on zip files only! */ + exists + fileexist(catx("/", p, cats(packageName,".zip"))); /* check on zip files only! */ if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -142,31 +146,60 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % filename &_PackageFileref_. list; data _null_; - length providedHash $ 128; + length providedHash $ 128 packageName $ 32; providedHash = strip(symget("hash")); - select; - when ( 'F*' = upcase(substr(providedHash,1,2)) ) /* F = file digest */ - SHA256 = 'F*' !! HASHING_FILE("SHA256", pathname("&_PackageFileref_.",'F'), 0); - when ( 'C*' = upcase(substr(providedHash,1,2)) ) /* C = content digest */ - SHA256 = 'C*' !! HASHING_FILE("SHA256", "&_PackageFileref_.", 4); - otherwise /* legacy approach, without C or F, digest value equivalent to C */ - SHA256 = HASHING_FILE("SHA256", "&_PackageFileref_.", 4); - end; - put "Provided Hash: " providedHash; - put "SHA256 digest: " SHA256; - put " "; - - if upcase(SHA256) = upcase(providedHash) then - do; - put "NOTE: Package verification SUCCESSFUL."; - put "NOTE- Generated hash is EQUAL to the provided one."; + packageName = strip(symget("packageName")); + + emptyHash = (providedHash = " " OR providedHash in ("F*" "f*" "C*" "c*")); + + put 82*"-" / @2 packageName / 82*"-" /; + + if NOT emptyHash then put "Provided Hash: " providedHash; + + length method $ 8 digest $ 128; + /* calculate SHA256 */ + method="SHA256"; + LINK CalcualteHashDigest; /* go to Link 1 */ + + if NOT emptyHash then + do; /* step for veryfication */ + if upcase(digest) = upcase(providedHash) then + do; + put "NOTE: Verification SUCCESSFUL." + / "NOTE- Generated hash is EQUAL to the provided one." / ; + end; + else + do; + pos = 0; + do i = 1 to max(lengthn(digest),lengthn(providedHash)) while(pos=0); + if char(digest,i) NE char(providedHash,i) then pos = i; + end; + put "ERROR- " @(pos+15)"^"/"ERROR- " @(pos+15)"| diff @" pos/"ERROR- "; + put "ERROR: Verification FAILED!!" + / "ERROR- Generated hash is DIFFERENT than the provided one." + / "ERROR- Check if the ZIP is genuine." / ; + end; end; else - do; - put "ERROR: Package verification FAILED!!"; - put "ERROR- Generated hash is DIFFERENT than the provided one."; - put "ERROR- Confirm if the package is genuine."; + do method = "SHA1", "MD5"; /* step for digest display, calcualte also SHA1 and MD5 */ + LINK CalcualteHashDigest; /* go to Link 1 */ end; + put 82*"-" /; + stop; + return; + CalcualteHashDigest: /* Link 1 */ + + select; + when ( 'F*' = upcase(substr(providedHash,1,2)) ) /* F = file digest */ + digest = 'F*' !! HASHING_FILE(method, pathname("&_PackageFileref_.",'F'), 0); + when ( 'C*' = upcase(substr(providedHash,1,2)) ) /* C = content digest */ + digest = 'C*' !! HASHING_FILE(method, "&_PackageFileref_.", 4); + otherwise /* legacy approach, without C or F, digest value equivalent to C */ + digest = HASHING_FILE(method, "&_PackageFileref_.", 4); + end; + put method "digest: " digest /; + + return; run; %let HASHING_FILE_exist = 0; %end; diff --git a/SPF/SPFinit.md b/SPF/SPFinit.md index 58d454a..2d05eaa 100644 --- a/SPF/SPFinit.md +++ b/SPF/SPFinit.md @@ -1,7 +1,7 @@ --- -# SAS Packages Framework, version `20260126` +# SAS Packages Framework, version `20260202` --- @@ -34,7 +34,7 @@ A **SAS package** is an automatically generated, single, stand alone *zip* file The *purpose of a package* is to be a simple, and easy to access, code sharing medium, which will allow: on the one hand, to separate the code complex dependencies created by the developer from the user experience with the final product and, on the other hand, reduce developer's and user's unnecessary frustration related to a remote deployment process. -In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20260126`**. +In this repository we are presenting the **SAS Packages Framework** which allows to develop and use SAS packages. The latest version of SPF is **`20260202`**. **To get started with SAS Packages** try this [**`Introduction to SAS Packages`**](https://youtube.com/playlist?list=PLeMzGEImIT5eV13IGXQIgWmTFCJt_cLZG&si=ElQm0_ifq76mvUbq "Introduction to SAS Packages video series") video series or [**`Getting Started with SAS Packages`**](https://github.com/yabwon/SAS_PACKAGES/blob/main/SPF/Documentation/Getting_Started_with_SAS_Packages.pdf "Getting Started with SAS Packages") presentation (see the `./SPF/Documentation` directory). @@ -57,7 +57,7 @@ them using the SPF can be found [**HERE**](https://github.com/yabwon/HoW-SASPack ## This is short help information for the `installPackage` macro -------------------------------------------------------------------------------------------- - Macro to install SAS packages, version `20260126` + Macro to install SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -185,7 +185,7 @@ filename packages "C:/SAS_PACKAGES"; ## This is short help information for the `helpPackage` macro ------------------------------------------------------------------------------- - Macro to get help about SAS packages, version `20260126` + Macro to get help about SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -263,7 +263,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `loadPackage` macro ------------------------------------------------------------------------------- - Macro to *load* SAS packages, version `20260126` + Macro to *load* SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -421,7 +421,7 @@ If created, those macros are automatically deleted when the `%unloadPackage()` m ## This is short help information for the `loadPackageS` macro ------------------------------------------------------------------------------- - Macro wrapper for the loadPackage macro, version `20260126` + Macro wrapper for the loadPackage macro, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -472,7 +472,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `unloadPackage` macro ------------------------------------------------------------------------------- - Macro to unload SAS packages, version `20260126` + Macro to unload SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -539,7 +539,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `listPackages` macro ----------------------------------------------------------------------------------------- - Macro to list available SAS packages, version `20260126` + Macro to list available SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -588,7 +588,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `verifyPackage` macro ------------------------------------------------------------------------------- - Macro to verify SAS package with it hash digest, version `20260126` + Macro to verify SAS package with it hash digest, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -609,7 +609,9 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; If empty displays this help information. - `hash=` A value of the package `SHA256` hash. - Provided by the user. + Provided by the user. When the value is not provided + then macro calculates `SHA256`, `SHA1`, and `MD5` + digests and display then in the log. - `path=` Location of a package. By default it looks for location of the "packages" fileref, i.e. @@ -636,13 +638,13 @@ filename packages "C:/SAS_PACKAGES"; %* set-up a directory for packages; %installPackage(SQLinDS) %* install the package from the Internet; %verifyPackage(SQLinDS, %* verify the package with provided hash; - hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4) + hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ## This is short help information for the `previewPackage` macro ------------------------------------------------------------------------------- - Macro to get preview of a SAS packages, version `20260126` + Macro to get preview of a SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -711,7 +713,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `generatePackage` macro ------------------------------------------------------------------------------- - Macro to generate SAS packages, version `20260126` + Macro to generate SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -944,7 +946,7 @@ All files have to have `.sas` extension. Other files are ignored. ## This is short help information for the `extendPackagesFileref` macro ----------------------------------------------------------------------------------------- - Macro to list directories pointed by 'packages' fileref, version `20260126` + Macro to list directories pointed by 'packages' fileref, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -986,7 +988,7 @@ filename packages ("D:/NEW_DIR" %extendPackagesFileref()); %* add new directory; ## This is short help information for the `loadPackageAddCnt` macro ------------------------------------------------------------------------------- - Macro to load *additional content* for a SAS package, version `20260126` + Macro to load *additional content* for a SAS package, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1080,7 +1082,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ------------------------------------------------------------------------------- Utility macro to *split* single file with SAS package code into multiple - files with separate snippets, version `20260126` + files with separate snippets, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1161,7 +1163,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `relocatePackage` macro ------------------------------------------------------------------------------- - Macro to *locally copy or move* (relocate) SAS packages, version `20260126` + Macro to *locally copy or move* (relocate) SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1273,7 +1275,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `isPackagesFilerefOK` macro ----------------------------------------------------------------------------------------- - Macro to check if the `packages` fileref is "correct", version `20260126` + Macro to check if the `packages` fileref is "correct", version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1324,7 +1326,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `SasPackagesFrameworkNotes` macro ------------------------------------------------------------------------------- - Macro prints help notes for SAS Packages Framework macros, version `20260126` + Macro prints help notes for SAS Packages Framework macros, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1374,7 +1376,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `bundlePackages` macro ------------------------------------------------------------------------------- - Macro to *create bundles* of SAS packages, version `20260126` + Macro to *create bundles* of SAS packages, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1443,7 +1445,7 @@ filename packages "C:/SAS_PACKAGES"; %* setup a directory for packages; ## This is short help information for the `unbundlePackages` macro ------------------------------------------------------------------------------- - Macro to *extract* SAS packages from a bundle, version `20260126` + Macro to *extract* SAS packages from a bundle, version `20260202` A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating diff --git a/SPF/SPFinit.sas b/SPF/SPFinit.sas index a0b12f1..f140620 100644 --- a/SPF/SPFinit.sas +++ b/SPF/SPFinit.sas @@ -43,7 +43,7 @@ - to unload, or - to generate SAS packages. - Version 20260126. + Version 20260202. See examples below. A SAS package is a zip file containing a group of files @@ -101,7 +101,7 @@ Contributors: */ )/secure /*** HELP END ***/ -des = 'Macro to load SAS package, version 20260126. Run %loadPackage() for help info.' +des = 'Macro to load SAS package, version 20260202. Run %loadPackage() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -117,7 +117,7 @@ minoperator %put ### This is short help information for the `loadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* SAS packages, version `20260126` #; + %put # Macro to *load* SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -245,30 +245,34 @@ minoperator %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); - run; + /*run;*/ /* moved to line 272 */ /* convert cherryPick to lower case if needed */ %if NOT (%str(*) = %superq(cherryPick)) %then %do; - data _null_; + /*data _null_;*/ call symputX("cherryPick",lowcase(compbl(compress(symget("cherryPick"),". _","KDA"))),"L"); - run; + /*run;*/ %end; + run; + /* empty list is equivalent to "*" */ %if %superq(cherryPick)= %then %do; @@ -394,7 +398,7 @@ minoperator */ )/secure /*** HELP END ***/ -des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for help info.' +des = 'Macro to unload SAS package, version 20260202. Run %unloadPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -409,7 +413,7 @@ des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for h %put ### This is short help information for the `unloadPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to unload SAS packages, version `20260126` #; + %put # Macro to unload SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -489,18 +493,20 @@ des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for h %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -562,7 +568,7 @@ des = 'Macro to unload SAS package, version 20260126. Run %unloadPackage() for h */ )/secure /*** HELP END ***/ -des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() for help info.' +des = 'Macro to get help about SAS package, version 20260202. Run %helpPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -577,7 +583,7 @@ des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() %put ### This is short help information for the `helpPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get help about SAS packages, version `20260126` #; + %put # Macro to get help about SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -667,18 +673,20 @@ des = 'Macro to get help about SAS package, version 20260126. Run %helpPackage() %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -720,7 +728,7 @@ TODO: */ /*+installPackage+*/ -/* Macros to install SAS packages, version 20260126 */ +/* Macros to install SAS packages, version 20260202 */ /* A SAS package is a zip file containing a group of files with SAS code (macros, functions, data steps generating data, etc.) wrapped up together and %INCLUDEed by @@ -747,7 +755,7 @@ TODO: /secure minoperator /*** HELP END ***/ -des = 'Macro to install SAS package, version 20260126. Run %%installPackage() for help info.' +des = 'Macro to install SAS package, version 20260202. Run %%installPackage() for help info.' ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then %do; @@ -762,7 +770,7 @@ des = 'Macro to install SAS package, version 20260126. Run %%installPackage() fo %put ### This is short help information for the `installPackage` macro #; %put #--------------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to install SAS packages, version `20260126` #; + %put # Macro to install SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1414,7 +1422,7 @@ des = 'Macro to install SAS package, version 20260126. Run %%installPackage() fo Macro to list SAS packages in packages folder. - Version 20260126 + Version 20260202 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1436,7 +1444,7 @@ des = 'Macro to install SAS package, version 20260126. Run %%installPackage() fo listDataSet /* Name of a data set to save results */ , quiet = 0 /* Indicate if results should be printed in log */ )/secure parmbuff -des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260126.' +des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HELP) for help, version 20260202.' ; %if (%QUPCASE(&listDataSet.) = HELP) %then %do; @@ -1451,7 +1459,7 @@ des = 'Macro to list SAS packages from `packages` fileref, type %listPackages(HE %put ### This is short help information for the `listPackages` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list available SAS packages, version `20260126` #; + %put # Macro to list available SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -1661,7 +1669,7 @@ run; %if 0=&quiet. %then %do; %put %str( ); - %put # Results ptovided in the &listDataSet. data set. #; + %put # Results provided in the &listDataSet. data set. #; %put %str( ); %end; %end; @@ -1677,7 +1685,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; Macro to generate SAS packages. - Version 20260126 + Version 20260202 A SAS package is a zip file containing a group of SAS codes (macros, functions, data steps generating @@ -1727,7 +1735,7 @@ options ls = &ls_tmp. ps = &ps_tmp. ¬es_tmp. &source_tmp.; when empty takes buildLocation */ )/ secure minoperator /*** HELP END ***/ -des = 'Macro to generate SAS packages, version 20260126. Run %generatePackage() for help info.' +des = 'Macro to generate SAS packages, version 20260202. Run %generatePackage() for help info.' ; %if (%superq(filesLocation) = ) OR (%qupcase(&filesLocation.) = HELP) %then %do; @@ -1742,7 +1750,7 @@ des = 'Macro to generate SAS packages, version 20260126. Run %generatePackage() %put ### This is short help information for the `generatePackage` macro #; %put #------------------------------------------------------------------------------------#; %put # #; - %put # Macro to generate SAS packages, version `20260126` #; + %put # Macro to generate SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -2118,10 +2126,10 @@ options NOquotelenmax NOstimer NOfullstimer; */ data _null_; call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); -run; +/*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* test if version is a number */ -data _null_; +/*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ v = "&packageVersion."; version = coalesce(input(scan(v,1,".","M"), ?? best32.),0)*1e8 + coalesce(input(scan(v,2,".","M"), ?? best32.),0)*1e4 @@ -2624,7 +2632,7 @@ title6 "MD5 hashed fileref of package lowcase name: &_PackageFileref_."; title&_titleNumber_. "Package ZIP file location is: &buildLocation."; %end; -footnote1 "SAS Packages Framework, version 20260126"; +footnote1 "SAS Packages Framework, version 20260202"; proc print data = &filesWithCodes.(drop=base build folderRef fileRef rc folderid _abort_ fileId additionalContent) @@ -3449,7 +3457,7 @@ data _null_; %end; put +(-1) '`.;''' / ' !! '' %put The macro generated: '' !! put(dtCASLudf, E8601DT19.-L) !! ";"' - / ' !! '' %put with the SAS Packages Framework version 20260126.;''' + / ' !! '' %put with the SAS Packages Framework version 20260202.;''' / ' !! '' %put ****************************************************************************;''' / ' !! '' %GOTO theEndOfTheMacro;''' / ' !! '' %end;''' ; @@ -3613,7 +3621,7 @@ data _null_; %end; put +(-1) '`.; '' !!' / ''' %put The macro generated: ''' " !! put(dtIML, E8601DT19.-L) !! " '''; '' !! ' / - ''' %put with the SAS Packages Framework version 20260126.; '' !! ' / + ''' %put with the SAS Packages Framework version 20260202.; '' !! ' / ''' %put ****************************************************************************; '' !! ' / ''' %GOTO theEndOfTheMacro; '' !! ' / ''' %end; '' !! ' / @@ -4484,7 +4492,7 @@ data _null_; %end; put 'put " " / @3 "---------------------------------------------------------------------" / " ";' - / 'put @3 "*SAS package generated by SAS Package Framework, version `20260126`*";' + / 'put @3 "*SAS package generated by SAS Package Framework, version `20260202`*";' / "put @3 '*under `&sysscp.`(`&sysscpl.`) operating system,*';" / "put @3 '*using SAS release: `&sysvlong4.`.*';" / 'put " " / @3 "---------------------------------------------------------------------";'; @@ -4923,7 +4931,7 @@ options &qlenmax_fstimer_tmp.; /*+SPFint_gnPckg_tests+*/ %macro SPFint_gnPckg_tests()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the test part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -5008,6 +5016,10 @@ run; @n '%put >>>%'"&packageName."'META(P)<<<;'/ @n '%put >>>%'"&packageName."'META(S)<<<;'/; + /* verify */ + put @n '%verifyPackage'"(&packageName.,"; + put @n " path=&buildLocation.)" /; + /* help */ put @n '%helpPackage'"(&packageName.,"; put @n " path=&buildLocation.)" /; @@ -5240,6 +5252,10 @@ data _null_; '%put >>req packages>%'"&packageName."'META(P)<<<;'/ '%put >>req SAS >%'"&packageName."'META(S)<<<;'/; + /* verify */ + put '%verifyPackage'"(&packageName.,"; + put " path=&buildLocation.)" /; + /* help */ put '%helpPackage'"(&packageName.," / " path=&buildLocation.)" /; @@ -5597,7 +5613,7 @@ options "elenmax_tmp.; /*+SPFint_gnPckg_markdown+*/ %macro SPFint_gnPckg_markdown()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the markdown documentation part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -5709,7 +5725,7 @@ data &filesWithCodes.markdown; %end; put " " / "---------------------------------------------------------------------" / " " - / "*SAS package generated by SAS Package Framework, version `20260126`,*" + / "*SAS package generated by SAS Package Framework, version `20260202`,*" / "*under `&sysscp.`(`&sysscpl.`) operating system,*" / "*using SAS release: `&sysvlong4.`.*" / " " / "---------------------------------------------------------------------" / " "; @@ -5850,7 +5866,7 @@ options &MarkDownOptionsTmp.; /*+SPFint_gnPckg_arch+*/ %macro SPFint_gnPckg_arch()/secure minoperator -des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260126.'; +des='SAS Packages Framework internal macro. Executable only inside the %generatePackage() macro. The macro encapsulates the archive version generation part of the process. Version 20260202.'; /* macro picks up all macrovariables from external scope, so from the %generatePackage() macro */ %if %sysmexecname(%sysmexecdepth-1) in (GENERATEPACKAGE) %then %do; @@ -6017,7 +6033,7 @@ TODO: (in Polish) */ )/secure /*** HELP END ***/ -des = 'Macro to load multiple SAS packages at one run, version 20260126. Run %loadPackages() for help info.' +des = 'Macro to load multiple SAS packages at one run, version 20260202. Run %loadPackages() for help info.' parmbuff ; %if (%superq(packagesNames) = ) OR (%qupcase(&packagesNames.) = HELP) %then @@ -6033,7 +6049,7 @@ parmbuff %put ### This is short help information for the `loadPackageS` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro wrapper for the loadPackage macro, version `20260126` #; + %put # Macro wrapper for the loadPackage macro, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6126,12 +6142,12 @@ parmbuff , path = %sysfunc(pathname(packages)) /* location of a package, by default it looks for location of "packages" fileref */ -, hash = /* The SHA256 hash digest for +, hash = F* /* The SHA256 hash digest for the package generated by hashing_file() function, SAS 9.4M6 */ )/secure /*** HELP END ***/ -des = 'Macro to verify SAS package with the hash digest, version 20260126. Run %verifyPackage() for help info.' +des = 'Macro to verify SAS package with the hash digest, version 20260202. Run %verifyPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -6146,7 +6162,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put ### This is short help information for the `verifyPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to verify SAS package with it hash digest, version `20260126` #; + %put # Macro to verify SAS package with it hash digest, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6166,7 +6182,9 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put # If empty displays this help information. #; %put # #; %put # - `hash=` A value of the package `SHA256` hash. #; - %put # Provided by the user. #; + %put # Provided by the user. When the value is not provided #; + %put # then macro calculates `SHA256`, `SHA1`, and `MD5` #; + %put # digests and display then in the log. #; %put # #; %put # - `path=` Location of a package. By default it looks for #; %put # location of the "packages" fileref, i.e. #; @@ -6194,7 +6212,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % %put ; %put %nrstr( %%installPackage(SQLinDS) %%* install the package from the Internet; ); %put %nrstr( %%verifyPackage%(SQLinDS, %%* verify the package with provided hash; ); - %put %nrstr( hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4%) ); + %put %nrstr( hash=HDA478ANJ3HKHRY327FGE88HF89VH89HFFFV73GCV98RF390VB4%) ); %put ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~; %put #################################################################################; %put ; @@ -6215,19 +6233,21 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc; %local _PackageFileref_ checkExist; - data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + data _null_; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".zip")); /* check on zip files only! */ + exists + fileexist(catx("/", p, cats(packageName,".zip"))); /* check on zip files only! */ if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -6260,31 +6280,60 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % filename &_PackageFileref_. list; data _null_; - length providedHash $ 128; + length providedHash $ 128 packageName $ 32; providedHash = strip(symget("hash")); - select; - when ( 'F*' = upcase(substr(providedHash,1,2)) ) /* F = file digest */ - SHA256 = 'F*' !! HASHING_FILE("SHA256", pathname("&_PackageFileref_.",'F'), 0); - when ( 'C*' = upcase(substr(providedHash,1,2)) ) /* C = content digest */ - SHA256 = 'C*' !! HASHING_FILE("SHA256", "&_PackageFileref_.", 4); - otherwise /* legacy approach, without C or F, digest value equivalent to C */ - SHA256 = HASHING_FILE("SHA256", "&_PackageFileref_.", 4); - end; - put "Provided Hash: " providedHash; - put "SHA256 digest: " SHA256; - put " "; - - if upcase(SHA256) = upcase(providedHash) then - do; - put "NOTE: Package verification SUCCESSFUL."; - put "NOTE- Generated hash is EQUAL to the provided one."; + packageName = strip(symget("packageName")); + + emptyHash = (providedHash = " " OR providedHash in ("F*" "f*" "C*" "c*")); + + put 82*"-" / @2 packageName / 82*"-" /; + + if NOT emptyHash then put "Provided Hash: " providedHash; + + length method $ 8 digest $ 128; + /* calculate SHA256 */ + method="SHA256"; + LINK CalcualteHashDigest; /* go to Link 1 */ + + if NOT emptyHash then + do; /* step for veryfication */ + if upcase(digest) = upcase(providedHash) then + do; + put "NOTE: Verification SUCCESSFUL." + / "NOTE- Generated hash is EQUAL to the provided one." / ; + end; + else + do; + pos = 0; + do i = 1 to max(lengthn(digest),lengthn(providedHash)) while(pos=0); + if char(digest,i) NE char(providedHash,i) then pos = i; + end; + put "ERROR- " @(pos+15)"^"/"ERROR- " @(pos+15)"| diff @" pos/"ERROR- "; + put "ERROR: Verification FAILED!!" + / "ERROR- Generated hash is DIFFERENT than the provided one." + / "ERROR- Check if the ZIP is genuine." / ; + end; end; else - do; - put "ERROR: Package verification FAILED!!"; - put "ERROR- Generated hash is DIFFERENT than the provided one."; - put "ERROR- Confirm if the package is genuine."; + do method = "SHA1", "MD5"; /* step for digest display, calcualte also SHA1 and MD5 */ + LINK CalcualteHashDigest; /* go to Link 1 */ end; + put 82*"-" /; + stop; + return; + CalcualteHashDigest: /* Link 1 */ + + select; + when ( 'F*' = upcase(substr(providedHash,1,2)) ) /* F = file digest */ + digest = 'F*' !! HASHING_FILE(method, pathname("&_PackageFileref_.",'F'), 0); + when ( 'C*' = upcase(substr(providedHash,1,2)) ) /* C = content digest */ + digest = 'C*' !! HASHING_FILE(method, "&_PackageFileref_.", 4); + otherwise /* legacy approach, without C or F, digest value equivalent to C */ + digest = HASHING_FILE(method, "&_PackageFileref_.", 4); + end; + put method "digest: " digest /; + + return; run; %let HASHING_FILE_exist = 0; %end; @@ -6329,7 +6378,7 @@ des = 'Macro to verify SAS package with the hash digest, version 20260126. Run % */ )/secure /*** HELP END ***/ -des = 'Macro to preview content of a SAS package, version 20260126. Run %previewPackage() for help info.' +des = 'Macro to preview content of a SAS package, version 20260202. Run %previewPackage() for help info.' ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then %do; @@ -6344,7 +6393,7 @@ des = 'Macro to preview content of a SAS package, version 20260126. Run %preview %put ### This is short help information for the `previewPackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to get preview of a SAS packages, version `20260126` #; + %put # Macro to get preview of a SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6425,18 +6474,20 @@ des = 'Macro to preview content of a SAS package, version 20260126. Run %preview %local _PackageFileref_; data _null_; - call symputX("_PackageFileref_", "P" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "P" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -6476,7 +6527,7 @@ des = 'Macro to preview content of a SAS package, version 20260126. Run %preview when empty the "packages" value is used */ )/secure /*** HELP END ***/ -des = 'Macro to list directories pointed by "packages" fileref, version 20260126. Run %extendPackagesFileref(HELP) for help info.' +des = 'Macro to list directories pointed by "packages" fileref, version 20260202. Run %extendPackagesFileref(HELP) for help info.' ; %if %QUPCASE(&packages.) = HELP %then @@ -6492,7 +6543,7 @@ des = 'Macro to list directories pointed by "packages" fileref, version 20260126 %put ### This is short help information for the `extendPackagesFileref` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to list directories pointed by 'packages' fileref, version `20260126` #; + %put # Macro to list directories pointed by 'packages' fileref, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6594,7 +6645,7 @@ filename packages list; is provided in required version */ )/secure /*** HELP END ***/ -des = 'Macro to load additional content for a SAS package, version 20260126. Run %loadPackageAddCnt() for help info.' +des = 'Macro to load additional content for a SAS package, version 20260202. Run %loadPackageAddCnt() for help info.' minoperator ; %if (%superq(packageName) = ) OR (%qupcase(&packageName.) = HELP) %then @@ -6610,7 +6661,7 @@ minoperator %put ### This is short help information for the `loadPackageAddCnt` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *load* additional content for a SAS package, version `20260126` #; + %put # Macro to *load* additional content for a SAS package, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -6691,20 +6742,22 @@ minoperator options NOnotes NOsource ls=MAX ps=MAX NOfullstimer NOstimer msglevel=N NOmautocomploc; %local _PackageFileref_; - data _null_; - call symputX("_PackageFileref_", "A" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - call symputX("_TargetFileref_", "T" !! put(MD5(lowcase("&packageName.")), hex7. -L), "L"); - run; + data _null_; + length packageName $ 32; + packageName = lowcase(symget("packageName")); + call symputX("_PackageFileref_", "A" !! put(MD5(strip(packageName)), hex7. -L), "L"); + call symputX("_TargetFileref_", "T" !! put(MD5(strip(packageName)), hex7. -L), "L"); + /*run;*/ /* <- comment out, because it can be 1 data step, not 2 */ /* when the packages reference is multi-directory search for the first one containing the package */ - data _null_; + /*data _null_;*/ /* <- comment out, because it can be 1 data step, not 2 */ exists = 0; length packages $ 32767 p $ 4096; packages = resolve(symget("path")); if char(packages,1) ^= "(" then packages = quote(strip(packages)); /* for paths with spaces */ do i = 1 to kcountw(packages, "()", "QS"); p = dequote(kscanx(packages, i, "()", "QS")); - exists + fileexist(catx("/", p, lowcase("&packageName.") !! ".&zip.")); + exists + fileexist(catx("/", p, cats(packageName,".&zip."))); if exists then leave; end; if exists then call symputx("path", p, "L"); @@ -6979,7 +7032,7 @@ minoperator ,nobs=0 /* technical parameter */ ) /*** HELP END ***/ -/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260126. Run %splitCodeForPackage() for help info.' +/ des = 'Utility macro to split "one big" code into multiple files for a SAS package, version 20260202. Run %splitCodeForPackage() for help info.' ; %if (%superq(codeFile) = ) OR (%qupcase(&codeFile.) = HELP) %then %do; @@ -6995,7 +7048,7 @@ minoperator %put #-------------------------------------------------------------------------------#; %put # #; %put # Utility macro to *split* single file with SAS package code into multiple #; - %put # files with separate snippets, version `20260126` #; + %put # files with separate snippets, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -7371,7 +7424,7 @@ options nomprint nosymbolgen nomlogic notes source ls=MAX ps=MAX msglevel=N ; */ if firstLine[j] then do; - put '/* File generated with help of SAS Packages Framework, version 20260126. */'; + put '/* File generated with help of SAS Packages Framework, version 20260202. */'; firstLine[j]=0; end; put _infile_; @@ -7404,7 +7457,7 @@ options &options_tmp2.; ,psMAX=MAX /* pageSise in case executed inside DoSubL() */ ,ods= /* a data set for results, e.g., work.relocatePackageReport */ ) -/ des = 'Utility macro that locally Copies or Moves Packages, version 20260126. Run %relocatePackage() for help info.' +/ des = 'Utility macro that locally Copies or Moves Packages, version 20260202. Run %relocatePackage() for help info.' secure minoperator ; @@ -7422,7 +7475,7 @@ options &options_tmp2.; %put ### This is short help information for the `relocatePackage` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260126` #; + %put # Macro to *locally copy or move* (relocate) SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8080,7 +8133,7 @@ filename PACKAGES ("R:\testPackages2" "R:\testPackages1"); vERRb /* indicates if macro should be verbose and report errors */ ) / minoperator PARMBUFF -des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260126.' +des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFilerefOK(HELP) for help, version 20260202.' ; /*** HELP END ***/ %if %QUPCASE(&SYSPBUFF.) = %str(%(HELP%)) %then @@ -8096,7 +8149,7 @@ des = 'Macro to check if the PACKAGES fileref is "correct", type %isPackagesFile %put ### This is short help information for the `isPackagesFilerefOK` macro #; %put #-----------------------------------------------------------------------------------------#;; %put # #; - %put # Macro to check if the `packages` fileref is "correct", version `20260126` #; + %put # Macro to check if the `packages` fileref is "correct", version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8230,7 +8283,7 @@ SPFmacroName /* space separated list of names */ / minoperator secure -des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260126. Run %SasPackagesFrameworkNotes(HELP) for help info.' +des = 'Macro to provide help notes about SAS Packages Framework macros, version 20260202. Run %SasPackagesFrameworkNotes(HELP) for help info.' ; %local list N i element; %let list= @@ -8276,7 +8329,7 @@ SasPackagesFrameworkNotes %put ### This is short help information for the `SasPackagesFrameworkNotes` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro prints help notes for SAS Packages Framework macros, version `20260126` #; + %put # Macro prints help notes for SAS Packages Framework macros, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8399,7 +8452,7 @@ options mlogic symbolgen; ,packagesRef=packages ,ods= /* data set for report file */ )/ -des='Macro to create a bundle of SAS packages, version 20260126. Run %bundlePackages(HELP) for help info.' +des='Macro to create a bundle of SAS packages, version 20260202. Run %bundlePackages(HELP) for help info.' secure minoperator ; @@ -8416,7 +8469,7 @@ secure minoperator %put ### This is short help information for the `bundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *create bundles* of SAS packages, version `20260126` #; + %put # Macro to *create bundles* of SAS packages, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -8901,7 +8954,7 @@ filename p2 "R:/dontexist"; ,ods= /* data set for report file */ ,verify=0 )/ -des='Macro to extract a bundle of SAS packages, version 20260126. Run %unbundlePackages(HELP) for help info.' +des='Macro to extract a bundle of SAS packages, version 20260202. Run %unbundlePackages(HELP) for help info.' secure minoperator ; @@ -8919,7 +8972,7 @@ minoperator %put ### This is short help information for the `unbundlePackages` macro #; %put #-------------------------------------------------------------------------------#; %put # #; - %put # Macro to *extract* SAS packages from a bundle, version `20260126` #; + %put # Macro to *extract* SAS packages from a bundle, version `20260202` #; %put # #; %put # A SAS package is a zip file containing a group #; %put # of SAS codes (macros, functions, data steps generating #; @@ -9021,11 +9074,10 @@ minoperator %let datetime = %sysfunc(datetime()); %let reportFile = WORK.tmpbundlefile%sysfunc(int(&datetime.), b8601dt15.)_; -data _null_ ; +data _null_; datetime=symgetn('datetime'); length packagesList $ 32767 bundleName $ 128; - bundleName = compress(symget('bundleName'),"_.","KAD"); /* bundle name is letters, digits, and underscore, up to 128 symbols */ if bundleName NE symget('bundleName') then /* warn about illegal characters */ @@ -9033,12 +9085,12 @@ if bundleName NE symget('bundleName') then /* warn about illegal characters */ put "ERROR: Bundle name contains illegal characters. Exiting"; stop; end; - bundleName=lowcase(bundleName); +lbn = length(bundleName); /* to cover lengths < 7 & 11 */ /* if there is ".bundle.zip" extension added, remove it */ -if substr(strip(reverse(bundleName)),1,11) = 'piz.eldnub.' then bundleName=scan(bundleName,-3,"."); +if substr(strip(reverse(bundleName)),1,min(11,lbn)) = 'piz.eldnub.' then bundleName=scan(bundleName,-3,"."); else /* if there is ".bundle" extension added, remove it */ -if substr(strip(reverse(bundleName)),1,7) = 'eldnub.' then bundleName=scan(bundleName,-2,"."); +if substr(strip(reverse(bundleName)),1,min(7,lbn)) = 'eldnub.' then bundleName=scan(bundleName,-2,"."); put / "INFO: Bundle name is: " bundleName / ; @@ -9046,7 +9098,6 @@ length packagesPath $ 32767 packagesRef $ 8; packagesPath = dequote(symget('packagesPath')); packagesRef = upcase(strip(symget('packagesRef'))); - /* organize target path (location for packages) */ if " "=packagesPath then do; @@ -9174,7 +9225,6 @@ label package="Package name" hash="SHA256 for the Package"; /*--------------------------------------------------*/ - if 0=Q.NUM_ITEMS then /* ... if empty then exit */ do; put "WARNING: No packages to unbundle. Exiting!"; @@ -9213,7 +9263,6 @@ put / "INFO: The " bundleName "bundle extraction ended."; rc = doSubL(code2); put / "INFO: The " bundleName "bundle verification ended."; %end; - put " "; rc=sleep(1,1);