Merge branch 'development' of github.com:DuneSt/FileLibraryHelper into development

Author: yann.lesage

src/BaselineOfFileLibraryHelper/BaselineOfFileLibraryHelper.class.st

@@ -5,7 +5,7 @@ To know more: https://github.com/jecisc/FileLibraryHelper
 Class {
 	#name : #BaselineOfFileLibraryHelper,
 	#superclass : #BaselineOf,
-	#category : 'BaselineOfFileLibraryHelper'
+	#category : #BaselineOfFileLibraryHelper
 }
 
 { #category : #baseline }
@@ -14,12 +14,22 @@ BaselineOfFileLibraryHelper >> baseline: spec [
 	spec
 		for: #common
 		do: [ self seaside3: spec.
-			spec package: 'FileLibraryHelper' with: [ spec requires: #('Seaside3') ] ].
-
+			spec
+				package: 'FileLibraryHelper'
+				with: [ spec requires: #('Seaside3') ] ].
+	spec
+		for: #dev
+		do: [ self seaside3: spec.
+			spec
+				package: 'FileLibraryHelper'
+					with: [ spec requires: #('Seaside3') ] spec;
+				package: 'FileLibraryHelper-Tests'
+					with: [ spec requires: #('GitBridge') ] ].
 	spec
 		for: #(#'pharo4.x' #'pharo5.x' #'pharo6.x' #'pharo7.x')
 		do: [ spec
-				package: 'FileLibraryHelper' with: [ spec requires: #('FileLibraryHelper-Pharo8') ];
+				package: 'FileLibraryHelper'
+					with: [ spec requires: #('FileLibraryHelper-Pharo8') ];
 				package: 'FileLibraryHelper-Pharo8' ]
 ]
 

src/FileLibraryHelper-Tests/FileLibraryGitBridge.class.st

@@ -0,0 +1,5 @@
+Class {
+	#name : #FileLibraryGitBridge,
+	#superclass : #GitBridge,
+	#category : #'FileLibraryHelper-Tests'
+}

src/FileLibraryHelper-Tests/FileLibraryHelperTest.class.st

@@ -0,0 +1,19 @@
+Class {
+	#name : #FileLibraryHelperTest,
+	#superclass : #TestCase,
+	#category : #'FileLibraryHelper-Tests'
+}
+
+{ #category : #tests }
+FileLibraryHelperTest >> tearDown [ 
+	 FileLibraryLibMock methods do: #removeFromSystem
+]
+
+{ #category : #tests }
+FileLibraryHelperTest >> testImportingJsFile [
+	FileLibraryLibMock importFiles.
+	self
+		assert: (FileLibraryLibMock new perform: #TheGoodPlaceJs)
+		equals: 'console.log("The Good Place is a serie about hell")
+'
+]

src/FileLibraryHelper-Tests/FileLibraryLibMock.class.st

@@ -0,0 +1,13 @@
+Class {
+	#name : #FileLibraryLibMock,
+	#superclass : #WAFileLibrary,
+	#classInstVars : [
+		'fileSystem'
+	],
+	#category : #'FileLibraryHelper-Tests'
+}
+
+{ #category : #accessing }
+FileLibraryLibMock class >> filesDirectory [
+	^ FileLibraryGitBridge root / 'testResource'
+]

src/FileLibraryHelper-Tests/package.st

@@ -0,0 +1 @@
+Package { #name : #'FileLibraryHelper-Tests' }

src/FileLibraryHelper/WAFileLibrary.extension.st

@@ -32,7 +32,7 @@ WAFileLibrary class >> export: methods inFolder: subFolder [
 
 { #category : #'*FileLibraryHelper' }
 WAFileLibrary class >> filesDirectory [
-	^ FileSystem workingDirectory
+	^ FileSystem workingDirectory / self resourcesFolderName
 ]
 
 { #category : #'*FileLibraryHelper' }
@@ -44,12 +44,15 @@ WAFileLibrary class >> importFiles [
 { #category : #'*FileLibraryHelper' }
 WAFileLibrary class >> importFilesFrom: aDirectory [
 	EpMonitor
-		disableDuring: [ ((aDirectory / self resourcesFolderName) directories reject: [ :each | each basename beginsWith: '.' ])
+		disableDuring: [ (aDirectory directories
+				reject: [ :each | each basename beginsWith: '.' ])
 				do: [ :directory | 
 					directory files
 						do: [ :file | 
-							self addFileAt: self resourcesFolderName , '/' , directory basename , '/' , file basename.
-							self methods detect: [ :m | m selector = (self default asSelector: file basename) ] ifFound: [ :m | m protocol: directory basename ] ]
+							self addFileAt: file fullName.
+							self methods
+								detect: [ :m | m selector = (self default asSelector: file basename) ]
+								ifFound: [ :m | m protocol: directory basename ] ]
 						displayingProgress: [ :file | 'Importing: ' , file basename ]
 						every: 200 ]
 				displayingProgress: [ :dir | 'Importing files from: ' , dir basename ]

testResource/js/TheGoodPlace.js

@@ -0,0 +1 @@
+console.log("The Good Place is a serie about hell")