Merge pull request #81 from tesonep/master

tesonep · web-flow · commit 6a71920cc412 · 2019-10-28T10:42:59.000+01:00
Deprecation of #withSqueakLineEndings
diff --git a/.travis.yml b/.travis.yml
@@ -9,4 +9,5 @@ smalltalk:
   - Pharo-5.0
   - Pharo-6.0
   - Pharo-6.1
-  - Pharo-7.0
+  - Pharo-7.0
+  - Pharo64-8.0
diff --git a/BaselineOfTonel.package/BaselineOfTonel.class/instance/baseline..st b/BaselineOfTonel.package/BaselineOfTonel.class/instance/baseline..st
@@ -12,8 +12,17 @@ baseline: spec
 				group: 'default' with: #('core' 'tests');
 				group: 'core' with: #('MonticelloTonel-Core' 'MonticelloTonel-FileSystem');
 				group: 'tests' with: #('MonticelloTonel-Tests') ].
+
+	spec for: #(#'pharo4.x' #'pharo5.x' #'pharo6.x' #'pharo7.x') do: [ 
+		self ston: spec.
+		
+		spec 
+			package: #'MonticelloTonel-Compatibility';
+			package: #'MonticelloTonel-Core' with: [ spec requires: #(#'MonticelloTonel-Compatibility') ] ].
 			
 	spec for: #(#'pharo1.x' #'pharo2.x' #'pharo3.x' #'pharo4.x') do: [ 
 		self ston: spec.
 		
-		spec package: #'MonticelloTonel-Core' with: [ spec requires: #('Ston') ] ]
+		spec 
+			package: #'MonticelloTonel-Compatibility';
+			package: #'MonticelloTonel-Core' with: [ spec requires: #(#'MonticelloTonel-Compatibility' 'Ston') ] ]
diff --git a/MonticelloTonel-Compatibility.package/.filetree b/MonticelloTonel-Compatibility.package/.filetree
@@ -0,0 +1,5 @@
+{
+	"separateMethodMetaAndSource" : false,
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
diff --git a/MonticelloTonel-Compatibility.package/String.extension/instance/withInternalLineEndings.st b/MonticelloTonel-Compatibility.package/String.extension/instance/withInternalLineEndings.st
@@ -0,0 +1,5 @@
+*MonticelloTonel-Compatibility
+withInternalLineEndings
+	"Answer a new instance where all occurrences of CRLF and LF are substituted with CR. Pharo internally uses CR for carriage return."
+
+	^ self withLineEndings: String cr
diff --git a/MonticelloTonel-Compatibility.package/String.extension/properties.json b/MonticelloTonel-Compatibility.package/String.extension/properties.json
@@ -0,0 +1,3 @@
+{
+	"name" : "String"
+}
diff --git a/MonticelloTonel-Compatibility.package/monticello.meta/categories.st b/MonticelloTonel-Compatibility.package/monticello.meta/categories.st
@@ -0,0 +1 @@
+SystemOrganization addCategory: #'MonticelloTonel-Compatibility'!
diff --git a/MonticelloTonel-Compatibility.package/monticello.meta/initializers.st b/MonticelloTonel-Compatibility.package/monticello.meta/initializers.st
diff --git a/MonticelloTonel-Compatibility.package/monticello.meta/package b/MonticelloTonel-Compatibility.package/monticello.meta/package
@@ -0,0 +1 @@
+(name 'MonticelloTonel-Compatibility')
diff --git a/MonticelloTonel-Compatibility.package/properties.json b/MonticelloTonel-Compatibility.package/properties.json
@@ -0,0 +1 @@
+{ }
diff --git a/MonticelloTonel-Core.package/TonelCommentScanner.class/instance/scan.st b/MonticelloTonel-Core.package/TonelCommentScanner.class/instance/scan.st
@@ -19,6 +19,6 @@ scan
 	self flag: #todo. "This is a hack to make my clean algoritm for bodies work also for 
 	comments. I need to refactor the 'eat enter' part out to use just that."
 	^ self 
-		removeFrom: '"',result contents,'"' withSqueakLineEndings
+		removeFrom: '"',result contents,'"' withInternalLineEndings
 		enclosingStart: $" 
 		end: $"
diff --git a/MonticelloTonel-Core.package/TonelSourceScanner.class/instance/scan.st b/MonticelloTonel-Core.package/TonelSourceScanner.class/instance/scan.st
@@ -7,7 +7,7 @@ scan
 	isFinished ifTrue: [ 
 		"clean up to return"
 		^ self 
-			removeFrom: result contents withSqueakLineEndings
+			removeFrom: result contents withInternalLineEndings
 			enclosingStart: $[ 
 			end: $]
 			clean: #right ].

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+SystemOrganization addCategory: #'MonticelloTonel-Compatibility'!`