11498155021

Committed 24 Oct 2024 11:15AM UTC coverage: 59.724% (+0.8%) from 58.906%

Build # 11498155021

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #96 from moosetechnology/develop

Develop

Run Details

713 of 970 new or added lines in 22 files covered. (73.51%)

15 existing lines in 5 files now uncovered.

9449 of 15821 relevant lines covered (59.72%)

0.6 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

77.45

/src/GitProjectHealth-Model-Importer/GPModelImporter.class.st

"
I am a superclass for Model importer.
I am a try of normalization for the different importer.

I also define some contract so it is easier to switch from one importer to another
"
Class {
        #name : #GPModelImporter,
        #superclass : #Object,
        #instVars : [
                'withCommitsSince',
                'withFiles',
                'glhModel',
                'userCatalogue',
                'repoApi',
                'withCommitDiffs'
        ],
        #classVars : [
                'currentImporter'
        ],
        #category : #'GitProjectHealth-Model-Importer'
}

{ #category : #'accessing - global variables' }
GPModelImporter class >> importers [
        ^ currentImporter 
]

{ #category : #initialization }
GPModelImporter class >> reset [
        currentImporter := OrderedDictionary new.
]

{ #category : #accessing }
GPModelImporter >> beWithFiles [

        withFiles := true
]

{ #category : #accessing }
GPModelImporter >> beWithoutFiles [

        withFiles := false
]

{ #category : #'as yet unclassified' }
GPModelImporter >> blockEqualityOn: aSymbol [
        ^ [ :existing :new |
          (existing perform: aSymbol) = (new perform: aSymbol) ]
]

{ #category : #equality }
GPModelImporter >> blockForDiffEquality [
        ^ [ :existing :new |
                        existing diffString size = new diffString size and: [
                                existing diffString = new diffString ] ]
]

{ #category : #'as yet unclassified' }
GPModelImporter >> blockForDiffRangeEquality [

        ^ [ :existing :new |
          existing diff mooseID = new diff mooseID and: [
                  existing originalLineRange = new originalLineRange and: [
                          existing newLineRange = new newLineRange ] ] ]
]

{ #category : #equality }
GPModelImporter >> blockOnIdEquality [

        ^ [ :existing :new |
          existing id = new id ]
]

{ #category : #equality }
GPModelImporter >> blockOnNameEquality [

        ^ self blockEqualityOn: #name
]

{ #category : #commit }
GPModelImporter >> chainsCommitsFrom: commitsCollection [

        | dic |
        ('Chains ' , commitsCollection size printString , ' commits')
                recordInfo.

        dic := ((self glhModel allWithType: GLHCommit) collect: [ :commit |
                        commit id -> commit ]) asSet asDictionary.

        commitsCollection do: [ :commit |
                commit parent_ids do: [ :parentId |
                        dic
                                at: parentId
                                ifPresent: [ :parentCommit |
                                        parentCommit childCommits
                                                add: commit
                                                unless: [ :existing :new | existing id = new id ] ]
                                ifAbsent: [  ] ] ].
        ^ commitsCollection
]

{ #category : #commit }
GPModelImporter >> completeImportedCommit: aGLHCommit [ 
        
        
        ('completing commit: ' , aGLHCommit short_id printString) recordInfo.
        self importCreatorOfCommit: aGLHCommit.

        self withCommitDiffs ifTrue: [
                | diffs |
                aGLHCommit diffs ifEmpty: [
                        diffs := self importDiffOfCommit: aGLHCommit.
                        self glhModel addAll: diffs unless: self blockForDiffEquality ] ].

        ^ aGLHCommit
]

{ #category : #'as yet unclassified' }
GPModelImporter >> filterCommitChanges: aCollection [

        ^ aCollection reject: [ :line |
                  | trimmedLine |
                  trimmedLine := line trimLeft.
                  (trimmedLine beginsWith: '---') or: [
                          (trimmedLine beginsWith: '+++') or: [
                                  trimmedLine beginsWith: '\ No newline at end of file' ] ] ]
]

{ #category : #accessing }
GPModelImporter >> glhModel [

        ^ glhModel
]

{ #category : #accessing }
GPModelImporter >> glhModel: anObject [

        glhModel := anObject
]

{ #category : #import }
GPModelImporter >> importDiffRangesForDiff: aGLHDiff [

        | diffRanges |
        aGLHDiff diffRanges ifNotEmpty: [
                ('Diffs already imported for ' , aGLHDiff printString) recordInfo.
                ^ aGLHDiff diffRanges ].

        ('Import changes of diff ' , aGLHDiff printString) recordInfo.
        "the import of 'diffRanges' entites is technically done inside the parseDiffString"

        diffRanges := self glhModel
                              addAll: (self parseDiffString: aGLHDiff)
                              unless: self blockForDiffRangeEquality.
        ^ aGLHDiff diffRanges
                  addAll: diffRanges
                  unless: self blockForDiffRangeEquality
]

{ #category : #initialization }
GPModelImporter >> initialize [

        super initialize.
        self withCommitsSince: (Date today - 1 week) asDateAndTime.
                userCatalogue := GLHUserCatalogueV2 new
                                 anImporter: self;
                                 yourself.
]

{ #category : #'as yet unclassified' }
GPModelImporter >> makeGlobal [
        ^ self makeGlobal: DateAndTime now printString.
]

{ #category : #'as yet unclassified' }
GPModelImporter >> makeGlobal: aLabel [ 

        currentImporter := GHModelImporter importers ifNil: [ OrderedDictionary new ].
        currentImporter at: aLabel put: self. 
        ^ currentImporter 
]

{ #category : #parsing }
GPModelImporter >> parseDiffString: aDiff [
        "parse diff string to create entities for each lines"

        | lines range index firstChangeRange |
        lines := aDiff diffString lines.
        index := 0.
        range := nil.

        lines ifEmpty: [ ^ aDiff diffRanges ].
        lines := self filterCommitChanges: lines.
        (lines first beginsWith: '@@') ifFalse: [ ^ aDiff diffRanges ].

        lines do: [ :line |
                | aChange |
                firstChangeRange := false.
                (line trim beginsWith: #'@@') ifTrue: [
                        range := GLPHEDiffRange newFrom: line.
                        firstChangeRange := true.
                        range := aDiff diffRanges add: range unless: [ :existing :new |
                                         existing originalLineRange = new originalLineRange and: [
                                                 existing newLineRange = new newLineRange ] ] ].

                self withCommitDiffs ifTrue: [
                        firstChangeRange ifFalse: [
                                aChange := GLPHEChange newFrom: line.
                                aChange relativeIndex: index.
                                aChange := range changes add: aChange unless: [ :existing :new |
                                                   existing sourceCode = new sourceCode and: [
                                                           existing index = new index ] ].
                                index := index + 1 ] ] ].

        "add changes to the diff range"
        aDiff diffRanges do: [ :diffRange |
                self glhModel addAll: diffRange changes unless: [ :existing :new |
                        existing diffRange mooseID = new diffRange mooseID and: [
                                existing sourceCode = new sourceCode and: [
                                        existing index = new index ] ] ] ].

        ^ aDiff diffRanges
]

{ #category : #accessing }
GPModelImporter >> repoApi [

        ^ repoApi
]

{ #category : #accessing }
GPModelImporter >> repoApi: anObject [

        repoApi := anObject
]

{ #category : #accessing }
GPModelImporter >> userCatalogue [
        ^ userCatalogue 
]

{ #category : #accessing }
GPModelImporter >> userCatalogue: aGLHUserCatalogue [

        userCatalogue := aGLHUserCatalogue.
        aGLHUserCatalogue anImporter: self. 
]

{ #category : #accessing }
GPModelImporter >> withCommitDiffs [

        ^ withCommitDiffs
]

{ #category : #accessing }
GPModelImporter >> withCommitDiffs: anObject [

        withCommitDiffs := anObject
]

{ #category : #accessing }
GPModelImporter >> withCommitsSince [

        ^ withCommitsSince
]

{ #category : #accessing }
GPModelImporter >> withCommitsSince: anObject [

        withCommitsSince := anObject
]

{ #category : #accessing }
GPModelImporter >> withFiles [

        ^ withFiles
]

{ #category : #accessing }
GPModelImporter >> withFiles: anObject [

        withFiles := anObject
]

1	"
2	I am a superclass for Model importer.
3	I am a try of normalization for the different importer.
4
5	I also define some contract so it is easier to switch from one importer to another
6	"
7	Class {
8	#name : #GPModelImporter,
9	#superclass : #Object,
10	#instVars : [
11	'withCommitsSince',
12	'withFiles',
13	'glhModel',
14	'userCatalogue',
15	'repoApi',
16	'withCommitDiffs'
17	],
18	#classVars : [
19	'currentImporter'
20	],
21	#category : #'GitProjectHealth-Model-Importer'
22	}
23
24	{ #category : #'accessing - global variables' }
25	GPModelImporter class >> importers [	×
26	^ currentImporter	×
27	]	×
28
29	{ #category : #initialization }
30	GPModelImporter class >> reset [	×
NEW 31	currentImporter := OrderedDictionary new.	×
32	]	×
33
34	{ #category : #accessing }
35	GPModelImporter >> beWithFiles [	×
36		×
37	withFiles := true	×
38	]	×
39
40	{ #category : #accessing }
41	GPModelImporter >> beWithoutFiles [	×
42		×
43	withFiles := false	×
44	]	×
45
46	{ #category : #'as yet unclassified' }
47	GPModelImporter >> blockEqualityOn: aSymbol [	1✔
48	^ [ :existing :new \|	1✔
49	(existing perform: aSymbol) = (new perform: aSymbol) ]	1✔
50	]	1✔
51
52	{ #category : #equality }
53	GPModelImporter >> blockForDiffEquality [	1✔
54	^ [ :existing :new \|	1✔
55	existing diffString size = new diffString size and: [	1✔
56	existing diffString = new diffString ] ]	1✔
57	]	1✔
58
59	{ #category : #'as yet unclassified' }
60	GPModelImporter >> blockForDiffRangeEquality [	1✔
61		1✔
62	^ [ :existing :new \|	1✔
63	existing diff mooseID = new diff mooseID and: [	1✔
64	existing originalLineRange = new originalLineRange and: [	1✔
65	existing newLineRange = new newLineRange ] ] ]	1✔
66	]	1✔
67
68	{ #category : #equality }
69	GPModelImporter >> blockOnIdEquality [	1✔
70		1✔
71	^ [ :existing :new \|	1✔
72	existing id = new id ]	1✔
73	]	1✔
74
75	{ #category : #equality }
76	GPModelImporter >> blockOnNameEquality [	1✔
77		1✔
78	^ self blockEqualityOn: #name	1✔
79	]	1✔
80
81	{ #category : #commit }
82	GPModelImporter >> chainsCommitsFrom: commitsCollection [	1✔
83		1✔
84	\| dic \|	1✔
85	('Chains ' , commitsCollection size printString , ' commits')	1✔
86	recordInfo.	1✔
87		1✔
88	dic := ((self glhModel allWithType: GLHCommit) collect: [ :commit \|	1✔
89	commit id -> commit ]) asSet asDictionary.	1✔
90		1✔
91	commitsCollection do: [ :commit \|	1✔
92	commit parent_ids do: [ :parentId \|	1✔
93	dic	1✔
94	at: parentId	1✔
95	ifPresent: [ :parentCommit \|	1✔
96	parentCommit childCommits	1✔
97	add: commit	1✔
98	unless: [ :existing :new \| existing id = new id ] ]	1✔
99	ifAbsent: [ ] ] ].	1✔
100	^ commitsCollection	1✔
101	]	1✔
102
103	{ #category : #commit }
NEW 104	GPModelImporter >> completeImportedCommit: aGLHCommit [	×
NEW 105		×
NEW 106		×
NEW 107	('completing commit: ' , aGLHCommit short_id printString) recordInfo.	×
NEW 108	self importCreatorOfCommit: aGLHCommit.	×
NEW 109		×
NEW 110	self withCommitDiffs ifTrue: [	×
NEW 111	\| diffs \|	×
NEW 112	aGLHCommit diffs ifEmpty: [	×
NEW 113	diffs := self importDiffOfCommit: aGLHCommit.	×
NEW 114	self glhModel addAll: diffs unless: self blockForDiffEquality ] ].	×
NEW 115		×
NEW 116	^ aGLHCommit	×
NEW 117	]	×
118
119	{ #category : #'as yet unclassified' }
120	GPModelImporter >> filterCommitChanges: aCollection [	1✔
121		1✔
122	^ aCollection reject: [ :line \|	1✔
123	\| trimmedLine \|	1✔
124	trimmedLine := line trimLeft.	1✔
125	(trimmedLine beginsWith: '---') or: [	1✔
126	(trimmedLine beginsWith: '+++') or: [	1✔
127	trimmedLine beginsWith: '\ No newline at end of file' ] ] ]	1✔
128	]	1✔
129
130	{ #category : #accessing }
131	GPModelImporter >> glhModel [	1✔
132		1✔
133	^ glhModel	1✔
134	]	1✔
135
136	{ #category : #accessing }
137	GPModelImporter >> glhModel: anObject [	1✔
138		1✔
139	glhModel := anObject	1✔
140	]	1✔
141
142	{ #category : #import }
143	GPModelImporter >> importDiffRangesForDiff: aGLHDiff [	1✔
144		1✔
145	\| diffRanges \|	1✔
146	aGLHDiff diffRanges ifNotEmpty: [	1✔
147	('Diffs already imported for ' , aGLHDiff printString) recordInfo.	1✔
148	^ aGLHDiff diffRanges ].	1✔
149		1✔
150	('Import changes of diff ' , aGLHDiff printString) recordInfo.	1✔
151	"the import of 'diffRanges' entites is technically done inside the parseDiffString"	1✔
152		1✔
153	diffRanges := self glhModel	1✔
154	addAll: (self parseDiffString: aGLHDiff)	1✔
155	unless: self blockForDiffRangeEquality.	1✔
156	^ aGLHDiff diffRanges	1✔
157	addAll: diffRanges	1✔
158	unless: self blockForDiffRangeEquality	1✔
159	]	1✔
160
161	{ #category : #initialization }
162	GPModelImporter >> initialize [	1✔
163		1✔
164	super initialize.	1✔
165	self withCommitsSince: (Date today - 1 week) asDateAndTime.	1✔
166	userCatalogue := GLHUserCatalogueV2 new	1✔
167	anImporter: self;	1✔
168	yourself.	1✔
169	]	1✔
170
171	{ #category : #'as yet unclassified' }
NEW 172	GPModelImporter >> makeGlobal [	×
NEW 173	^ self makeGlobal: DateAndTime now printString.	×
NEW 174	]	×
175
176	{ #category : #'as yet unclassified' }
NEW 177	GPModelImporter >> makeGlobal: aLabel [	×
NEW 178		×
NEW 179	currentImporter := GHModelImporter importers ifNil: [ OrderedDictionary new ].	×
NEW 180	currentImporter at: aLabel put: self.	×
NEW 181	^ currentImporter	×
NEW 182	]	×
183
184	{ #category : #parsing }
185	GPModelImporter >> parseDiffString: aDiff [	1✔
186	"parse diff string to create entities for each lines"	1✔
187		1✔
188	\| lines range index firstChangeRange \|	1✔
189	lines := aDiff diffString lines.	1✔
190	index := 0.	1✔
191	range := nil.	1✔
192		1✔
193	lines ifEmpty: [ ^ aDiff diffRanges ].	1✔
194	lines := self filterCommitChanges: lines.	1✔
195	(lines first beginsWith: '@@') ifFalse: [ ^ aDiff diffRanges ].	1✔
196		1✔
197	lines do: [ :line \|	1✔
198	\| aChange \|	1✔
199	firstChangeRange := false.	1✔
200	(line trim beginsWith: #'@@') ifTrue: [	1✔
201	range := GLPHEDiffRange newFrom: line.	1✔
202	firstChangeRange := true.	1✔
203	range := aDiff diffRanges add: range unless: [ :existing :new \|	1✔
204	existing originalLineRange = new originalLineRange and: [	1✔
205	existing newLineRange = new newLineRange ] ] ].	1✔
206		1✔
207	self withCommitDiffs ifTrue: [	1✔
208	firstChangeRange ifFalse: [	1✔
209	aChange := GLPHEChange newFrom: line.	1✔
210	aChange relativeIndex: index.	1✔
211	aChange := range changes add: aChange unless: [ :existing :new \|	1✔
212	existing sourceCode = new sourceCode and: [	1✔
213	existing index = new index ] ].	1✔
214	index := index + 1 ] ] ].	1✔
215		1✔
216	"add changes to the diff range"	1✔
217	aDiff diffRanges do: [ :diffRange \|	1✔
218	self glhModel addAll: diffRange changes unless: [ :existing :new \|	1✔
219	existing diffRange mooseID = new diffRange mooseID and: [	1✔
220	existing sourceCode = new sourceCode and: [	1✔
221	existing index = new index ] ] ] ].	1✔
222		1✔
223	^ aDiff diffRanges	1✔
224	]	1✔
225
226	{ #category : #accessing }
227	GPModelImporter >> repoApi [	1✔
228		1✔
229	^ repoApi	1✔
230	]	1✔
231
232	{ #category : #accessing }
233	GPModelImporter >> repoApi: anObject [	1✔
234		1✔
235	repoApi := anObject	1✔
236	]	1✔
237
238	{ #category : #accessing }
239	GPModelImporter >> userCatalogue [	1✔
240	^ userCatalogue	1✔
241	]	1✔
242
243	{ #category : #accessing }
NEW 244	GPModelImporter >> userCatalogue: aGLHUserCatalogue [	×
NEW 245		×
NEW 246	userCatalogue := aGLHUserCatalogue.	×
NEW 247	aGLHUserCatalogue anImporter: self.	×
NEW 248	]	×
249
250	{ #category : #accessing }
251	GPModelImporter >> withCommitDiffs [	1✔
252		1✔
253	^ withCommitDiffs	1✔
254	]	1✔
255
256	{ #category : #accessing }
257	GPModelImporter >> withCommitDiffs: anObject [	1✔
258		1✔
259	withCommitDiffs := anObject	1✔
260	]	1✔
261
262	{ #category : #accessing }
263	GPModelImporter >> withCommitsSince [	×
264		×
265	^ withCommitsSince	×
266	]	×
267
268	{ #category : #accessing }
269	GPModelImporter >> withCommitsSince: anObject [	1✔
270		1✔
271	withCommitsSince := anObject	1✔
272	]	1✔
273
274	{ #category : #accessing }
275	GPModelImporter >> withFiles [	1✔
276		1✔
277	^ withFiles	1✔
278	]	1✔
279
280	{ #category : #accessing }
281	GPModelImporter >> withFiles: anObject [	1✔
282		1✔
283	withFiles := anObject	1✔
284	]	1✔

moosetechnology / GitProjectHealth / 11498155021

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous