Fixes #58 - Registry should produce an anouncement when creating a re…

…pository. Renamed IceCreateRepositoryModel to IceCloneRepositoryModel. Allow for git SCP urls without a trailing '.git'. Slightly improving of error messages on wrong repository URLs.
pharo-vcs · Aug 2, 2016 · 8676a9f · 8676a9f
1 parent 359fae9
commit 8676a9f
Show file tree

Hide file tree

Showing 38 changed files with 76 additions and 15 deletions.
diff --git a/.../IceCreateRepositoryModel.class/README.md → ...e/IceCloneRepositoryModel.class/README.md b/.../IceCreateRepositoryModel.class/README.md → ...e/IceCloneRepositoryModel.class/README.md
diff --git a/...epositoryModel.class/class/defaultSpec.st → ...epositoryModel.class/class/defaultSpec.st b/...epositoryModel.class/class/defaultSpec.st → ...epositoryModel.class/class/defaultSpec.st
diff --git a/...oryModel.class/instance/changeLocation.st → ...oryModel.class/instance/changeLocation.st b/...oryModel.class/instance/changeLocation.st → ...oryModel.class/instance/changeLocation.st
diff --git a/...el.class/instance/changeLocationButton.st → ...el.class/instance/changeLocationButton.st b/...el.class/instance/changeLocationButton.st → ...el.class/instance/changeLocationButton.st
diff --git a/...toryModel.class/instance/createButton..st → ...toryModel.class/instance/createButton..st b/...toryModel.class/instance/createButton..st → ...toryModel.class/instance/createButton..st
diff --git a/...itoryModel.class/instance/createButton.st → ...itoryModel.class/instance/createButton.st b/...itoryModel.class/instance/createButton.st → ...itoryModel.class/instance/createButton.st
diff --git a/...yModel.class/instance/createRepository.st → ...yModel.class/instance/createRepository.st b/...yModel.class/instance/createRepository.st → ...yModel.class/instance/createRepository.st
@@ -10,4 +10,7 @@ createRepository
 		self window delete. 
 	]
 	on: IceWrongUrl 
-	do: [ UIManager default abort: 'The entered URL is not a valid scp repository URL.' ]
+	do: [ :error | 
+		UIManager default 
+			abort: error messageText 
+			title: 'Could not create repository' ]
diff --git a/...toryModel.class/instance/initialExtent.st → ...toryModel.class/instance/initialExtent.st b/...toryModel.class/instance/initialExtent.st → ...toryModel.class/instance/initialExtent.st
diff --git a/...ositoryModel.class/instance/initialize.st → ...ositoryModel.class/instance/initialize.st b/...ositoryModel.class/instance/initialize.st → ...ositoryModel.class/instance/initialize.st
diff --git a/...del.class/instance/initializePresenter.st → ...del.class/instance/initializePresenter.st b/...del.class/instance/initializePresenter.st → ...del.class/instance/initializePresenter.st
diff --git a/...Model.class/instance/initializeWidgets.st → ...Model.class/instance/initializeWidgets.st b/...Model.class/instance/initializeWidgets.st → ...Model.class/instance/initializeWidgets.st
@@ -3,11 +3,11 @@ initializeWidgets
 	remoteUrlLabel := self newLabel label: 'Remote URL'.
 	remoteUrl := self newTextInput text: '[email protected]:'; autoAccept: true.
 
-	localDirectoryLabel := self newLabel label: 'Local repository:'.
+	localDirectoryLabel := self newLabel label: 'Local directory:'.
 	localDirectory := self newLabel label: 'default location (iceberg-cache)'.
 	changeLocationButton := self newButton label: 'Change'.
 
-	subdirectoryLabel := self newLabel label: 'Subdirectory'.
+	subdirectoryLabel := self newLabel label: 'Code subdirectory'.
 	subdirectory := self newTextInput autoAccept: true.
 
 	createButton := self newButton

