Merge pull request #1144 from pharo-vcs/dev-1.0

Preparing release of v1.5.2

BaselineOfIceberg.package/BaselineOfIceberg.class/instance/commander..st

@@ -4,5 +4,5 @@ commander: spec
 		baseline: 'Commander' 
 		with: [ 
 			spec 
-				repository: 'github://pharo-ide/Commander:v0.7.1/src';
+				repository: 'github://pharo-ide/Commander:v0.7.2/src';
 				loads: #('Core' 'AllActivators' 'Commander-SpecSupport') ]

BaselineOfIceberg.package/BaselineOfIceberg.class/instance/tonel..st

@@ -2,4 +2,4 @@ baseline
 tonel: spec
 	spec
 		baseline: 'Tonel' 
-		with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.11' ]
+		with: [ spec repository: 'github://pharo-vcs/tonel:v1.0.12' ]

Iceberg-Metacello-Integration.package/IceGitLocalRepositoryType.class/instance/mcRepository.st

@@ -16,4 +16,4 @@ mcRepository
 				createRepository)
 				register ].
 
-	^ repository metacelloAdapter
+	^ repository metacelloAdapter: repository head description.

Iceberg-Metacello-Integration.package/IceGithubRepositoryType.class/instance/mcRepository.st

@@ -3,7 +3,7 @@ mcRepository
 	| baseRepo |
 
 	self guessRegisteredRepository
-		ifNotNil: [ :repo | ^ repo metacelloAdapter ].
+		ifNotNil: [ :repo | ^ repo metacelloAdapter: self projectVersion ].
 
 	baseRepo := self mcRepositoryClass location: self location.
 	^ (Iceberg icebergRepositoriesURLs includes: baseRepo scpUrl)
@@ -12,5 +12,5 @@ mcRepository
 			see https://github.com/pharo-vcs/iceberg/issues/168"
 			baseRepo ]
 		ifFalse: [  
-			baseRepo getOrCreateIcebergRepository metacelloAdapter ]
+			baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ]
 

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/instance/guessRegisteredRepository.st

@@ -2,9 +2,7 @@ accessing
 guessRegisteredRepository
 	"I get the project name and try to find it into the already registered projects. 
 	 If I find it, I will use this instead cloning a new one."
-	| projectName |
-
-	projectName := (self location substrings: '/') third copyUpTo: $:.
+
 	^ IceRepository registry 
-		detect: [ : each | each name = projectName ] 
+		detect: [ : each | each name = self projectName ] 
 		ifNone: [ nil ]

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/instance/mcRepository.st

@@ -3,7 +3,7 @@ mcRepository
 	| baseRepo |
 
 	self guessRegisteredRepository
-		ifNotNil: [ :repo | ^ repo metacelloAdapter ].
+		ifNotNil: [ :repo | ^ repo metacelloAdapter: self projectVersion  ].
 
 	baseRepo := self mcRepositoryClass location: self location.
-	^ baseRepo getOrCreateIcebergRepository metacelloAdapter
+	^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/instance/projectName.st

@@ -0,0 +1,4 @@
+accessing
+projectName
+
+	^ (self location substrings: '/') third copyUpTo: $:

Iceberg-Metacello-Integration.package/IceProviderRepositoryType.class/instance/projectVersion.st

@@ -0,0 +1,4 @@
+accessing
+projectVersion
+
+	^ (location substrings: '/') third copyAfter: $:

Iceberg-Tests-MetacelloIntegration.package/AbstractIceMetacelloIntegrationTests.class/class/isAbstract.st

@@ -0,0 +1,4 @@
+testing
+isAbstract
+
+	^ self name = #AbstractIceMetacelloIntegrationTests

Iceberg-Tests-MetacelloIntegration.package/AbstractIceMetacelloIntegrationTests.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"commentStamp" : "",
+	"super" : "IceParameterizedTestCase",
+	"category" : "Iceberg-Tests-MetacelloIntegration",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"repository",
+		"conflictingRepository"
+	],
+	"name" : "AbstractIceMetacelloIntegrationTests",
+	"type" : "normal"
+}

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationTests.class/properties.json

@@ -1,16 +1,13 @@
 {
 	"commentStamp" : "",
-	"super" : "IceParameterizedTestCase",
+	"super" : "AbstractIceMetacelloIntegrationTests",
 	"category" : "Iceberg-Tests-MetacelloIntegration",
 	"classinstvars" : [ ],
 	"pools" : [ ],
 	"classvars" : [
 		"CommitishToUse"
 	],
-	"instvars" : [
-		"repository",
-		"conflictingRepository"
-	],
+	"instvars" : [ ],
 	"name" : "IceMetacelloIntegrationTests",
 	"type" : "normal"
 }

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/repositoryName.st

