Skip to content

Commit 5049528

Browse files
valentinedwvnein09fils
authored
Fix 124 identifiers sha (#135)
* run configurations * adding a uuid command to get uuid for a file sent to stdin. updated cobra and viper package versions * Example JSON Paths and arrays of paths * glcon tool id --idtype indentifiersha --jsonld some file * test for #129. * Implemented changes to prevent context mangling * * Get things working and DRY code up a bit * Extract out a constant and a json processing function * Add test for json finding method * Test for the api config helper * Try to make this work for DataStream as well * Identifiers fix for @graph * fix wrap in quotes 'script[type="application/ld+json"]' * add an ideal example resource * IdentiferPath is a comma separated set of strings, or one string. * If you are trying not to recorder an array... and copy it, don't use the original later Clean up LdProc Normalize Tests. Empty triples will be empty triples * #150 #108 initialize gleaner and nabu configs idependently. * #145 * added test for a couple of problem children. * methods to allow dumping data before upload and glcon tools jsonld: jsonld > corrected jsonld rdf: jsonld > rdf * add a couple resources for cli testing * Headless rework to make more testable * Fix Minio connection check error, like was done on nabu * Implement headlessWait in the headless Javascript. Fixes #152 * Implement headlessWait in the headless Javascript. Fixes #152 add a test that is expected to fail, with 1 JSONld returned. * #155 enable --prefix flag for nabu * Using c.Page.LoadEventFired to wait for content. Works. leaving in the headlessWait incase another issue that requires its. * linux reading of config not working. Updating modules * Use the config class to read the gleanerConfig. * Use the config class to read the gleanerConfig. * Cleaned up tests. Files now used. (#161) Added ability to just generate a sha of the json. Was option, but not coded. * Fix 124 identifiers tests (#162) * Cleaned up tests. Files now used. Added ability to just generate a sha of the json. Was option, but not coded. * put in approvals into jsonutils * use log.info not println so this does not show up in console output. * test for #129. * Implemented changes to prevent context mangling * Example JSON Paths and arrays of paths * clean up some logging CLI. * glcon tool id --idtype indentifiersha --jsonld some file * If it's an array, we standardized. Tests to be sure arrays are not mangled by string and that strings are not mangled by array. * IdentiferPath is a comma separated set of strings, or one string. * methods to allow dumping data before upload glcon tools jsonld: jsonld > corrected jsonld rdf: jsonld > rdf Added ability to just generate a sha of the json. Was option, but not coded. * Fix 124 identifiers tests (#162) * put in approvals into jsonutils * add approval test .approved * Sort the jsonpath results because UUID generation depends on order of results. * One more fix for tool id. If no config is passed, just use a generic one. We need is the contexts, for the triples if it falls through to a normalizedsha makefile. copy binaries up to that assets are in correct location relative to binaries --------- Co-authored-by: melinda <[email protected]> Co-authored-by: Douglas Fils <[email protected]>
1 parent ecbab66 commit 5049528

File tree

62 files changed

+29487
-25578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+29487
-25578
lines changed

‎.github/workflows/release_gleaner.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ jobs:
3535
project_path: "./cmd/gleaner"
3636
binary_name: "gleaner"
3737
ldflags: "-s -w -X main.VERSION=${{ env.VERSION }}"
38-
extra_files: README.md docs/ configs/ scripts/ schemaorg-current-https.jsonld
38+
extra_files: README.md docs/ configs/ scripts/ assets/
3939
# extra_files: LICENSE README.md

‎.github/workflows/release_gleaner_v3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ jobs:
3838
project_path: "./cmd/glcon"
3939
binary_name: "glcon"
4040
ldflags: "-s -w -X main.VERSION=${{ env.VERSION }}"
41-
extra_files: README.md docs/ configs/ scripts/ schemaorg-current-https.jsonld assets/
41+
extra_files: README.md docs/ configs/ scripts/ assets/
4242
# extra_files: LICENSE README.md

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ configs/local/
1313
**/credentials/
1414
.idea
1515

16+
/configs/wifire/

‎Makefile

+17-8
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,44 @@ MAINVERSION :=`cat ../../VERSION`
66

77
gleaner:
88
cd cmd/$(BINARY) ; \
9-
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY)
9+
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY);\
10+
cp $(BINARY) ../../
11+
1012

1113
gleaner.exe:
1214
cd cmd/$(BINARY) ; \
13-
GOOS=windows GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY).exe
15+
GOOS=windows GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY).exe;\
16+
cp $(BINARY).exe ../../
1417

1518
gleaner.darwin:
1619
cd cmd/$(BINARY) ; \
17-
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY)_darwin
20+
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY)_darwin;\
21+
cp $(BINARY)_darwin ../../
1822

1923
gleaner.m2:
2024
cd cmd/$(BINARY) ; \
21-
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY)_m2
25+
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARY)_m2;\
26+
cp $(BINARY)_m2 ../../
2227

2328
glcon:
2429
cd cmd/$(BINARYIO) ; \
25-
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO)
30+
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO);\
31+
cp $(BINARYIO) ../../
2632

2733
glcon.exe:
2834
cd cmd/$(BINARYIO) ; \
29-
GOOS=windows GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO).exe
35+
GOOS=windows GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO).exe;\
36+
cp $(BINARYIO).exe ../../
3037

3138
glcon.darwin:
3239
cd cmd/$(BINARYIO) ; \
33-
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO)_darwin
40+
GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO)_darwin ;\
41+
cp $(BINARYIO)_darwin ../../
3442

3543
glcon.m2:
3644
cd cmd/$(BINARYIO) ; \
37-
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO)_m2
45+
GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 env go build -ldflags "-X main.VERSION=$(MAINVERSION)" -o $(BINARYIO)_m2;\
46+
cp $(BINARYIO)_m2 ../../
3847

3948
releases: gleaner gleaner.exe gleaner.darwin gleaner.m2 glcon glcon.exe glcon.darwin glcon.m2
4049

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v3.0.7-development
1+
v3.0.8-fix129

‎cmd/glcon/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package main
22

33
import (
4-
"fmt"
54
"github.com/gleanerio/gleaner/pkg/cli"
5+
log "github.com/sirupsen/logrus"
66
)
77

88
var VERSION string
99

1010
func main() {
11-
fmt.Println("version: ", VERSION)
11+
log.Info("version: ", VERSION)
1212
cli.Execute()
1313
}

0 commit comments

Comments
 (0)