diff --git a/...oryModel.class/instance/localDirectory.st → ...oryModel.class/instance/localDirectory.st b/...oryModel.class/instance/localDirectory.st → ...oryModel.class/instance/localDirectory.st
diff --git a/...del.class/instance/localDirectoryLabel.st → ...del.class/instance/localDirectoryLabel.st b/...del.class/instance/localDirectoryLabel.st → ...del.class/instance/localDirectoryLabel.st
diff --git a/...positoryModel.class/instance/location..st → ...positoryModel.class/instance/location..st b/...positoryModel.class/instance/location..st → ...positoryModel.class/instance/location..st
diff --git a/...epositoryModel.class/instance/location.st → ...epositoryModel.class/instance/location.st b/...epositoryModel.class/instance/location.st → ...epositoryModel.class/instance/location.st
diff --git a/...positoryModel.class/instance/remoteUrl.st → ...positoryModel.class/instance/remoteUrl.st b/...positoryModel.class/instance/remoteUrl.st → ...positoryModel.class/instance/remoteUrl.st
diff --git a/...oryModel.class/instance/remoteUrlLabel.st → ...oryModel.class/instance/remoteUrlLabel.st b/...oryModel.class/instance/remoteUrlLabel.st → ...oryModel.class/instance/remoteUrlLabel.st
diff --git a/...itoryModel.class/instance/subdirectory.st → ...itoryModel.class/instance/subdirectory.st b/...itoryModel.class/instance/subdirectory.st → ...itoryModel.class/instance/subdirectory.st
diff --git a/...Model.class/instance/subdirectoryLabel.st → ...Model.class/instance/subdirectoryLabel.st b/...Model.class/instance/subdirectoryLabel.st → ...Model.class/instance/subdirectoryLabel.st
diff --git a/...teRepositoryModel.class/instance/title.st → ...neRepositoryModel.class/instance/title.st b/...teRepositoryModel.class/instance/title.st → ...neRepositoryModel.class/instance/title.st
diff --git a/...eateRepositoryModel.class/properties.json → ...loneRepositoryModel.class/properties.json b/...eateRepositoryModel.class/properties.json → ...loneRepositoryModel.class/properties.json
@@ -15,7 +15,7 @@
 		"subdirectory",
 		"changeLocationButton",
 		"createButton" ],
-	"name" : "IceCreateRepositoryModel",
+	"name" : "IceCloneRepositoryModel",
 	"pools" : [
 		 ],
 	"super" : "ComposableModel",

diff --git a/Iceberg.package/IceExamples.class/class/exampleCreateRepository.st b/Iceberg.package/IceExamples.class/class/exampleCreateRepository.st
@@ -1,3 +1,3 @@
 examples - repositories
 exampleCreateRepository
-	IceCreateRepositoryModel new openWithSpec.
+	IceCloneRepositoryModel new openWithSpec.
diff --git a/Iceberg.package/IceRemoteScpRepository.class/instance/parseUrl.st b/Iceberg.package/IceRemoteScpRepository.class/instance/parseUrl.st
@@ -1,14 +1,14 @@
 private
 parseUrl
 	| matcher |
-	matcher := '(git@)?([\w.]+)\:([\w]+)/([\w\-]+)\.git/?.*' asRegex.
+	matcher := '(git@)?([\w.]+)\:([\w]+)/([\w\-]+)(\.git)?' asRegex.
 	(matcher matches: url) 
 		ifTrue: [ 
 			host := matcher subexpression: 3.
 			owner := matcher subexpression: 4.
 			projectName := matcher subexpression: 5.
 		]
-		ifFalse: [ IceWrongUrl signal: 'Could not parse scp url: ', url ]
+		ifFalse: [ IceWrongUrl signal: 'Could not parse URL: ', url ]
 
 
 

diff --git a/Iceberg.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st b/Iceberg.package/IceRepositoriesBrowser.class/instance/composeRepositoriesIn..st
@@ -4,10 +4,13 @@ composeRepositoriesIn: composite
 		title: 'Repositories';
 		column: 'Origin' evaluated: [:repo | repo origin url ] width: 320;
 		column: 'Current branch' evaluated: #branchName;
+		updateOn: IceChangeSetChanged from: #announcer;
+		updateOn: IceRepositoryRegistryModified from: [ Iceberg announcer ];
 		addAction: self createRepositoryAction;
+		addAction: self createLocalRepositoryAction;
 		addAction: self synchronizeRepositoryAction;
-		selectionAct: self switchBranch on: $b entitled: 'Switch branch';
-		selectionAct: self forgetRepository on: $x entitled: 'Forget repository';
+		selectionAct: self switchBranch on: $b entitled: 'Switch branch...';
+		selectionAct: self forgetRepository on: $x entitled: 'Forget repository...';
 		addSelectionAction: self pushAction;
 		selectionAct: self refreshRepository on: $r entitled: 'Refresh repository';
 		onChangeOfPort: #strongSelection act: [ :table | IceGlamourSynchronizer synchronize: table selection ]