@@ -0,0 +1,4 @@
+configuring
+repositoryName
+
+	^ 'test-project-source-properties-tonel'

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/tearDown.st

@@ -0,0 +1,15 @@
+tests
+tearDown
+
+	super tearDown.
+
+	(IceRepository registry select: [ :e | e name = 'test-project-with-dep' ]) do: [ :each | each ifNotNil: [ :repo |
+		repo unload.
+		repo forget.
+		repo location ifNotNil: #ensureDeleteAll ] ].
+
+	"Cleanup Metacello registry to avoid conflicts"		
+	MetacelloProjectRegistration registry baselineRegistry
+		detect: [ :registration | registration projectName = 'TestProjectWithDep' ]
+		ifFound: [ :registration | registration unregisterProject ].
+

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/testConflictDetectedWithProjectWithDependency.st

@@ -0,0 +1,16 @@
+tests
+testConflictDetectedWithProjectWithDependency
+
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository:'github://pharo-vcs/test-project-source-properties-tonel';
+		load.
+
+	self assert: self repositoryForTest head description equals: 'master'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 700.
+
+	self should: [Metacello new
+		baseline: 'TestProjectWithDep';
+		repository:'github://pharo-vcs/test-project-with-dep';
+		load] raise: MetacelloConflictingProjectError.
+

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/testIncommingWhenProjectWithDependency.st

@@ -0,0 +1,20 @@
+tests
+testIncommingWhenProjectWithDependency
+
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository:'github://pharo-vcs/test-project-source-properties-tonel';
+		load.
+
+	self assert: self repositoryForTest head description equals: 'master'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 700.
+
+	Metacello new
+		baseline: 'TestProjectWithDep';
+		repository:'github://pharo-vcs/test-project-with-dep';
+		onConflictUseIncoming;
+		load.
+
+	self assert: self repositoryForTest head description equals: '1.2.3'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 697.
+

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/testKeepExistingWhenProjectWithDependency.st

@@ -0,0 +1,20 @@
+tests
+testKeepExistingWhenProjectWithDependency
+
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository:'github://pharo-vcs/test-project-source-properties-tonel';
+		load.
+
+	self assert: self repositoryForTest head description equals: 'master'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 700.
+
+	Metacello new
+		baseline: 'TestProjectWithDep';
+		repository:'github://pharo-vcs/test-project-with-dep';
+		onConflictUseLoaded;
+		load.
+
+	self assert: self repositoryForTest head description equals: 'master'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 700.
+

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/instance/testUpdateProjectShouldCheckoutTheNewVersion.st

@@ -0,0 +1,19 @@
+tests
+testUpdateProjectShouldCheckoutTheNewVersion
+
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository:'github://pharo-vcs/test-project-source-properties-tonel';
+		load.
+
+	self assert: self repositoryForTest head description equals: 'master'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 700.
+
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository:'github://pharo-vcs/test-project-source-properties-tonel:1.2.3';
+		onConflictUseIncoming;
+		load.
+
+	self assert: self repositoryForTest head description equals: '1.2.3'.
+	self assert: (Smalltalk classNamed: #Test) new versionNumber equals: 697.

Iceberg-Tests-MetacelloIntegration.package/IceMetacelloIntegrationUpdateALoadedVersionTest.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "AbstractIceMetacelloIntegrationTests",
+	"category" : "Iceberg-Tests-MetacelloIntegration",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "IceMetacelloIntegrationUpdateALoadedVersionTest",
+	"type" : "normal"
+}

Iceberg-TipUI.package/FTBasicItem.extension/instance/toggle.st

@@ -0,0 +1,5 @@
+*Iceberg-TipUI
+toggle
+	self isExpanded
+		ifTrue: [ self collapseAndRefresh ]
+		ifFalse: [ self expandAndRefresh ]

Iceberg-TipUI.package/FTBasicItem.extension/properties.json

@@ -0,0 +1,3 @@
+{
+	"name" : "FTBasicItem"
+}

Iceberg-TipUI.package/IceTipEntityModel.class/instance/colorModified.st

@@ -1,4 +1,3 @@
 TOMOVE
 colorModified
-	self flag: #todo. "Make themable"
-	^ Color r: 0 g: 0.5 b: 0
+	^ Smalltalk ui theme successTextColor

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/README.md

@@ -0,0 +1,6 @@
+Description
+--------------------
+
+I am a cell used to render the header of an outline datasource.
+
+Since the header should not be part of the tree, to collapse it we do not have a button but I am clickable. (I show a web cursor to show the feature to the user)

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/class/dataSource.item..st

@@ -0,0 +1,6 @@
+instance creation
+dataSource: aDataSource item: anItem
+	^ self new
+		dataSource: aDataSource;
+		item: anItem;
+		yourself

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/dataSource..st

@@ -0,0 +1,3 @@
+accessing
+dataSource: aDataSource 
+	dataSource := aDataSource

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/defaultColor.st

@@ -0,0 +1,3 @@
+initialize
+defaultColor
+	^ self theme backgroundColor negated alpha: 0.05

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/handlesMouseDown..st

@@ -0,0 +1,3 @@
+event handling
+handlesMouseDown: evt
+	^ true

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/handlesMouseOver..st

@@ -0,0 +1,3 @@
+event handling
+handlesMouseOver: evt
+	^ true

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/item..st

@@ -0,0 +1,3 @@
+accessing
+item: anItem 
+	item := anItem

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/mouseEnter..st

@@ -0,0 +1,4 @@
+event handling
+mouseEnter: evt
+	self currentHand showTemporaryCursor: Cursor webLink.
+	super mouseEnter: evt

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/mouseLeave..st

@@ -0,0 +1,4 @@
+event handling
+mouseLeave: evt
+	self currentHand showTemporaryCursor: nil.
+	super mouseLeave: evt

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/instance/mouseUp..st

@@ -0,0 +1,5 @@
+event handling
+mouseUp: evt
+	((dataSource canDisplayChildrenOf: item) and: [ item children isNotEmpty ])
+		ifTrue: [ item toggle ].
+	super mouseUp: evt

Iceberg-TipUI.package/IceTipOutlineHeaderCellMorph.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"commentStamp" : "CyrilFerlicot 11/8/2018 12:00",
+	"super" : "FTCellMorph",
+	"category" : "Iceberg-TipUI-View-DataSource",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"dataSource",
+		"item"
+	],
+	"name" : "IceTipOutlineHeaderCellMorph",
+	"type" : "normal"
+}

