From b8262d00ca8325cc13d7f7e9c29db06afbfcf1f8 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 22:36:49 +0000 Subject: [PATCH 1/7] Debugging baseline. --- .../BaselineOfMiniDocs.class.st | 194 +++++++++--------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index 048ce46..afb6556 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -1,97 +1,97 @@ -Class { - #name : #BaselineOfMiniDocs, - #superclass : #BaselineOf, - #category : #BaselineOfMiniDocs -} - -{ #category : #accessing } -BaselineOfMiniDocs >> baseline: spec [ - - spec - for: #common - do: [ - "Dependencies" - self setUpTeapot: spec. - self setUpPetitParser: spec. - self setUpLepiterBuildingBlocs: spec. - spec - baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; - baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ]; - baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ]. - - "self fossil: spec." - "self xmlParserHTML: spec" - - "Packages" - spec - package: 'PetitMarkdown' with: [ spec requires: #('PetitParser')]; - package: 'MiniDocs' - with: [ spec requires: #( - 'Mustache' 'Temple' "Templating" - 'Teapot' 'Tealight' "Web server" - 'PetitMarkdown' 'PetitParser' "Parsers" - 'DataFrame' "Tabular data")]. -. - - "Groups" - - ]. - spec - -] - -{ #category : #accessing } -BaselineOfMiniDocs >> fossil: spec [ - | repo | - repo := ExoRepo new - repository: 'https://code.sustrato.red/Offray/Fossil'. - repo load. - spec baseline: 'Fossil' with: [ spec repository: 'gitlocal://', repo local fullName ] -] - -{ #category : #accessing } -BaselineOfMiniDocs >> semanticVersion [ - ^ '0.2.0' -] - -{ #category : #accessing } -BaselineOfMiniDocs >> setUpLepiterBuildingBlocs: spec [ - spec - baseline: 'LepiterBuildingBlocs' - with: [spec - repository: 'github://botwhytho/LepiterBuildingBlocs:main/src'; - loads: #('ALL')]; - import: 'LepiterBuildingBlocs' -] - -{ #category : #accessing } -BaselineOfMiniDocs >> setUpPetitParser: spec [ - spec - baseline: 'PetitParser' - with: [ spec - repository: 'github://moosetechnology/PetitParser:v3.x.x/src'; - loads: #('Minimal' 'Core' 'Tests' 'Islands')]; - import: 'PetitParser' -] - -{ #category : #accessing } -BaselineOfMiniDocs >> setUpTeapot: spec [ - - spec - baseline: 'Teapot' - with: [ spec - repository: 'github://zeroflag/Teapot/source'; - loads: #('ALL') ]; - import: 'Teapot' -] - -{ #category : #accessing } -BaselineOfMiniDocs >> xmlParserHTML: spec [ - - spec - baseline: 'XMLParserHTML' - with: [ spec - repository: 'github://pharo-contributions/XML-XMLParserHTML/src'; - loads: #('ALL')]; - import: 'XMLParserHTML' -] +Class { + #name : #BaselineOfMiniDocs, + #superclass : #BaselineOf, + #category : #BaselineOfMiniDocs +} + +{ #category : #accessing } +BaselineOfMiniDocs >> baseline: spec [ + + spec + for: #common + do: [ + "Dependencies" + self setUpTeapot: spec. + self setUpPetitParser: spec. + self setUpLepiterBuildingBlocs: spec. + spec + baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; + baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ]; + baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ]. + + "self fossil: spec." + self xmlParserHTML: spec. + + "Packages" + spec + package: 'PetitMarkdown' with: [ spec requires: #('PetitParser')]; + package: 'MiniDocs' + with: [ spec requires: #( + 'Mustache' 'Temple' "Templating" + 'Teapot' 'Tealight' "Web server" + 'PetitMarkdown' 'PetitParser' "Parsers" + 'DataFrame' "Tabular data")]. +. + + "Groups" + + ]. + spec + +] + +{ #category : #accessing } +BaselineOfMiniDocs >> fossil: spec [ + | repo | + repo := ExoRepo new + repository: 'https://code.sustrato.red/Offray/Fossil'. + repo load. + spec baseline: 'Fossil' with: [ spec repository: 'gitlocal://', repo local fullName ] +] + +{ #category : #accessing } +BaselineOfMiniDocs >> semanticVersion [ + ^ '0.2.0' +] + +{ #category : #accessing } +BaselineOfMiniDocs >> setUpLepiterBuildingBlocs: spec [ + spec + baseline: 'LepiterBuildingBlocs' + with: [spec + repository: 'github://botwhytho/LepiterBuildingBlocs:main/src'; + loads: #('ALL')]; + import: 'LepiterBuildingBlocs' +] + +{ #category : #accessing } +BaselineOfMiniDocs >> setUpPetitParser: spec [ + spec + baseline: 'PetitParser' + with: [ spec + repository: 'github://moosetechnology/PetitParser:v3.x.x/src'; + loads: #('Minimal' 'Core' 'Tests' 'Islands')]; + import: 'PetitParser' +] + +{ #category : #accessing } +BaselineOfMiniDocs >> setUpTeapot: spec [ + + spec + baseline: 'Teapot' + with: [ spec + repository: 'github://zeroflag/Teapot/source'; + loads: #('ALL') ]; + import: 'Teapot' +] + +{ #category : #accessing } +BaselineOfMiniDocs >> xmlParserHTML: spec [ + + spec + baseline: 'XMLParserHTML' + with: [ spec + repository: 'github:///ruidajo/XML-XMLParserHTML/src'; + loads: #('ALL')]; + import: 'XMLParserHTML' +] From 82405165e1906bbcfee465a9525880847a643e1e Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 23:11:47 +0000 Subject: [PATCH 2/7] Debugging baseline. --- src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index afb6556..b0482f5 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -91,7 +91,7 @@ BaselineOfMiniDocs >> xmlParserHTML: spec [ spec baseline: 'XMLParserHTML' with: [ spec - repository: 'github:///ruidajo/XML-XMLParserHTML/src'; + repository: 'github://ruidajo/XML-XMLParserHTML/src'; loads: #('ALL')]; import: 'XMLParserHTML' ] From 2037af37a307a0f1213aa40fec080fd16c666ec7 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 23:21:15 +0000 Subject: [PATCH 3/7] Debugging baseline, adding dataframe. --- src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index b0482f5..08ef81b 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -17,7 +17,8 @@ BaselineOfMiniDocs >> baseline: spec [ spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ]; - baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ]. + baseline: 'Tealight' with: [ spec repository: 'github://astares/Tealight:main/src' ]; + baseline: 'DataFrame' with: [ spec repository: 'github://PolyMathOrg/DataFrame/src' ]. "self fossil: spec." self xmlParserHTML: spec. From 5c897886e06fb71c9b8f7c66f2680fb78e6750df Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 23:32:41 +0000 Subject: [PATCH 4/7] Debugging baseline, error handler for LepiterBuildingBlocs. --- src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index 08ef81b..b603be5 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -13,7 +13,8 @@ BaselineOfMiniDocs >> baseline: spec [ "Dependencies" self setUpTeapot: spec. self setUpPetitParser: spec. - self setUpLepiterBuildingBlocs: spec. + [self lepiterBuildingBlocs: spec] + onErrorDo: [:err | self inform: 'LepiterBuilldingBlocs error: ', err asString]. spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ]; From 7cd3f302168d6ec864b7301edd74d5600f389ac9 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 23:42:34 +0000 Subject: [PATCH 5/7] Debugging baseline, fixing typo. --- src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index b603be5..c5be974 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -13,7 +13,7 @@ BaselineOfMiniDocs >> baseline: spec [ "Dependencies" self setUpTeapot: spec. self setUpPetitParser: spec. - [self lepiterBuildingBlocs: spec] + [self setUpLepiterBuildingBlocs: spec] onErrorDo: [:err | self inform: 'LepiterBuilldingBlocs error: ', err asString]. spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; From 3a2d09602527280b20f93eb0386a0f09cfde9b21 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Tue, 2 Apr 2024 23:51:36 +0000 Subject: [PATCH 6/7] Debugging baseline, comment on LepiterBuildingBlocs. --- src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index c5be974..149fb33 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -13,8 +13,8 @@ BaselineOfMiniDocs >> baseline: spec [ "Dependencies" self setUpTeapot: spec. self setUpPetitParser: spec. - [self setUpLepiterBuildingBlocs: spec] - onErrorDo: [:err | self inform: 'LepiterBuilldingBlocs error: ', err asString]. + "LepiterBuildingBlocs commented while resolving the conflict with the internal gtoolkit renaming." + "self setUpLepiterBuildingBlocs: spec" spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache' ]; baseline: 'Temple' with: [ spec repository: 'github://astares/Pharo-Temple/src' ]; From 642712cdfd1561757d222e3071271f146ff6b772 Mon Sep 17 00:00:00 2001 From: pfmar Date: Wed, 3 Apr 2024 17:10:01 -0500 Subject: [PATCH 7/7] Adding yq support to Windows platform. --- src/MiniDocs/YQ.class.st | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/MiniDocs/YQ.class.st b/src/MiniDocs/YQ.class.st index 8b0eacf..7d64782 100644 --- a/src/MiniDocs/YQ.class.st +++ b/src/MiniDocs/YQ.class.st @@ -33,12 +33,16 @@ YQ class >> jsonToYaml: aDictionary [ | jsonFile | self binaryFile exists ifFalse: [ YQ install]. jsonFile := MarkupFile exportAsFileOn: FileLocator temp / 'data.json' containing: aDictionary. - OSSUnixSubprocess new - shellCommand: 'cat ', jsonFile fullName,' | yq -y'; - redirectStdout; - runAndWaitOnExitDo: [ :command :outString | - ^ outString - ]. + (Smalltalk os isUnix or: [ Smalltalk os isMacOS ]) + ifTrue: [ + OSSUnixSubprocess new + shellCommand: 'cat ', jsonFile fullName,' | yq -y'; + redirectStdout; + runAndWaitOnExitDo: [ :command :outString | + ^ outString + ]]. + Smalltalk os isWindows + ifTrue: [ ^ LibC resultOfCommand: 'yq -p=json ', jsonFile fullName ]. ] { #category : #accessing }