diff --git a/Iceberg.package/IceRepositoriesBrowser.class/instance/createLocalRepositoryAction.st b/Iceberg.package/IceRepositoriesBrowser.class/instance/createLocalRepositoryAction.st
@@ -0,0 +1,7 @@
+action creators
+createLocalRepositoryAction
+	^ GLMGenericAction new
+		action: [ :presentation | self class createLocalRepository ifNotNil: [ presentation pane ]];
+		icon: GLMUIThemeExtraIcons glamorousAdd;
+		shortcut: $a;
+		title: 'Add local repository'; showTitle
diff --git a/Iceberg.package/IceRepositoriesBrowser.class/instance/createRepositoryAction.st b/Iceberg.package/IceRepositoriesBrowser.class/instance/createRepositoryAction.st
@@ -3,5 +3,5 @@ createRepositoryAction
 	^ GLMGenericAction new
 		action: [ :presentation | self class createRepository ifNotNil: [ presentation pane ]];
 		icon: GLMUIThemeExtraIcons glamorousAdd;
-		shortcut: $a;
-		title: 'Add repository'; showTitle
+		shortcut: $c;
+		title: 'Clone new repository'; showTitle
diff --git a/Iceberg.package/IceRepository.class/class/reset.st b/Iceberg.package/IceRepository.class/class/reset.st
@@ -1,3 +1,4 @@
 registry
 reset
-	Registry := nil
+	Registry := nil.
+	Iceberg announcer announce: IceRepositoryForgotten new.
diff --git a/Iceberg.package/IceRepository.class/instance/forget.st b/Iceberg.package/IceRepository.class/instance/forget.st
@@ -1,3 +1,4 @@
 registry
 forget
-	self class registry remove: self ifAbsent: [ "Ignore" ]
+	(self class registry remove: self ifAbsent: [ "Ignore" ])
+		ifNotNil: [ Iceberg announcer announce: IceRepositoryForgotten new ]
diff --git a/Iceberg.package/IceRepository.class/instance/register.st b/Iceberg.package/IceRepository.class/instance/register.st
@@ -2,4 +2,5 @@ registry
 register
 	self ensureLocalRepository.
 	self class registry add: self.
+	Iceberg announcer announce: IceRepositoryCreated new.
 	^ self 
diff --git a/Iceberg.package/IceRepositoryCreated.class/README.md b/Iceberg.package/IceRepositoryCreated.class/README.md
diff --git a/Iceberg.package/IceRepositoryCreated.class/properties.json b/Iceberg.package/IceRepositoryCreated.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Announcements",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "IceRepositoryCreated",
+	"pools" : [
+		 ],
+	"super" : "IceRepositoryRegistryModified",
+	"type" : "normal" }
diff --git a/Iceberg.package/IceRepositoryForgotten.class/README.md b/Iceberg.package/IceRepositoryForgotten.class/README.md
diff --git a/Iceberg.package/IceRepositoryForgotten.class/properties.json b/Iceberg.package/IceRepositoryForgotten.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Announcements",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "IceRepositoryForgotten",
+	"pools" : [
+		 ],
+	"super" : "IceRepositoryRegistryModified",
+	"type" : "normal" }
diff --git a/Iceberg.package/IceRepositoryRegistryModified.class/README.md b/Iceberg.package/IceRepositoryRegistryModified.class/README.md
diff --git a/Iceberg.package/IceRepositoryRegistryModified.class/properties.json b/Iceberg.package/IceRepositoryRegistryModified.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"category" : "Iceberg-Announcements",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "IceRepositoryRegistryModified",
+	"pools" : [
+		 ],
+	"super" : "Announcement",
+	"type" : "normal" }
diff --git a/Iceberg.package/IceTool.class/class/createRepository.st b/Iceberg.package/IceTool.class/class/createRepository.st
@@ -1,3 +1,3 @@
 utilities
 createRepository
-	IceCreateRepositoryModel new openWithSpec
+	IceCloneRepositoryModel new openWithSpec
diff --git a/Iceberg.package/Iceberg.class/class/announcer.st b/Iceberg.package/Iceberg.class/class/announcer.st
@@ -0,0 +1,3 @@
+accessing
+announcer
+	^ IcebergAnnouncer ifNil: [ IcebergAnnouncer := Announcer new ]
diff --git a/Iceberg.package/Iceberg.class/properties.json b/Iceberg.package/Iceberg.class/properties.json
@@ -1,7 +1,7 @@
 {
 	"category" : "Iceberg-Core",
 	"classinstvars" : [
-		 ],
+		"IcebergAnnouncer" ],
 	"classvars" : [
 		 ],
 	"commentStamp" : "NicoPasserini 4/28/2016 14:10",