Iceberg-TipUI.package/IceTipRepositoryBrowser.class/instance/newSidebarTreeDataSource.st

@@ -1,6 +1,6 @@
 private factory
 newSidebarTreeDataSource
-	^ IceTipTreeDataSource new 
+	^ IceTipTreeOutlineDataSource new 
 		tool: self;
 		rootForItems: self model repositoryModelsByGroup;
 		childrenBlock: [ :each | each children ];

Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/README.md

@@ -0,0 +1,6 @@
+Description
+--------------------
+
+I'm a tree datasource to generate an Outline component.
+
+My roots are displayed as section and not as part of the tree.

Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellColumn.row..st

@@ -0,0 +1,8 @@
+instance creation
+cellColumn: column row: rowIndex
+	| item |
+
+	item := self elementAt: rowIndex.
+	^ item depth = 0
+		ifTrue: [ self newRootCellFor: item ]
+		ifFalse: [ self newCellFor: item ] 

Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/cellIndentFor..st

@@ -0,0 +1,3 @@
+private factory
+cellIndentFor: item
+	^ ((item depth - 1) * 16) + 3 

Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/instance/newRootCellFor..st

@@ -0,0 +1,11 @@
+instance creation
+newRootCellFor: item
+	| cell |
+	cell := IceTipOutlineHeaderCellMorph dataSource: self item: item.
+	(self iconFor: item data) ifNotNil: [ :icon | cell addMorphBack: icon asMorph ].
+	cell addMorphBack: (self toString: item data) asMorph asReadOnlyMorph.
+	cell addMorphBack: (AlignmentMorph newSpacer: Color transparent).
+	cell addMorphBack: item children size asMorph asReadOnlyMorph.
+	"Since we might have a scroll bar we do not want to have the number of children displayed at the extreme right."
+	cell addMorphBack: (Morph newBounds: (0 @ 0 corner: 20 @ 0) color: Color transparent) asReadOnlyMorph.
+	^ cell

Iceberg-TipUI.package/IceTipTreeOutlineDataSource.class/properties.json

@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "CyrilFerlicot 11/8/2018 12:01",
+	"super" : "IceTipTreeDataSource",
+	"category" : "Iceberg-TipUI-View-DataSource",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "IceTipTreeOutlineDataSource",
+	"type" : "normal"
+}

Iceberg.package/IceCheckoutStrategy.class/instance/commitish..st

@@ -0,0 +1,4 @@
+accessing
+commitish: aCommittish
+
+	committish := aCommittish