diff --git a/.github/scripts/preLoading.st b/.github/scripts/preLoading.st deleted file mode 100644 index 3eb1cbe92e..0000000000 --- a/.github/scripts/preLoading.st +++ /dev/null @@ -1,3 +0,0 @@ -#( 'BaselineOfLibGit' 'BaselineOfIceberg' ) do: [ :each | - (RPackageOrganizer default packageNamed: each ifAbsent: [ nil ]) - ifNotNil: [ :aPackage | aPackage removeFromSystem ] ] diff --git a/.github/scripts/preTesting.st b/.github/scripts/preTesting.st deleted file mode 100644 index 7136993914..0000000000 --- a/.github/scripts/preTesting.st +++ /dev/null @@ -1,3 +0,0 @@ -"Adding this to pass a release test that does not has sense to run here" -(FileLocator imageDirectory / 'pharo.version') writeStreamDo: [ :stream | - stream << (SystemVersion current major asString, SystemVersion current minor asString) ] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1592af0894..89c428c23a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,16 +32,11 @@ jobs: runs-on: ${{ matrix.os }} name: ${{ matrix.smalltalk }} on ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup smalltalkCI uses: hpi-swa/setup-smalltalkCI@v1 with: - smalltalk-image: ${{ matrix.smalltalk }} -# - name: Load Image and Run Release Tests -# run: smalltalkci -s ${{ matrix.smalltalk }} .smalltalk.release.ston -# timeout-minutes: 10 -# - name: Clean Up -# run: rm -Rf ${{ env.SMALLTALK_CI_BUILD }} + smalltalk-version: ${{ matrix.smalltalk }} - name: Load Image and Run Tests run: smalltalkci -s ${{ matrix.smalltalk }} ${{ matrix.ston }} shell: bash diff --git a/.project b/.project index 078c63e532..ac2d93a83c 100644 --- a/.project +++ b/.project @@ -1,4 +1,3 @@ { - 'srcDirectory' : '', - 'tags' : [ #system ] + 'srcDirectory' : '' } diff --git a/.smalltalk.release.ston b/.smalltalk.release.ston deleted file mode 100644 index 9ec58385eb..0000000000 --- a/.smalltalk.release.ston +++ /dev/null @@ -1,18 +0,0 @@ -SmalltalkCISpec { - #loading : [ - SCIMetacelloLoadSpec { - #baseline : 'Iceberg', - #onConflict : #useIncoming, - #onUpgrade : #useIncoming, - #ignoreImage : true, - #onWarningLog : true, - #load : [ 'development' ] - } - ], - #preTesting : [ '.github/scripts/preTesting.st' ], - #testing : { - #packages : [ - 'System-Settings-Tests.*', - 'ReleaseTests.*' ] - } -} diff --git a/BaselineOfIceberg/BaselineOfIceberg.class.st b/BaselineOfIceberg/BaselineOfIceberg.class.st index 8921116e73..6c4345b801 100644 --- a/BaselineOfIceberg/BaselineOfIceberg.class.st +++ b/BaselineOfIceberg/BaselineOfIceberg.class.st @@ -17,7 +17,6 @@ BaselineOfIceberg >> baseline: spec [ self tonel: spec. self libgit: spec. - self ring2: spec. spec "iceberg" @@ -31,7 +30,7 @@ BaselineOfIceberg >> baseline: spec [ package: 'Iceberg-TipUI' with: [ spec requires: #('Iceberg') ]; package: 'Iceberg-Memory' with: [ spec requires: #('Iceberg') ]; "tests" - package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory' 'Ring2') ]; + package: 'Iceberg-Tests' with: [ spec requires: #('Iceberg' 'Iceberg-Memory') ]; package: 'Iceberg-Tests-MetacelloIntegration' with: [ spec requires: #('Iceberg-Tests') ]; package: 'Iceberg-UI-Tests' with: [ spec requires: #('Iceberg-TipUI' 'Iceberg-Tests')]; package: 'Iceberg-Plugin-Migration-Tests' with: [ spec requires: #('Iceberg-Plugin-Migration' 'Iceberg-Tests') ]; @@ -77,7 +76,7 @@ BaselineOfIceberg >> libgit: spec [ baseline: 'LibGit' with: [ spec - repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.7'; + repository: 'github://pharo-vcs/libgit2-pharo-bindings:v3.0.9'; loads: 'default' ]. spec project: 'LibGit-Tests' @@ -125,13 +124,6 @@ BaselineOfIceberg >> resetKMRepository [ ifPresent: [ :class | class reset ] ] -{ #category : 'baseline' } -BaselineOfIceberg >> ring2: spec [ - spec - baseline: 'Ring2' - with: [ spec repository: 'github://guillep/Ring2:v2.0.0/src' ] -] - { #category : 'baseline' } BaselineOfIceberg >> tonel: spec [ spec diff --git a/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st b/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st index 7404476c71..e2d671e1a8 100644 --- a/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st +++ b/Iceberg-ArchitecturalRules/IceLibgitRuleBreakerRepository.class.st @@ -1,47 +1,48 @@ Class { - #name : #IceLibgitRuleBreakerRepository, - #superclass : #IceLibgitRepository, - #category : 'Iceberg-ArchitecturalRules' + #name : 'IceLibgitRuleBreakerRepository', + #superclass : 'IceLibgitRepository', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testDefinedRepositoryAccessor [ ^ handle ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectly [ ^ handle allBranches ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleDirectlyWithErrorHandler [ self handleLibgitError: [handle allBranches] ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessor [ ^ self testDefinedRepositoryAccessor allBranches ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodAccessHandleThroughAccessorWithErrorHandler [ self handleLibgitError: [ self testDefinedRepositoryAccessor allBranches] ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testMethodNotBreakingRule [ ^ 1+1 ] -{ #category : #tests } +{ #category : 'tests' } IceLibgitRuleBreakerRepository >> testNonDefinedRepositoryAccessor [ ^ handle diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st index 431bcaa6b9..e244c3af05 100644 --- a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st +++ b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrors.class.st @@ -6,18 +6,19 @@ Otherwise, libgit errors may be thrown to the user and produce ugly effects. E.g - Libgit errors are criptyc and can only be understood by reading the message text... " Class { - #name : #IceShouldHandleLibgitErrors, - #superclass : #ReAbstractRule, - #category : #'Iceberg-ArchitecturalRules' + #name : 'IceShouldHandleLibgitErrors', + #superclass : 'ReAbstractRule', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #'testing-interest' } +{ #category : 'testing-interest' } IceShouldHandleLibgitErrors class >> checksNode [ ^ true ] -{ #category : #running } +{ #category : 'running' } IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [ "Detect strange case where method node is nil" @@ -44,13 +45,13 @@ IceShouldHandleLibgitErrors >> check: aNode forCritiquesDo: aBlock [ ifFalse: [ aBlock cull: (self critiqueFor: aNode) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> group [ ^ 'Architectural' ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [ ^ aClass allMethods @@ -58,7 +59,7 @@ IceShouldHandleLibgitErrors >> libgitRepositoryHandleAccessorsForClass: aClass [ [ :m | m pragmas anySatisfy: [ :p | p selector = IceLibgitRepository libgitRepositoryHandleAccessorPragmaSelector ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceShouldHandleLibgitErrors >> name [ ^ 'Should manage errors when doing a libgit call' diff --git a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st index 0b87f127b7..5f08bb76d9 100644 --- a/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st +++ b/Iceberg-ArchitecturalRules/IceShouldHandleLibgitErrorsTest.class.st @@ -1,15 +1,16 @@ Class { - #name : #IceShouldHandleLibgitErrorsTest, - #superclass : #TestCase, - #category : 'Iceberg-ArchitecturalRules' + #name : 'IceShouldHandleLibgitErrorsTest', + #superclass : 'TestCase', + #category : 'Iceberg-ArchitecturalRules', + #package : 'Iceberg-ArchitecturalRules' } -{ #category : #rules } +{ #category : 'rules' } IceShouldHandleLibgitErrorsTest class >> libgitRepositoryHandleAccessors [ self shouldBeImplemented. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [ | lintRule | @@ -18,7 +19,7 @@ IceShouldHandleLibgitErrorsTest >> check: aRule on: aMethod [ ^ lintRule result smallLintCritics ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule [ | critiques | @@ -27,7 +28,7 @@ IceShouldHandleLibgitErrorsTest >> testDefinedRepositoryAccessorDoesNotBreakRule self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [ | critiques | @@ -36,7 +37,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithErrorChecking [ self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [ | critiques | @@ -45,7 +46,7 @@ IceShouldHandleLibgitErrorsTest >> testDirectHandleAccessWithoutErrorChecking [ self assert: critiques notEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErrorChecking [ | critiques | @@ -54,7 +55,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithErr self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithoutErrorChecking [ | critiques | @@ -63,7 +64,7 @@ IceShouldHandleLibgitErrorsTest >> testHandleAccessThroughAllowedAccessorWithout self assert: critiques notEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [ | critiques | @@ -72,7 +73,7 @@ IceShouldHandleLibgitErrorsTest >> testMethodNotBreakingRuleYieldsNoCritiques [ self assert: critiques isEmpty. ] -{ #category : #tests } +{ #category : 'tests' } IceShouldHandleLibgitErrorsTest >> testNonDefinedRepositoryAccessorBreaksRule [ | critiques | diff --git a/Iceberg-ArchitecturalRules/package.st b/Iceberg-ArchitecturalRules/package.st index 3c48720b44..cd17b06d4f 100644 --- a/Iceberg-ArchitecturalRules/package.st +++ b/Iceberg-ArchitecturalRules/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-ArchitecturalRules' } +Package { #name : 'Iceberg-ArchitecturalRules' } diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st index b1bccf1d42..cde75852b4 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeFileUtils.class.st @@ -2,27 +2,29 @@ Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository. " Class { - #name : #IceLibgitFiletreeFileUtils, - #superclass : #Object, - #category : #'Iceberg-Libgit-Filetree-Utilities' + #name : 'IceLibgitFiletreeFileUtils', + #superclass : 'Object', + #category : 'Iceberg-Libgit-Filetree-Utilities', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Utilities' } -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> deleteAll: aTreeBuilder [ ^ aTreeBuilder deleteAll ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryExists: aLGitTreeEntry [ ^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryFromEntry: treeEntry [ ^ treeEntry object ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aCommitOrTree [ ^ aCommitOrTree entryByPath: aString @@ -31,27 +33,27 @@ IceLibgitFiletreeFileUtils class >> directoryFromPath: aString relativeTo: aComm ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> directoryName: anEntry [ ^ anEntry filename ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> fileName: anEntry [ ^ anEntry filename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeFileUtils class >> pathNameDelimiter [ ^ $/ ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> readStreamFor: fileName in: tree do: aBlock [ (tree entryByPath: fileName) readStreamDo: aBlock ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeFileUtils class >> writeStreamFor: fileName in: directory do: aBlock [ directory addEntryNamed: fileName withContents: (String streamContents: aBlock). ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st index b44ae81ca7..6760559e4e 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLog.class.st @@ -2,52 +2,54 @@ I'm a tool to ask the full history of a method (based on filetree file format). " Class { - #name : #IceLibgitFiletreeLog, - #superclass : #IceLog, - #category : #'Iceberg-Libgit-Filetree-Log' + #name : 'IceLibgitFiletreeLog', + #superclass : 'IceLog', + #category : 'Iceberg-Libgit-Filetree-Log', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Log' } -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeLog class >> isAvailableFor: aRepository [ ^ aRepository writerClass id = #filetree ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> basepathOf: aPath [ ^ aPath ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressClassOrTraitName: aMethod [ ^ aMethod origin instanceSide name, (self cypressMethodClassExtension: aMethod) ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodClassExtension: aMethod [ aMethod isExtension ifTrue: [ ^ '.extension' ]. aMethod origin isTrait ifTrue: [ ^ '.trait' ]. ^ '.class' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodName: aMethod [ ^ (MCFileTreeStCypressWriter fileNameForSelector: aMethod selector asString), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressMethodSideName: aMethod [ ^ aMethod origin isClassSide ifTrue: [ 'class' ] ifFalse: [ 'instance' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> cypressPackageName: aPackage [ ^ aPackage name, '.package' ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> definitionFor: aMethod path: aPath commit: aCommit [ ^ ((IceLibgitFiletreeLogReader fileName: aPath on: aCommit) package: aMethod package mcPackage; @@ -66,7 +68,7 @@ IceLibgitFiletreeLog >> definitionFor: aMethod path: aPath commit: aCommit [ source: '' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> fileNameForMethod: aMethod [ | path | @@ -83,7 +85,7 @@ IceLibgitFiletreeLog >> fileNameForMethod: aMethod [ path asStringOn: stream delimiter: '/' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitFiletreeLog >> toFileName: aMethod [ ^ self fileNameForMethod: aMethod ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st index 882934e06c..152658d89e 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeLogReader.class.st @@ -3,32 +3,34 @@ I read exclusively the definition of the method defined in fileName. I'm using to speed the creation of a version list on IceLibgitFiletreeLog. " Class { - #name : #IceLibgitFiletreeLogReader, - #superclass : #IceLibgitFiletreeReader, + #name : 'IceLibgitFiletreeLogReader', + #superclass : 'IceLibgitFiletreeReader', #instVars : [ 'fileName' ], - #category : #'Iceberg-Libgit-Filetree-Reader' + #category : 'Iceberg-Libgit-Filetree-Reader', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Reader' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitFiletreeLogReader class >> fileName: aString on: aCommit [ ^ (self on: aCommit) fileName: aString; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> fileName [ ^ fileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> fileName: aString [ fileName := aString ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitFiletreeLogReader >> loadDefinitions [ | entry segments className classIsMeta entryPath packageIndex | @@ -63,12 +65,12 @@ IceLibgitFiletreeLogReader >> loadDefinitions [ source: source) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeLogReader >> package: aPackage [ package := aPackage ] diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st index 6107c0e193..d3bef7fe34 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeReader.class.st @@ -4,17 +4,19 @@ Reads an MCVersion from a git repository (its blob, not a working copy!) using l Currently we only support metadata-less repositories. " Class { - #name : #IceLibgitFiletreeReader, - #superclass : #MCFileTreeStCypressReader, + #name : 'IceLibgitFiletreeReader', + #superclass : 'MCFileTreeStCypressReader', #traits : 'TIceRepositoryReader', #classTraits : 'TIceRepositoryReader classTrait', #instVars : [ 'iceVersion' ], - #category : #'Iceberg-Libgit-Filetree-Reader' + #category : 'Iceberg-Libgit-Filetree-Reader', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Reader' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader class >> compatibleAuthorNameOf: aString [ "Timestamp of method has a very precise format that needs to be fulfiled: @@ -26,60 +28,60 @@ IceLibgitFiletreeReader class >> compatibleAuthorNameOf: aString [ ^ aString reject: [ :each | each = Character space ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader class >> id [ ^ #filetree ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader class >> isLegacyDefault [ ^ true ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitFiletreeReader class >> on: aCommitOrTree iceVersion: iceVersion [ ^ (self on: aCommitOrTree) iceVersion: iceVersion; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> commit [ ^ stream ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeReader >> hasMonticelloMetadata [ ^ false ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> iceVersion [ ^ iceVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> iceVersion: anObject [ iceVersion := anObject. self packageDirectory: (iceVersion commit project sourceDirectoryPath / (IceLibgitFiletreeWriter directoryNameFor: (IcePackage named: iceVersion package name repository: iceVersion commit repository))) pathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> loadVersionInfo [ ^ info := self iceVersion info ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> packageNameFromPackageDirectory [ ^ iceVersion packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeReader >> versionName [ ^ ('{1}-{2}.{3}' format: { self packageNameFromPackageDirectory. diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st index fcb81b269f..4649254d50 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeSnapshotWriter.class.st @@ -3,22 +3,24 @@ I'm a filetree snapshot writer to ensure the output will be libgit2 compatible. I'm not surre I cannot unify myself class with my parent. " Class { - #name : #IceLibgitFiletreeSnapshotWriter, - #superclass : #IceMetadatalessStCypressWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceLibgitFiletreeSnapshotWriter', + #superclass : 'IceMetadatalessStCypressWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeSnapshotWriter >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #'initialize-release' } +{ #category : 'initialize-release' } IceLibgitFiletreeSnapshotWriter >> propertyFileExtension [ ^ MCFileTreeRepository defaultPropertyFileExtension ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeSnapshotWriter >> writeInDirectoryName: directoryNameOrPath fileName: fileName extension: ext visit: visitBlock [ | directory | directory := self directoryForDirectoryNamed: directoryNameOrPath. diff --git a/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st b/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st index c7a5894abf..6717cb5531 100644 --- a/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceLibgitFiletreeWriter.class.st @@ -3,58 +3,60 @@ I'm a filetree writer to ensure the output will be libgit2 compatible. I'm not surre I cannot unify myself class with my parent. " Class { - #name : #IceLibgitFiletreeWriter, - #superclass : #IceMetadatalessFileTreeWriter, + #name : 'IceLibgitFiletreeWriter', + #superclass : 'IceMetadatalessFileTreeWriter', #traits : 'TIceRepositoryWriter', #classTraits : 'TIceRepositoryWriter classTrait', - #category : #'Iceberg-Libgit-Filetree-Writer' + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> description [ ^ 'Filetree' ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> directoryNameFor: aPackage [ ^ aPackage name, '.package' ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> forInternalStore [ ^ IceMetadatalessFileTreeWriter ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitFiletreeWriter class >> forInternalStoreFileOut: aMCVersion on: aRepository [ self forInternalStore fileOut: aMCVersion on: (IceBackendWriterAdapter for: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> id [ ^ #filetree ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeWriter class >> isLegacyDefault [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitFiletreeWriter class >> isValidPackage: aFileReference [ ^ (aFileReference basename endsWith: '.package') and: [ aFileReference isDirectory and: [(aFileReference / 'monticello.meta') exists]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter class >> packageNameFromDirectory: aFileReference [ ^ aFileReference basenameWithoutExtension ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitFiletreeWriter >> addString: string at: fileNameOrPath encodedTo: ignored [ "fileNameOrPath may have one or two elements" "encodeTo: arg, because FileTree uses UTF8 by default" @@ -69,22 +71,22 @@ IceLibgitFiletreeWriter >> addString: string at: fileNameOrPath encodedTo: ignor ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter >> fileUtils [ ^ IceLibgitFiletreeFileUtils ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitFiletreeWriter >> snapshotWriterClass [ ^ IceLibgitFiletreeSnapshotWriter ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeWriter >> subPackageFileDirectoryFor: directoryNameOrPath [ ^ self packageFileDirectory entryByPath: directoryNameOrPath ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitFiletreeWriter >> writeVersion: aVersion [ directory := aVersion package name, '.package'. packageFileDirectory := stream / directory. diff --git a/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st b/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st index 66be3e0615..91fde45f86 100644 --- a/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceMetadatalessFileTreeWriter.class.st @@ -2,22 +2,24 @@ I can write metadataless filetree versions from an ice formed version. " Class { - #name : #IceMetadatalessFileTreeWriter, - #superclass : #MCFileTreeWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceMetadatalessFileTreeWriter', + #superclass : 'MCFileTreeWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessFileTreeWriter class >> fileOut: aVersion on: aStream [ (self on: aStream) writeVersion: aVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetadatalessFileTreeWriter >> snapshotWriterClass [ ^ IceMetadatalessStCypressWriter ] -{ #category : #visiting } +{ #category : 'visiting' } IceMetadatalessFileTreeWriter >> writeVersion: aVersion [ "We have to do that to avoid writing the version info." diff --git a/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st b/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st index d4246f8760..d3a53a0070 100644 --- a/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st +++ b/Iceberg-Libgit-Filetree/IceMetadatalessStCypressWriter.class.st @@ -2,17 +2,19 @@ I can write filetree metadataless versions of a snapshot. " Class { - #name : #IceMetadatalessStCypressWriter, - #superclass : #MCFileTreeStCypressWriter, - #category : #'Iceberg-Libgit-Filetree-Writer' + #name : 'IceMetadatalessStCypressWriter', + #superclass : 'MCFileTreeStCypressWriter', + #category : 'Iceberg-Libgit-Filetree-Writer', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Writer' } -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter class >> on: aStream [ ^ self new stream: aStream ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeClassDefinition: definition to: classPath [ self writeInDirectoryName: classPath @@ -26,7 +28,7 @@ IceMetadatalessStCypressWriter >> writeClassDefinition: definition to: classPath visit: [ self writeClassDefinition: definition ] ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeDefinitions: aCollection [ | classDirExtension extensionClasses extensionMethodDefinitions extensionMethodMap methodHolders | self writeBasicDefinitions: aCollection. @@ -95,14 +97,14 @@ IceMetadatalessStCypressWriter >> writeDefinitions: aCollection [ filename: filename ] ] ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeMethodProperties: classMethodDefinitions [ "We don't want to write that." self shouldNotImplement ] -{ #category : #writing } +{ #category : 'writing' } IceMetadatalessStCypressWriter >> writeTraitDefinition: definition to: classPath [ self writeInDirectoryName: classPath diff --git a/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st b/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st index be450bd147..6507369c69 100644 --- a/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st +++ b/Iceberg-Libgit-Filetree/ManifestIcebergLibgitFiletree.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgitFiletree, - #superclass : #PackageManifest, - #category : 'Iceberg-Libgit-Filetree-Manifest' + #name : 'ManifestIcebergLibgitFiletree', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Filetree-Manifest', + #package : 'Iceberg-Libgit-Filetree', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgitFiletree class >> description [ ^ 'I contain the libgit binding for the FileTree export format. diff --git a/Iceberg-Libgit-Filetree/package.st b/Iceberg-Libgit-Filetree/package.st index 80fec0171f..3e3214ee4e 100644 --- a/Iceberg-Libgit-Filetree/package.st +++ b/Iceberg-Libgit-Filetree/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit-Filetree' } +Package { #name : 'Iceberg-Libgit-Filetree' } diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st index e8474cd955..78b7ad3de4 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelFileUtils.class.st @@ -2,27 +2,29 @@ Emulates other 'file utils' classes by reading from a git repository (its blob, not a working copy'). Allows for reading any tree (from any commit) in the repository. " Class { - #name : #IceLibgitTonelFileUtils, - #superclass : #Object, - #category : #'Iceberg-Libgit-Tonel-Utilities' + #name : 'IceLibgitTonelFileUtils', + #superclass : 'Object', + #category : 'Iceberg-Libgit-Tonel-Utilities', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Utilities' } -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> deleteAll: aTreeBuilder [ ^ aTreeBuilder deleteAll ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryExists: aLGitTreeEntry [ ^ aLGitTreeEntry type = LGitObjectTypeEnum git_obj_tree ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryFromEntry: treeEntry [ ^ treeEntry object ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryFromPath: aString relativeTo: aCommitOrTree [ ^ aCommitOrTree entryByPath: aString @@ -31,27 +33,27 @@ IceLibgitTonelFileUtils class >> directoryFromPath: aString relativeTo: aCommitO ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> directoryName: anEntry [ ^ anEntry filename ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> fileName: anEntry [ ^ anEntry filename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelFileUtils class >> pathNameDelimiter [ ^ $/ ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> readStreamFor: fileName in: tree do: aBlock [ (tree entryByPath: fileName) readStreamDo: aBlock ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitTonelFileUtils class >> writeStreamFor: fileName in: directory do: aBlock [ directory addEntryNamed: fileName withContents: (String streamContents: aBlock). ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st index 8da2e3555f..cdf301f65d 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelLog.class.st @@ -2,22 +2,24 @@ I'm a tool to ask the full history of a method (based on tonel file format). " Class { - #name : #IceLibgitTonelLog, - #superclass : #IceLog, - #category : #'Iceberg-Libgit-Tonel-Log' + #name : 'IceLibgitTonelLog', + #superclass : 'IceLog', + #category : 'Iceberg-Libgit-Tonel-Log', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Log' } -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelLog class >> isAvailableFor: aRepository [ ^ aRepository writerClass id = #tonel ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> basepathOf: aPath [ ^ aPath copyAfterLast: $/ ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> definitionFor: aMethod path: aPath commit: aCommit [ ^ ((IceLibgitTonelLogReader fileName: aPath on: aCommit) package: aMethod package mcPackage; @@ -36,7 +38,7 @@ IceLibgitTonelLog >> definitionFor: aMethod path: aPath commit: aCommit [ source: '' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> fileNameForMethod: aMethod [ | path | @@ -50,23 +52,23 @@ IceLibgitTonelLog >> fileNameForMethod: aMethod [ path asStringOn: stream delimiter: '/' ] ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> toFileName: aMethod [ ^ self fileNameForMethod: aMethod ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelClassExtension: aClass [ aClass isTrait ifTrue: [ ^ '.trait' ]. ^ '.class' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelClassOrTraitName: aClass [ ^ aClass name, (self tonelClassExtension: aClass), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelMethodClassExtension: aMethod [ aMethod isExtension ifTrue: [ ^ '.extension' ]. aMethod origin isTrait ifTrue: [ ^ '.trait' ]. @@ -74,14 +76,14 @@ IceLibgitTonelLog >> tonelMethodClassExtension: aMethod [ ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelMethodClassOrTraitName: aMethod [ ^ aMethod origin instanceSide name, (self tonelMethodClassExtension: aMethod), '.st' ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLog >> tonelPackageName: aPackage [ ^ aPackage name ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st index 7dd1de4e33..8b86a364f7 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelLogReader.class.st @@ -3,43 +3,45 @@ I read exclusively the definition of the method defined in fileName. I'm using to speed the creation of a version list on IceLibgitTonelLog. " Class { - #name : #IceLibgitTonelLogReader, - #superclass : #IceLibgitTonelReader, + #name : 'IceLibgitTonelLogReader', + #superclass : 'IceLibgitTonelReader', #instVars : [ 'fileName' ], - #category : #'Iceberg-Libgit-Tonel-Reader' + #category : 'Iceberg-Libgit-Tonel-Reader', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Reader' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelLogReader class >> fileName: aString on: aCommit [ ^ (self on: aCommit) fileName: aString; yourself ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelLogReader >> canBeLoaded: aFileReference [ ^ (super canBeLoaded: aFileReference) and: [ aFileReference filename = self fileName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> fileName [ ^ fileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> fileName: aString [ fileName := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> package [ ^ package ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelLogReader >> package: aPackage [ package := aPackage ] diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st index 67c9946df4..b0cab04951 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelReader.class.st @@ -3,44 +3,46 @@ I'm a reader for the tonel file format. " Class { - #name : #IceLibgitTonelReader, - #superclass : #TonelReader, + #name : 'IceLibgitTonelReader', + #superclass : 'TonelReader', #traits : 'TIceRepositoryReader', #classTraits : 'TIceRepositoryReader classTrait', #instVars : [ 'iceVersion' ], - #category : #'Iceberg-Libgit-Tonel-Reader' + #category : 'Iceberg-Libgit-Tonel-Reader', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Reader' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader class >> id [ ^ #tonel ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelReader class >> on: aCommitOrTree iceVersion: iceVersion [ ^ (self on: aCommitOrTree) iceVersion: iceVersion; yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> commit [ ^ stream ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> fileUtils [ ^ IceLibgitTonelFileUtils ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> iceVersion [ ^ iceVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> iceVersion: anObject [ | repository packageDirectoryName | iceVersion := anObject. @@ -51,27 +53,27 @@ IceLibgitTonelReader >> iceVersion: anObject [ self packageDirectory: (repository subdirectoryPath / packageDirectoryName) pathString ] -{ #category : #loading } +{ #category : 'loading' } IceLibgitTonelReader >> loadVersionInfo [ ^ info := self iceVersion info ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> package [ ^ MCPackage named: self iceVersion packageName ] -{ #category : #private } +{ #category : 'private' } IceLibgitTonelReader >> packageNameFromPackageDirectory [ ^ iceVersion packageName ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> repository [ ^ self iceVersion repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelReader >> versionName [ ^ ('{1}-{2}.{3}' format: { self packageNameFromPackageDirectory. diff --git a/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st b/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st index a9919d85ae..dff3220f26 100644 --- a/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st +++ b/Iceberg-Libgit-Tonel/IceLibgitTonelWriter.class.st @@ -2,55 +2,57 @@ I write versions and snapshots in tonel format. " Class { - #name : #IceLibgitTonelWriter, - #superclass : #MCWriter, + #name : 'IceLibgitTonelWriter', + #superclass : 'MCWriter', #traits : 'TIceRepositoryWriter', #classTraits : 'TIceRepositoryWriter classTrait', #instVars : [ 'repositoryDirectory' ], - #category : #'Iceberg-Libgit-Tonel-Writer' + #category : 'Iceberg-Libgit-Tonel-Writer', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Writer' } -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> description [ ^ 'Tonel' ] -{ #category : #'accessing - ancient preference selectors' } +{ #category : 'accessing - ancient preference selectors' } IceLibgitTonelWriter class >> directoryNameFor: aPackage [ ^ aPackage name ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter class >> fileOut: aVersion on: dir [ (self on: dir) writeVersion: aVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> forInternalStore [ ^ TonelWriter ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter class >> forInternalStoreFileOut: aMCVersion on: aRepository [ self forInternalStore fileOut: aMCVersion on: aRepository subdirectoryReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> id [ ^ #tonel ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelWriter class >> isDefault [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitTonelWriter class >> isValidPackage: aFileReference [ ^ aFileReference basename first isLetter @@ -58,12 +60,12 @@ IceLibgitTonelWriter class >> isValidPackage: aFileReference [ and: [ (aFileReference / 'package.st') exists ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> logClass [ ^ IceLibgitTonelLog ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTonelWriter class >> on: dir [ ^ self new repositoryDirectory: dir @@ -71,33 +73,33 @@ IceLibgitTonelWriter class >> on: dir [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> packageNameFromDirectory: aFileReference [ ^ aFileReference basename ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter class >> readerClass [ ^ IceLibgitTonelReader ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter >> repositoryDirectory [ ^ repositoryDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTonelWriter >> repositoryDirectory: anObject [ repositoryDirectory := anObject ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter >> writeSnapshot: aSnapshot [ (TonelWriter on: self repositoryDirectory) writeSnapshot: aSnapshot ] -{ #category : #writing } +{ #category : 'writing' } IceLibgitTonelWriter >> writeVersion: aVersion [ (self repositoryDirectory / aVersion package name) ensureDeleteAll. self writeSnapshot: aVersion snapshot diff --git a/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st b/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st index 1dab4db244..8fdbaec2de 100644 --- a/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st +++ b/Iceberg-Libgit-Tonel/ManifestIcebergLibgitTonel.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgitTonel, - #superclass : #PackageManifest, - #category : 'Iceberg-Libgit-Tonel-Manifest' + #name : 'ManifestIcebergLibgitTonel', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Tonel-Manifest', + #package : 'Iceberg-Libgit-Tonel', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgitTonel class >> description [ ^ 'I contain the libgit binding for the Tonel export format. diff --git a/Iceberg-Libgit-Tonel/package.st b/Iceberg-Libgit-Tonel/package.st index 2864f7ce28..83eb22365a 100644 --- a/Iceberg-Libgit-Tonel/package.st +++ b/Iceberg-Libgit-Tonel/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit-Tonel' } +Package { #name : 'Iceberg-Libgit-Tonel' } diff --git a/Iceberg-Libgit/IceBranchNotFound.class.st b/Iceberg-Libgit/IceBranchNotFound.class.st index fa3ee75ef9..29fb6e220e 100644 --- a/Iceberg-Libgit/IceBranchNotFound.class.st +++ b/Iceberg-Libgit/IceBranchNotFound.class.st @@ -2,20 +2,22 @@ A branch was not found. " Class { - #name : #IceBranchNotFound, - #superclass : #IceError, + #name : 'IceBranchNotFound', + #superclass : 'IceError', #instVars : [ 'branchName' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #accessing } +{ #category : 'accessing' } IceBranchNotFound >> branchName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceBranchNotFound >> branchName: aString [ branchName := aString ] diff --git a/Iceberg-Libgit/IceChangeImporter.extension.st b/Iceberg-Libgit/IceChangeImporter.extension.st index 95c9b4b407..dea75d7242 100644 --- a/Iceberg-Libgit/IceChangeImporter.extension.st +++ b/Iceberg-Libgit/IceChangeImporter.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceChangeImporter } +Extension { #name : 'IceChangeImporter' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } IceChangeImporter >> visitGitChange: anIceGitChange [ | importer | diff --git a/Iceberg-Libgit/IceCloneError.class.st b/Iceberg-Libgit/IceCloneError.class.st index 47f92913c2..44393f940a 100644 --- a/Iceberg-Libgit/IceCloneError.class.st +++ b/Iceberg-Libgit/IceCloneError.class.st @@ -2,12 +2,14 @@ Error while cloning a project " Class { - #name : #IceCloneError, - #superclass : #IceError, - #category : #'Iceberg-Libgit-Exceptions' + #name : 'IceCloneError', + #superclass : 'IceError', + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneError class >> signalFor: anObject [ ^ self subclassResponsibility diff --git a/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st b/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st index 39cd0b8f15..debc41bae4 100644 --- a/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st +++ b/Iceberg-Libgit/IceCloneLocationAlreadyExists.class.st @@ -3,32 +3,34 @@ Error while cloning a project - the location on disk already exists " Class { - #name : #IceCloneLocationAlreadyExists, - #superclass : #IceCloneError, + #name : 'IceCloneLocationAlreadyExists', + #superclass : 'IceCloneError', #instVars : [ 'location' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneLocationAlreadyExists class >> signalFor: aLocation [ ^ self new location: aLocation; signal. ] -{ #category : #visiting } +{ #category : 'visiting' } IceCloneLocationAlreadyExists >> acceptError: aVisitor [ aVisitor visitCloneLocationAlreadyExists: self. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneLocationAlreadyExists >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneLocationAlreadyExists >> location: anObject [ location := anObject ] diff --git a/Iceberg-Libgit/IceCloneRemoteNotFound.class.st b/Iceberg-Libgit/IceCloneRemoteNotFound.class.st index 773fbe7ef6..8844171fd5 100644 --- a/Iceberg-Libgit/IceCloneRemoteNotFound.class.st +++ b/Iceberg-Libgit/IceCloneRemoteNotFound.class.st @@ -2,32 +2,34 @@ The remote was not found " Class { - #name : #IceCloneRemoteNotFound, - #superclass : #IceCloneError, + #name : 'IceCloneRemoteNotFound', + #superclass : 'IceCloneError', #instVars : [ 'remoteUrl' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #signalling } +{ #category : 'signalling' } IceCloneRemoteNotFound class >> signalFor: aUrl [ ^ self new remoteUrl: aUrl; signal. ] -{ #category : #visiting } +{ #category : 'visiting' } IceCloneRemoteNotFound >> acceptError: aVisitor [ aVisitor visitCloneRemoteNotFound: self. ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneRemoteNotFound >> remoteUrl [ ^ remoteUrl ] -{ #category : #accessing } +{ #category : 'accessing' } IceCloneRemoteNotFound >> remoteUrl: anObject [ remoteUrl := anObject ] diff --git a/Iceberg-Libgit/IceGitChange.class.st b/Iceberg-Libgit/IceGitChange.class.st index a9ccc3c0f2..fb5207f3c0 100644 --- a/Iceberg-Libgit/IceGitChange.class.st +++ b/Iceberg-Libgit/IceGitChange.class.st @@ -2,15 +2,17 @@ I represent a change coming from git (in contrast to a change coming from the image). I know the changed file and I can be visited to define the create a more detailed diff. " Class { - #name : #IceGitChange, - #superclass : #IceChange, + #name : 'IceGitChange', + #superclass : 'IceChange', #instVars : [ 'filePathString' ], - #category : #'Iceberg-Libgit-Changes' + #category : 'Iceberg-Libgit-Changes', + #package : 'Iceberg-Libgit', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange class >> on: aString [ ^ self new @@ -18,35 +20,35 @@ IceGitChange class >> on: aString [ yourself ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitChange >> accept: aVisitor [ ^ aVisitor visitGitChange: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> child [ ^ IceGitChange on: (RelativePath withAll: self path segments allButFirst) pathString ] -{ #category : #displaying } +{ #category : 'displaying' } IceGitChange >> displayingProgressString [ ^ 'Comparing changes of ' , filePathString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> filePathString: aString [ filePathString := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChange >> path [ ^ Path from: filePathString ] -{ #category : #printing } +{ #category : 'printing' } IceGitChange >> printOn: aStream [ aStream diff --git a/Iceberg-Libgit/IceGitChangeImporter.class.st b/Iceberg-Libgit/IceGitChangeImporter.class.st index 836b801e9a..04f69f6ff7 100644 --- a/Iceberg-Libgit/IceGitChangeImporter.class.st +++ b/Iceberg-Libgit/IceGitChangeImporter.class.st @@ -1,20 +1,22 @@ Class { - #name : #IceGitChangeImporter, - #superclass : #Object, + #name : 'IceGitChangeImporter', + #superclass : 'Object', #instVars : [ 'path', 'diff', 'version' ], - #category : #'Iceberg-Libgit-Changes' + #category : 'Iceberg-Libgit-Changes', + #package : 'Iceberg-Libgit', + #tag : 'Changes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> ensureDirectory: aFileReference inParentNode: aNode [ aNode childAt: aFileReference basename ifPresent: [ :node | @@ -23,7 +25,7 @@ IceGitChangeImporter >> ensureDirectory: aFileReference inParentNode: aNode [ ^ aNode addChild: (IceDirectoryDefinition named: aFileReference basename path: aNode path / aFileReference basename) ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> ensurePackageFromDirectory: aFileReference inParentNode: aParentNode [ | importer packageName package | @@ -45,7 +47,7 @@ IceGitChangeImporter >> ensurePackageFromDirectory: aFileReference inParentNode: ^ importer importOn: aParentNode ] -{ #category : #importing } +{ #category : 'importing' } IceGitChangeImporter >> importOn: aNode [ | currentSegment fileReference filePath | @@ -84,7 +86,7 @@ IceGitChangeImporter >> importOn: aNode [ "If path size = 0 we should stop recursion" ] -{ #category : #building } +{ #category : 'building' } IceGitChangeImporter >> nextPath [ ^ IceGitChangeImporter new @@ -94,18 +96,18 @@ IceGitChangeImporter >> nextPath [ yourself. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> path: aRelativePath [ path := aRelativePath ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> repository [ ^ diff repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitChangeImporter >> version: aVersion [ version := aVersion diff --git a/Iceberg-Libgit/IceGitClone.class.st b/Iceberg-Libgit/IceGitClone.class.st index a0dfd41c31..89819f179b 100644 --- a/Iceberg-Libgit/IceGitClone.class.st +++ b/Iceberg-Libgit/IceGitClone.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceGitClone, - #superclass : #Object, + #name : 'IceGitClone', + #superclass : 'Object', #instVars : [ 'location', 'url' ], - #category : #'Iceberg-Libgit-GitActions' + #category : 'Iceberg-Libgit-GitActions', + #package : 'Iceberg-Libgit', + #tag : 'GitActions' } -{ #category : #'private - operations' } +{ #category : 'private - operations' } IceGitClone >> cloneRepo: repo cloneOptions: cloneOptions remainingRetries: remainingRetries [ [repo clone: url options: cloneOptions] @@ -22,7 +24,7 @@ IceGitClone >> cloneRepo: repo cloneOptions: cloneOptions remainingRetries: rema ] -{ #category : #actions } +{ #category : 'actions' } IceGitClone >> execute [ | repo cloneOptions checkoutOptions callbacks | @@ -34,6 +36,8 @@ IceGitClone >> execute [ repo := LGitRepository on: location. cloneOptions := repo cloneOptionsStructureClass withCredentialsProvider: (IceCredentialsProvider defaultForRemoteUrl: url). + Iceberg configureLGitProxyOpt: cloneOptions fetchOptions proxyOptions. + "Keeping references, because if not the GC take them." checkoutOptions := cloneOptions checkoutOptions. callbacks := cloneOptions fetchOptions callbacks. @@ -53,22 +57,22 @@ IceGitClone >> execute [ error acceptError: (IceLibgitErrorVisitor onContext: self) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> location: aFileReference [ location := aFileReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> url [ ^ url ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitClone >> url: aString [ url := aString ] diff --git a/Iceberg-Libgit/IceGitCommit.class.st b/Iceberg-Libgit/IceGitCommit.class.st index 58c7437335..85fc953dac 100644 --- a/Iceberg-Libgit/IceGitCommit.class.st +++ b/Iceberg-Libgit/IceGitCommit.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceGitCommit, - #superclass : #IceCommit, + #name : 'IceGitCommit', + #superclass : 'IceCommit', #instVars : [ 'id', 'author', @@ -9,10 +9,12 @@ Class { 'comment', 'packageNamesCache' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #comparing } +{ #category : 'comparing' } IceGitCommit >> = aGitCommit [ (aGitCommit isKindOf: self species) @@ -20,51 +22,51 @@ IceGitCommit >> = aGitCommit [ ^ self id = aGitCommit id ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestorIds [ ^ ancestorIds ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestorIds: aCollection [ ancestorIds := aCollection ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> ancestors [ ^ ancestorIds collect: [ :each | repository lookupCommit: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> author [ ^ author ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> author: aString [ author := aString ] -{ #category : #'API - changes' } +{ #category : 'API - changes' } IceGitCommit >> changesFromCommit: anIceGitCommit [ | files | files := self repository changedFilesBetween: anIceGitCommit and: self. ^ files collect: [ :each | IceGitChange on: each ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> comment [ ^ comment ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> comment: aString [ comment := aString ] -{ #category : #ancestry } +{ #category : 'ancestry' } IceGitCommit >> commonAncestorWithCommit: anIceGitCommit [ repository handleLibgitError: [ | mergeBaseId | @@ -76,7 +78,7 @@ IceGitCommit >> commonAncestorWithCommit: anIceGitCommit [ ^ mergeBaseId ifNotNil: [ self repository lookupCommit: mergeBaseId ] ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceGitCommit >> createTag: aString [ self repository handleLibgitError: [ @@ -89,23 +91,23 @@ IceGitCommit >> createTag: aString [ inRepository: self repository ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> datetime [ ^ datetime ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> datetime: aDateAndTime [ datetime := aDateAndTime ] -{ #category : #'accessing - file' } +{ #category : 'accessing - file' } IceGitCommit >> entryByPath: aString [ repository handleLibgitError: [ ^ (LGitCommit of: self repositoryHandle fromHexString: self id) entryByPath: aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> fetchPackageNames [ | writerClass dir | @@ -119,19 +121,19 @@ IceGitCommit >> fetchPackageNames [ thenCollect: [ :each | writerClass packageNameFromDirectory: each ] ] -{ #category : #'accessing - file' } +{ #category : 'accessing - file' } IceGitCommit >> fileSystem [ ^ (FileSystem onGitCommit: self libgitCommit) root ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> gitRef [ ^ self id ] -{ #category : #testing } +{ #category : 'testing' } IceGitCommit >> hasMultipleAncestors [ | ancestors | "using ancestorsIds because ancestors will instantiate parents and is slower" @@ -140,29 +142,29 @@ IceGitCommit >> hasMultipleAncestors [ and: [ ancestors size > 1 ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitCommit >> hash [ ^ self id hash ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> id [ ^ id ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> id: aString [ id := aString ] -{ #category : #private } +{ #category : 'private' } IceGitCommit >> libgitCommit [ repository handleLibgitError: [ ^ LGitCommit of: self repositoryHandle fromHexString: self id ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> packageNames [ ^ self repository commitsInPackageCache @@ -170,7 +172,7 @@ IceGitCommit >> packageNames [ ifAbsentPut: [ self fetchPackageNames ] ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceGitCommit >> project [ self flag: #todo. "This is a quick fix for issue https://github.com/pharo-vcs/iceberg/issues/1002 and this should probably be improved to also cover issue https://github.com/pharo-vcs/iceberg/issues/949 @@ -184,38 +186,38 @@ IceGitCommit >> project [ do: [ self repository fetch. IceProjectReader readProjectFrom: self ] ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceGitCommit >> readerClass [ ^ self properties readerClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceGitCommit >> resetPackageCache [ packageNamesCache := nil. ] -{ #category : #TOMOVE } +{ #category : 'TOMOVE' } IceGitCommit >> snapshotFor: package [ ^ [ (self repository mcVersionFor: (self versionFor: package)) snapshot ] on: IceVersionDoesNotExist do: [ :e | MCSnapshot empty ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommit >> timeStamp [ ^ self datetime ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceGitCommit >> writerClass [ ^ self properties writerClass diff --git a/Iceberg-Libgit/IceGitFileRemote.class.st b/Iceberg-Libgit/IceGitFileRemote.class.st index 7299784e67..1bbfeb1c94 100644 --- a/Iceberg-Libgit/IceGitFileRemote.class.st +++ b/Iceberg-Libgit/IceGitFileRemote.class.st @@ -2,35 +2,37 @@ I am a 'remote' repository which is stored locally in your machine and accessed through a 'file://' url. " Class { - #name : #IceGitFileRemote, - #superclass : #IceGitRemote, + #name : 'IceGitFileRemote', + #superclass : 'IceGitRemote', #instVars : [ 'path' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitFileRemote class >> canHandleUrl: aRepositoryUrl [ ^ (aRepositoryUrl beginsWith: 'file:') or: [aRepositoryUrl beginsWith: '/'] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> detailedInfo [ ^ { 'Origin' -> path pathString } ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> host [ ^ 'local filesystem' ] -{ #category : #querying } +{ #category : 'querying' } IceGitFileRemote >> organizer [ ^ 'local' ] -{ #category : #private } +{ #category : 'private' } IceGitFileRemote >> parseUrl [ | znUrl | znUrl := ZnUrl fromString: url defaultScheme: 'file'. @@ -39,7 +41,7 @@ IceGitFileRemote >> parseUrl [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitFileRemote >> projectName [ ^ path basename diff --git a/Iceberg-Libgit/IceGitHttpRemote.class.st b/Iceberg-Libgit/IceGitHttpRemote.class.st index fba2683b17..d0f0214a1e 100644 --- a/Iceberg-Libgit/IceGitHttpRemote.class.st +++ b/Iceberg-Libgit/IceGitHttpRemote.class.st @@ -4,24 +4,26 @@ A remote repository created out of a HTTP url, such as 'http://localhost/owner/ " Class { - #name : #IceGitHttpRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitHttpRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitHttpRemote class >> canHandleUrl: aRepositoryUrl [ ^ (aRepositoryUrl beginsWith: self protocolID, '://') ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpRemote class >> defaultPort [ "Returns the HTTP default port" ^80 ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpRemote class >> protocolID [ "Return the protocol identifier" diff --git a/Iceberg-Libgit/IceGitHttpsRemote.class.st b/Iceberg-Libgit/IceGitHttpsRemote.class.st index 949dcb3f94..0019c57c60 100644 --- a/Iceberg-Libgit/IceGitHttpsRemote.class.st +++ b/Iceberg-Libgit/IceGitHttpsRemote.class.st @@ -4,19 +4,21 @@ A remote repository created out of a HTTPS url, such as 'https://github.com/npa " Class { - #name : #IceGitHttpsRemote, - #superclass : #IceGitHttpRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitHttpsRemote', + #superclass : 'IceGitHttpRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpsRemote class >> defaultPort [ "Returns the HTTPS default port" ^443 ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHttpsRemote class >> protocolID [ "Return the protocol identifier" diff --git a/Iceberg-Libgit/IceGitIndex.class.st b/Iceberg-Libgit/IceGitIndex.class.st index b29dfd8dec..4c081a9227 100644 --- a/Iceberg-Libgit/IceGitIndex.class.st +++ b/Iceberg-Libgit/IceGitIndex.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceGitIndex, - #superclass : #IceIndex, + #name : 'IceGitIndex', + #superclass : 'IceIndex', #instVars : [ 'modifiedFilePaths' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #adding } +{ #category : 'adding' } IceGitIndex >> addPackage: anIcePackageDefinition [ | pathSegments | @@ -16,19 +18,19 @@ IceGitIndex >> addPackage: anIcePackageDefinition [ self addPath: (RelativePath withAll: pathSegments) ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> addPath: aPath [ modifiedFilePaths add: aPath ] -{ #category : #operations } +{ #category : 'operations' } IceGitIndex >> addToGitIndex [ repository addFilesToIndex: modifiedFilePaths. ] -{ #category : #'API - commiting' } +{ #category : 'API - commiting' } IceGitIndex >> commitWithMessage: message andParents: parentCommits [ | index | @@ -60,33 +62,33 @@ IceGitIndex >> commitWithMessage: message andParents: parentCommits [ ^ repository commitFromGitCommit: (LGitCommit of: self repositoryHandle fromId: commitId)] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitIndex >> includes: aRelativePath [ ^ modifiedFilePaths includes: aRelativePath ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitIndex >> initialize [ super initialize. modifiedFilePaths := Set new ] -{ #category : #testing } +{ #category : 'testing' } IceGitIndex >> isEmpty [ ^ modifiedFilePaths isEmpty ] -{ #category : #'API - commiting' } +{ #category : 'API - commiting' } IceGitIndex >> libGitCommitsFrom: aLGitRepository for: aListOfCommitish [ ^ aListOfCommitish collect: [ :commitish | LGitCommit of: aLGitRepository fromId: (LGitId fromHexString: commitish id) ] ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> removeFileDefinition: anIceFileDefinition [ (repository location resolve: anIceFileDefinition path) @@ -95,14 +97,14 @@ IceGitIndex >> removeFileDefinition: anIceFileDefinition [ self addPath: anIceFileDefinition path ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitIndex >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeFileDefinition: anIceFileDefinition [ (repository location resolve: anIceFileDefinition path) @@ -113,7 +115,7 @@ IceGitIndex >> storeFileDefinition: anIceFileDefinition [ self addPath: anIceFileDefinition path ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeMCVersion: aMCVersion [ | pathSegments | @@ -126,13 +128,13 @@ IceGitIndex >> storeMCVersion: aMCVersion [ self addPath: (RelativePath withAll: pathSegments) ] -{ #category : #storing } +{ #category : 'storing' } IceGitIndex >> storeVersion: aMCVersion [ repository internalStoreVersion: aMCVersion ] -{ #category : #updating } +{ #category : 'updating' } IceGitIndex >> updateDiskWorkingCopy: anIceDiff [ anIceDiff tree accept: diff --git a/Iceberg-Libgit/IceGitLocalBranch.class.st b/Iceberg-Libgit/IceGitLocalBranch.class.st index 86c55a68c4..1f2f236fa1 100644 --- a/Iceberg-Libgit/IceGitLocalBranch.class.st +++ b/Iceberg-Libgit/IceGitLocalBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitLocalBranch, - #superclass : #IceLocalBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitLocalBranch', + #superclass : 'IceLocalBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> basicPushTo: aRemote [ | gitRemote | @@ -32,13 +34,13 @@ IceGitLocalBranch >> basicPushTo: aRemote [ yourself) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> branchNamePrefix [ ^ 'refs/heads/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> commit [ repository handleLibgitError: [ | gitCommit gitId | @@ -47,7 +49,7 @@ IceGitLocalBranch >> commit [ ^ self repository commitFromGitCommit: gitCommit ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> commit: anIceGitCommit [ "Update the branch to point to a commit. If the branch is HEAD, check it out in disk also." @@ -65,74 +67,94 @@ IceGitLocalBranch >> commit: anIceGitCommit [ yourself) ]] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceGitLocalBranch >> delete [ repository handleLibgitError: [ | found | found := self repositoryHandle lookupLocalBranch: self name ifAbsent: [ nil ]. self repositoryHandle deleteBranch: found ] ] -{ #category : #'file-access' } +{ #category : 'file-access' } IceGitLocalBranch >> fileSystem [ ^ self commit fileSystem ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> gitRef [ ^ self name ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> hasUpstream [ self upstreamIfNone: [ ^ false ]. ^ true ] -{ #category : #merging } +{ #category : 'merging' } IceGitLocalBranch >> mergeWithBranch: anIceGitRemoteBranch [ self shouldBeImplemented. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> name [ ^ self fullname withoutPrefix: self branchNamePrefix ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushBranchToRemote: aRemote gitRemote: gitRemote progress: pushProgress [ - - gitRemote + + | pushOptions | + pushOptions := gitRemote ffiLibrary uniqueInstance + pushOptionsStructureClass defaults + callbacks: + ((gitRemote ffiLibrary uniqueInstance + remoteCallbacksStructureClass withProvider: + (IceCredentialsProvider defaultForRemote: + aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself. + + Iceberg configureLGitProxyOpt: pushOptions proxyOptions. + + gitRemote pushWithRefSpec: (LGitRefSpec new - source: self fullname; - destination: self fullname; - yourself) - pushOptions: (gitRemote ffiLibrary uniqueInstance pushOptionsStructureClass defaults - callbacks: ((gitRemote ffiLibrary uniqueInstance remoteCallbacksStructureClass withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself); - yourself) + source: self fullname; + destination: self fullname; + yourself) + pushOptions: pushOptions ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushTag: tag toRemote: aRemote gitRemote: gitRemote progress: pushProgress [ - gitRemote + | pushOptions | + pushOptions := gitRemote ffiLibrary uniqueInstance + pushOptionsStructureClass defaults + callbacks: + ((gitRemote ffiLibrary uniqueInstance + remoteCallbacksStructureClass withProvider: + (IceCredentialsProvider defaultForRemote: + aRemote)) + pushTransferProgress: pushProgress; + yourself); + yourself. + + Iceberg configureLGitProxyOpt: pushOptions proxyOptions. + + gitRemote pushWithRefSpec: (LGitRefSpec new - source: 'refs/tags/' , tag name; - destination: 'refs/tags/' , tag name; - yourself) - pushOptions: (gitRemote ffiLibrary uniqueInstance pushOptionsStructureClass defaults - callbacks: ((gitRemote ffiLibrary uniqueInstance remoteCallbacksStructureClass withProvider: (IceCredentialsProvider defaultForRemote: aRemote)) - pushTransferProgress: pushProgress; - yourself); - yourself) + source: 'refs/tags/' , tag name; + destination: 'refs/tags/' , tag name; + yourself) + pushOptions: pushOptions ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> pushTagsToRemote: aRemote gitRemote: gitRemote progress: pushProgress [ self tags do: [ :tag | @@ -143,21 +165,21 @@ IceGitLocalBranch >> pushTagsToRemote: aRemote gitRemote: gitRemote progress: pu progress: pushProgress ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceGitLocalBranch >> pushTo: aRemote [ repository handleLibgitError: [ self basicPushTo: aRemote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceGitLocalBranch >> setUpstream: anIceGitRemoteBranch [ repository handleLibgitError: [ | localBranch | @@ -165,20 +187,20 @@ IceGitLocalBranch >> setUpstream: anIceGitRemoteBranch [ localBranch setUpstream: anIceGitRemoteBranch gitRef ] ] -{ #category : #'private - pushing' } +{ #category : 'private - pushing' } IceGitLocalBranch >> setUpstreamIfMissing: aRemote [ self hasUpstream ifTrue: [ ^ self ]. self setUpstream: (aRemote remoteBranchNamed: self gitRef) ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> shortname [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalBranch >> trackedBranch [ | upstream | @@ -189,19 +211,19 @@ IceGitLocalBranch >> trackedBranch [ ^ upstream ] -{ #category : #tracking } +{ #category : 'tracking' } IceGitLocalBranch >> tracksRemoteBranch [ ^ self hasUpstream ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> upstream [ ^ self upstreamIfNone: [ IceUpstreamNotConfigured signal ] ] -{ #category : #'private - tracking' } +{ #category : 'private - tracking' } IceGitLocalBranch >> upstreamIfNone: aBlock [ repository handleLibgitError: [ | localBranch gitUpstream | localBranch := self repositoryHandle lookupLocalBranch: self name. diff --git a/Iceberg-Libgit/IceGitNetworkRemote.class.st b/Iceberg-Libgit/IceGitNetworkRemote.class.st index 38735c7e88..44457b73e7 100644 --- a/Iceberg-Libgit/IceGitNetworkRemote.class.st +++ b/Iceberg-Libgit/IceGitNetworkRemote.class.st @@ -2,8 +2,8 @@ Base abstract class for SCP and HTTPS remotes. " Class { - #name : #IceGitNetworkRemote, - #superclass : #IceGitRemote, + #name : 'IceGitNetworkRemote', + #superclass : 'IceGitRemote', #instVars : [ 'user', 'host', @@ -11,27 +11,29 @@ Class { 'path', 'owner' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitNetworkRemote class >> canHandleUrl: aString [ "I am abstract I can't handle any url." ^ false ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitNetworkRemote class >> defaultPort [ ^self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceGitNetworkRemote class >> isAbstract [ ^ self == IceGitNetworkRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> detailedInfo [ ^ { 'Origin' -> self url. @@ -41,22 +43,22 @@ IceGitNetworkRemote >> detailedInfo [ } ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> host [ ^ host ] -{ #category : #querying } +{ #category : 'querying' } IceGitNetworkRemote >> organizer [ ^ self owner ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> owner [ ^ owner ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> parseUrl [ | znUrl | znUrl := ZnUrl fromString: url. @@ -72,23 +74,23 @@ IceGitNetworkRemote >> parseUrl [ projectName := self stripPossibleExtension: (znUrl segments last). ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> path [ ^path ifNil: [ path := OrderedCollection new ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> port [ ^port ifNil: [ self class defaultPort ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> portName [ ^self port asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> projectPath [ | projectPath | @@ -99,26 +101,26 @@ IceGitNetworkRemote >> projectPath [ ^ (RelativePath withAll: projectPath) pathString ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitNetworkRemote >> referencesSameRemoteLocationAs: another [ ^ (self httpsUrl withoutSuffix: '.git') sameAs: (another httpsUrl withoutSuffix: '.git') ] -{ #category : #private } +{ #category : 'private' } IceGitNetworkRemote >> stripPossibleExtension: aString [ ^ (aString endsWith: '.git') ifTrue: [ aString allButLast: 4 ] ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> user [ ^user ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitNetworkRemote >> userName [ ^user ifNil: [ '' ] diff --git a/Iceberg-Libgit/IceGitRemote.class.st b/Iceberg-Libgit/IceGitRemote.class.st index 06bffe6ca0..b3981f5cca 100644 --- a/Iceberg-Libgit/IceGitRemote.class.st +++ b/Iceberg-Libgit/IceGitRemote.class.st @@ -1,34 +1,36 @@ Class { - #name : #IceGitRemote, - #superclass : #IceRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitRemote', + #superclass : 'IceRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> canHandleUrl: aRepositoryUrl [ ^ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> isAbstract [ ^ self == IceGitRemote ] -{ #category : #testing } +{ #category : 'testing' } IceGitRemote class >> isValidUrl: aRepositoryUrl [ ^ self allSubclasses anySatisfy: [ :subclass | subclass canHandleUrl: aRepositoryUrl ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitRemote class >> name: aName url: anUrl [ ^ (self url: anUrl) name: aName; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitRemote class >> url: aRepositoryUrl [ self allSubclasses detect: [ :subclass | subclass canHandleUrl: aRepositoryUrl ] @@ -36,52 +38,56 @@ IceGitRemote class >> url: aRepositoryUrl [ ifNone: [ IceWrongUrl signal: 'Remote repository scheme not supported: ', aRepositoryUrl ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceGitRemote >> = another [ ^ self species = another species and: [ self referencesSameRemoteLocationAs: another ] ] -{ #category : #branches } +{ #category : 'branches' } IceGitRemote >> branches [ ^ self localRepository remoteTrackedBranches select: [ :e | e remoteName = self name ] ] -{ #category : #fetching } -IceGitRemote >> fetch [ - +{ #category : 'fetching' } +IceGitRemote >> doFetchWithRefSpec: refSpec [ + localRepository handleLibgitError: [ - [ (LGitRemote of: self repositoryHandle named: self name) + [ + (LGitRemote of: self repositoryHandle named: self name) lookup; - fetchWithCredentials: (IceCredentialsProvider defaultForRemote: self) - andProgressCallback: IceGitTransferProgress new ] + fetchWithCredentials: + (IceCredentialsProvider defaultForRemote: self) + andProgressCallback: IceGitTransferProgress new + refSpec: refSpec + proxyConfigurationBlock: [ :proxyOpt | Iceberg configureLGitProxyOpt: proxyOpt ] ] on: LGitAbstractError - do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ]. - - "Call post fetch to fix unknown commits" - localRepository postFetch ] + do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ] ] +] + +{ #category : 'fetching' } +IceGitRemote >> fetch [ + + self doFetchWithRefSpec: nil. + + "Call post fetch to fix unknown commits" + localRepository postFetch ] -{ #category : #fetching } +{ #category : 'fetching' } IceGitRemote >> fetchBranch: aBranch [ - - localRepository handleLibgitError: [ - [ | refSpec remote | - refSpec := LGitRefSpec - fromString: - ('{2}:refs/remotes/{1}/{2}' - format: - {self name. - aBranch name}). - (remote := LGitRemote of: self repositoryHandle named: self name) - lookup; - fetchWithCredentials: (IceCredentialsProvider defaultForRemote: self) refSpec: refSpec ] - on: LGitAbstractError - do: [ :e | e acceptError: (IceLibgitErrorVisitor onContext: self) ] ] + + | refSpec | + refSpec := LGitRefSpec fromString: + ('{2}:refs/remotes/{1}/{2}' format: { + self name. + aBranch name }). + + self doFetchWithRefSpec: refSpec ] -{ #category : #branches } +{ #category : 'branches' } IceGitRemote >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ localRepository handleLibgitError: [ @@ -94,7 +100,7 @@ IceGitRemote >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: abs ifNil: absentBlock ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemote >> repositoryHandle [ diff --git a/Iceberg-Libgit/IceGitRemoteBranch.class.st b/Iceberg-Libgit/IceGitRemoteBranch.class.st index b353f51311..fd596cd87e 100644 --- a/Iceberg-Libgit/IceGitRemoteBranch.class.st +++ b/Iceberg-Libgit/IceGitRemoteBranch.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRemoteBranch, - #superclass : #IceRemoteBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitRemoteBranch', + #superclass : 'IceRemoteBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> commit [ repository handleLibgitError: [ | gitCommit gitId | @@ -13,7 +15,7 @@ IceGitRemoteBranch >> commit [ ^ self repository commitFromGitCommit: gitCommit ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceGitRemoteBranch >> delete [ repository handleLibgitError: [ | found | @@ -21,43 +23,43 @@ IceGitRemoteBranch >> delete [ self repositoryHandle deleteBranch: found ] ] -{ #category : #filesystem } +{ #category : 'filesystem' } IceGitRemoteBranch >> fileSystem [ ^ self commit fileSystem ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> gitRef [ ^ self name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> name [ ^ self fullname withoutPrefix: self prefix ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> prefix [ ^ 'refs/remotes/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> remoteName [ ^ (self fullname substrings: '/') third ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRemoteBranch >> shortname [ ^ self name withoutPrefix: self remoteName, '/' diff --git a/Iceberg-Libgit/IceGitScpRemote.class.st b/Iceberg-Libgit/IceGitScpRemote.class.st index a2370bdaa4..8a1b6b3301 100644 --- a/Iceberg-Libgit/IceGitScpRemote.class.st +++ b/Iceberg-Libgit/IceGitScpRemote.class.st @@ -4,12 +4,14 @@ A remote repository created out of a SCP url, such as 'git@github.com:npasserini " Class { - #name : #IceGitScpRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitScpRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> canHandleUrl: aUrl [ "Very simplistic implementation that does not cover all cases. Either there is the ssh scheme or treat all non absolute paths as SSH" @@ -17,41 +19,41 @@ IceGitScpRemote class >> canHandleUrl: aUrl [ ^ (self isSSHUrl: aUrl) or: [ self isAlternateSSHUrl: aUrl ] ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitScpRemote class >> defaultPort [ ^ 22 ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> isAlternateSSHUrl: aUrl [ "Definition taken from https://stackoverflow.com/questions/14348874/git-repository-url-ssh-syntax-without-absolute-path" ^ (aUrl includesSubstring: '://') not and: [ (aUrl beginsWith: '/') not ] ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote class >> isSSHUrl: aUrl [ ^ aUrl beginsWith: 'ssh://' ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitScpRemote >> httpsUrl [ ^ 'https://{1}/{2}.git' format: { self host . self projectPath } ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote >> isAlternateSSHUrl: aString [ ^ self class isAlternateSSHUrl: aString ] -{ #category : #testing } +{ #category : 'testing' } IceGitScpRemote >> isSSHUrl: aString [ ^ self class isSSHUrl: aString ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitScpRemote >> parseUrl [ | urlStream restSegments | (self isSSHUrl: url) diff --git a/Iceberg-Libgit/IceGitSshRemote.class.st b/Iceberg-Libgit/IceGitSshRemote.class.st index eb06776166..728c3bda7c 100644 --- a/Iceberg-Libgit/IceGitSshRemote.class.st +++ b/Iceberg-Libgit/IceGitSshRemote.class.st @@ -4,22 +4,24 @@ A remote repository created out of a git url, such as 'git://localhost/owner/re " Class { - #name : #IceGitSshRemote, - #superclass : #IceGitNetworkRemote, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitSshRemote', + #superclass : 'IceGitNetworkRemote', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitSshRemote class >> canHandleUrl: aRepositoryUrl [ ^ aRepositoryUrl beginsWith: 'git://' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitSshRemote class >> defaultPort [ ^9418 ] -{ #category : #'private - patches' } +{ #category : 'private - patches' } IceGitSshRemote >> httpsUrl [ ^ 'https://{1}/{2}.git' format: { self host . self projectPath } diff --git a/Iceberg-Libgit/IceGitUnbornBranch.class.st b/Iceberg-Libgit/IceGitUnbornBranch.class.st index f0aaa8f118..bfb6f50102 100644 --- a/Iceberg-Libgit/IceGitUnbornBranch.class.st +++ b/Iceberg-Libgit/IceGitUnbornBranch.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitUnbornBranch, - #superclass : #IceUnbornBranch, - #category : #'Iceberg-Libgit-Core' + #name : 'IceGitUnbornBranch', + #superclass : 'IceUnbornBranch', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> branchNamePrefix [ ^ 'refs/heads/' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> gitRef [ "When the repository is unborn, the repository has a single ref that points to no commits. The HEAD file then contains some content such as: @@ -21,7 +23,7 @@ IceGitUnbornBranch >> gitRef [ ^ ((repository location / '.git' / 'HEAD') contents withoutPrefix: 'ref: ') trimBoth ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitUnbornBranch >> name [ "Remove the refs/heads prefix from the full branch name" ^ self gitRef withoutPrefix: self branchNamePrefix diff --git a/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st b/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st index 54c69eed46..59bbfffb05 100644 --- a/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st +++ b/Iceberg-Libgit/IceGitWorkingCopyUpdateVisitor.class.st @@ -1,60 +1,62 @@ Class { - #name : #IceGitWorkingCopyUpdateVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceGitWorkingCopyUpdateVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'repository', 'diff', 'index' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> index: anIndex [ index := anIndex ] -{ #category : #operations } +{ #category : 'operations' } IceGitWorkingCopyUpdateVisitor >> removeFile: anIceFileDefinition [ (repository location resolvePath: anIceFileDefinition path) ensureDelete ] -{ #category : #actions } +{ #category : 'actions' } IceGitWorkingCopyUpdateVisitor >> removeFileReferenceInPath: aPath [ (repository workingCopy fileSystem resolve: aPath) ensureDeleteAll ] -{ #category : #operations } +{ #category : 'operations' } IceGitWorkingCopyUpdateVisitor >> removePackage: aDefinition [ (repository location resolvePath: aDefinition path) ensureDeleteAll ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitWorkingCopyUpdateVisitor >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitAddition: anIceAddition [ anIceAddition definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitFileNode: anIceFileDefinition [ | reference | @@ -66,25 +68,25 @@ IceGitWorkingCopyUpdateVisitor >> visitFileNode: anIceFileDefinition [ writeStream nextPutAll: anIceFileDefinition basicContents ]. ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitModification: anIceModification [ ^ anIceModification leftDefinition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitPackage: anIcePackageDefinition [ "I am a package, I have to export my changes using the repository format. @@ -114,13 +116,13 @@ IceGitWorkingCopyUpdateVisitor >> visitPackage: anIcePackageDefinition [ index storeVersion: version ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFrom: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceGitWorkingCopyUpdateVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceIndexUpdateVisitor.class.st b/Iceberg-Libgit/IceIndexUpdateVisitor.class.st index 3d32c8c960..122ae237cf 100644 --- a/Iceberg-Libgit/IceIndexUpdateVisitor.class.st +++ b/Iceberg-Libgit/IceIndexUpdateVisitor.class.st @@ -1,79 +1,81 @@ Class { - #name : #IceIndexUpdateVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceIndexUpdateVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'diff', 'index' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> diff: anIceDiff [ diff := anIceDiff ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> index: anIndex [ index := anIndex ] -{ #category : #accessing } +{ #category : 'accessing' } IceIndexUpdateVisitor >> repository [ ^ index repository ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitAddition: anIceAddition [ anIceAddition definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitDirectoryDefinition: anIceDirectoryDefinition [ self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitFileNode: anIceFileDefinition [ index addPath: anIceFileDefinition path ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitModification: anIceModification [ ^ anIceModification leftDefinition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitPackage: anIcePackageDefinition [ index addPackage: anIcePackageDefinition ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitRemoval: anIceRemoval [ "Do the same as an addition" self visitAddition: anIceRemoval ] -{ #category : #visiting } +{ #category : 'visiting' } IceIndexUpdateVisitor >> visitRootDefinition: anIceRootDefinition [ self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceLibgitCommitWalk.class.st b/Iceberg-Libgit/IceLibgitCommitWalk.class.st index 2ac805ce81..08816b49ca 100644 --- a/Iceberg-Libgit/IceLibgitCommitWalk.class.st +++ b/Iceberg-Libgit/IceLibgitCommitWalk.class.st @@ -2,16 +2,18 @@ Utility class for searching through a commit history taking advantage of git revwalk utilities. Found and returned commits will be added to the commit cache of the corresponding IceRepository. " Class { - #name : #IceLibgitCommitWalk, - #superclass : #IceAbstractCommitWalk, + #name : 'IceLibgitCommitWalk', + #superclass : 'IceAbstractCommitWalk', #instVars : [ 'revwalk', 'lgitRepository' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #walking } +{ #category : 'walking' } IceLibgitCommitWalk >> commitsDo: aBlock [ self maxNumber ifNil: [ super commitsDo: aBlock ] @@ -26,7 +28,7 @@ IceLibgitCommitWalk >> commitsDo: aBlock [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromBranch: branch [ [ self revwalk pushReference: (lgitRepository lookupBranch: (branch isRemote ifTrue: [branch fullname] ifFalse: [ branch shortname ]) remote: branch isRemote) ] on: LGit_GIT_EINVALIDSPEC do: [ @@ -38,27 +40,27 @@ IceLibgitCommitWalk >> fromBranch: branch [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromCommit: commit [ self fromCommitId: commit id ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromCommitId: commitId [ self fromLGitId: (LGitId fromHexString: commitId) ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromHead [ self revwalk pushHead ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromLGitId: lGitId [ self revwalk pushCommit: lGitId ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> fromTag: tag [ self revwalk. ^ self fromLGitId: (lgitRepository revparse: tag name) id @@ -66,21 +68,21 @@ IceLibgitCommitWalk >> fromTag: tag [ ] -{ #category : #private } +{ #category : 'private' } IceLibgitCommitWalk >> rawResultsDo: aBlockClosure [ self revwalk select: [ :result | self shouldInclude: result ] thenDo: aBlockClosure ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitCommitWalk >> repositoryHandle [ ^ repository repositoryHandle ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitCommitWalk >> revwalk [ repository handleLibgitError: [ @@ -93,7 +95,7 @@ IceLibgitCommitWalk >> revwalk [ revwalk ]] ] -{ #category : #private } +{ #category : 'private' } IceLibgitCommitWalk >> shouldInclude: aLGitCommit [ ^ self modifyingPackage ifNil: [ true ] @@ -102,7 +104,7 @@ IceLibgitCommitWalk >> shouldInclude: aLGitCommit [ ] -{ #category : #'walk definition' } +{ #category : 'walk definition' } IceLibgitCommitWalk >> uptoCommit: commit [ self revwalk hideCommit: (LGitId fromHexString: commit id) ] diff --git a/Iceberg-Libgit/IceLibgitErrorVisitor.class.st b/Iceberg-Libgit/IceLibgitErrorVisitor.class.st index 7221b4a4d6..38dfa13180 100644 --- a/Iceberg-Libgit/IceLibgitErrorVisitor.class.st +++ b/Iceberg-Libgit/IceLibgitErrorVisitor.class.st @@ -8,15 +8,17 @@ I also have a context, which points to the object that is requesting the excepti This context is used to obtain more information about the operation that failed, usually not provided by Libgit, such as urls, locations, etc. " Class { - #name : #IceLibgitErrorVisitor, - #superclass : #Object, + #name : 'IceLibgitErrorVisitor', + #superclass : 'Object', #instVars : [ 'context' ], - #category : #'Iceberg-Libgit-Exceptions' + #category : 'Iceberg-Libgit-Exceptions', + #package : 'Iceberg-Libgit', + #tag : 'Exceptions' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitErrorVisitor class >> onContext: aContext [ ^ self new @@ -24,24 +26,24 @@ IceLibgitErrorVisitor class >> onContext: aContext [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitErrorVisitor >> context [ ^ context ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitErrorVisitor >> context: anObject [ context := anObject ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitECONFLICT: anError [ anError object = LGitErrorTypeEnum giterr_checkout ifTrue: [ ^ anError resignalAs: IceCheckoutConflictError new ]. self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEEOF: aLGit_GIT_EEOF [ aLGit_GIT_EEOF messageText trimmed = 'ERROR: Repository not found.' @@ -50,7 +52,7 @@ IceLibgitErrorVisitor >> visitEEOF: aLGit_GIT_EEOF [ ^ self visitGenericError: aLGit_GIT_EEOF ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEEXISTS: anError [ (anError messageText asLowercase beginsWith: 'failed to write reference ''refs/tags') @@ -66,13 +68,13 @@ IceLibgitErrorVisitor >> visitEEXISTS: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitENOTFOUND: anError [ NotFound signal: anError messageText ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitERROR: anError [ (anError object = LGitErrorTypeEnum giterr_ssh) @@ -93,7 +95,7 @@ IceLibgitErrorVisitor >> visitERROR: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitEUSER: anError [ "Since user errors do not have a code, they can can just be handled by analysis of messageText. String comparisson is not the thing in history, but for not it will @@ -105,7 +107,7 @@ IceLibgitErrorVisitor >> visitEUSER: anError [ self visitGenericError: anError ] -{ #category : #visiting } +{ #category : 'visiting' } IceLibgitErrorVisitor >> visitGenericError: anError [ IceGenericError new diff --git a/Iceberg-Libgit/IceLibgitRepository.class.st b/Iceberg-Libgit/IceLibgitRepository.class.st index fe29a55322..1a52008d33 100644 --- a/Iceberg-Libgit/IceLibgitRepository.class.st +++ b/Iceberg-Libgit/IceLibgitRepository.class.st @@ -5,8 +5,8 @@ I have a handle to a LGitRepository that is lazily initialized on usage, and cle Every access to the libgit repository should be wrapped with a call to #handleLibgitError: to manage possible libgit errors and transform them to a correct iceberg error. " Class { - #name : #IceLibgitRepository, - #superclass : #IceRepository, + #name : 'IceLibgitRepository', + #superclass : 'IceRepository', #instVars : [ 'location', 'commitCache', @@ -18,27 +18,29 @@ Class { 'ShareRepositoriesBetweenImages', 'SharedRepositoriesLocation' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultCodeSubdirectory [ ^ DefaultCodeSubdirectory ifNil: [ DefaultCodeSubdirectory := 'src' ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultCodeSubdirectory: aString [ DefaultCodeSubdirectory := aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> defaultFileFormat [ ^ Smalltalk at: self defaultFileFormatType asSymbol ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultFileFormatType [ ^ DefaultFileFormatType ifNil: [ DefaultFileFormatType := TIceRepositoryWriter traitUsers @@ -47,19 +49,19 @@ IceLibgitRepository class >> defaultFileFormatType [ ifNone: [ nil "To be filled later (on first demand)" ] ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> defaultFileFormatType: anObject [ DefaultFileFormatType := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> formatTypeDomainValues [ ^ TIceRepositoryWriter traitUsers ifNotEmpty: [ :users | users collect: [ :each | each description -> each name ] ] ifEmpty: [ { 'Undefined' -> nil } ] ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitErrorHandlerPragmaSelector [ "Pragma selector used to detect methods used as libgit error handlers. @@ -67,7 +69,7 @@ IceLibgitRepository class >> libgitErrorHandlerPragmaSelector [ ^ #libgitErrorHandler ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitErrorHandlerSelector [ "Detect what method is used for handling libgit errors. @@ -78,7 +80,7 @@ IceLibgitRepository class >> libgitErrorHandlerSelector [ each pragmas anySatisfy: [ :pragma | pragma keyword = self libgitErrorHandlerPragmaSelector ] ]) selector ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitRepositoryHandleAccessorPragmaSelector [ "Pragma selector used to detect methods allowed to directly access the repository handle. @@ -86,25 +88,25 @@ IceLibgitRepository class >> libgitRepositoryHandleAccessorPragmaSelector [ ^ #repositoryHandleAccessor ] -{ #category : #rules } +{ #category : 'rules' } IceLibgitRepository class >> libgitRepositoryHandleAccessors [ ^ self allMethods select: [ :m | m pragmas anySatisfy: [ :p | p keyword = self libgitRepositoryHandleAccessorPragmaSelector ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> localRepositoriesLocation [ ^ FileLocator localDirectory / #iceberg ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitRepository class >> repositoriesLocation [ ^ self shareRepositoriesBetweenImages ifTrue: [ self sharedRepositoriesLocation ] ifFalse: [ self localRepositoriesLocation ] ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitRepository class >> requiredLibGit2MinimumVersion [ ^ IceSemanticVersion major: 0 @@ -112,7 +114,7 @@ IceLibgitRepository class >> requiredLibGit2MinimumVersion [ patch: 1 ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> settingsOn: aBuilder [ @@ -148,38 +150,38 @@ IceLibgitRepository class >> settingsOn: aBuilder [ ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> shareRepositoriesBetweenImages [ ^ ShareRepositoriesBetweenImages ifNil: [ ShareRepositoriesBetweenImages := false ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> shareRepositoriesBetweenImages: anObject [ ShareRepositoriesBetweenImages := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocation [ ^ SharedRepositoriesLocation ifNil: [ SharedRepositoriesLocation := (FileLocator home / #iceberg) asFileReference ] ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocation: anObject [ SharedRepositoriesLocation := anObject ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocationString [ ^ self sharedRepositoriesLocation fullName ] -{ #category : #settings } +{ #category : 'settings' } IceLibgitRepository class >> sharedRepositoriesLocationString: aString [ SharedRepositoriesLocation := aString asFileReference ] -{ #category : #utilities } +{ #category : 'utilities' } IceLibgitRepository class >> verifyBackendAvailabilityIfNot: aBlock [ | presentVersion requiredVersion | @@ -189,13 +191,13 @@ IceLibgitRepository class >> verifyBackendAvailabilityIfNot: aBlock [ ifFalse: [ ^ aBlock cull: requiredVersion cull: presentVersion ] ] -{ #category : #'API - files' } +{ #category : 'API - files' } IceLibgitRepository >> addFileToIndex: aFile [ self addFilesToIndex: { aFile } ] -{ #category : #'API - files' } +{ #category : 'API - files' } IceLibgitRepository >> addFilesToIndex: aCollection [ self handleLibgitError: [ @@ -214,37 +216,37 @@ IceLibgitRepository >> addFilesToIndex: aCollection [ free ] ] -{ #category : #'to-cleanup' } +{ #category : 'to-cleanup' } IceLibgitRepository >> addTo: aMCRepositoryGroup [ "For now do not add me as an MCRepository" ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> allBranches [ ^ self localBranches, self remoteTrackedBranches ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> basicCodeDirectory [ ^ self subdirectory isEmptyOrNil ifTrue: [ self repositoryDirectory ] ifFalse: [ self repositoryDirectory / self subdirectory ]. ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> basicNewBranchNamed: aString [ ^ IceGitLocalBranch named: aString inRepository: self ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> basicNewRemoteBranchNamed: aString [ ^ IceGitRemoteBranch named: aString inRepository: self ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> branchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ self handleLibgitError: [ | found | @@ -252,7 +254,7 @@ IceLibgitRepository >> branchNamed: aString ifPresent: presentBlock ifAbsent: ab ^ found ifNil: absentBlock ifNotNil: [ presentBlock value: (self basicNewBranchNamed: found name) ] ] ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceLibgitRepository >> changedFilesBetween: aCommitish and: otherCommitish [ "Answer a list of files that changed between two commits" @@ -263,7 +265,7 @@ IceLibgitRepository >> changedFilesBetween: aCommitish and: otherCommitish [ ^ diff files ] ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceLibgitRepository >> checkForRegistryConflicts [ "If the repository has no location, do not check for conflicts." @@ -292,7 +294,7 @@ and the original repository''s url is {3}.' format: {self location. self origin. repo origin}) ]]. ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> codeDirectory [ "Code repository might have been deleted or image might have been moved." self repositoryDirectory exists @@ -300,13 +302,13 @@ IceLibgitRepository >> codeDirectory [ ifFalse: [ IceLocalRepositoryMissing signalFor: self ] ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> commitCache [ ^ commitCache ifNil: [ commitCache := LRUCache new maximumWeight: 30 ] ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> commitFromGitCommit: aLGitCommit [ ^ self commitCache at: aLGitCommit id hexString ifAbsentPut: [ @@ -321,12 +323,12 @@ IceLibgitRepository >> commitFromGitCommit: aLGitCommit [ yourself ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> commitIdFrom: aLGitCommit [ ^ aLGitCommit id hexString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> commitishNamed: aName [ "Resolve a name in the form of: - a commit hash @@ -345,7 +347,7 @@ IceLibgitRepository >> commitishNamed: aName [ self revparse: aName ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> createBranch: branchName [ | newBranch | "This is really low level and may provoke problems. @@ -370,7 +372,7 @@ IceLibgitRepository >> createBranch: branchName [ ^ self head ] ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> createBranch: aString inCommit: anIceGitCommit [ self handleLibgitError: [ @@ -382,7 +384,7 @@ IceLibgitRepository >> createBranch: aString inCommit: anIceGitCommit [ yourself ] ] -{ #category : #'API - working copy' } +{ #category : 'API - working copy' } IceLibgitRepository >> createSourceDirectory [ (location / self subdirectory) ensureCreateDirectory. @@ -391,7 +393,7 @@ IceLibgitRepository >> createSourceDirectory [ store ] -{ #category : #'API - registry' } +{ #category : 'API - registry' } IceLibgitRepository >> delete [ "Delete is idempotent. If the repository does not exist, do nothing. Otherwise, forget the repository and remove it from the disk. @@ -403,7 +405,7 @@ IceLibgitRepository >> delete [ self locationIfPresent: [ :aLocation | aLocation ensureDeleteAll ] ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitRepository >> description [ ^ [ super description ] on: Error do: [ self location isNil @@ -411,7 +413,7 @@ IceLibgitRepository >> description [ ifFalse: [ 'Bad location: ', self location path pathString ] ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryForPackage: mcPackage [ | package | package := self packageNamed: mcPackage name. @@ -420,7 +422,7 @@ IceLibgitRepository >> directoryForPackage: mcPackage [ ifFalse: [ self subdirectory, '/', (self directoryNameForPackage: package) ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryNameForPackage: package [ ^ (self writerClass @@ -428,7 +430,7 @@ IceLibgitRepository >> directoryNameForPackage: package [ asString ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> directoryPathStringForPackage: aMCPackage [ ^ self subdirectory isEmptyOrNil @@ -436,7 +438,7 @@ IceLibgitRepository >> directoryPathStringForPackage: aMCPackage [ ifFalse: [ self subdirectory, '/', (self directoryNameForPackage: aMCPackage) ] ] -{ #category : #'private - remotes' } +{ #category : 'private - remotes' } IceLibgitRepository >> doRemoveRemote: aRemote [ self handleLibgitError: [ (LGitRemote of: self repositoryHandle named: aRemote name) @@ -444,7 +446,7 @@ IceLibgitRepository >> doRemoveRemote: aRemote [ delete ] ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> free [ (handle isNil or: [ handle isNull ]) @@ -453,7 +455,7 @@ IceLibgitRepository >> free [ handle := nil ] ] -{ #category : #'API - configuration' } +{ #category : 'API - configuration' } IceLibgitRepository >> getConfigurationGlobal: aBoolean [ self handleLibgitError: [ | config | @@ -463,7 +465,7 @@ IceLibgitRepository >> getConfigurationGlobal: aBoolean [ ifFalse: [ config ] ] ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> handleLibgitError: aBlock [ "Handle errors while calling libgit. The pragma is used to detect this method and verify on architectural rules that it is correctly called" @@ -472,32 +474,32 @@ IceLibgitRepository >> handleLibgitError: aBlock [ aBlock on: LGitCallReturnHandler do: [ :error | error acceptError: (IceLibgitErrorVisitor onContext: self) ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> hasTagNamed: aString [ ^ self tagNames includes: aString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> head [ ^ self lookupHead ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitRepository >> headDescription [ ^ [ super headDescription ] on: Error do: [ 'Bad location' ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> iceCommitFrom: aGitCommit [ "The type of 'aCommitish' depends on how each backend internal representation. " ^ self commitFromGitCommit: aGitCommit ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } IceLibgitRepository >> init [ "Initialize new repository. This is the equivalent to running in the command line: $ git init @@ -506,45 +508,45 @@ IceLibgitRepository >> init [ self initBare: false ] -{ #category : #initialization } +{ #category : 'initialization' } IceLibgitRepository >> initBare: isBare [ (LGitRepository on: self location) initBare: isBare ] -{ #category : #'private - commits' } +{ #category : 'private - commits' } IceLibgitRepository >> internalStoreVersion: aMCVersion [ self writerClass forInternalStoreFileOut: aMCVersion on: self ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isCloneOfUrl: aString [ ^ self isMissing not and: [ super isCloneOfUrl: aString ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isCodeMissing [ ^ self subdirectory isEmptyOrNil ifTrue: [ self isMissing ] ifFalse: [ (self repositoryDirectory / self subdirectory) exists not ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isMissing [ ^ self repositoryDirectory isNil or: [ self repositoryDirectory exists not ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> isModified [ "We cannot correctly determine if a repository is modified if it is missing so, false" ^ self isMissing not and: [ super isModified ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> isPackageExported: anIceSavedPackage [ | packageLocation | @@ -552,13 +554,13 @@ IceLibgitRepository >> isPackageExported: anIceSavedPackage [ ^ packageLocation exists and: [ packageLocation hasChildren ] ] -{ #category : #testing } +{ #category : 'testing' } IceLibgitRepository >> isValid [ self flag: #pharoTodo. "Make this tests more solid" ^ self isMissing not ] -{ #category : #'API - branches' } +{ #category : 'API - branches' } IceLibgitRepository >> localBranches [ self handleLibgitError: [ @@ -569,24 +571,24 @@ IceLibgitRepository >> localBranches [ streamContents: [ :stream | self repositoryHandle localBranchesDo: [ :br :isLocal | stream nextPut: (self basicNewBranchNamed: br name) ] ] ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> location [ ^ location ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> location: aFileReference [ location := aFileReference. self resetHandle ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> locationIfPresent: aBlock [ ^ self locationIfPresent: aBlock ifAbsent: [ self ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> locationIfPresent: aBlock ifAbsent: absentBlock [ self location ifNil: [ ^ absentBlock value ]. @@ -596,25 +598,25 @@ IceLibgitRepository >> locationIfPresent: aBlock ifAbsent: absentBlock [ ifFalse: [ absentBlock value ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> log [ ^ self logClass for: self ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> logClass [ ^ IceLog allSubclasses detect: [ :each | each isAvailableFor: self ] ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> lookupCommit: commitId ifAbsent: aBlock [ ^ [ self revparse: commitId ] on: NotFound do: aBlock ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> lookupHead [ self handleLibgitError: [ | head | self repositoryHandle isUnborn @@ -625,7 +627,7 @@ IceLibgitRepository >> lookupHead [ ifFalse: [ head object asIcebergObjectInRepository: self ] ] ] -{ #category : #'private - monticello' } +{ #category : 'private - monticello' } IceLibgitRepository >> mcVersionFor: iceVersion [ [ | commit | commit := iceVersion commit libgitCommit. @@ -637,7 +639,7 @@ IceLibgitRepository >> mcVersionFor: iceVersion [ signal ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> mergeBaseBetween: aCommitId and: anotherCommitId [ self handleLibgitError: [ ^ (self repositoryHandle @@ -645,42 +647,42 @@ IceLibgitRepository >> mergeBaseBetween: aCommitId and: anotherCommitId [ and: (LGitId fromHexString: anotherCommitId)) hexString ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> name [ ^ name ifNil: [ name := self obtainRepositoryName ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> newCommitWalk [ ^ IceLibgitCommitWalk forRepository: self ] -{ #category : #'private - changes' } +{ #category : 'private - changes' } IceLibgitRepository >> newIndex [ ^ IceGitIndex on: self ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> newNoCommit [ ^ IceNoCommit repository: self ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceLibgitRepository >> newProjectFromCommit: aCommit [ ^ IceProjectReader readProjectFrom: self ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> obtainRepositoryName [ ^ self location basename ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> origin [ ^ self @@ -691,7 +693,7 @@ IceLibgitRepository >> origin [ yourself ] ] -{ #category : #'API - packages' } +{ #category : 'API - packages' } IceLibgitRepository >> packageLocationFor: anIceSavedPackage [ | packageLocation directoryName | @@ -703,36 +705,36 @@ IceLibgitRepository >> packageLocationFor: anIceSavedPackage [ ^ packageLocation ] -{ #category : #'private - tags' } +{ #category : 'private - tags' } IceLibgitRepository >> peelTag: anIceTag [ self handleLibgitError: [ | lgitRef | lgitRef := (self repositoryHandle lookup: 'refs/tags/', anIceTag name). ^ self lookupCommit: lgitRef targetId hexString ] ] -{ #category : #'API - project' } +{ #category : 'API - project' } IceLibgitRepository >> project [ ^ self workingCopy project ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> properties [ ^ self workingCopy repositoryProperties ] -{ #category : #'API - properties' } +{ #category : 'API - properties' } IceLibgitRepository >> readerClass [ ^ self properties readerClass ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteAt: aString put: aRemote [ self handleLibgitError: [ self repositoryHandle addRemote: aRemote name url: aRemote url ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbsent: absentBlock [ self handleLibgitError: [ | branchRef | @@ -740,7 +742,7 @@ IceLibgitRepository >> remoteBranchNamed: aString ifPresent: presentBlock ifAbse presentBlock value: (self basicNewRemoteBranchNamed: branchRef name) ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteNamed: aName ifAbsent: aBlockClosure [ self handleLibgitError: [ | gitRemote | @@ -752,7 +754,7 @@ IceLibgitRepository >> remoteNamed: aName ifAbsent: aBlockClosure [ do: [ ^ aBlockClosure value ] ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remoteTrackedBranches [ self handleLibgitError: [ @@ -765,7 +767,7 @@ IceLibgitRepository >> remoteTrackedBranches [ stream nextPut: (self basicNewRemoteBranchNamed: br name) ] ] ] ] -{ #category : #'API - remotes' } +{ #category : 'API - remotes' } IceLibgitRepository >> remotes [ LGitLibrary uniqueInstance isAvailable @@ -783,19 +785,19 @@ IceLibgitRepository >> remotes [ yourself ] ] ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> removeTag: anIceTag [ self handleLibgitError: [ self repositoryHandle git_tag_delete: anIceTag name ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> repositoryDirectory [ ^ self location ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> repositoryHandle [ @@ -804,12 +806,12 @@ IceLibgitRepository >> repositoryHandle [ ^ handle ] -{ #category : #'private - libgit' } +{ #category : 'private - libgit' } IceLibgitRepository >> resetHandle [ handle := nil ] -{ #category : #'API - commits' } +{ #category : 'API - commits' } IceLibgitRepository >> revparse: aName [ self handleLibgitError: [ | gitCommit gitId | @@ -818,7 +820,7 @@ IceLibgitRepository >> revparse: aName [ ^ self commitFromGitCommit: gitCommit ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> setHead: anIceGitCommitish [ "Need to keep the reference, if not it is garbage collected. As the options are only passed to a FFI call" @@ -835,18 +837,18 @@ IceLibgitRepository >> setHead: anIceGitCommitish [ yourself) ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectory [ ^ self project sourceDirectory ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectory: aString [ self project sourceDirectory: aString ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectoryPath [ "API compatible both with Pharo6 and Pharo7. @@ -857,13 +859,13 @@ IceLibgitRepository >> subdirectoryPath [ ^ RelativePath withAll: (RelativePath canonicalizeElements: ($/ split: self subdirectory)) ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> subdirectoryReference [ ^ self location resolve: self subdirectoryPath ] -{ #category : #'API - tags' } +{ #category : 'API - tags' } IceLibgitRepository >> tags [ self handleLibgitError: [ ^ self repositoryHandle tags @@ -871,7 +873,7 @@ IceLibgitRepository >> tags [ IceTag named: each inRepository: self ] ] ] -{ #category : #'API - accessing' } +{ #category : 'API - accessing' } IceLibgitRepository >> writerClass [ ^ self project writerClass ] diff --git a/Iceberg-Libgit/IceLibgitTreeBuilder.class.st b/Iceberg-Libgit/IceLibgitTreeBuilder.class.st index d4f13da3d9..77a6ff4c0f 100644 --- a/Iceberg-Libgit/IceLibgitTreeBuilder.class.st +++ b/Iceberg-Libgit/IceLibgitTreeBuilder.class.st @@ -29,8 +29,8 @@ Internal Representation and Key Implementation Points. Implementation Points " Class { - #name : #IceLibgitTreeBuilder, - #superclass : #Object, + #name : 'IceLibgitTreeBuilder', + #superclass : 'Object', #instVars : [ 'parent', 'entryName', @@ -40,16 +40,18 @@ Class { 'initialTree', 'hasChanges' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceLibgitTreeBuilder class >> on: aLGitTree [ "Creates a tree builder on the root of the repository" ^ self new initializeWithTree: aLGitTree ] -{ #category : #modifying } +{ #category : 'modifying' } IceLibgitTreeBuilder >> addEntryNamed: name withContents: aString [ self builder addEntry: (LGitBlob of: self repository fromString: aString) @@ -59,7 +61,7 @@ IceLibgitTreeBuilder >> addEntryNamed: name withContents: aString [ hasChanges := true ] -{ #category : #building } +{ #category : 'building' } IceLibgitTreeBuilder >> buildTree [ self children keysAndValuesDo: [ :childEntryName :childBuilder | childBuilder hasChanges ifTrue: [ @@ -72,7 +74,7 @@ IceLibgitTreeBuilder >> buildTree [ ^ self builder newTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> builder [ ^ builder ifNil: [ builder := LGitTreeBuilder @@ -81,28 +83,28 @@ IceLibgitTreeBuilder >> builder [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> changes [ ^ changes ifNil: [ changes := OrderedCollection new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> children [ ^ children ifNil: [ children := Dictionary new ] ] -{ #category : #modifying } +{ #category : 'modifying' } IceLibgitTreeBuilder >> deleteAll [ self builder clear. ] -{ #category : #patches } +{ #category : 'patches' } IceLibgitTreeBuilder >> directory [ ^ self ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> entryByName: aString [ ^ self children at: aString @@ -112,7 +114,7 @@ IceLibgitTreeBuilder >> entryByName: aString [ entryName: aString ] ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> entryByPath: aString [ ^ (aString = '.' ) ifTrue: [ self ] @@ -121,12 +123,12 @@ IceLibgitTreeBuilder >> entryByPath: aString [ into: [ :treeBuilder :name | treeBuilder entryByName: name ]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> entryName [ ^ entryName ] -{ #category : #querying } +{ #category : 'querying' } IceLibgitTreeBuilder >> hasChanges [ ^ hasChanges or: [ initialTree isNil "It means that this is a new tree" @@ -134,20 +136,20 @@ IceLibgitTreeBuilder >> hasChanges [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> initialTree [ ^ initialTree ] -{ #category : #initialization } +{ #category : 'initialization' } IceLibgitTreeBuilder >> initialize [ super initialize. hasChanges := false. ] -{ #category : #initializing } +{ #category : 'initializing' } IceLibgitTreeBuilder >> initializeWithParent: anIceTreeBuilder entryName: aString [ | treeEntry | parent := anIceTreeBuilder. @@ -162,18 +164,18 @@ IceLibgitTreeBuilder >> initializeWithParent: anIceTreeBuilder entryName: aStrin ] -{ #category : #initializing } +{ #category : 'initializing' } IceLibgitTreeBuilder >> initializeWithTree: aLGitTree [ "This is a builder on the root of a repository" initialTree := aLGitTree ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> parent [ ^ parent ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitTreeBuilder >> printOn: aStream [ aStream nextPutAll: self class name; @@ -183,7 +185,7 @@ IceLibgitTreeBuilder >> printOn: aStream [ ] -{ #category : #printing } +{ #category : 'printing' } IceLibgitTreeBuilder >> printPathOn: aStream [ parent ifNil: [ @@ -194,7 +196,7 @@ IceLibgitTreeBuilder >> printPathOn: aStream [ nextPutAll: entryName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceLibgitTreeBuilder >> repository [ ^ parent ifNotNil: [ self parent repository ] diff --git a/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st b/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st index 85f316af55..47f3fb5750 100644 --- a/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st +++ b/Iceberg-Libgit/IceMCSnapshotPatchVisitor.class.st @@ -1,44 +1,46 @@ Class { - #name : #IceMCSnapshotPatchVisitor, - #superclass : #IceTreeVisitor, + #name : 'IceMCSnapshotPatchVisitor', + #superclass : 'IceTreeVisitor', #instVars : [ 'patcher' ], - #category : #'Iceberg-Libgit-Commit' + #category : 'Iceberg-Libgit-Commit', + #package : 'Iceberg-Libgit', + #tag : 'Commit' } -{ #category : #accessing } +{ #category : 'accessing' } IceMCSnapshotPatchVisitor >> patcher: aMCPatcher [ patcher := aMCPatcher ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitAddition: anIceAddition [ anIceAddition definition addToPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitModification: anIceModification [ anIceModification leftDefinition addModification: anIceModification toPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitNoModification: anIceNoModification [ anIceNoModification definition addToPatcher: patcher. self visitChildrenOf: currentNode ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitNonConflictingOperation: anIceNonConflictingOperation [ ^ anIceNonConflictingOperation chosenOperation accept: self ] -{ #category : #visiting } +{ #category : 'visiting' } IceMCSnapshotPatchVisitor >> visitRemoval: anIceRemoval [ anIceRemoval definition removeFromPatcher: patcher. self visitChildrenOf: currentNode diff --git a/Iceberg-Libgit/IceRepositoryCreator.class.st b/Iceberg-Libgit/IceRepositoryCreator.class.st index 8be5355293..73240d6d15 100644 --- a/Iceberg-Libgit/IceRepositoryCreator.class.st +++ b/Iceberg-Libgit/IceRepositoryCreator.class.st @@ -8,8 +8,8 @@ I do this (trying in this order): You can also define branchName to checkout a specific branch. " Class { - #name : #IceRepositoryCreator, - #superclass : #Object, + #name : 'IceRepositoryCreator', + #superclass : 'Object', #instVars : [ 'location', 'url', @@ -20,15 +20,17 @@ Class { 'ensureProjectFile', 'isBareRepository' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator class >> defaultSubdirectory [ ^ '' ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryCreator class >> isGitRoot: aReference [ self flag: #pharoTodo. "This does not understand submodules" ^ aReference isDirectory @@ -36,7 +38,7 @@ IceRepositoryCreator class >> isGitRoot: aReference [ and: [ (aReference / '.git' / 'config') exists ] ] ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> addLocalRepository [ self repository location: self locationToUse. self repository pluginManager repositoryWillBeCreated: self repository. @@ -48,7 +50,7 @@ IceRepositoryCreator >> addLocalRepository [ ^ self repository ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> addLocalRepositoryAndCheckout [ | localRepository | localRepository := self addLocalRepository. @@ -59,7 +61,7 @@ IceRepositoryCreator >> addLocalRepositoryAndCheckout [ ^ localRepository ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> addProjectFileTo: aRepository [ | newProject | @@ -68,24 +70,24 @@ IceRepositoryCreator >> addProjectFileTo: aRepository [ aRepository workingCopy basicSetProject: newProject. ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> addPropertiesFileTo: aRepository [ aRepository properties fileFormat: self formatToUse ] -{ #category : #remotes } +{ #category : 'remotes' } IceRepositoryCreator >> addRemote: aString [ self remote: (IceGitRemote url: aString) ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCreator >> beBare [ isBareRepository := true ] -{ #category : #'private - actions' } +{ #category : 'private - actions' } IceRepositoryCreator >> cloneRepository [ IceGitClone new location: self locationToUse; @@ -104,17 +106,17 @@ IceRepositoryCreator >> cloneRepository [ ^ self repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> commitishName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> commitishName: aName [ branchName := aName ] -{ #category : #actions } +{ #category : 'actions' } IceRepositoryCreator >> createNewRepositoryNamed: aString [ | locationToUse | self validate. @@ -136,7 +138,7 @@ IceRepositoryCreator >> createNewRepositoryNamed: aString [ ^ repository ] -{ #category : #actions } +{ #category : 'actions' } IceRepositoryCreator >> createRepository [ ^ [ self validate. @@ -149,7 +151,7 @@ IceRepositoryCreator >> createRepository [ e signal ] ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> defaultLocation [ | remoteToUse | remoteToUse := self remoteToUse. @@ -158,7 +160,7 @@ IceRepositoryCreator >> defaultLocation [ / remoteToUse projectName ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> doEnsureProject [ ensureProjectFile ifFalse: [ ^ self ]. @@ -177,100 +179,100 @@ IceRepositoryCreator >> doEnsureProject [ self repository workingCopy refreshPackages. ] -{ #category : #'API-project' } +{ #category : 'API-project' } IceRepositoryCreator >> ensureProjectFile [ ensureProjectFile := true ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> formatToUse [ ^ IceLibgitRepository defaultFileFormat ] -{ #category : #initialization } +{ #category : 'initialization' } IceRepositoryCreator >> initialize [ super initialize. ensureProjectFile := false. isBareRepository := false ] -{ #category : #'private - testing' } +{ #category : 'private - testing' } IceRepositoryCreator >> isCloning [ ^ self remoteToUse notNil ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> location: anObject [ location := anObject ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> locationToUse [ ^ self location ifNil: [ self defaultLocation ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> remote: anObject [ remote := anObject ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceRepositoryCreator >> remoteToUse [ self remote ifNotNil: [ ^ self remote ]. self url ifNotNil: [ ^ IceGitRemote url: self url ]. ^ nil ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> repository [ ^ repository ifNil: [ repository := IceLibgitRepository new ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> repository: anExistingRepository [ repository := anExistingRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> subdirectory [ ^ subdirectory ifNil: [ self class defaultSubdirectory ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> subdirectory: anObject [ subdirectory := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> url [ ^ url ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryCreator >> url: anObject [ url := anObject ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validate [ self validateLocation. self validateAlreadyPresentAndNotGit. self validateNotDuplicated ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateAlreadyPresentAndNotGit [ "Validate if I will add a local repository (url isNil and location isNotNil)... testing the local directory actually exists" @@ -283,14 +285,14 @@ IceRepositoryCreator >> validateAlreadyPresentAndNotGit [ ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateLocation [ (self location isNil and: [ self remoteToUse isNil ]) ifTrue: [ IceError signal: 'No location/url or remote defined.' ] ] -{ #category : #private } +{ #category : 'private' } IceRepositoryCreator >> validateNotDuplicated [ (self remoteToUse isNotNil and: [ self locationToUse exists and: [ self locationToUse hasChildren ] ]) diff --git a/Iceberg-Libgit/IceRepositoryProperties.class.st b/Iceberg-Libgit/IceRepositoryProperties.class.st index 6a547b0e63..3f47452796 100644 --- a/Iceberg-Libgit/IceRepositoryProperties.class.st +++ b/Iceberg-Libgit/IceRepositoryProperties.class.st @@ -7,17 +7,19 @@ I can answer concrete things about repositories, e.g. : - ... " Class { - #name : #IceRepositoryProperties, - #superclass : #Object, + #name : 'IceRepositoryProperties', + #superclass : 'Object', #instVars : [ 'properties', 'repository', 'commitish' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromDictionary: aDictionary commitish: aCommitish [ ^ self new repository: aCommitish repository; @@ -27,7 +29,7 @@ IceRepositoryProperties class >> fromDictionary: aDictionary commitish: aCommiti yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromFileReference: aFileReference commitish: aCommitish [ aFileReference exists @@ -35,31 +37,31 @@ IceRepositoryProperties class >> fromFileReference: aFileReference commitish: aC ^ self fromDictionary: (self readPropertiesFrom: aFileReference) commitish: aCommitish ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> fromFileReferenceDirectory: aDirectory commitish: aCommitish [ ^ self fromFileReference: aDirectory / self propertiesFileName commitish: aCommitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties class >> propertiesFileName [ ^ '.properties' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceRepositoryProperties class >> readPropertiesFrom: aFileReference [ self flag: #pharoFixMe. "When Pharo 6.1 will not be supported anymore we can directly use: `ref readStreamDo: [ :stream | STON fromStream: stream ]` but currently FileReference>>readStream return a ZnBufferedStream in Pharo 61 and a ZnCharacterReadStream decoding utf8 in Pharo 7." ^ aFileReference binaryReadStreamDo: [ :stream | STON fromStream: (ZnCharacterReadStream on: stream encoding: 'utf8') ] ] -{ #category : #comparing } +{ #category : 'comparing' } IceRepositoryProperties >> = anotherObject [ ^ self species = anotherObject species and: [ properties = anotherObject properties ] ] -{ #category : #writing } +{ #category : 'writing' } IceRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ anIceChangeImporter @@ -68,36 +70,36 @@ IceRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ contents: self contentsString ] -{ #category : #converting } +{ #category : 'converting' } IceRepositoryProperties >> asBornProperties [ ^ self ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> at: aKey [ ^ self properties at: aKey ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> at: aKey put: aValue [ self properties at: aKey put: aValue ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> commitish [ ^ commitish ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> commitish: anObject [ self assert: anObject isNotNil. commitish := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> contentsString [ ^ ByteArray streamContents: [ :stream | @@ -107,7 +109,7 @@ IceRepositoryProperties >> contentsString [ nextPut: self properties ] ] -{ #category : #'initialization-release' } +{ #category : 'initialization-release' } IceRepositoryProperties >> ensureDefaultProperties [ properties at: #format ifAbsentPut: [ @@ -115,72 +117,72 @@ IceRepositoryProperties >> ensureDefaultProperties [ ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormat [ ^ self writerClass ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormat: aClass [ self fileFormatId: aClass id ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> fileFormatId: aFileFormatId [ self properties at: #format put: aFileFormatId ] -{ #category : #comparing } +{ #category : 'comparing' } IceRepositoryProperties >> hash [ ^ properties hash ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryProperties >> isDirty [ ^ repository workingCopy referenceCommit properties ~= self ] -{ #category : #testing } +{ #category : 'testing' } IceRepositoryProperties >> isUnborn [ ^ false ] -{ #category : #private } +{ #category : 'private' } IceRepositoryProperties >> properties [ ^ properties ifNil: [ properties := Dictionary new ] ] -{ #category : #private } +{ #category : 'private' } IceRepositoryProperties >> properties: aDictionary [ properties := aDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> propertiesFilePath [ ^ repository project sourceDirectoryPath / self class propertiesFileName ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> readerClass [ ^ TIceRepositoryReader users detect: [ :each | each id = self fileFormat id ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> repository: anIceLibgitRepository [ repository := anIceLibgitRepository ] -{ #category : #storing } +{ #category : 'storing' } IceRepositoryProperties >> storeOnDirectory: aFileLocator root: rootDirectory [ | propertiesFileReference relativePath | @@ -196,7 +198,7 @@ IceRepositoryProperties >> storeOnDirectory: aFileLocator root: rootDirectory [ nextPut: self properties ] ] -{ #category : #storing } +{ #category : 'storing' } IceRepositoryProperties >> storeOnFileReference: aFileReference [ aFileReference @@ -208,7 +210,7 @@ IceRepositoryProperties >> storeOnFileReference: aFileReference [ nextPut: self properties ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceRepositoryProperties >> writerClass [ ^ self properties at: 'format' diff --git a/Iceberg-Libgit/IceSemanticVersion.class.st b/Iceberg-Libgit/IceSemanticVersion.class.st index 7476697175..b567db4abe 100644 --- a/Iceberg-Libgit/IceSemanticVersion.class.st +++ b/Iceberg-Libgit/IceSemanticVersion.class.st @@ -4,17 +4,19 @@ Since I exist just to be able to compare versions, I'm limited (reason why I'm n " Class { - #name : #IceSemanticVersion, - #superclass : #Magnitude, + #name : 'IceSemanticVersion', + #superclass : 'Magnitude', #instVars : [ 'major', 'minor', 'patch' ], - #category : #'Iceberg-Libgit-Core' + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> fromArray: anArray [ ^ self major: anArray first @@ -22,7 +24,7 @@ IceSemanticVersion class >> fromArray: anArray [ patch: anArray third ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> major: majorNumber minor: minorNumber patch: patchNumber [ ^ self basicNew initializeMajor: majorNumber @@ -31,12 +33,12 @@ IceSemanticVersion class >> major: majorNumber minor: minorNumber patch: patchNu yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceSemanticVersion class >> new [ self error: 'Use one of my siblings' ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> < aMagnitude [ "Answer whether the receiver is less than the argument." | version | @@ -45,7 +47,7 @@ IceSemanticVersion >> < aMagnitude [ ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> = aMagnitude [ "Compare the receiver with the argument and answer with true if the receiver is equal to the argument. Otherwise answer false." @@ -56,7 +58,7 @@ IceSemanticVersion >> = aMagnitude [ ] -{ #category : #converting } +{ #category : 'converting' } IceSemanticVersion >> asInteger [ "this does not works for versions 0.100+.*, but I do not think it will arrive to that" ^ (self major * 10000) @@ -64,7 +66,7 @@ IceSemanticVersion >> asInteger [ + self patch ] -{ #category : #comparing } +{ #category : 'comparing' } IceSemanticVersion >> hash [ ^ ((self species hash bitXor: self major) @@ -73,34 +75,34 @@ IceSemanticVersion >> hash [ ] -{ #category : #converting } +{ #category : 'converting' } IceSemanticVersion >> iceSemanticVersion [ ^ self ] -{ #category : #initialization } +{ #category : 'initialization' } IceSemanticVersion >> initializeMajor: majorNumber minor: minorNumber patch: patchNumber [ major := majorNumber. minor := minorNumber. patch := patchNumber ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> major [ ^ major ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> minor [ ^ minor ] -{ #category : #accessing } +{ #category : 'accessing' } IceSemanticVersion >> patch [ ^ patch ] -{ #category : #printing } +{ #category : 'printing' } IceSemanticVersion >> printOn: stream [ stream << self major asString diff --git a/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st b/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st index 59bccec1ad..dcf385a31d 100644 --- a/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st +++ b/Iceberg-Libgit/IceUnbornRepositoryProperties.class.st @@ -1,17 +1,19 @@ Class { - #name : #IceUnbornRepositoryProperties, - #superclass : #IceRepositoryProperties, - #category : #'Iceberg-Libgit-Core' + #name : 'IceUnbornRepositoryProperties', + #superclass : 'IceRepositoryProperties', + #category : 'Iceberg-Libgit-Core', + #package : 'Iceberg-Libgit', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> addToChangeBuilder: anIceChangeImporter [ "I'm unborn" ^ self ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> asBornProperties [ ^ IceRepositoryProperties @@ -19,7 +21,7 @@ IceUnbornRepositoryProperties >> asBornProperties [ commitish: commitish ] -{ #category : #testing } +{ #category : 'testing' } IceUnbornRepositoryProperties >> isUnborn [ ^ true diff --git a/Iceberg-Libgit/LGitAbstractError.extension.st b/Iceberg-Libgit/LGitAbstractError.extension.st index a03353045d..0b3773409b 100644 --- a/Iceberg-Libgit/LGitAbstractError.extension.st +++ b/Iceberg-Libgit/LGitAbstractError.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #LGitAbstractError } +Extension { #name : 'LGitAbstractError' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGitAbstractError >> acceptError: aVisitor [ ^ aVisitor visitGenericError: self ] diff --git a/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st b/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st index e1416fe606..d17964ccaf 100644 --- a/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ECONFLICT.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ECONFLICT' } +Extension { #name : 'LGit_GIT_ECONFLICT' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ECONFLICT >> acceptError: aVisitor [ ^ aVisitor visitECONFLICT: self ] diff --git a/Iceberg-Libgit/LGit_GIT_EEOF.extension.st b/Iceberg-Libgit/LGit_GIT_EEOF.extension.st index aa4d074d34..132eaea2dd 100644 --- a/Iceberg-Libgit/LGit_GIT_EEOF.extension.st +++ b/Iceberg-Libgit/LGit_GIT_EEOF.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_EEOF' } +Extension { #name : 'LGit_GIT_EEOF' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_EEOF >> acceptError: aVisitor [ ^ aVisitor visitEEOF: self diff --git a/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st b/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st index 6462c57e5d..008c807c52 100644 --- a/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ENOTFOUND.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ENOTFOUND' } +Extension { #name : 'LGit_GIT_ENOTFOUND' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ENOTFOUND >> acceptError: aVisitor [ ^ aVisitor visitENOTFOUND: self ] diff --git a/Iceberg-Libgit/LGit_GIT_ERROR.extension.st b/Iceberg-Libgit/LGit_GIT_ERROR.extension.st index 996009194d..5479d79a31 100644 --- a/Iceberg-Libgit/LGit_GIT_ERROR.extension.st +++ b/Iceberg-Libgit/LGit_GIT_ERROR.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_ERROR' } +Extension { #name : 'LGit_GIT_ERROR' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_ERROR >> acceptError: aVisitor [ ^ aVisitor visitERROR: self ] diff --git a/Iceberg-Libgit/LGit_GIT_EUSER.extension.st b/Iceberg-Libgit/LGit_GIT_EUSER.extension.st index a7e670a417..a8d53004d6 100644 --- a/Iceberg-Libgit/LGit_GIT_EUSER.extension.st +++ b/Iceberg-Libgit/LGit_GIT_EUSER.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #'LGit_GIT_EUSER' } +Extension { #name : 'LGit_GIT_EUSER' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } LGit_GIT_EUSER >> acceptError: aVisitor [ ^ aVisitor visitEUSER: self ] diff --git a/Iceberg-Libgit/Magnitude.extension.st b/Iceberg-Libgit/Magnitude.extension.st index d27342fa45..1206c0237f 100644 --- a/Iceberg-Libgit/Magnitude.extension.st +++ b/Iceberg-Libgit/Magnitude.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #Magnitude } +Extension { #name : 'Magnitude' } -{ #category : #'*Iceberg-Libgit' } +{ #category : '*Iceberg-Libgit' } Magnitude >> iceSemanticVersion [ ^ IceSemanticVersion major: self asInteger minor: 0 patch: 0 ] diff --git a/Iceberg-Libgit/ManifestIcebergLibgit.class.st b/Iceberg-Libgit/ManifestIcebergLibgit.class.st index ffd7d0a8b8..d1a372608c 100644 --- a/Iceberg-Libgit/ManifestIcebergLibgit.class.st +++ b/Iceberg-Libgit/ManifestIcebergLibgit.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergLibgit, - #superclass : #PackageManifest, - #category : #'Iceberg-Libgit-Manifest' + #name : 'ManifestIcebergLibgit', + #superclass : 'PackageManifest', + #category : 'Iceberg-Libgit-Manifest', + #package : 'Iceberg-Libgit', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergLibgit class >> description [ ^ 'I contains the core of the libgit binding of Iceberg. diff --git a/Iceberg-Libgit/TIceRepositoryReader.trait.st b/Iceberg-Libgit/TIceRepositoryReader.trait.st index fdf9f0a4ee..452e058883 100644 --- a/Iceberg-Libgit/TIceRepositoryReader.trait.st +++ b/Iceberg-Libgit/TIceRepositoryReader.trait.st @@ -2,16 +2,18 @@ I indicate when a clas is reader for iceberg " Trait { - #name : #TIceRepositoryReader, - #category : #'Iceberg-Libgit-Writing' + #name : 'TIceRepositoryReader', + #category : 'Iceberg-Libgit-Writing', + #package : 'Iceberg-Libgit', + #tag : 'Writing' } -{ #category : #accessing } +{ #category : 'accessing' } TIceRepositoryReader classSide >> id [ ^ self required ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryReader classSide >> isLegacyDefault [ ^ false ] diff --git a/Iceberg-Libgit/TIceRepositoryWriter.trait.st b/Iceberg-Libgit/TIceRepositoryWriter.trait.st index 29bc669bb6..ae87f6b5d8 100644 --- a/Iceberg-Libgit/TIceRepositoryWriter.trait.st +++ b/Iceberg-Libgit/TIceRepositoryWriter.trait.st @@ -2,22 +2,24 @@ I indicate when a class is writer for iceberg " Trait { - #name : #TIceRepositoryWriter, - #category : #'Iceberg-Libgit-Writing' + #name : 'TIceRepositoryWriter', + #category : 'Iceberg-Libgit-Writing', + #package : 'Iceberg-Libgit', + #tag : 'Writing' } -{ #category : #accessing } +{ #category : 'accessing' } TIceRepositoryWriter classSide >> id [ ^ self required ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryWriter classSide >> isDefault [ "Indicates when this is default when create new repositories" ^ false ] -{ #category : #testing } +{ #category : 'testing' } TIceRepositoryWriter classSide >> isLegacyDefault [ "Indicates when repository is default as legacy (when there is no properties file indicating a specific format type)" diff --git a/Iceberg-Libgit/package.st b/Iceberg-Libgit/package.st index 5b2adfb856..994226c8c8 100644 --- a/Iceberg-Libgit/package.st +++ b/Iceberg-Libgit/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Libgit' } +Package { #name : 'Iceberg-Libgit' } diff --git a/Iceberg-Memory/IceMemoryCommit.class.st b/Iceberg-Memory/IceMemoryCommit.class.st index 6566600ed9..712cf67a70 100644 --- a/Iceberg-Memory/IceMemoryCommit.class.st +++ b/Iceberg-Memory/IceMemoryCommit.class.st @@ -15,8 +15,11 @@ Class { { #category : 'comparing' } IceMemoryCommit >> = aCommit [ - ^ (self mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) - = (aCommit mcCommit dependencies asArray sort: [ :a :b | a timeStamp > b timeStamp ]) + self == aCommit ifTrue: [ ^ true ]. + + self species = aCommit species ifFalse: [ ^ false ]. + + ^ self mcCommit dependencies asSet = aCommit mcCommit dependencies asSet ] { #category : 'accessing' } diff --git a/Iceberg-Memory/IceMemoryRepository.class.st b/Iceberg-Memory/IceMemoryRepository.class.st index e07eae0d14..5c2833c36e 100644 --- a/Iceberg-Memory/IceMemoryRepository.class.st +++ b/Iceberg-Memory/IceMemoryRepository.class.st @@ -63,10 +63,7 @@ IceMemoryRepository class >> exampleWithChanges [ anotherPackageName := 'AnotherNonExistentPackage' asSymbol. repository := self exampleWithNoChanges. repository workingCopy addPackageNamed: anotherPackageName. - Object subclass: 'IceGeneratedClassForUI' - instanceVariableNames: '' - classVariableNames: '' - package: anotherPackageName. + (Object << 'IceGeneratedClassForUI' package: anotherPackageName) install. self assert: repository isModified. ^ repository ] diff --git a/Iceberg-Memory/IceRingWorkingCopy.class.st b/Iceberg-Memory/IceRingWorkingCopy.class.st index c0571d4cd6..621662bf80 100644 --- a/Iceberg-Memory/IceRingWorkingCopy.class.st +++ b/Iceberg-Memory/IceRingWorkingCopy.class.st @@ -10,9 +10,10 @@ Class { { #category : 'helpers' } IceRingWorkingCopy >> addClassVariable: aVariableName to: aClassName [ + | class | class := ringEnvironment ensureClassNamed: aClassName. - class addClassVariable: (RG2ClassVariableDefinition named: aVariableName asSymbol parent: class ). + class addClassVariable: (RGClassVariable named: aVariableName asSymbol parent: class) ] { #category : 'private-impacting-changes' } @@ -139,7 +140,7 @@ IceRingWorkingCopy >> environment [ IceRingWorkingCopy >> initialize [ super initialize. - ringEnvironment := RG2Environment new. + ringEnvironment := RGEnvironment new. ] { #category : 'packages' } @@ -169,7 +170,7 @@ IceRingWorkingCopy >> loadPackagesNamed: packageNames fromCommit: aCommit [ fromCommit: aCommit package: package) mcSnapshot. - snapshot ring2ImportInto: ringEnvironment asPackageNamed: packageName. + snapshot importInto: ringEnvironment asPackageNamed: packageName. package beClean. ]. self referenceCommit: aCommit diff --git a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st index 188ba5bc1a..0bd002e277 100644 --- a/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st +++ b/Iceberg-Memory/IceRingWorkingCopyChangerVisitor.class.st @@ -180,8 +180,8 @@ IceRingWorkingCopyChangerVisitor >> visitTraitDefinition: anIceTraitDefinition [ inPackage: package name with: [ :trait | | composition transformations | - composition := RG2TraitCompositionDefinition parent: trait. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: trait. + transformations := RGTraitCompositionVisitor new parse: anIceTraitDefinition asMCDefinition traitComposition for: composition. trait traitComposition: composition. diff --git a/Iceberg-Memory/ManifestIcebergMemory.class.st b/Iceberg-Memory/ManifestIcebergMemory.class.st new file mode 100644 index 0000000000..307731660f --- /dev/null +++ b/Iceberg-Memory/ManifestIcebergMemory.class.st @@ -0,0 +1,17 @@ +" +Please describe the package using the class comment of the included manifest class. The manifest class also includes other additional metadata for the package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser +" +Class { + #name : 'ManifestIcebergMemory', + #superclass : 'PackageManifest', + #category : 'Iceberg-Memory-Manifest', + #package : 'Iceberg-Memory', + #tag : 'Manifest' +} + +{ #category : 'meta-data - dependency analyser' } +ManifestIcebergMemory class >> manuallyResolvedDependencies [ + + + ^ #(#'Collections-Streams' #'Monticello-Model' #'FileSystem-Core' #'Collections-Abstract' #'Ring-Monticello') +] diff --git a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st index 9f4ffef342..fb260621cb 100644 --- a/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceBitbucketRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Bitbucket repositories " Class { - #name : #IceBitbucketRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceBitbucketRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceBitbucketRepositoryType class >> type [ ^ 'bitbucket' ] diff --git a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st index 1c2f49f152..bf150ca7e2 100644 --- a/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitLocalRepositoryType.class.st @@ -20,22 +20,24 @@ Metacello new " Class { - #name : #IceGitLocalRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitLocalRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType class >> type [ ^ 'gitlocal' ] -{ #category : #testing } +{ #category : 'testing' } IceGitLocalRepositoryType >> isGitRoot: aReference [ ^ IceRepositoryCreator isGitRoot: aReference ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitLocalRepositoryType >> mcRepository [ | repository tuple extractedLocation | @@ -57,7 +59,7 @@ IceGitLocalRepositoryType >> mcRepository [ ^ repository metacelloAdapter: repository head description. ] -{ #category : #private } +{ #category : 'private' } IceGitLocalRepositoryType >> splitRootAndSubdirectoryFromLocation [ | root subDir | (self location beginsWith: (self class type, '://')) diff --git a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st index d8f91b3b32..2b2b031127 100644 --- a/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitRepositoryType.class.st @@ -7,18 +7,20 @@ git:https://github.com/user/project.git git:git@github.com:user/project.git " Class { - #name : #IceGitRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType class >> type [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitRepositoryType >> mcRepositoryClass [ ^ MCGitRemoteRepository diff --git a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st index 3d42910506..00b3bf513c 100644 --- a/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGithubRepositoryType.class.st @@ -2,17 +2,19 @@ I resolve Github repositories " Class { - #name : #IceGithubRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGithubRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType class >> type [ ^ 'github' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGithubRepositoryType >> mcRepository [ | baseRepo | diff --git a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st index 597dcee6da..620b0f0811 100644 --- a/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceGitlabRepositoryType.class.st @@ -2,12 +2,14 @@ I resolve Gilab repositories " Class { - #name : #IceGitlabRepositoryType, - #superclass : #IceProviderRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceGitlabRepositoryType', + #superclass : 'IceProviderRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitlabRepositoryType class >> type [ ^ 'gitlab' ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st index 3ab968801a..2f7b4b760e 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadChoice.class.st @@ -3,60 +3,62 @@ I'm a recorded choice when installing a metacello baseline/configuration. A choice is created whenever there is a conflict between two project versions (loaded and incomming). Due the nature of Matacello, this choice can be asked several times... A choice keeps track of what user selected to avoid asking him every time. " Class { - #name : #IceMetacelloLoadChoice, - #superclass : #Object, + #name : 'IceMetacelloLoadChoice', + #superclass : 'Object', #instVars : [ 'projectName', 'optionA', 'optionB', 'choosen' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen [ ^ choosen ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> choosen: anObject [ choosen := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloLoadChoice >> isChoiceBetween: firstOption and: secondOption [ ^ (self optionA = firstOption) and: [ self optionB = secondOption ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA [ ^ optionA ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionA: anObject [ optionA := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB [ ^ optionB ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> optionB: anObject [ optionB := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadChoice >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st index 71cd94a286..1e0f8d7831 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSession.class.st @@ -5,28 +5,30 @@ I will be active during the context of a ""metacello load"" command, and it will Tipically, I will be used to keep some state needed during the full execution, like a choice of what whas selected when conflicting or upgraded versions acts. " Class { - #name : #IceMetacelloLoadSession, - #superclass : #Object, + #name : 'IceMetacelloLoadSession', + #superclass : 'Object', #instVars : [ 'choices' ], - #category : #'Iceberg-Metacello-Integration-Session' + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloLoadSession >> initialize [ super initialize. choices := Set new ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoice: anIceMetacelloLoadChoice [ ^ choices add: anIceMetacelloLoadChoice ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloLoadSession >> recordChoiceProject: projectName optionA: optionA optionB: optionB ifAbsentAnswer: aBlock [ ^ choices diff --git a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st index 20c708ea70..ff4a76cf1a 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloLoadSessionContext.class.st @@ -2,7 +2,9 @@ I'm a dynamic variable to keep a load session. " Class { - #name : #IceMetacelloLoadSessionContext, - #superclass : #DynamicVariable, - #category : #'Iceberg-Metacello-Integration-Session' + #name : 'IceMetacelloLoadSessionContext', + #superclass : 'DynamicVariable', + #category : 'Iceberg-Metacello-Integration-Session', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Session' } diff --git a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st index 84a2c88bbf..25e20e3cda 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloPharoPlatform.class.st @@ -2,23 +2,25 @@ I'm a class to add support for iceberg to metacello. " Class { - #name : #IceMetacelloPharoPlatform, - #superclass : #MetacelloPharoPlatform, - #category : #'Iceberg-Metacello-Integration-Platform' + #name : 'IceMetacelloPharoPlatform', + #superclass : 'MetacelloPharoPlatform', + #category : 'Iceberg-Metacello-Integration-Platform', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Platform' } -{ #category : #'class initialization' } +{ #category : 'class initialization' } IceMetacelloPharoPlatform class >> initialize [ self select ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloPharoPlatform >> canHandleType: type [ ^ Iceberg enableMetacelloIntegration and: [ IceMetacelloRepositoryType canHandleType: type ] ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ (self canHandleType: aRepositorySpec type) ifTrue: [ ^ Iceberg mcRepositoryFor: aRepositorySpec description ]. @@ -26,7 +28,7 @@ IceMetacelloPharoPlatform >> createRepository: aRepositorySpec [ ^ super createRepository: aRepositorySpec ] -{ #category : #'repository creation' } +{ #category : 'repository creation' } IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ (description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ]. @@ -36,7 +38,7 @@ IceMetacelloPharoPlatform >> extractTypeFromDescription: description [ ^ super extractTypeFromDescription: description ] -{ #category : #enumerating } +{ #category : 'enumerating' } IceMetacelloPharoPlatform >> withMetacelloLoadSessionDo: aBlock [ | context | diff --git a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st index ad7653c809..57f5b0a2c1 100644 --- a/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceMetacelloRepositoryType.class.st @@ -3,21 +3,23 @@ I'm a base class to provide different type of MCRepositories from iceberg, so me My children define specific types, visit them to have more details of what you can do. " Class { - #name : #IceMetacelloRepositoryType, - #superclass : #Object, + #name : 'IceMetacelloRepositoryType', + #superclass : 'Object', #instVars : [ 'location' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> allTypes [ ^ self allSubclasses reject: [ :each | each isAbstract ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> canHandleType: aType [ ^ self allTypes @@ -25,35 +27,35 @@ IceMetacelloRepositoryType class >> canHandleType: aType [ ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> extractTypeOf: aString [ ^ aString copyUpTo: $: ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceMetacelloRepositoryType class >> for: aLocationString [ ^ (self allTypes detect: [ :each | each isSuitableForLocation: aLocationString ]) location: aLocationString ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isAbstract [ ^ self = IceMetacelloRepositoryType ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForLocation: aLocationString [ ^ self isSuitableForType: (self extractTypeOf: aLocationString) ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloRepositoryType class >> isSuitableForType: aType [ ^ self type = aType ] -{ #category : #private } +{ #category : 'private' } IceMetacelloRepositoryType class >> location: aLocationString [ self = IceMetacelloRepositoryType ifTrue: [ self error: 'I''m an abstract class, use one of my children instead.' ]. @@ -63,23 +65,23 @@ IceMetacelloRepositoryType class >> location: aLocationString [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType class >> type [ ^ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceMetacelloRepositoryType >> initializeLocation: aString [ location := aString. self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> location [ ^ location ] -{ #category : #accessing } +{ #category : 'accessing' } IceMetacelloRepositoryType >> mcRepository [ self subclassResponsibility ] diff --git a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st index ae7b35ddbb..4036cf4c81 100644 --- a/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st +++ b/Iceberg-Metacello-Integration/IceProviderRepositoryType.class.st @@ -20,18 +20,20 @@ Metacello new load: 'mongo tests'. " Class { - #name : #IceProviderRepositoryType, - #superclass : #IceMetacelloRepositoryType, - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #name : 'IceProviderRepositoryType', + #superclass : 'IceMetacelloRepositoryType', + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #testing } +{ #category : 'testing' } IceProviderRepositoryType class >> isAbstract [ ^ super isAbstract or: [ self = IceProviderRepositoryType ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> 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." @@ -41,7 +43,7 @@ IceProviderRepositoryType >> guessRegisteredRepository [ ifNone: [ nil ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepository [ | baseRepo | @@ -55,7 +57,7 @@ IceProviderRepositoryType >> mcRepository [ ^ baseRepo getOrCreateIcebergRepository metacelloAdapter: self projectVersion ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> mcRepositoryClass [ ^ (MCGitBasedNetworkRepository allSubclasses @@ -63,13 +65,13 @@ IceProviderRepositoryType >> mcRepositoryClass [ detect: [ :each | each basicDescription = self class type ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectName [ ^ (self location substrings: '/') third copyUpTo: $: ] -{ #category : #accessing } +{ #category : 'accessing' } IceProviderRepositoryType >> projectVersion [ ^ (location substrings: '/') third copyAfter: $: diff --git a/Iceberg-Metacello-Integration/IceRepository.extension.st b/Iceberg-Metacello-Integration/IceRepository.extension.st index fcb43e92a5..e9f60ebc90 100644 --- a/Iceberg-Metacello-Integration/IceRepository.extension.st +++ b/Iceberg-Metacello-Integration/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } IceRepository >> metacelloAdapter: version [ ^ IceMetacelloRepositoryAdapter for: self withVersion: version ] diff --git a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st index a698e9d6d7..6874e90140 100644 --- a/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st +++ b/Iceberg-Metacello-Integration/MCGitRemoteRepository.class.st @@ -9,30 +9,32 @@ git@github.com:user/project.git WARNING: This repository is meant to be used with iceberg and it will not work with plain Monticello/Metacello (because there is no way to know how to download a zip) " Class { - #name : #MCGitRemoteRepository, - #superclass : #MCGitBasedNetworkRepository, + #name : 'MCGitRemoteRepository', + #superclass : 'MCGitBasedNetworkRepository', #instVars : [ 'host', 'port', 'path', 'user' ], - #category : #'Iceberg-Metacello-Integration-RepoTypes' + #category : 'Iceberg-Metacello-Integration-RepoTypes', + #package : 'Iceberg-Metacello-Integration', + #tag : 'RepoTypes' } -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> basicDescription [ ^ 'git' ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository class >> description [ ^ self basicDescription , ':' ] -{ #category : #private } +{ #category : 'private' } MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ ^ self new @@ -40,13 +42,13 @@ MCGitRemoteRepository class >> parseLocation: aLocation version: aVersion [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> host [ ^ host ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> httpsUrl [ ^ 'https://{1}{2}/{3}.git' format: { @@ -57,13 +59,13 @@ MCGitRemoteRepository >> httpsUrl [ self path } ] -{ #category : #initialization } +{ #category : 'initialization' } MCGitRemoteRepository >> initialize [ super initialize. ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseHTTPLocation: aString [ | url | @@ -73,7 +75,7 @@ MCGitRemoteRepository >> parseHTTPLocation: aString [ path := self pathFrom: url path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseLocation: aString [ (#('http:' 'https:') @@ -82,7 +84,7 @@ MCGitRemoteRepository >> parseLocation: aString [ ifFalse: [ self parseSSHLocation: aString ] ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> parseSSHLocation: aString [ | segments | @@ -92,13 +94,13 @@ MCGitRemoteRepository >> parseSSHLocation: aString [ path := self pathFrom: segments third ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> path [ ^ path ] -{ #category : #'private - initialization' } +{ #category : 'private - initialization' } MCGitRemoteRepository >> pathFrom: aString [ ^ (aString endsWith: '.git') @@ -106,19 +108,19 @@ MCGitRemoteRepository >> pathFrom: aString [ ifFalse: [ aString ] ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> port [ ^ port ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> projectPath [ ^ self path ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> scpUrl [ ^ '{1}@{2}/{3}.git' format: { @@ -127,7 +129,7 @@ MCGitRemoteRepository >> scpUrl [ self path } ] -{ #category : #accessing } +{ #category : 'accessing' } MCGitRemoteRepository >> user [ ^ user diff --git a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st index db10aae91b..d60493f9b4 100644 --- a/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st +++ b/Iceberg-Metacello-Integration/ManifestIcebergMetacelloIntegration.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergMetacelloIntegration, - #superclass : #PackageManifest, - #category : 'Iceberg-Metacello-Integration-Manifest' + #name : 'ManifestIcebergMetacelloIntegration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Metacello-Integration-Manifest', + #package : 'Iceberg-Metacello-Integration', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergMetacelloIntegration class >> description [ ^ 'I contains the code related to the Metacello integration of Iceberg. diff --git a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st index 6c833fb9fe..28bb44563a 100644 --- a/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloPlatform.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloPlatform } +Extension { #name : 'MetacelloPlatform' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloPlatform >> withMetacelloLoadSessionDo: aBlock [ aBlock value diff --git a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st index 00384fd4ac..74c3d4eb18 100644 --- a/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st +++ b/Iceberg-Metacello-Integration/MetacelloScriptApiExecutor.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MetacelloScriptApiExecutor } +Extension { #name : 'MetacelloScriptApiExecutor' } -{ #category : #'*Iceberg-Metacello-Integration' } +{ #category : '*Iceberg-Metacello-Integration' } MetacelloScriptApiExecutor >> execute: statements [ MetacelloPlatform current withMetacelloLoadSessionDo: [ diff --git a/Iceberg-Metacello-Integration/package.st b/Iceberg-Metacello-Integration/package.st index c5a00f7fb1..228e3a9d15 100644 --- a/Iceberg-Metacello-Integration/package.st +++ b/Iceberg-Metacello-Integration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Metacello-Integration' } +Package { #name : 'Iceberg-Metacello-Integration' } diff --git a/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st b/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st index 6c2f25c54d..b9b5549e64 100644 --- a/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st +++ b/Iceberg-Playground-Plugin-Gist/IcePlaygroundPublishGistCommand.class.st @@ -2,36 +2,38 @@ Publish content of playground a github gist (in your user space) " Class { - #name : #IcePlaygroundPublishGistCommand, - #superclass : #StPlaygroundToolbarExtensionCommand, - #category : #'Iceberg-Playground-Plugin-Gist-Command' + #name : 'IcePlaygroundPublishGistCommand', + #superclass : 'StPlaygroundToolbarExtensionCommand', + #category : 'Iceberg-Playground-Plugin-Gist-Command', + #package : 'Iceberg-Playground-Plugin-Gist', + #tag : 'Command' } -{ #category : #default } +{ #category : 'default' } IcePlaygroundPublishGistCommand class >> defaultDescription [ ^ 'Publish contents as gist.' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand class >> defaultIconName [ ^ #github ] -{ #category : #default } +{ #category : 'default' } IcePlaygroundPublishGistCommand class >> defaultName [ ^ 'Publish Gist' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand class >> order [ ^ 6 ] -{ #category : #execution } +{ #category : 'execution' } IcePlaygroundPublishGistCommand >> execute [ | contents | @@ -47,7 +49,7 @@ IcePlaygroundPublishGistCommand >> execute [ openModal ] -{ #category : #accessing } +{ #category : 'accessing' } IcePlaygroundPublishGistCommand >> page [ ^ context page diff --git a/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st b/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st index e1065e8501..8008734986 100644 --- a/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st +++ b/Iceberg-Playground-Plugin-Gist/IcePublishGistPresenter.class.st @@ -4,8 +4,8 @@ A presenter to request aditional data and publish the content of a playground as The method `StPlaygroundPublishGistPresenter>>#publishThen:` will use the `IceGitHubAPI` to publish the data. " Class { - #name : #IcePublishGistPresenter, - #superclass : #SpPresenter, + #name : 'IcePublishGistPresenter', + #superclass : 'SpPresenter', #instVars : [ 'descriptionTextInput', 'contentCode', @@ -15,34 +15,36 @@ Class { #classVars : [ 'GistPublic' ], - #category : #'Iceberg-Playground-Plugin-Gist-View' + #category : 'Iceberg-Playground-Plugin-Gist-View', + #package : 'Iceberg-Playground-Plugin-Gist', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter class >> initialExtent [ ^ 600@400 ] -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter class >> windowTitle [ ^ 'Publish Gist' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePublishGistPresenter >> content: aString [ contentCode text: aString ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> defaultPublic [ ^ GistPublic ifNil: [ GistPublic := true ] ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> fileNameFrom: aString [ | normalized | @@ -54,7 +56,7 @@ IcePublishGistPresenter >> fileNameFrom: aString [ ^ normalized, '.st' ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -65,7 +67,7 @@ IcePublishGistPresenter >> initializeDialogWindow: aDialogWindowPresenter [ self publishThen: [ presenter close ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializePresenters [ self layout: (SpBoxLayout newTopToBottom @@ -86,7 +88,7 @@ IcePublishGistPresenter >> initializePresenters [ beForScripting ] -{ #category : #initialization } +{ #category : 'initialization' } IcePublishGistPresenter >> initializeWindow: aWindowPresenter [ aWindowPresenter @@ -94,7 +96,7 @@ IcePublishGistPresenter >> initializeWindow: aWindowPresenter [ initialExtent: self class initialExtent. ] -{ #category : #actions } +{ #category : 'actions' } IcePublishGistPresenter >> publishThen: aBlock [ | description public jsonResult | @@ -116,7 +118,7 @@ IcePublishGistPresenter >> publishThen: aBlock [ aBlock value. ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> showError: aString [ self application newInform @@ -125,7 +127,7 @@ IcePublishGistPresenter >> showError: aString [ openModalWithSpecParent: self window ] -{ #category : #private } +{ #category : 'private' } IcePublishGistPresenter >> validate [ descriptionTextInput text trimmed ifEmpty: [ @@ -136,7 +138,7 @@ IcePublishGistPresenter >> validate [ ] -{ #category : #events } +{ #category : 'events' } IcePublishGistPresenter >> whenPublishedDo: aBlock [ publishedAction := aBlock diff --git a/Iceberg-Playground-Plugin-Gist/package.st b/Iceberg-Playground-Plugin-Gist/package.st index 240986a6e3..1a63bd2699 100644 --- a/Iceberg-Playground-Plugin-Gist/package.st +++ b/Iceberg-Playground-Plugin-Gist/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Playground-Plugin-Gist' } +Package { #name : 'Iceberg-Playground-Plugin-Gist' } diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st index b1757b8910..e43b1d23a5 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPI.class.st @@ -3,17 +3,19 @@ I represent an access point to the GitHub API. I provide different high level abstractions to interact with GitHub, following the speciphications you can find here: https://developer.github.com/v3/ " Class { - #name : #IceGitHubAPI, - #superclass : #Object, + #name : 'IceGitHubAPI', + #superclass : 'Object', #instVars : [ 'credentials', 'isAnonymous', 'acceptMediaType' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #credentials } +{ #category : 'credentials' } IceGitHubAPI class >> ensureCredentials [ | provider | @@ -21,7 +23,7 @@ IceGitHubAPI class >> ensureCredentials [ ^ provider providePlaintextCredentials. ] -{ #category : #utilities } +{ #category : 'utilities' } IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ "Answers a string with a list and description of items closed on a milestone. Used to paste it as explanations on releases, etc. @@ -57,7 +59,7 @@ IceGitHubAPI class >> issuesClosedOn: repoName milestone: milestone [ separatedBy: [ stream << String lf ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI class >> obtainCredentials [ | provider | @@ -70,14 +72,14 @@ IceGitHubAPI class >> obtainCredentials [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType [ ^ acceptMediaType ifNil: [ acceptMediaType := 'application/vnd.github.v3+json' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> acceptMediaType: aString [ "Set the media type to use in the request. See: https://developer.github.com/v3/media/" @@ -85,7 +87,7 @@ IceGitHubAPI >> acceptMediaType: aString [ acceptMediaType := aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self put: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString, '/merge' @@ -95,7 +97,7 @@ IceGitHubAPI >> acceptPullRequest: owner project: projectName number: aNumber da contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/issues/', aNumber asString, '/comments' @@ -105,7 +107,7 @@ IceGitHubAPI >> addComment: owner project: projectName number: aNumber data: aDi contentType: ZnMimeType applicationJson ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ ^ self post: 'repos/', owner, '/', projectName, '/pulls' @@ -115,28 +117,28 @@ IceGitHubAPI >> addPullRequest: owner project: projectName data: aDictionary [ contentType: ZnMimeType applicationJson ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> beAnonymous [ isAnonymous := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> contentsWithValidationDo: aBlock [ ^ (self responseWithValidationDo: aBlock) contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials [ ^ credentials ifNil: [ credentials := self class obtainCredentials ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPI >> credentials: anObject [ credentials := anObject ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> delete: aString [ ^ self contentsWithValidationDo: [ (self newRequestTo: aString) @@ -144,12 +146,12 @@ IceGitHubAPI >> delete: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> deleteBranch: owner project: projectName name: branchName [ ^ self delete: 'repos/', owner, '/', projectName, '/git/refs/heads/', branchName ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -157,7 +159,7 @@ IceGitHubAPI >> get: aString [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> get: aString parameters: aDictionary [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString, (String streamContents: [ :stream | @@ -169,41 +171,41 @@ IceGitHubAPI >> get: aString parameters: aDictionary [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranch: owner project: projectName name: branchName [ ^ self get: 'repos/', owner,'/', projectName, '/branches/', branchName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getBranches: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/branches' ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getCommit: aCommitish owner: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName, '/commits/', aCommitish ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getIssue: owner project: projectName number: issueNumber [ ^ self get: 'repos/', owner,'/', projectName, '/issues/', (issueNumber asString) ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getPaginated: aString [ ^ IceGitHubAPIPaginatedResult api: self request: aString ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getPullRequests: owner project: projectName [ ^ self getPaginated: 'repos/', owner, '/', projectName, '/pulls' ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> getRaw: aString [ ^ self responseWithValidationDo: [ (self newRequestTo: aString) @@ -211,18 +213,18 @@ IceGitHubAPI >> getRaw: aString [ response ] ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getRepository: owner project: projectName [ ^ self get: 'repos/', owner,'/', projectName ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> getTagsOwner: owner project: project [ ^ self get: 'repos', '/', owner, '/', project, '/tags' ] -{ #category : #responses } +{ #category : 'responses' } IceGitHubAPI >> handleUnauthorized: aZnResponse [ "If we are in unauthorized we require the correct credentials." @@ -243,20 +245,20 @@ IceGitHubAPI >> handleUnauthorized: aZnResponse [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAPI >> initialize [ super initialize. isAnonymous := false ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> jsonContentsWithValidationDo: aBlock [ ^ STON fromString: (self contentsWithValidationDo: aBlock) ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubAPI >> newRequestTo: aString [ ^ ZnClient new @@ -270,7 +272,7 @@ IceGitHubAPI >> newRequestTo: aString [ yourself ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> patch: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -279,7 +281,7 @@ IceGitHubAPI >> patch: aString with: aBlock [ response ] ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> post: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -288,7 +290,7 @@ IceGitHubAPI >> post: aString with: aBlock [ response ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAssociations [ ^ self @@ -306,7 +308,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean files: anArrayOfAss contentType: ZnMimeType applicationJson ] ] -{ #category : #'requesting - gists' } +{ #category : 'requesting - gists' } IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName contents: contentsString [ ^ self @@ -315,7 +317,7 @@ IceGitHubAPI >> postGist: descriptionString public: aBoolean name: fileName cont files: { fileName -> contentsString } ] -{ #category : #'private - requesting' } +{ #category : 'private - requesting' } IceGitHubAPI >> put: aString with: aBlock [ ^ self jsonContentsWithValidationDo: [ (self newRequestTo: aString) @@ -324,7 +326,7 @@ IceGitHubAPI >> put: aString with: aBlock [ response ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPI >> responseWithValidationDo: aBlock [ | response | @@ -337,7 +339,7 @@ IceGitHubAPI >> responseWithValidationDo: aBlock [ ^ response ] -{ #category : #requesting } +{ #category : 'requesting' } IceGitHubAPI >> updatePullRequest: owner project: projectName number: aNumber data: aDictionary [ ^ self patch: 'repos/', owner, '/', projectName, '/pulls/', aNumber asString diff --git a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st index d556e04f6d..d6cb2cb7aa 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAPIPaginatedResult.class.st @@ -2,18 +2,20 @@ I'm a paginated answer from github (he sends results in pages and includes information in headers) " Class { - #name : #IceGitHubAPIPaginatedResult, - #superclass : #Object, + #name : 'IceGitHubAPIPaginatedResult', + #superclass : 'Object', #instVars : [ 'api', 'request', 'result', 'nextPage' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ^ self new api: anAPI; @@ -22,7 +24,7 @@ IceGitHubAPIPaginatedResult class >> api: anAPI request: aString [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> all [ | stream | stream := Array new writeStream. @@ -31,22 +33,22 @@ IceGitHubAPIPaginatedResult >> all [ ^ stream contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api [ ^ api ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> api: anObject [ api := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> hasNext [ ^ result isNil or: [ self parseMorePages: (result headers at: 'Link' ifAbsent: [ nil ]) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> next [ nextPage ifNil: [ nextPage := 1 ]. @@ -59,7 +61,7 @@ IceGitHubAPIPaginatedResult >> next [ ] ensure: [ nextPage := nextPage + 1 ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAPIPaginatedResult >> parseMorePages: aString [ "github does not send 'Links' header if there are no pages, and it does not sends 'next' link if we are at the last page" @@ -67,12 +69,12 @@ IceGitHubAPIPaginatedResult >> parseMorePages: aString [ ^ (aString substrings: ',') anySatisfy: [ :each | each includesSubstring: 'rel="next"' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request [ ^ request ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAPIPaginatedResult >> request: anObject [ request := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st index cd59c9f869..5a19df5eec 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog for collecting data to accept a pull request. " Class { - #name : #IceGitHubAcceptPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubAcceptPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', @@ -11,10 +11,12 @@ Class { 'typeList', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubAcceptPullRequestModel >> accept [ acceptBlock ifNotNil: [ @@ -22,13 +24,13 @@ IceGitHubAcceptPullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> connectPresenters [ self typeList @@ -36,7 +38,7 @@ IceGitHubAcceptPullRequestModel >> connectPresenters [ selectItem: self defaultType ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubAcceptPullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -48,19 +50,19 @@ IceGitHubAcceptPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubAcceptPullRequestModel >> initialExtentForWindow [ ^ (600 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -71,7 +73,7 @@ IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAcceptPullRequestModel >> initializePresenters [ messageLabel := self newLabel. @@ -85,13 +87,13 @@ IceGitHubAcceptPullRequestModel >> initializePresenters [ typeLabel label: 'Merge type' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -99,42 +101,42 @@ IceGitHubAcceptPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubAcceptPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubAcceptPullRequestModel >> titleForWindow [ ^ 'Accept pull request' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAcceptPullRequestModel >> type [ ^ self typeList selectedItem ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeLabel [ ^ typeLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubAcceptPullRequestModel >> typeList [ ^ typeList diff --git a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st index 3aaad09ba9..b25a0b4725 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubAction.class.st @@ -2,34 +2,36 @@ I represent a common behavior for the actions of the GithubPlugin " Class { - #name : #IceGitHubAction, - #superclass : #IceTipAction, + #name : 'IceGitHubAction', + #superclass : 'IceTipAction', #instVars : [ 'credentials', 'remote', 'retries' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubAction class >> isAbstract [ ^ self == IceGitHubAction ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> credentials [ ^ credentials ifNil: [ credentials := self obtainCredentials ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubAction >> execute [ self withErrorHandlingDo: [ [[ self basicExecute ] on: IceAuthenticationError do: [ :e | @@ -40,34 +42,34 @@ IceGitHubAction >> execute [ self finishSuccess ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> github [ ^ IceGitHubAPI new credentials: self credentials; yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubAction >> initialize [ retries := 3 ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> obtainCredentials [ ^ IceGitHubAPI obtainCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubAction >> remote: anObject [ remote := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubAction >> reportError: error [ | message | diff --git a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st index ab3dbcd6c4..bd1f0039e2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubBadCredentialsError.class.st @@ -2,17 +2,19 @@ I'm an error that happens when credentials are bad. " Class { - #name : #IceGitHubBadCredentialsError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubBadCredentialsError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubBadCredentialsError class >> isAppropriateFor: aResponse [ ^ aResponse status = 401 ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubBadCredentialsError >> messageBody [ ^ 'Credentials provided are wrong' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st index 73aa81a6df..347e57926c 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCommand.class.st @@ -3,24 +3,26 @@ I'm a generic command to perform plugin actions for GitHub. My children define the real behavior, and they need to implement #execute. " Class { - #name : #IceGitHubCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand class >> isAbstract [ ^ self == IceGitHubCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubCommand >> canBeExecuted [ ^ super canBeExecuted and: [ self remote url includesSubstring: 'github.com' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCommand >> remote [ ^ self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st index 5407bc4e0e..56a27acda2 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to ask for data relevant to create a pull request. " Class { - #name : #IceGitHubCreatePullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubCreatePullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'repository', 'titleLabel', @@ -26,15 +26,17 @@ Class { 'titleTextInput', 'bodyText' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> new [ self error: 'Use #repository:credentials:headRemote:' ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubCreatePullRequestModel class >> newApplication: anApplication repository: aRepository credentials: aCredentials @@ -48,13 +50,13 @@ IceGitHubCreatePullRequestModel class >> newApplication: anApplication yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel class >> titleSize [ ^ 80 ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubCreatePullRequestModel >> accept [ | title | @@ -72,14 +74,14 @@ IceGitHubCreatePullRequestModel >> accept [ self closeWindow ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableBranchNames [ ^ availableBranchNames ifNil: [ availableBranchNames := self obtainAvailableBranchNames ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> availableRemotes [ "Retrieves available remotes to perform the PR" @@ -87,40 +89,40 @@ IceGitHubCreatePullRequestModel >> availableRemotes [ availableRemotes := self obtainAvailableRemotes ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseBranchList [ ^ baseBranchList ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranchNames [ ^ self baseBranches collect: [ :each | each at: #name ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> baseBranches [ ^ baseBranches ifNil: [ baseBranches := self requestBaseBranches ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseDefaultBranchName [ ^ self gitBase at: #default_branch ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseForkList [ ^ baseForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> baseLabel [ ^ baseLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> baseRemote [ "This is the 'base' remote (the place where the repository is forked). This is used to suggest fork PR destination (base)" @@ -128,23 +130,23 @@ IceGitHubCreatePullRequestModel >> baseRemote [ ^ baseRemote ifNil: [ baseRemote := self obtainBaseRemote ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyLabel [ ^ bodyLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> bodyPanel [ ^ bodyText ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> branch [ ^ self repository branch ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> createPullRequest [ ^ IceGitHubPullRequestDefinition new @@ -158,19 +160,19 @@ IceGitHubCreatePullRequestModel >> createPullRequest [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> credentials: aCredentials [ credentials := aCredentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ self hasParent ifFalse: [ ^ self baseDefaultBranchName ]. @@ -179,13 +181,13 @@ IceGitHubCreatePullRequestModel >> defaultBaseBranchName [ ifNone: [ self baseDefaultBranchName ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> defaultHeadBranchName [ ^ self branch shortname ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubCreatePullRequestModel >> defaultLayout [ ^ SpGridLayout new @@ -200,7 +202,7 @@ IceGitHubCreatePullRequestModel >> defaultLayout [ yourself ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitBase [ | json | @@ -208,47 +210,47 @@ IceGitHubCreatePullRequestModel >> gitBase [ ^ json at: #parent ifAbsent: [ json ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> gitRepositoryInfo [ ^ gitRepositoryInfo ifNil: [ gitRepositoryInfo := self requestGitRepositoryInfo ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> hasParent [ ^ self gitRepositoryInfo includesKey: #parent ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headBranchList [ ^ headBranchList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headForkList [ ^ headForkList ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> headLabel [ ^ headLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> headRemote [ ^ headRemote ifNil: [ self repository head upstream remote ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initialExtentForWindow [ ^ (700 @ 300) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ aWindow @@ -259,7 +261,7 @@ IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializePresenters [ titleLabel := self newLabel label: 'Title'. @@ -280,7 +282,7 @@ IceGitHubCreatePullRequestModel >> initializePresenters [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials: aCredentials headRemote: aRemote [ repository := aRepository. @@ -289,13 +291,13 @@ IceGitHubCreatePullRequestModel >> initializeRepository: aRepository credentials self initialize ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> lastCommitMessage [ ^ lastCommitMessage ifNil: [ lastCommitMessage := self obtainLastCommitMessage ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ^ ((self repository allBranches collect: #shortname as: Set) @@ -305,7 +307,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableBranchNames [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ | remotes | @@ -316,7 +318,7 @@ IceGitHubCreatePullRequestModel >> obtainAvailableRemotes [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainBaseRemote [ | base sshUrl httpUrl | @@ -331,19 +333,19 @@ IceGitHubCreatePullRequestModel >> obtainBaseRemote [ yourself ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> obtainLastCommitMessage [ ^ self branch commit comment ] -{ #category : #events } +{ #category : 'events' } IceGitHubCreatePullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedComment [ | lines firstLine remainingLines | @@ -362,7 +364,7 @@ IceGitHubCreatePullRequestModel >> proposedComment [ separatedBy: [ stream cr ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubCreatePullRequestModel >> proposedTitle [ self lastCommitMessage linesDo: [ :eachLine | @@ -373,13 +375,13 @@ IceGitHubCreatePullRequestModel >> proposedTitle [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubCreatePullRequestModel >> repository [ ^ repository ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestBaseBranches [ ^ IceGitHubAPI new @@ -388,7 +390,7 @@ IceGitHubCreatePullRequestModel >> requestBaseBranches [ project: self baseRemote projectBasename ] -{ #category : #'private - request' } +{ #category : 'private - request' } IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ | remote | @@ -398,25 +400,25 @@ IceGitHubCreatePullRequestModel >> requestGitRepositoryInfo [ getRepository: remote owner project: remote projectBasename ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubCreatePullRequestModel >> titleForWindow [ ^ 'New pull request' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titleLabel [ ^ titleLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubCreatePullRequestModel >> titlePanel [ ^ titleTextInput ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubCreatePullRequestModel >> updatePresenter [ baseForkList diff --git a/Iceberg-Plugin-GitHub/IceGitHubError.class.st b/Iceberg-Plugin-GitHub/IceGitHubError.class.st index 4050f7bf0e..832ecbb444 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubError.class.st @@ -2,56 +2,58 @@ I'm an error that happens when something fails when performing a GitHub action. " Class { - #name : #IceGitHubError, - #superclass : #Error, + #name : 'IceGitHubError', + #superclass : 'Error', #instVars : [ 'response', 'jsonContents' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #private } +{ #category : 'private' } IceGitHubError class >> errorClassFor: aResponse [ ^ self allSubclasses detect: [ :each | each isAppropriateFor: aResponse ] ifNone: [ self ] ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> for: aResponse [ ^ (self errorClassFor: aResponse) new response: aResponse; yourself ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubError class >> isAppropriateFor: aResponse [ ^ false ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubError class >> signalFor: aResponse [ ^ (self for: aResponse) signal ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> code [ ^ self response status ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> contents [ ^ self response contents ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> customError: aDictionary [ ^ aDictionary at: #message ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> errorToString: aDictionary [ (aDictionary at: #code) = 'custom' ifTrue: [ ^ self customError: aDictionary ]. (aDictionary at: #code) = 'invalid' ifTrue: [ ^ self invalidError: aDictionary ]. @@ -59,20 +61,20 @@ IceGitHubError >> errorToString: aDictionary [ ^ self unknownError: aDictionary ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> invalidError: aDictionary [ ^ 'Invalid field: ', (aDictionary at: #field) ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> jsonContents [ ^ jsonContents ifNil: [ jsonContents := STON fromString: self contents ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageBody [ | errors | errors := self jsonContents at: #errors ifAbsent: [ ^ '' ]. @@ -82,22 +84,22 @@ IceGitHubError >> messageBody [ separatedBy: [ stream cr ] ]. ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> messageText [ ^ self jsonContents at: #message ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response [ ^ response ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubError >> response: anObject [ response := anObject ] -{ #category : #private } +{ #category : 'private' } IceGitHubError >> unknownError: aDictionary [ ^ String streamContents: [ :stream | (aDictionary associations sorted: [ :a :b | a key < b key ]) diff --git a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st index 88aa35a4c1..cc8e5ec297 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubGenericError.class.st @@ -2,12 +2,14 @@ I'm an error that happens when something went wrong on GitHub API operations. " Class { - #name : #IceGitHubGenericError, - #superclass : #IceGitHubError, - #category : 'Iceberg-Plugin-GitHub-Model' + #name : 'IceGitHubGenericError', + #superclass : 'IceGitHubError', + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubGenericError class >> isAppropriateFor: aResponse [ ^ aResponse status = 422 ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st index 679432db0c..379544f3ba 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubJSONDataSource.class.st @@ -3,19 +3,21 @@ I'm a generic datasource to show in a table results of a JSON. I'm intended to be used to show information from GitHub API, but I'm generic enough to be used which any kind of JSON structure. " Class { - #name : #IceGitHubJSONDataSource, - #superclass : #FTSimpleDataSource, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubJSONDataSource', + #superclass : 'FTSimpleDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> actionColumn: column [ elements := elements sorted: [ :a :b | (a at: column id) < (b at: column id) ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ^ FTCellMorph new addMorphBack: ((self elementAt: rowIndex) at: column id) asStringMorph; @@ -23,12 +25,12 @@ IceGitHubJSONDataSource >> cellColumn: column row: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubJSONDataSource >> columnTitleFor: column [ ^ column id capitalized ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubJSONDataSource >> headerColumn: column [ column id ifNil: [ ^ nil ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st index 246c06412c..9af63050a6 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssueCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceGitHubNewBranchFromIssueCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewBranchFromIssueCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultName [ ^ 'Create new branch for issue...' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand class >> defaultToolbarItemName [ ^ 'New issue' ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> canBeExecuted [ ^ self repositoryModel isNotNil ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewBranchFromIssueCommand >> execute [ (IceTipCheckoutBranchDialog on: self repositoryModel) @@ -30,13 +32,13 @@ IceGitHubNewBranchFromIssueCommand >> execute [ openDialog ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> iconName [ ^ #github ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubNewBranchFromIssueCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st index 5e1ddfeea4..d7bcca423e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewBranchFromIssuePanel.class.st @@ -5,8 +5,8 @@ A GitHub issue will be created in the form: 123-a-github-issue " Class { - #name : #IceGitHubNewBranchFromIssuePanel, - #superclass : #IceTipCheckoutNewBranchPanel, + #name : 'IceGitHubNewBranchFromIssuePanel', + #superclass : 'IceTipCheckoutNewBranchPanel', #instVars : [ 'remotePanel', 'issueNumberText', @@ -18,10 +18,12 @@ Class { 'issueText', 'remoteLabel' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> branchName [ ^ '{1}-{2}' format: { @@ -29,13 +31,13 @@ IceGitHubNewBranchFromIssuePanel >> branchName [ issueText text trim }. ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> defaultApplication [ ^ SpApplication defaultApplication ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubNewBranchFromIssuePanel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -54,26 +56,26 @@ IceGitHubNewBranchFromIssuePanel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> icon [ ^ (self iconNamed: #github) scaledToSize: 16@16 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialExtentForWindow [ ^ 800 @ 175 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> initializePresenters [ super initializePresenters. @@ -102,31 +104,31 @@ IceGitHubNewBranchFromIssuePanel >> initializePresenters [ issueNumberText whenTextChangedDo: [ :text | self validateIssue: text ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueLabel [ ^ issueLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueNumberText [ ^ issueNumberText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> issueText [ ^ issueText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubNewBranchFromIssuePanel >> remotePanel [ ^ remotePanel ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ | separators safeSeparator | @@ -140,7 +142,7 @@ IceGitHubNewBranchFromIssuePanel >> sanitizeTitle: aString [ c isAlphaNumeric ifTrue: [ str nextPut: c ] ] ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ ^ selectRemoteModel ifNil: [ @@ -149,32 +151,32 @@ IceGitHubNewBranchFromIssuePanel >> selectRemoteModel [ on: self model entity ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubNewBranchFromIssuePanel >> titleForWindow [ ^ 'New branch from issue' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> unknownTitle [ ^ 'INVALID-ISSUE' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> updateText: aString [ issueText text: aString. fetched := true ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> useRemote: aRemoteModel [ self selectRemoteModel useRemote: aRemoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNewBranchFromIssuePanel >> validate [ self @@ -185,7 +187,7 @@ IceGitHubNewBranchFromIssuePanel >> validate [ description: 'Please fetch a valid issue number' ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ | number remote | @@ -213,7 +215,7 @@ IceGitHubNewBranchFromIssuePanel >> validateIssue: aString [ self updateText: self unknownTitle ] ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewBranchFromIssuePanel >> wait: time thenDo: aBlock [ "This method avoids to request too many times the github api. It does it in the simplest way possible: it starts a process that waits some diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st index 2a73c8c00a..2cb8a64469 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestAction.class.st @@ -2,18 +2,20 @@ I'm an action to create a new pull request. " Class { - #name : #IceGitHubNewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> askRemote: aRepository [ ^ aRepository remotes anyOne ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. @@ -37,7 +39,7 @@ IceGitHubNewPullRequestAction >> basicExecute [ open ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ [ | pullRequestDatas url | @@ -53,12 +55,12 @@ IceGitHubNewPullRequestAction >> informPullRequestDone: pullRequest [ do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubNewPullRequestAction >> validateMakePullRequestOn: aRepository [ | status | status := OrderedCollection new: 2. - aRepository isModified ifTrue: [ status add: 'Uncommited changes' ]. + aRepository isModified ifTrue: [ status add: 'Uncommitted changes' ]. (aRepository outgoingCommitsTo: remote) ifNotEmpty: [ :commits | '{1} not published' format: { commits size } ]. status ifEmpty: [ ^ true ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st index 7e69b15818..d6edc030f8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubNewPullRequestCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubNewPullRequestCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubNewPullRequestCommand class >> defaultName [ ^ 'Create Pull Request...' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st index 3dbc4588c3..0909d8d9a3 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubNilPullRequest.class.st @@ -5,32 +5,34 @@ Description I am a nil PR that can be used when the user has no PR to see. " Class { - #name : #IceGitHubNilPullRequest, - #superclass : #Object, - #category : 'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubNilPullRequest', + #superclass : 'Object', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> author [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> baseLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> body [ ^ '' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> headLabel [ ^ 'No PR selected' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubNilPullRequest >> url [ ^ 'No PR selected' ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st index 46eff77942..567af5269e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubAction.class.st @@ -13,16 +13,18 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceGitHubOpenOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubOpenOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -30,7 +32,7 @@ IceGitHubOpenOnGithubAction class >> organisation: aString projectName: anotherS yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubAction >> basicExecute [ [ @@ -59,22 +61,22 @@ IceGitHubOpenOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubOpenOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st index d57849f27a..aead585cd8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubOpenOnGithubCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubOpenOnGithubCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st index 478e659b62..d901aa0d09 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPlugin.class.st @@ -6,18 +6,20 @@ It just add options to easily handle the creation of branchs with the ""conventi " Class { - #name : #IceGitHubPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-GitHub-Core' + #name : 'IceGitHubPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-GitHub-Core', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Core' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubPlugin class >> isAvailableFor: aRepository [ ^ aRepository remotes anySatisfy: [ :each | each host = 'github.com' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPlugin >> checkoutBranchPanelsOnModel: aRepositoryModel [ ^ { IceGitHubNewBranchFromIssuePanel on: aRepositoryModel } diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st index f817771784..606d1d5dc0 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequest.class.st @@ -3,8 +3,8 @@ I'm a pull request from github API. I represent (more or less), what is described here: https://developer.github.com/v3/pulls/#list-pull-requests " Class { - #name : #IceGitHubPullRequest, - #superclass : #Object, + #name : 'IceGitHubPullRequest', + #superclass : 'Object', #instVars : [ 'repository', 'json', @@ -14,17 +14,19 @@ Class { 'status', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubPullRequest class >> fromJSON: aDictionary [ ^ self basicNew initializeWithJSON: aDictionary; yourself ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ IceGitHubAPI new acceptPullRequest: self owner @@ -41,7 +43,7 @@ IceGitHubPullRequest >> acceptMessage: messageString type: typeString [ #merge_method -> typeString } asDictionary ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> addComment: messageString [ IceGitHubAPI new addComment: self owner @@ -50,103 +52,103 @@ IceGitHubPullRequest >> addComment: messageString [ data: { #body -> messageString } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> author [ ^ (self jsonAt: 'user') at: 'login' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseCommit [ ^ repository commitAt: self baseSHA ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseLabel [ ^ (self jsonAt: #base) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> baseSHA [ ^ (self jsonAt: #base) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> body [ ^ self jsonAt: #body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branch [ fetched ifFalse: [ self fetch ]. ^ branch ifNil: [ branch := self remote remoteBranchNamed: self headRef ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> branchName [ ^ self branch name ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> commits [ ^ self branch commits ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> detail [ ^ detail ifNil: [ detail := IceGitHubAPI new get: ((self jsonAt: #url) allButFirst: 23) ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> fetch [ ^ [ self remote fetch ] ensure: [ fetched := true ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headLabel [ ^ (self jsonAt: #head) at: #label ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headRef [ ^ (self jsonAt: #head) at: #ref ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> headSHA [ ^ (self jsonAt: #head) at: #sha ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> htmlUrl [ ^ self jsonAt: #html_url ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initialize [ super initialize. fetched := false ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequest >> initializeWithJSON: aDictionary [ json := aDictionary. self initialize ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> json [ ^ json ] -{ #category : #'private - accessing' } +{ #category : 'private - accessing' } IceGitHubPullRequest >> jsonAt: aKey [ ^ self json at: aKey ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> mergeIntoWorkingCopy [ self repository ensureBranch: self branchName; @@ -154,12 +156,12 @@ IceGitHubPullRequest >> mergeIntoWorkingCopy [ self branch merge ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> number [ ^ self jsonAt: #number ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequest >> obtainRemote [ | remoteCandidate | @@ -175,17 +177,17 @@ IceGitHubPullRequest >> obtainRemote [ remoteCandidate ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> owner [ ^ (((self jsonAt: #base) at: #repo) at: #owner) at: #login ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> projectName [ ^ ((self jsonAt: #base) at: #repo) at: #name ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequest >> rejectMessage: messageString [ messageString trimBoth ifNotEmpty: [ self addComment: messageString ]. @@ -196,40 +198,40 @@ IceGitHubPullRequest >> rejectMessage: messageString [ data: { #state -> #closed } asDictionary ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> remote [ ^ remote ifNil: [ remote := self obtainRemote ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> state [ ^ self jsonAt: #state ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> status [ ^ status ifNil: [ status := IceGitHubAPI new get: 'repos/', self owner, '/', self projectName, '/commits/', self headSHA, '/status' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> title [ ^ self jsonAt: #title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequest >> url [ ^ self jsonAt: #url ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st index 1bd7fed23a..d31145b524 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDataSource.class.st @@ -4,19 +4,21 @@ I'm a datasource for pull request status, to be used when showing pull requests See IceGitHubPullRequestDetailModel " Class { - #name : #IceGitHubPullRequestDataSource, - #superclass : #IceGitHubJSONDataSource, - #category : #'Iceberg-Plugin-GitHub-Utils' + #name : 'IceGitHubPullRequestDataSource', + #superclass : 'IceGitHubJSONDataSource', + #category : 'Iceberg-Plugin-GitHub-Utils', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Utils' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> actionColumn: column [ column id = #target_url ifTrue: [ ^ self ]. ^ super actionColumn: column ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ column id = #target_url ifTrue: [ ^ self targetUrlCellColumn: column rowIndex: rowIndex ]. column id = #state ifTrue: [ ^ self statusCellColumn: column rowIndex: rowIndex ]. @@ -24,13 +26,13 @@ IceGitHubPullRequestDataSource >> cellColumn: column row: rowIndex [ ^ super cellColumn: column row: rowIndex ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> columnTitleFor: column [ column id = #target_url ifTrue: [ ^ '' ]. ^ super columnTitleFor: column ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ | context | context := (self elementAt: rowIndex) at: column id. @@ -42,17 +44,17 @@ IceGitHubPullRequestDataSource >> contextCellColumn: column rowIndex: rowIndex [ ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDataSource >> copyToClipboard: url [ Clipboard clipboardText: url informing: ('Url {1} copied to clipboard' format: {url}) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconForStatus: status [ ^ self iconNamed: (self iconNameForStatus: status) ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> iconNameForStatus: status [ status = 'success' ifTrue: [ ^ #testGreen ]. status = 'failure' ifTrue: [ ^ #testRed ]. @@ -61,7 +63,7 @@ IceGitHubPullRequestDataSource >> iconNameForStatus: status [ ^ #testNotRun ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ | status | status := (self elementAt: rowIndex) at: column id. @@ -73,7 +75,7 @@ IceGitHubPullRequestDataSource >> statusCellColumn: column rowIndex: rowIndex [ ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDataSource >> targetUrlCellColumn: column rowIndex: rowIndex [ | url | url := (self elementAt: rowIndex) at: column id. diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st index b4d31af781..f4367e908b 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDefinition.class.st @@ -3,8 +3,8 @@ I am a pull request. I can be sent using ==#sendWithCredentials:== protocol. " Class { - #name : #IceGitHubPullRequestDefinition, - #superclass : #Object, + #name : 'IceGitHubPullRequestDefinition', + #superclass : 'Object', #instVars : [ 'credentials', 'title', @@ -14,70 +14,72 @@ Class { 'headBranchName', 'body' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName [ ^ baseBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseBranchName: anObject [ baseBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote [ ^ baseRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> baseRemote: anObject [ baseRemote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body [ ^ body ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> body: anObject [ body := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials [ ^ credentials ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> credentials: anObject [ credentials := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName [ ^ headBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headBranchName: anObject [ headBranchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote [ ^ headRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> headRemote: anObject [ headRemote := anObject ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubPullRequestDefinition >> send [ | pullRequestData | @@ -95,12 +97,12 @@ IceGitHubPullRequestDefinition >> send [ data: pullRequestData ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title [ ^ title ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDefinition >> title: anObject [ title := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st index d7ba4b97bc..2c08055388 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubPullRequestDetailModel.class.st @@ -2,8 +2,8 @@ I'm a spec model to present a detailed view of a Pull Request. " Class { - #name : #IceGitHubPullRequestDetailModel, - #superclass : #SpPresenter, + #name : 'IceGitHubPullRequestDetailModel', + #superclass : 'SpPresenter', #instVars : [ 'urlLabel', 'urlText', @@ -24,10 +24,12 @@ Class { 'statusIcon', 'scheduler' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntance forRoot: rootCommandGroup [ rootCommandGroup register: @@ -35,27 +37,27 @@ IceGitHubPullRequestDetailModel class >> buildCommandsGroupWith: presenterIntanc register: IceTipOpenCheckUrlCommand forSpec) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorLabel [ ^ authorLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> authorText [ ^ authorText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> bodyText [ ^ bodyText ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> checksTable [ ^ checksTable ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubPullRequestDetailModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -88,23 +90,23 @@ IceGitHubPullRequestDetailModel >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromLabel [ ^ fromLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> fromText [ ^ fromText ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForMergeable: mergeable [ mergeable = true ifTrue: [ ^ self iconNamed: #smallOk ]. ^ self iconNamed: #smallCancel ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> iconForStatus: status [ status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. @@ -113,7 +115,7 @@ IceGitHubPullRequestDetailModel >> iconForStatus: status [ ^ self iconNamed: #testNotRun ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> initializePresenters [ urlLabel := self newLabel label: 'Url'. @@ -139,17 +141,17 @@ IceGitHubPullRequestDetailModel >> initializePresenters [ addStyle: 'iceTipReadonly' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableLabel [ ^ mergeableLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> mergeableMessage [ ^ mergeableMessage ] -{ #category : #'private - factory' } +{ #category : 'private - factory' } IceGitHubPullRequestDetailModel >> newChecksTable [ ^ self newTable @@ -173,19 +175,19 @@ IceGitHubPullRequestDetailModel >> newChecksTable [ contextMenu: [ (self rootCommandsGroup / 'checks commands') beRoot asMenuPresenter ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubPullRequestDetailModel >> pullRequest: aPullRequest [ pullRequest := aPullRequest. self updatePresenter ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveDetail [ self mergeableMessage text: (self mergeableMessage text , ' Loading...' ). @@ -202,7 +204,7 @@ IceGitHubPullRequestDetailModel >> retrieveDetail [ mergeableIcon image: ( self iconForMergeable: mergeable) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> retrieveStatuses [ " self statusPanel widget addMorphBack: 'Loading...' asMorph." self statusMessage text: (statusMessage text , ' Loading...'). @@ -222,13 +224,13 @@ IceGitHubPullRequestDetailModel >> retrieveStatuses [ checksTable defer: [ checksTable items:(statuses ) ] ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> schedule: aBlock [ self scheduler schedule: aBlock ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> scheduler [ ^ scheduler ifNil: [ @@ -238,22 +240,22 @@ IceGitHubPullRequestDetailModel >> scheduler [ yourself ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusIcon [ ^ statusIcon ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusLabel [ ^ statusLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> statusMessage [ ^ statusMessage ] -{ #category : #private } +{ #category : 'private' } IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ mergeable = true ifTrue: [ ^ 'Yes' ]. @@ -263,17 +265,17 @@ IceGitHubPullRequestDetailModel >> textForMergeable: mergeable [ ifNil: [ 'Unknown' ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toLabel [ ^ toLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> toText [ ^ toText ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubPullRequestDetailModel >> updatePresenter [ self pullRequest ifNil: [ ^ self ]. @@ -287,12 +289,12 @@ IceGitHubPullRequestDetailModel >> updatePresenter [ self retrieveDetail ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlLabel [ ^ urlLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubPullRequestDetailModel >> urlText [ ^ urlText ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st index c8657444fe..29d86d03e1 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st @@ -2,18 +2,20 @@ I'm a dialog to collect data about a pull request rejection. " Class { - #name : #IceGitHubRejectPullRequestModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRejectPullRequestModel', + #superclass : 'IceTipPresenter', #instVars : [ 'messageLabel', 'messageText', 'acceptButton', 'acceptBlock' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRejectPullRequestModel >> accept [ acceptBlock ifNotNil: [ acceptBlock cull: self ]. @@ -21,19 +23,19 @@ IceGitHubRejectPullRequestModel >> accept [ self closeWindow ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> acceptButton [ ^ acceptButton ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> availableTypes [ ^ #( 'merge' 'squash' 'rebase' ) ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRejectPullRequestModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -44,19 +46,19 @@ IceGitHubRejectPullRequestModel >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> defaultType [ ^ 'merge' ] -{ #category : #api } +{ #category : 'api' } IceGitHubRejectPullRequestModel >> initialExtentForWindow [ ^ (500 @ 250) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -68,7 +70,7 @@ IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresente presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRejectPullRequestModel >> initializePresenters [ super initializePresenters. @@ -84,13 +86,13 @@ IceGitHubRejectPullRequestModel >> initializePresenters [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> message [ ^ self messageText text asString ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRejectPullRequestModel >> messageGhostText [ ^ 'Commit title @@ -98,25 +100,25 @@ IceGitHubRejectPullRequestModel >> messageGhostText [ Add an optional extented description' ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageLabel [ ^ messageLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRejectPullRequestModel >> messageText [ ^ messageText ] -{ #category : #events } +{ #category : 'events' } IceGitHubRejectPullRequestModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #specs } +{ #category : 'specs' } IceGitHubRejectPullRequestModel >> titleForWindow [ ^ 'Reject pull request' diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st index 9ac0aba650..c20a2f536e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoteCommand.class.st @@ -2,39 +2,41 @@ I represent the commands that execute on certain repository's remote. " Class { - #name : #IceGitHubRemoteCommand, - #superclass : #IceGitHubCommand, + #name : 'IceGitHubRemoteCommand', + #superclass : 'IceGitHubCommand', #instVars : [ 'remoteModel' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubRemoteCommand class >> isAbstract [ ^ self == IceGitHubRemoteCommand ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remote [ ^ self remoteModel entity ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel [ ^ remoteModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> remoteModel: aModel [ remoteModel := aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoteCommand >> repositoryModel [ ^ self remoteModel repositoryModel diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st index 9ba9896429..854ba15eab 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesAction.class.st @@ -2,16 +2,18 @@ I'm an action to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubRemoveBranchesAction', + #superclass : 'IceGitHubAction', #instVars : [ 'branches', 'branchesByName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. UIManager default @@ -27,7 +29,7 @@ IceGitHubRemoveBranchesAction >> basicExecute [ open ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> cacheAllBranches [ self remoteBranches do: [ :each | | branchName | branchName := each at: 'name'. @@ -36,23 +38,23 @@ IceGitHubRemoveBranchesAction >> cacheAllBranches [ ifAbsentPut: [ self remoteBranch: branchName ] ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesAction >> initialize [ super initialize. branchesByName := OrderedDictionary new ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranch: aName [ ^ self requestRemoteBranch: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> remoteBranches [ ^ branches ifNil: [ branches := self requestRemoteBranches ] ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranch: json [ | branchName | @@ -67,14 +69,14 @@ IceGitHubRemoveBranchesAction >> removeBranch: json [ openModal ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesAction >> removeBranches: aCollection [ [ aCollection do: [ :each | self removeBranch: each ] ] on: IceGitHubError do: [ :e | self reportError: e ] ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ ^ IceGitHubAPI new getBranch: self remote owner @@ -82,7 +84,7 @@ IceGitHubRemoveBranchesAction >> requestRemoteBranch: aName [ name: aName ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesAction >> requestRemoteBranches [ ^ IceGitHubAPI new getBranches: self remote owner diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st index 8cf7f2ef0c..f9bac67a31 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubRemoveBranchesCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubRemoveBranchesCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubRemoveBranchesCommand class >> defaultName [ ^ 'Remove Branches...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st index 6a03ad61ad..fc8e1b1965 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st @@ -2,8 +2,8 @@ I'm a dialog to select a list of anything (used by branches now). " Class { - #name : #IceGitHubRemoveBranchesModel, - #superclass : #IceTipPresenter, + #name : 'IceGitHubRemoveBranchesModel', + #superclass : 'IceTipPresenter', #instVars : [ 'selectedItems', 'listPanel', @@ -11,17 +11,19 @@ Class { 'displayBlock', 'remote' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #actions } +{ #category : 'actions' } IceGitHubRemoveBranchesModel >> confirmSelection [ acceptBlock ifNotNil: [ acceptBlock value: selectedItems ]. self closeWindow ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubRemoveBranchesModel >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -30,26 +32,26 @@ IceGitHubRemoveBranchesModel >> defaultLayout [ yourself ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> displayBlock: aBlock [ displayBlock := aBlock ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialExtentForWindow [ ^ 550 @ 500 ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initialize [ selectedItems := Set new. super initialize ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ aDialogWindowPresenter @@ -61,7 +63,7 @@ IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [ presenter close ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> initializePresenters [ listPanel := self newTable. @@ -76,37 +78,37 @@ IceGitHubRemoveBranchesModel >> initializePresenters [ addColumn: (SpStringTableColumn evaluated: [ :branch | self timeSinceLastCommit: branch ]) ] -{ #category : #api } +{ #category : 'api' } IceGitHubRemoveBranchesModel >> items: aCollection [ self listPanel items: aCollection ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubRemoveBranchesModel >> listPanel [ ^ listPanel ] -{ #category : #events } +{ #category : 'events' } IceGitHubRemoveBranchesModel >> onAccept: aBlock [ acceptBlock := aBlock ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> remote: anObject [ remote := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ | lastCommitDate | @@ -115,14 +117,14 @@ IceGitHubRemoveBranchesModel >> timeSinceLastCommit: branch [ ^ '{1} days' format: {(Date today - lastCommitDate) days} ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubRemoveBranchesModel >> titleForWindow [ ^ 'Select branches to remove on remote {1}' format: { self remote name } ] -{ #category : #private } +{ #category : 'private' } IceGitHubRemoveBranchesModel >> triggerAcceptAction [ acceptBlock ifNil: [ ^ self ]. diff --git a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st index 98bc78b454..6c88298b43 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubSelectItem.class.st @@ -2,52 +2,54 @@ I'm a helper to keep selected items in a list. " Class { - #name : #IceGitHubSelectItem, - #superclass : #Object, + #name : 'IceGitHubSelectItem', + #superclass : 'Object', #instVars : [ 'list', 'item' ], - #category : 'Iceberg-Plugin-GitHub-Model' + #category : 'Iceberg-Plugin-GitHub-Model', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Model' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> list: selectedItems item: anObject [ ^ self basicNew initializeList: selectedItems item: anObject; yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubSelectItem class >> new [ self error: 'Use #list:item:' ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> addItem [ (list includes: item) ifTrue: [ ^ self ]. list add: item ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubSelectItem >> initializeList: aCollection item: anObject [ list := aCollection. item := anObject. self initialize ] -{ #category : #private } +{ #category : 'private' } IceGitHubSelectItem >> removeItem [ (list includes: item) ifFalse: [ ^ self ]. list remove: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value [ ^ list includes: item ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubSelectItem >> value: aBoolean [ aBoolean ifTrue: [ self addItem ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st index 6b69f7f713..dae041341e 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTipPullRequestBrowser.class.st @@ -8,8 +8,8 @@ I display the list of commits of the PR for review, allow the user to merge the " Class { - #name : #IceGitHubTipPullRequestBrowser, - #superclass : #IceTipBrowser, + #name : 'IceGitHubTipPullRequestBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'repositoryModel', 'pullRequest', @@ -20,22 +20,24 @@ Class { 'acceptButton', 'rejectButton' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #commands } +{ #category : 'commands' } IceGitHubTipPullRequestBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ "Nothing to add" ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRequest: aPullRequest [ ^ self basicNew @@ -46,19 +48,19 @@ IceGitHubTipPullRequestBrowser class >> newApplication: app model: aModel pullRe yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> acceptButton [ ^ acceptButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> acceptPullRequest [ IceGitHubAcceptPullRequestModel new @@ -69,19 +71,19 @@ IceGitHubTipPullRequestBrowser >> acceptPullRequest [ open ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commitLabel [ ^ commitLabel ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> commits [ ^ commits ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> connectPresenters [ super connectPresenters. @@ -93,7 +95,7 @@ IceGitHubTipPullRequestBrowser >> connectPresenters [ rejectButton action: [ self rejectPullRequest ] ] -{ #category : #layout } +{ #category : 'layout' } IceGitHubTipPullRequestBrowser >> defaultLayout [ ^ SpBoxLayout newTopToBottom @@ -112,19 +114,19 @@ IceGitHubTipPullRequestBrowser >> defaultLayout [ yourself ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> diff [ ^ diff ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initialExtentForWindow [ ^ (1050 @ 800) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ | textStylingBlock | @@ -165,14 +167,14 @@ IceGitHubTipPullRequestBrowser >> initializeCommitsTable [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializeDiff [ diff beForMerge. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> initializePresenters [ super initializePresenters. @@ -201,20 +203,20 @@ IceGitHubTipPullRequestBrowser >> initializePresenters [ icon: (self iconNamed: #testRed) ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mainList [ "Answer the presenter that is the main list of items of this browser." ^ commits ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> mergeButton [ ^ mergeButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ (self confirm: @@ -226,17 +228,17 @@ IceGitHubTipPullRequestBrowser >> mergePullRequestIntoImage [ self pullRequest mergeIntoWorkingCopy ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest [ ^ pullRequest ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> pullRequest: anObject [ pullRequest := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> refresh [ | commitModels | @@ -250,13 +252,13 @@ IceGitHubTipPullRequestBrowser >> refresh [ commits items: commitModels ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceGitHubTipPullRequestBrowser >> rejectButton [ ^ rejectButton ] -{ #category : #actions } +{ #category : 'actions' } IceGitHubTipPullRequestBrowser >> rejectPullRequest [ ((IceGitHubRejectPullRequestModel newApplication: self application) @@ -269,30 +271,30 @@ IceGitHubTipPullRequestBrowser >> rejectPullRequest [ open ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel [ ^ repositoryModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> repositoryModel: anObject [ repositoryModel := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> setModelBeforeInitialization: aModel [ self repositoryModel: aModel ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTipPullRequestBrowser >> titleForWindow [ ^ 'Browsing pull request: #{1} {2}' format: { self pullRequest number. self pullRequest title } ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitHubTipPullRequestBrowser >> updatePresenter [ self refresh diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st index 678fa7d9e0..ea12946868 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeCommand.class.st @@ -2,42 +2,44 @@ I represent all the Github commands that work on a Tree item " Class { - #name : #IceGitHubTreeCommand, - #superclass : #IceGitHubCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeCommand', + #superclass : 'IceGitHubCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand class >> isAbstract [ ^ self == IceGitHubTreeCommand ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnBranch: anIceTipTreeBranch [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnRemote: aRemoteModel [ ^ true ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> actsOnTag: aRemoteModel [ ^ false ] -{ #category : #testing } +{ #category : 'testing' } IceGitHubTreeCommand >> canBeExecuted [ ^ self item notNil and: [(self item canActivateCommand: self) and: [super canBeExecuted]] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubTreeCommand >> remote [ ^ self item model entity diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st index 705319f26e..843332c918 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeNewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to create a Pull Request " Class { - #name : #IceGitHubTreeNewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeNewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeNewPullRequestCommand class >> defaultName [ ^ 'New Pull Request' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeNewPullRequestCommand >> execute [ ^ IceGitHubNewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st index ab78eb0052..5d9b54362a 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeOpenOnGithubCommand.class.st @@ -5,18 +5,20 @@ Description I am a command opening the repository page of the remote on GitHub if possible. " Class { - #name : #IceGitHubTreeOpenOnGithubCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeOpenOnGithubCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeOpenOnGithubCommand class >> defaultName [ ^ 'Open on github' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeOpenOnGithubCommand >> execute [ (IceGitHubOpenOnGithubAction diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st index 8118e2f7c9..d657e71447 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeRemoveBranchesCommand.class.st @@ -2,18 +2,20 @@ I'm a command to remove branches from remotes. " Class { - #name : #IceGitHubTreeRemoveBranchesCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeRemoveBranchesCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeRemoveBranchesCommand class >> defaultName [ ^ 'Remove Remote Branches' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeRemoveBranchesCommand >> execute [ ^ IceGitHubRemoveBranchesAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st index a8d2ed51fc..7917530343 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubTreeViewPullRequestCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubTreeViewPullRequestCommand, - #superclass : #IceGitHubTreeCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubTreeViewPullRequestCommand', + #superclass : 'IceGitHubTreeCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubTreeViewPullRequestCommand class >> defaultName [ ^ 'View Pull Requests' ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubTreeViewPullRequestCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st index de680c2d32..2a0627cf35 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestAction.class.st @@ -2,12 +2,14 @@ I'm an action to view the open pull Requests. " Class { - #name : #IceGitHubViewPullRequestAction, - #superclass : #IceGitHubAction, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestAction', + #superclass : 'IceGitHubAction', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestAction >> basicExecute [ credentials := IceGitHubAPI ensureCredentials. diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st index b3e2fa4f79..1cd03b3202 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestOnGithubAction.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceGitHubViewPullRequestOnGithubAction, - #superclass : #IceGitHubAction, + #name : 'IceGitHubViewPullRequestOnGithubAction', + #superclass : 'IceGitHubAction', #instVars : [ 'organisation', 'projectName' ], - #category : #'Iceberg-Plugin-GitHub-Commands' + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectName: anotherString [ ^ self new organisation: aString; @@ -16,7 +18,7 @@ IceGitHubViewPullRequestOnGithubAction class >> organisation: aString projectNam yourself ] -{ #category : #executing } +{ #category : 'executing' } IceGitHubViewPullRequestOnGithubAction >> basicExecute [ [ @@ -45,22 +47,22 @@ IceGitHubViewPullRequestOnGithubAction >> basicExecute [ openModal ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation [ ^ organisation ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> organisation: anObject [ organisation := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName [ ^ projectName ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitHubViewPullRequestOnGithubAction >> projectName: anObject [ projectName := anObject ] diff --git a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st index 4568ca6e71..49c03821a8 100644 --- a/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceGitHubViewPullRequestsCommand.class.st @@ -2,18 +2,20 @@ I'm a command to show the pull request review browser. " Class { - #name : #IceGitHubViewPullRequestsCommand, - #superclass : #IceGitHubRemoteCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceGitHubViewPullRequestsCommand', + #superclass : 'IceGitHubRemoteCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceGitHubViewPullRequestsCommand class >> defaultName [ ^ 'View Pull Requests...' ] -{ #category : #execute } +{ #category : 'execute' } IceGitHubViewPullRequestsCommand >> execute [ ^ IceGitHubViewPullRequestAction new diff --git a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st index 4f213015f8..4a9a9a1e1b 100644 --- a/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceHttpsProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceHttpsProtocol } +Extension { #name : 'IceHttpsProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceHttpsProtocol class >> githubRequestUrlKey [ ^ #'clone_url' diff --git a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st index 7ab271db48..6b4cd0e304 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextCredentials } +Extension { #name : 'IcePlaintextCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextCredentials >> applyToRequest: aRequest [ aRequest username: self username password: self password diff --git a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st index 303dc4c0ea..97d3a6f9c7 100644 --- a/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IcePlaintextOtpCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IcePlaintextOtpCredentials } +Extension { #name : 'IcePlaintextOtpCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IcePlaintextOtpCredentials >> applyToRequest: aRequest [ super applyToRequest: aRequest. self token ifNotNil: [:aToken | diff --git a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st index e1416b318b..2123bca7a7 100644 --- a/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceSSHProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceSSHProtocol } +Extension { #name : 'IceSSHProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceSSHProtocol class >> githubRequestUrlKey [ ^ #'ssh_url' diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st index 4516b774f3..9817279f26 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubPullRequestListBrowser.class.st @@ -14,23 +14,25 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceTipGitHubPullRequestListBrowser, - #superclass : #IceTipBrowser, + #name : 'IceTipGitHubPullRequestListBrowser', + #superclass : 'IceTipBrowser', #instVars : [ 'remote', 'pullRequests', 'details' ], - #category : #'Iceberg-Plugin-GitHub-View' + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildGeneralCommandGroupWith: presenter for: aCommandGroup [ aCommandGroup register: IceTipRefreshPullRequestsCommand forSpec ] -{ #category : #commands } +{ #category : 'commands' } IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: presenter for: aCommandGroup [ { @@ -41,19 +43,19 @@ IceTipGitHubPullRequestListBrowser class >> buildSelectionCommandGroupWith: pres ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTipGitHubPullRequestListBrowser class >> onRepository: aRepository [ ^ self on: (IceTipRepositoryModel on: aRepository) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser class >> taskbarIconName [ ^ #komitterSmalltalkhubRemote ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> connectPresenters [ super connectPresenters. @@ -65,7 +67,7 @@ IceTipGitHubPullRequestListBrowser >> connectPresenters [ ] -{ #category : #layout } +{ #category : 'layout' } IceTipGitHubPullRequestListBrowser >> defaultLayout [ ^ SpPanedLayout newTopToBottom @@ -75,13 +77,13 @@ IceTipGitHubPullRequestListBrowser >> defaultLayout [ yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> details [ ^ details ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ ^ (IceGitHubAPI new @@ -92,13 +94,13 @@ IceTipGitHubPullRequestListBrowser >> fetchPullRequests [ yourself ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initialExtentForWindow [ ^ (700 @ 700) scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePresenters [ super initializePresenters. @@ -109,7 +111,7 @@ IceTipGitHubPullRequestListBrowser >> initializePresenters [ ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ pullRequests @@ -140,19 +142,19 @@ IceTipGitHubPullRequestListBrowser >> initializePullRequestsTable [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipGitHubPullRequestListBrowser >> mainList [ ^ pullRequests ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> pullRequests [ ^ pullRequests ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ self pullRequests @@ -161,44 +163,44 @@ IceTipGitHubPullRequestListBrowser >> refreshPullRequests [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> remote: aRemote [ remote := aRemote ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubPullRequestListBrowser >> repository [ ^ model ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> strongSelection: aSelection [ self viewPullRequest: aSelection selectedItem ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubPullRequestListBrowser >> titleForWindow [ ^ 'Pull requests on {1} ({2})' format: { self remote name. self remote url } ] -{ #category : #private } +{ #category : 'private' } IceTipGitHubPullRequestListBrowser >> updateSelectedPullRequest: aSpSingleSelectionMode [ aSpSingleSelectionMode isEmpty ifFalse: [ self details pullRequest: aSpSingleSelectionMode selectedItem ] ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitHubPullRequestListBrowser >> viewPullRequest: aPullRequest [ UIManager default diff --git a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st index f0555f5701..8979de690d 100644 --- a/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st +++ b/Iceberg-Plugin-GitHub/IceTipGitHubRepositoryPanel.class.st @@ -3,24 +3,26 @@ I'm a presenter to define a new remote repository from a GitHub repository (owne " Class { - #name : #IceTipGitHubRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipGitHubRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel class >> order [ ^ 100 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beGithub ] -{ #category : #'querying - github' } +{ #category : 'querying - github' } IceTipGitHubRepositoryPanel >> getGitHubRepository [ ^ [ [ IceGitHubAPI new @@ -36,13 +38,13 @@ IceTipGitHubRepositoryPanel >> getGitHubRepository [ error pass ] ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> iconForWindow [ ^ (self iconNamed: #github) lighter: 0.50 "just to be sure is visible in all themes" ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> newRepository [ | newRepository | @@ -64,13 +66,13 @@ IceTipGitHubRepositoryPanel >> newRepository [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitHubRepositoryPanel >> providerName [ ^ 'GitHub' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitHubRepositoryPanel >> titleForWindow [ ^ 'Clone from github.com' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st index 4b77df36d1..b13fe12178 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenCheckUrlCommand.class.st @@ -3,24 +3,26 @@ I'm a command to open in the native web browser the detail of a GitHub Pull Requ " Class { - #name : #IceTipOpenCheckUrlCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-View' + #name : 'IceTipOpenCheckUrlCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-View', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'View' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultDescription [ ^ 'Open a internet browser to look for the url of the check' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenCheckUrlCommand class >> defaultName [ ^ 'Open url' ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenCheckUrlCommand >> execute [ "Execute the actions that should be done by the command. This method expect that the context has been put in #context inst.var. if any context is relevant." @@ -29,7 +31,7 @@ IceTipOpenCheckUrlCommand >> execute [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenCheckUrlCommand >> targetUrl [ ^ self context checksTable selection selectedItem at: 'target_url' diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st index 487e8524a6..c6271c0e94 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestCommand.class.st @@ -5,36 +5,38 @@ Description I am a simple command to open the PR review tool. " Class { - #name : #IceTipOpenGitHubPullRequestCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultDescription [ ^ 'Open the Pull Request review tool' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestCommand class >> defaultName [ ^ 'Review pull request' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestCommand >> execute [ self tool viewPullRequest: self item ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipOpenGitHubPullRequestCommand >> iconName [ ^ #smallFind diff --git a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st index 8c3107e3c1..8a98bfd62c 100644 --- a/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipOpenGitHubPullRequestInBrowserCommand.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceTipOpenGitHubPullRequestInBrowserCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipOpenGitHubPullRequestInBrowserCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultDescription [ ^ 'Open the Pull Request in your default web browser' ] -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipOpenGitHubPullRequestInBrowserCommand class >> defaultName [ ^ 'Open pull request in GitHub.com' ] -{ #category : #testing } +{ #category : 'testing' } IceTipOpenGitHubPullRequestInBrowserCommand >> canBeExecuted [ ^ self hasSelectedItem ] -{ #category : #executing } +{ #category : 'executing' } IceTipOpenGitHubPullRequestInBrowserCommand >> execute [ WebBrowser openOn: self item htmlUrl diff --git a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st index 8496430a9b..d38b01d222 100644 --- a/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st +++ b/Iceberg-Plugin-GitHub/IceTipRefreshPullRequestsCommand.class.st @@ -5,24 +5,26 @@ Description I am a simple command to refresh the content of the github pull requests browser " Class { - #name : #IceTipRefreshPullRequestsCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-GitHub-Commands' + #name : 'IceTipRefreshPullRequestsCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-GitHub-Commands', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Commands' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultDescription [ ^ 'Refresh the pull requests availables' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand class >> defaultName [ ^ 'Refresh' ] -{ #category : #executing } +{ #category : 'executing' } IceTipRefreshPullRequestsCommand >> execute [ UIManager default @@ -30,13 +32,13 @@ IceTipRefreshPullRequestsCommand >> execute [ during: [ self tool refreshPullRequests ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> iconName [ ^ #glamorousRefresh ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipRefreshPullRequestsCommand >> shouldBeDisplayedOnRightSideInToolbar [ ^ true diff --git a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st index d5b825e97e..b7a9c95210 100644 --- a/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-GitHub/IceTipRepositoriesBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipRepositoriesBrowser } +Extension { #name : 'IceTipRepositoriesBrowser' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: aCommandGroup [ @@ -34,7 +34,7 @@ IceTipRepositoriesBrowser class >> githubCommandsWith: presenter forRootGroup: a ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup [ | thisRemoteGroup | @@ -54,7 +54,7 @@ IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRoo ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTipRepositoriesBrowser class >> githubRemoteCommands: anIceRemoteModel forRootGroup: aCommandGroup context: aPresenter [ | thisRemoteGroup | diff --git a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st index 65215bb52e..7fd0036bed 100644 --- a/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st +++ b/Iceberg-Plugin-GitHub/IceTokenCredentials.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTokenCredentials } +Extension { #name : 'IceTokenCredentials' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> applyToRequest: aRequest [ token ifNil: [ ^ self ]. @@ -10,13 +10,13 @@ IceTokenCredentials >> applyToRequest: aRequest [ put: self authorizationHeaderValue ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderKey [ ^ 'Authorization' ] -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceTokenCredentials >> authorizationHeaderValue [ ^ 'Bearer ' , token diff --git a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st index 25f8d7bcfa..0ba4c281cd 100644 --- a/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st +++ b/Iceberg-Plugin-GitHub/IceUrlProtocol.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceUrlProtocol } +Extension { #name : 'IceUrlProtocol' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } IceUrlProtocol class >> githubRequestUrlKey [ "Return the key used in github REST responses to get the URL with the correct protocol" self subclassResponsibility diff --git a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st index ac14d56d9d..912f1b6c53 100644 --- a/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st +++ b/Iceberg-Plugin-GitHub/ManifestIcebergPluginGitHub.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginGitHub, - #superclass : #PackageManifest, - #category : 'Iceberg-Plugin-GitHub-Manifest' + #name : 'ManifestIcebergPluginGitHub', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-GitHub-Manifest', + #package : 'Iceberg-Plugin-GitHub', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergPluginGitHub class >> description [ ^ 'I contains a plugin to ease the integration of Iceberg with GitHub''s services. diff --git a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st index f46ec689e8..62a0d92b40 100644 --- a/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st +++ b/Iceberg-Plugin-GitHub/MorphicUIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MorphicUIManager } +Extension { #name : 'MorphicUIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } MorphicUIManager >> inform: aStringOrText actionOnClick: aBlock [ "Display a message for the user to read and then dismiss. When clicked, execute an action." diff --git a/Iceberg-Plugin-GitHub/UIManager.extension.st b/Iceberg-Plugin-GitHub/UIManager.extension.st index a067943440..55b5c9d88d 100644 --- a/Iceberg-Plugin-GitHub/UIManager.extension.st +++ b/Iceberg-Plugin-GitHub/UIManager.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #UIManager } +Extension { #name : 'UIManager' } -{ #category : #'*Iceberg-Plugin-GitHub' } +{ #category : '*Iceberg-Plugin-GitHub' } UIManager >> inform: aString actionOnClick: aBlock [ "Only the MorphicUIManager should make the growl clickable." diff --git a/Iceberg-Plugin-GitHub/package.st b/Iceberg-Plugin-GitHub/package.st index 109b2a8251..bd2c1112e1 100644 --- a/Iceberg-Plugin-GitHub/package.st +++ b/Iceberg-Plugin-GitHub/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-GitHub' } +Package { #name : 'Iceberg-Plugin-GitHub' } diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st index 4b4a223ffd..ed623a2dc2 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloBaselineDecorator.class.st @@ -2,12 +2,13 @@ A decorator to react to the fact that a package is a Baseline " Class { - #name : #IceTipMetacelloBaselineDecorator, - #superclass : #IceTipDecorator, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloBaselineDecorator', + #superclass : 'IceTipDecorator', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloBaselineDecorator >> iconNameForPackage: aPackage [ (self isBaseline: aPackage) ifFalse: [ ^ nil ]. @@ -17,13 +18,13 @@ IceTipMetacelloBaselineDecorator >> iconNameForPackage: aPackage [ ifFalse: [ #package ] ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloBaselineDecorator >> isBaseline: aPackage [ ^ aPackage name beginsWith: 'BaselineOf' ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloBaselineDecorator >> isLocked: aPackage [ ^ (MetacelloProjectRegistration diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st index 6dfa8869b8..20a824174b 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineCommand.class.st @@ -2,18 +2,19 @@ I'm a general command to install metacello baselines. " Class { - #name : #IceTipMetacelloInstallBaselineCommand, - #superclass : #IceTipPackageCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineCommand', + #superclass : 'IceTipPackageCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloInstallBaselineCommand class >> isAbstract [ ^ self == IceTipMetacelloInstallBaselineCommand ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> basicInstallBaseline: icePackage groups: anArray [ | packageDir sourceDirectory | @@ -34,13 +35,13 @@ IceTipMetacelloInstallBaselineCommand >> basicInstallBaseline: icePackage groups load: anArray ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloInstallBaselineCommand >> canBeExecuted [ ^ self packageModel notNil and: [ self package isMetacelloBaseline ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyFor: aMetacelloUpgradeRequest [ | projectName optionA optionB sessionContext | @@ -60,7 +61,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyFor: aMetacelloUpgr optionB: optionB ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyProject: projectName optionA: optionA optionB: optionB [ ^ UIManager default @@ -74,7 +75,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseConflictPolicyProject: projectNam title: 'Conflicting project versions' ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyFor: aMetacelloUpgradeRequest [ | projectName optionA optionB sessionContext | @@ -94,7 +95,7 @@ IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyFor: aMetacelloUpgra optionB: optionB ] ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyProject: projectName optionA: optionA optionB: optionB [ ^ UIManager default @@ -108,19 +109,19 @@ IceTipMetacelloInstallBaselineCommand >> chooseUpgradePolicyProject: projectName title: 'Duplicated project!' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineCommand >> iconName [ ^ #smallLoadProject ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> installBaseline: icePackage [ ^ self installBaseline: icePackage groups: #() ] -{ #category : #private } +{ #category : 'private' } IceTipMetacelloInstallBaselineCommand >> installBaseline: icePackage groups: anArray [ IceTipStandardAction new diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st index baef3e03b6..6749a27ab5 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineDefaultCommand.class.st @@ -2,18 +2,19 @@ I'm a command to install a baseline (default group) " Class { - #name : #IceTipMetacelloInstallBaselineDefaultCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineDefaultCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMetacelloInstallBaselineDefaultCommand class >> defaultName [ ^ 'Install baseline (default)' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineDefaultCommand >> execute [ self installBaseline: self package diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st index 3a02c189ba..580b67f281 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallBaselineGroupCommand.class.st @@ -2,18 +2,19 @@ I'm a command to install a baseline (choose the group(s) to install) " Class { - #name : #IceTipMetacelloInstallBaselineGroupCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallBaselineGroupCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceTipMetacelloInstallBaselineGroupCommand class >> defaultName [ ^ 'Install baseline...' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloInstallBaselineGroupCommand >> execute [ | result | diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st index 37330b95ab..eb437d3c05 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloInstallCommandBuilder.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceTipMetacelloInstallCommandBuilder, - #superclass : #Object, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloInstallCommandBuilder', + #superclass : 'Object', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #builder } +{ #category : 'builder' } IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel intoGroup: aSpCommandGroup [ | baselines | @@ -18,7 +19,7 @@ IceTipMetacelloInstallCommandBuilder >> addCommandsFor: anIceTipRepositoryModel self addCommandsForPackage: aPackage intoGroup: aSpCommandGroup ] ] -{ #category : #builder } +{ #category : 'builder' } IceTipMetacelloInstallCommandBuilder >> addCommandsForPackage: aPackage intoGroup: commandGroup [ | defaultBaselineCommand groupBaselineCommand baselineName | diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st index ba2dddadc8..8038554c86 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloPlugin.class.st @@ -2,12 +2,13 @@ I'm a plugin to add Metacello extensions into IceTip UI. " Class { - #name : #IceTipMetacelloPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloPlugin class >> isAvailableFor: aRepository [ ^ true ] diff --git a/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st b/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st index 4f120e1c76..45e2e3e5d5 100644 --- a/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st +++ b/Iceberg-Plugin-Metacello/IceTipMetacelloToggleLockCommand.class.st @@ -1,22 +1,23 @@ Class { - #name : #IceTipMetacelloToggleLockCommand, - #superclass : #IceTipMetacelloInstallBaselineCommand, - #category : #'Iceberg-Plugin-Metacello' + #name : 'IceTipMetacelloToggleLockCommand', + #superclass : 'IceTipMetacelloInstallBaselineCommand', + #category : 'Iceberg-Plugin-Metacello', + #package : 'Iceberg-Plugin-Metacello' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> baselineName [ ^ self packageName allButFirst: 10 ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> description [ ^ 'Toggle lock/unlock baseline.' ] -{ #category : #executing } +{ #category : 'executing' } IceTipMetacelloToggleLockCommand >> execute [ | metacello | @@ -31,20 +32,20 @@ IceTipMetacelloToggleLockCommand >> execute [ context ifNotNil: [ context refresh ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> iconName [ ^ #smallLock ] -{ #category : #testing } +{ #category : 'testing' } IceTipMetacelloToggleLockCommand >> isBaseline [ self packageModel ifNil: [ ^ false ]. ^ self packageName beginsWith: 'BaselineOf' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> isLocked [ self isBaseline ifFalse: [ ^ false ]. @@ -55,7 +56,7 @@ IceTipMetacelloToggleLockCommand >> isLocked [ isLocked ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> name [ self isBaseline ifFalse: [ ^ 'Lock/Unlock' ]. @@ -65,7 +66,7 @@ IceTipMetacelloToggleLockCommand >> name [ ifFalse: [ 'Lock {1}' format: { self baselineName } ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipMetacelloToggleLockCommand >> packageName [ ^ self package name diff --git a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st index 622b71193e..8c84f96af2 100644 --- a/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st +++ b/Iceberg-Plugin-Metacello/IceTipRepositoriesBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipRepositoriesBrowser } +Extension { #name : 'IceTipRepositoriesBrowser' } -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipRepositoriesBrowser class >> metacelloCommandsWith: presenter forRootGroup: aCommandGroup [ diff --git a/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st b/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st index bedc78b966..b1b61540a9 100644 --- a/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st +++ b/Iceberg-Plugin-Metacello/IceTipWorkingCopyBrowser.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceTipWorkingCopyBrowser } +Extension { #name : 'IceTipWorkingCopyBrowser' } -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipWorkingCopyBrowser class >> metacelloCommandsWith: presenter forRootGroup: aCommandGroup [ | newGroup | @@ -21,7 +21,7 @@ IceTipWorkingCopyBrowser class >> metacelloCommandsWith: presenter forRootGroup: ] -{ #category : #'*Iceberg-Plugin-Metacello' } +{ #category : '*Iceberg-Plugin-Metacello' } IceTipWorkingCopyBrowser class >> metacelloDecorators [ diff --git a/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st b/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st index 9209594dcf..adb7ba29c8 100644 --- a/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st +++ b/Iceberg-Plugin-Metacello/ManifestIcebergPluginMetacello.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginMetacello, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Metacello-Manifest' + #name : 'ManifestIcebergPluginMetacello', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Metacello-Manifest', + #package : 'Iceberg-Plugin-Metacello', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Metacello/package.st b/Iceberg-Plugin-Metacello/package.st index 3e6a014f91..ca6a4a5ddb 100644 --- a/Iceberg-Plugin-Metacello/package.st +++ b/Iceberg-Plugin-Metacello/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Metacello' } +Package { #name : 'Iceberg-Plugin-Metacello' } diff --git a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st index b7f0770e95..dc49384b0c 100644 --- a/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st +++ b/Iceberg-Plugin-Migration/IceConvertFormatAction.class.st @@ -1,45 +1,47 @@ Class { - #name : #IceConvertFormatAction, - #superclass : #Object, + #name : 'IceConvertFormatAction', + #superclass : 'Object', #instVars : [ 'repository', 'branchName', 'format', 'mergeWithCurrentBranch' ], - #category : #'Iceberg-Plugin-Migration-Conversion' + #category : 'Iceberg-Plugin-Migration-Conversion', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Conversion' } -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> branchName [ ^ branchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> branchName: anObject [ branchName := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> codeDirectory [ ^ self repository codeDirectory ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> codeDirectoryWithDelim [ ^ self repository subdirectory isEmptyOrNil ifTrue: [ '' ] ifFalse: [ self repository subdirectory, '/' ] ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> ensureMCClassOrganisationHasCorrectStructure: mcVersion [ (mcVersion snapshot definitions detect: [ :each | each isOrganizationDefinition ]) packageName ifNil: [ self error: 'I have no package name in the organization definition' ] ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> ensureMCVersionWithClassOrganisation: mcVersion [ "if a package does not has class organisation (happens when package is composed only for extensions, we need to ensure it has one, otherwise package creation will @@ -55,7 +57,7 @@ IceConvertFormatAction >> ensureMCVersionWithClassOrganisation: mcVersion [ snapshot: (MCSnapshot fromDefinitions: { (MCOrganizationDefinition packageName: mcVersion package name) } , mcVersion snapshot definitions) ] ] -{ #category : #execution } +{ #category : 'execution' } IceConvertFormatAction >> execute [ | oldBranch newBranch | @@ -67,27 +69,27 @@ IceConvertFormatAction >> execute [ newBranch merge ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> format [ ^ format ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> format: anObject [ format := anObject ] -{ #category : #testing } +{ #category : 'testing' } IceConvertFormatAction >> isMergeWithCurrentBranch [ ^ mergeWithCurrentBranch ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> mergeWithCurrentBranch: anObject [ mergeWithCurrentBranch := anObject ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> migratePackage: packageName commit: commit [ | filetreePackage srcDir subDirWithDelim mcVersion | @@ -105,7 +107,7 @@ IceConvertFormatAction >> migratePackage: packageName commit: commit [ (subDirWithDelim , (IceLibgitFiletreeWriter directoryNameFor: packageName)) } ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> migrateSources [ | commit | @@ -136,7 +138,7 @@ IceConvertFormatAction >> migrateSources [ andParents: { commit }. ] -{ #category : #private } +{ #category : 'private' } IceConvertFormatAction >> removeFiletreeRemnants [ "remove .filetree remaining" | filetreeFiles | @@ -148,17 +150,17 @@ IceConvertFormatAction >> removeFiletreeRemnants [ ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> repository [ ^ repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> repository: anObject [ repository := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceConvertFormatAction >> writerClass [ ^ format = #tonel diff --git a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st index 123ed18021..fedb08bf82 100644 --- a/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st +++ b/Iceberg-Plugin-Migration/IceFiletreeToTonelCommand.class.st @@ -4,18 +4,20 @@ I will be active in repository list browser, when repository is in filetree form " Class { - #name : #IceFiletreeToTonelCommand, - #superclass : #IceTipCommand, - #category : #'Iceberg-Plugin-Migration-Commands' + #name : 'IceFiletreeToTonelCommand', + #superclass : 'IceTipCommand', + #category : 'Iceberg-Plugin-Migration-Commands', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Commands' } -{ #category : #'accessing - defaults' } +{ #category : 'accessing - defaults' } IceFiletreeToTonelCommand class >> defaultName [ ^ 'Convert repository sources to tonel' ] -{ #category : #testing } +{ #category : 'testing' } IceFiletreeToTonelCommand >> canBeExecuted [ | repository | @@ -28,7 +30,7 @@ IceFiletreeToTonelCommand >> canBeExecuted [ and: [ repository head isUnbornBranch not ] ] ] ] -{ #category : #executing } +{ #category : 'executing' } IceFiletreeToTonelCommand >> execute [ (IceTipFiletreeToTonelDialogPresenter on: self repository) openDialog diff --git a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st index c8f1549d88..0d7fcfaa54 100644 --- a/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st +++ b/Iceberg-Plugin-Migration/IceTipFiletreeToTonelDialogPresenter.class.st @@ -3,8 +3,8 @@ I'm a dialog validate and perform a migration of sources from filetree to tonel. " Class { - #name : #IceTipFiletreeToTonelDialogPresenter, - #superclass : #IceTipDialogPresenter, + #name : 'IceTipFiletreeToTonelDialogPresenter', + #superclass : 'IceTipDialogPresenter', #instVars : [ 'iconPanel', 'confirmLabel', @@ -12,10 +12,12 @@ Class { 'branchName', 'repository' ], - #category : #'Iceberg-Plugin-Migration-UI' + #category : 'Iceberg-Plugin-Migration-UI', + #package : 'Iceberg-Plugin-Migration', + #tag : 'UI' } -{ #category : #actions } +{ #category : 'actions' } IceTipFiletreeToTonelDialogPresenter >> accept [ IceTipStandardAction new @@ -27,25 +29,25 @@ IceTipFiletreeToTonelDialogPresenter >> accept [ executeWithContext: self ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> branchBaseName [ ^ 'migrate-sources-to-tonel' ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> branchName [ ^ branchName ifNil: [ branchName := self obtainBranchName ] ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> confirmLabel [ ^ confirmLabel ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> confirmMessage [ ^ 'Convert repository {1} sources from filetree format to tonel. @@ -55,7 +57,7 @@ You can choose to not merge immediately your migration. ARE YOU SURE?' ] -{ #category : #layout } +{ #category : 'layout' } IceTipFiletreeToTonelDialogPresenter >> defaultLayout [ ^ SpBoxLayout newLeftToRight @@ -69,7 +71,7 @@ IceTipFiletreeToTonelDialogPresenter >> defaultLayout [ yourself ] -{ #category : #actions } +{ #category : 'actions' } IceTipFiletreeToTonelDialogPresenter >> doAccept [ IceConvertFormatAction new @@ -80,13 +82,13 @@ IceTipFiletreeToTonelDialogPresenter >> doAccept [ execute ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> iconPanel [ ^ iconPanel ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ ^ (500 @@ -94,7 +96,7 @@ IceTipFiletreeToTonelDialogPresenter >> initialExtentForWindow [ scaledByDisplayScaleFactor ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ super initializePresenters. @@ -113,13 +115,13 @@ IceTipFiletreeToTonelDialogPresenter >> initializePresenters [ ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IceTipFiletreeToTonelDialogPresenter >> mergeWithMasterCheckbox [ ^ mergeWithMasterCheckbox ] -{ #category : #private } +{ #category : 'private' } IceTipFiletreeToTonelDialogPresenter >> obtainBranchName [ | baseName suffix count | @@ -134,19 +136,19 @@ IceTipFiletreeToTonelDialogPresenter >> obtainBranchName [ suffix := '-' , count asString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipFiletreeToTonelDialogPresenter >> repository [ ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> setModelBeforeInitialization: anObject [ repository := anObject ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipFiletreeToTonelDialogPresenter >> titleForWindow [ ^ 'Convert sources to tonel' diff --git a/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st b/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st index 8089b8dbaf..bdfb39c763 100644 --- a/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st +++ b/Iceberg-Plugin-Migration/ManifestIcebergPluginMigration.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginMigration, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Migration-Manifest' + #name : 'ManifestIcebergPluginMigration', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Migration-Manifest', + #package : 'Iceberg-Plugin-Migration', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Migration/package.st b/Iceberg-Plugin-Migration/package.st index 57007d9830..2da48e2a97 100644 --- a/Iceberg-Plugin-Migration/package.st +++ b/Iceberg-Plugin-Migration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Migration' } +Package { #name : 'Iceberg-Plugin-Migration' } diff --git a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st index 7db229a57a..3304144db8 100644 --- a/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st +++ b/Iceberg-Plugin-Pharo/IcePharoPlugin.class.st @@ -1,10 +1,12 @@ Class { - #name : #IcePharoPlugin, - #superclass : #IcePlugin, - #category : #'Iceberg-Plugin-Pharo-Core' + #name : 'IcePharoPlugin', + #superclass : 'IcePlugin', + #category : 'Iceberg-Plugin-Pharo-Core', + #package : 'Iceberg-Plugin-Pharo', + #tag : 'Core' } -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addIcebergProjectToIceberg [ self @@ -24,7 +26,7 @@ IcePharoPlugin class >> addIcebergProjectToIceberg [ ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addPharoProjectToIceberg [ "It will take all packages corresponding to Pharo project and it will create an iceberg project with it" @@ -54,7 +56,7 @@ IcePharoPlugin class >> addPharoProjectToIceberg [ BaselineOfUnifiedFFI). ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCollection [ self @@ -64,7 +66,7 @@ IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCol tags: #(#system) ] -{ #category : #adding } +{ #category : 'adding' } IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCollection tags: tagArray [ | repository commit workingCopy | @@ -100,7 +102,7 @@ IcePharoPlugin class >> addProjectNamed: aName commit: aCommitId baselines: aCol repository register ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> commitOfExternalProject: aName [ | externalProject tags branch | @@ -123,7 +125,7 @@ IcePharoPlugin class >> commitOfExternalProject: aName [ ^ branch at: #commit at: #sha ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> getCommitishOfProject: projectName owner: owner repository: repository [ | shortHash | @@ -141,7 +143,7 @@ IcePharoPlugin class >> getCommitishOfProject: projectName owner: owner reposito project: repository) at: #sha ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> icebergCommitHash [ ^ self @@ -150,13 +152,13 @@ IcePharoPlugin class >> icebergCommitHash [ repository: 'iceberg' ] -{ #category : #testing } +{ #category : 'testing' } IcePharoPlugin class >> isAvailableFor: aRepository [ ^ aRepository remotes anySatisfy: [ :each | each projectName = 'pharo' ] ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> libgitCommitHash [ ^ self @@ -165,13 +167,13 @@ IcePharoPlugin class >> libgitCommitHash [ repository: 'libgit2-pharo-bindings' ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> pharoCommitHash [ ^ SystemVersion current commitHash ] -{ #category : #'accessing - commits' } +{ #category : 'accessing - commits' } IcePharoPlugin class >> tonelCommitHash [ ^ self @@ -180,7 +182,7 @@ IcePharoPlugin class >> tonelCommitHash [ repository: 'tonel' ] -{ #category : #events } +{ #category : 'events' } IcePharoPlugin >> fetchIfNeeded: aRepository [ (aRepository lookupCommit: SystemVersion current commitHash) isUnknownCommit @@ -193,7 +195,7 @@ IcePharoPlugin >> fetchIfNeeded: aRepository [ ifFound: [ :each | each fetch ] ] ] -{ #category : #events } +{ #category : 'events' } IcePharoPlugin >> repositoryWillBeCreated: aRepository [ SystemVersion current major < 7 ifTrue: [ ^ self ]. diff --git a/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st b/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st index c73a0fcd6c..7c48386c9b 100644 --- a/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st +++ b/Iceberg-Plugin-Pharo/ManifestIcebergPluginPharo.class.st @@ -2,7 +2,9 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPluginPharo, - #superclass : #PackageManifest, - #category : #'Iceberg-Plugin-Pharo-Manifest' + #name : 'ManifestIcebergPluginPharo', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Pharo-Manifest', + #package : 'Iceberg-Plugin-Pharo', + #tag : 'Manifest' } diff --git a/Iceberg-Plugin-Pharo/package.st b/Iceberg-Plugin-Pharo/package.st index 09511a9da0..1028c14509 100644 --- a/Iceberg-Plugin-Pharo/package.st +++ b/Iceberg-Plugin-Pharo/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin-Pharo' } +Package { #name : 'Iceberg-Plugin-Pharo' } diff --git a/Iceberg-Plugin/IcePlugin.class.st b/Iceberg-Plugin/IcePlugin.class.st index d62d0e9501..9acd5e901a 100644 --- a/Iceberg-Plugin/IcePlugin.class.st +++ b/Iceberg-Plugin/IcePlugin.class.st @@ -6,42 +6,44 @@ I can define - ... (TBD) " Class { - #name : #IcePlugin, - #superclass : #Object, - #category : #'Iceberg-Plugin-Base' + #name : 'IcePlugin', + #superclass : 'Object', + #category : 'Iceberg-Plugin-Base', + #package : 'Iceberg-Plugin', + #tag : 'Base' } -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> allAvailableFor: aRepository [ ^ self allSubclasses select: [ :each | each isAvailableFor: aRepository ] ] -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> isAbstract [ ^ self == IcePlugin ] -{ #category : #testing } +{ #category : 'testing' } IcePlugin class >> isAvailableFor: aRepository [ ^ self subclassResponsibility ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IcePlugin >> checkoutBranchPanelsOnModel: anIceTipCachedModel [ "Hook for subclasses" ^ #() ] -{ #category : #events } +{ #category : 'events' } IcePlugin >> repositoryWasCreated: aRepository [ "Hook. Allows plugins to do an action when a repository is created" ] -{ #category : #events } +{ #category : 'events' } IcePlugin >> repositoryWillBeCreated: aRepository [ "Hook. Allows plugins to do an action when a repository will be added" diff --git a/Iceberg-Plugin/IcePluginManager.class.st b/Iceberg-Plugin/IcePluginManager.class.st index e31242b509..20e22c4059 100644 --- a/Iceberg-Plugin/IcePluginManager.class.st +++ b/Iceberg-Plugin/IcePluginManager.class.st @@ -5,37 +5,39 @@ WARNING: Managers are kept in a weak dictionary with Repository as a key, reason Consider using stateless plugins or instance copies of relevant information instead. " Class { - #name : #IcePluginManager, - #superclass : #Object, + #name : 'IcePluginManager', + #superclass : 'Object', #instVars : [ 'plugins' ], - #category : #'Iceberg-Plugin-Base' + #category : 'Iceberg-Plugin-Base', + #package : 'Iceberg-Plugin', + #tag : 'Base' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePluginManager class >> managerFor: aRepository [ ^ self basicNew initializeRepository: aRepository ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IcePluginManager class >> new [ self error: 'Use #managerFor:' ] -{ #category : #accessing } +{ #category : 'accessing' } IcePluginManager >> addPlugin: aPlugin [ plugins := plugins copyWith: aPlugin ] -{ #category : #initialization } +{ #category : 'initialization' } IcePluginManager >> availablePluginsFor: aRepository [ ^ (IcePlugin allAvailableFor: aRepository) collect: #new as: Array ] -{ #category : #'accessing - ui' } +{ #category : 'accessing - ui' } IcePluginManager >> checkoutBranchPanelsOnModel: aModel [ ^ Array streamContents: [ :stream | @@ -43,23 +45,23 @@ IcePluginManager >> checkoutBranchPanelsOnModel: aModel [ stream nextPutAll: (each checkoutBranchPanelsOnModel: aModel) ]] ] -{ #category : #initialization } +{ #category : 'initialization' } IcePluginManager >> initializeRepository: aRepository [ self initialize. plugins := self availablePluginsFor: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IcePluginManager >> plugins [ ^ plugins ] -{ #category : #events } +{ #category : 'events' } IcePluginManager >> repositoryWasCreated: aRepository [ ^ self plugins do: [ :each | each repositoryWasCreated: aRepository ] ] -{ #category : #events } +{ #category : 'events' } IcePluginManager >> repositoryWillBeCreated: aRepository [ ^ self plugins do: [ :each | each repositoryWillBeCreated: aRepository ] ] diff --git a/Iceberg-Plugin/IceRepository.extension.st b/Iceberg-Plugin/IceRepository.extension.st index ca34abeb2d..72d4a452a9 100644 --- a/Iceberg-Plugin/IceRepository.extension.st +++ b/Iceberg-Plugin/IceRepository.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Plugin' } +{ #category : '*Iceberg-Plugin' } IceRepository >> pluginManager [ ^ IcePluginManager managerFor: self ] diff --git a/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st b/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st index 9f14992175..35dfe8e24c 100644 --- a/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st +++ b/Iceberg-Plugin/IceTipBitbucketRepositoryPanel.class.st @@ -2,36 +2,38 @@ I'm a panel to show and/or manipulate a project definition in a BitBucket git repository. " Class { - #name : #IceTipBitbucketRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-Bitbucket' + #name : 'IceTipBitbucketRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-Bitbucket', + #package : 'Iceberg-Plugin', + #tag : 'Bitbucket' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipBitbucketRepositoryPanel class >> order [ ^ 110 ] -{ #category : #actions } +{ #category : 'actions' } IceTipBitbucketRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beBitbucket ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBitbucketRepositoryPanel >> iconForWindow [ ^ self iconNamed: #bitbucket ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipBitbucketRepositoryPanel >> providerName [ ^ 'Bitbucket' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipBitbucketRepositoryPanel >> titleForWindow [ ^ 'Clone from bitbucket.org' diff --git a/Iceberg-Plugin/IceTipDecorator.class.st b/Iceberg-Plugin/IceTipDecorator.class.st index 23137ed71f..42a0d2e787 100644 --- a/Iceberg-Plugin/IceTipDecorator.class.st +++ b/Iceberg-Plugin/IceTipDecorator.class.st @@ -9,12 +9,13 @@ It is expected that more decorators will be created with time. " Class { - #name : #IceTipDecorator, - #superclass : #Object, - #category : #'Iceberg-Plugin' + #name : 'IceTipDecorator', + #superclass : 'Object', + #category : 'Iceberg-Plugin', + #package : 'Iceberg-Plugin' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipDecorator >> iconNameForPackage: aPackage [ ^ nil diff --git a/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st b/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st index 2f11c973fc..1cd40d5852 100644 --- a/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st +++ b/Iceberg-Plugin/IceTipGitLabRepositoryPanel.class.st @@ -2,36 +2,38 @@ I'm a panel to show and/or manipulate a project definition in a GitLab git repository. " Class { - #name : #IceTipGitLabRepositoryPanel, - #superclass : #IceTipGitProviderRepositoryPanel, - #category : #'Iceberg-Plugin-Gitlab' + #name : 'IceTipGitLabRepositoryPanel', + #superclass : 'IceTipGitProviderRepositoryPanel', + #category : 'Iceberg-Plugin-Gitlab', + #package : 'Iceberg-Plugin', + #tag : 'Gitlab' } -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitLabRepositoryPanel class >> order [ ^ 120 ] -{ #category : #actions } +{ #category : 'actions' } IceTipGitLabRepositoryPanel >> configureBuilder: aBuilder [ aBuilder beGitLab ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitLabRepositoryPanel >> iconForWindow [ ^ self iconNamed: #gitlab ] -{ #category : #accessing } +{ #category : 'accessing' } IceTipGitLabRepositoryPanel >> providerName [ ^ 'GitLab' ] -{ #category : #initialization } +{ #category : 'initialization' } IceTipGitLabRepositoryPanel >> titleForWindow [ ^ 'Clone from gitlab.com' diff --git a/Iceberg-Plugin/ManifestIcebergPlugin.class.st b/Iceberg-Plugin/ManifestIcebergPlugin.class.st index 4b3d16013c..f7bdd9b9f4 100644 --- a/Iceberg-Plugin/ManifestIcebergPlugin.class.st +++ b/Iceberg-Plugin/ManifestIcebergPlugin.class.st @@ -2,12 +2,14 @@ I store metadata for this package. These meta data are used by other tools such as the SmalllintManifestChecker and the critics Browser " Class { - #name : #ManifestIcebergPlugin, - #superclass : #PackageManifest, - #category : 'Iceberg-Plugin-Manifest' + #name : 'ManifestIcebergPlugin', + #superclass : 'PackageManifest', + #category : 'Iceberg-Plugin-Manifest', + #package : 'Iceberg-Plugin', + #tag : 'Manifest' } -{ #category : #'meta-data' } +{ #category : 'meta-data' } ManifestIcebergPlugin class >> description [ ^ 'I contains a plugin manager for Iceberg. diff --git a/Iceberg-Plugin/package.st b/Iceberg-Plugin/package.st index 2ecd14506b..787eaa69fd 100644 --- a/Iceberg-Plugin/package.st +++ b/Iceberg-Plugin/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Plugin' } +Package { #name : 'Iceberg-Plugin' } diff --git a/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st b/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st index 1ddfec9dc4..999e414d0a 100644 --- a/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st +++ b/Iceberg-Tests-MetacelloIntegration/AbstractIceMetacelloIntegrationTests.class.st @@ -1,49 +1,50 @@ Class { - #name : #AbstractIceMetacelloIntegrationTests, - #superclass : #IceParameterizedTestCase, + #name : 'AbstractIceMetacelloIntegrationTests', + #superclass : 'IceParameterizedTestCase', #instVars : [ 'repository', 'conflictingRepository' ], - #category : 'Iceberg-Tests-MetacelloIntegration' + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } AbstractIceMetacelloIntegrationTests class >> isAbstract [ ^ self name = #AbstractIceMetacelloIntegrationTests ] -{ #category : #accessing } +{ #category : 'accessing' } AbstractIceMetacelloIntegrationTests >> defaultTimeLimit [ ^ 30 seconds ] -{ #category : #tests } +{ #category : 'tests' } AbstractIceMetacelloIntegrationTests >> repositoriesForTest [ ^ IceRepository registry select: [ :e | e name = self repositoryName ] ] -{ #category : #configuring } +{ #category : 'configuring' } AbstractIceMetacelloIntegrationTests >> repository [ ^ 'github://pharo-vcs/' , self repositoryName ] -{ #category : #tests } +{ #category : 'tests' } AbstractIceMetacelloIntegrationTests >> repositoryForTest [ ^ IceRepository registry detect: [ :e | e name = self repositoryName ] ] -{ #category : #configuring } +{ #category : 'configuring' } AbstractIceMetacelloIntegrationTests >> repositoryName [ ^ self subclassResponsibility ] -{ #category : #running } +{ #category : 'running' } AbstractIceMetacelloIntegrationTests >> tearDown [ (self repositoriesForTest, { conflictingRepository }) do: [ :each | each ifNotNil: [ :repo | diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st index 069c4281aa..4d8d383c91 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationTests.class.st @@ -1,13 +1,14 @@ Class { - #name : #IceMetacelloIntegrationTests, - #superclass : #AbstractIceMetacelloIntegrationTests, + #name : 'IceMetacelloIntegrationTests', + #superclass : 'AbstractIceMetacelloIntegrationTests', #classVars : [ 'CommitishToUse' ], - #category : 'Iceberg-Tests-MetacelloIntegration' + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishConfiguration [ ^ IceTestParameter @@ -18,7 +19,7 @@ IceMetacelloIntegrationTests class >> commitishConfiguration [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishOptions [ ^ { ''. "Without commitish" @@ -28,37 +29,37 @@ IceMetacelloIntegrationTests class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishToUse [ ^ CommitishToUse ifNil: [ '' ] ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> commitishToUse: aValue [ CommitishToUse := aValue ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> isAbstract [ ^ self name = #IceMetacelloIntegrationTests ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests class >> parameters [ ^ { self remoteTypeConfiguration. self commitishConfiguration } ] -{ #category : #creation } +{ #category : 'creation' } IceMetacelloIntegrationTests >> createConflictingRepository [ self createConflictingRepositoryIn: 'temp/test' ] -{ #category : #creation } +{ #category : 'creation' } IceMetacelloIntegrationTests >> createConflictingRepositoryIn: aLocation [ conflictingRepository := (IceRepositoryCreator new @@ -68,19 +69,19 @@ IceMetacelloIntegrationTests >> createConflictingRepositoryIn: aLocation [ yourself. ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> expectedFileFormat [ ^ self subclassResponsibility ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> hasProject [ ^ self subclassResponsibility ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> installBaseline [ Metacello new @@ -89,25 +90,25 @@ IceMetacelloIntegrationTests >> installBaseline [ load. ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests >> isTestingHTTPS [ ^ Iceberg remoteTypeSelector = #httpsUrl ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloIntegrationTests >> isTestingSSH [ ^ Iceberg remoteTypeSelector = #scpUrl ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationTests >> shouldBeDirty [ ^ false ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS [ "This test is meant to run in the CI using SSH, when SSH is not available. @@ -120,7 +121,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS self assert: repository origin url asUrl scheme equals: 'https' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhenSSHIsAvailableUsesSSH [ "This test is meant to run on SSH when SSH is running only. @@ -134,7 +135,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhenSSHIsAvailableUsesSSH [ self assert: (repository origin url beginsWith: 'git@') ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWhileMissingRepositoryIsInstalledIsPossible [ "Avoid this test if on ssh on the CI" @@ -150,7 +151,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWhileMissingRepositoryIsInsta self assert: repository workingCopy isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingRepositoryInDiskThrowsError [ "Avoid this test if on ssh on the CI" @@ -164,7 +165,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingRepositoryInDi self installBaseline ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingUnrelatedRepositoryInDiskThrowsError [ "Avoid this test if on ssh on the CI" @@ -176,7 +177,7 @@ IceMetacelloIntegrationTests >> testInstallBaselineWithConflictingUnrelatedRepos self should: [ self installBaseline ] raise: IceMetacelloDuplicatedNotification ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testInstallingAMetacelloBaselineCreatesAnIcebergRepository [ "Avoid this test if on ssh on the CI" @@ -186,7 +187,7 @@ IceMetacelloIntegrationTests >> testInstallingAMetacelloBaselineCreatesAnIceberg self installBaseline ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testNewRepositoryPackagesAreClean [ "Avoid this test if on ssh on the CI" @@ -199,7 +200,7 @@ IceMetacelloIntegrationTests >> testNewRepositoryPackagesAreClean [ self assert: repository workingCopy isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectDirtiness [ "Avoid this test if on ssh on the CI" @@ -212,7 +213,7 @@ IceMetacelloIntegrationTests >> testProjectDirtiness [ self assert: repository isModified equals: self shouldBeDirty ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectFileFormat [ "Avoid this test if on ssh on the CI" @@ -225,7 +226,7 @@ IceMetacelloIntegrationTests >> testProjectFileFormat [ self assert: repository properties fileFormat equals: self expectedFileFormat. ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationTests >> testProjectHasDescriptor [ "Avoid this test if on ssh on the CI" diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st index 84bd7b289f..a64504f250 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationUpdateALoadedVersionTest.class.st @@ -1,16 +1,17 @@ Class { - #name : #IceMetacelloIntegrationUpdateALoadedVersionTest, - #superclass : #AbstractIceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloIntegrationUpdateALoadedVersionTest', + #superclass : 'AbstractIceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationUpdateALoadedVersionTest >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> tearDown [ super tearDown. @@ -27,7 +28,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testConflictDetectedWithProjectWithDependency [ Metacello new @@ -45,7 +46,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testConflictDetectedWithProje ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testIncommingWhenProjectWithDependency [ Metacello new @@ -67,7 +68,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testIncommingWhenProjectWithD ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testKeepExistingWhenProjectWithDependency [ Metacello new @@ -89,7 +90,7 @@ IceMetacelloIntegrationUpdateALoadedVersionTest >> testKeepExistingWhenProjectWi ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationUpdateALoadedVersionTest >> testUpdateProjectShouldCheckoutTheNewVersion [ Metacello new diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st index 3882fa7aa1..e30e2db5fd 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloIntegrationWithMissingClone.class.st @@ -1,16 +1,17 @@ Class { - #name : #IceMetacelloIntegrationWithMissingClone, - #superclass : #AbstractIceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloIntegrationWithMissingClone', + #superclass : 'AbstractIceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloIntegrationWithMissingClone >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> setUp [ super setUp. @@ -26,7 +27,7 @@ IceMetacelloIntegrationWithMissingClone >> setUp [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> tearDown [ super tearDown. @@ -43,7 +44,7 @@ IceMetacelloIntegrationWithMissingClone >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceMetacelloIntegrationWithMissingClone >> testMissingRepositoryShouldNotFail [ Metacello new diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st index 5224a8367e..df7439e217 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourceNoPropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourceNoPropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourceNoPropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':d68a059b2e36672b1103d89689412d37462b9ca2' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourceNoPropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> repositoryName [ ^ 'test-noproject-nosource-noproperties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourceNoPropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st index 9e4385f923..0b16034657 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':06d29d26ac71072a49f1846f73f5389a89ebc455' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> repositoryName [ ^ 'test-noproject-nosource-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st index a06af62533..fea768a516 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectNoSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectNoSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectNoSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectNoSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { ':e29c9ff7ef370ea7349d25d79edf9823488d33e2' "With commit"} @@ -12,25 +13,25 @@ IceMetacelloNoProjectNoSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> repositoryName [ ^ 'test-noproject-nosource-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectNoSourcePropertiesTonel >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st index a600b62c96..6171901e1a 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourceNoPropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourceNoPropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourceNoPropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourceNoPropertiesFiletree class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> repositoryName [ ^ 'test-noproject-source-noproperties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourceNoPropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st index a83e194081..1d4c836c9e 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesFiletree class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> repositoryName [ ^ 'test-noproject-source-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesFiletree >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st index d0e2965604..18f44167b7 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloNoProjectSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloNoProjectSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloNoProjectSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesTonel class >> commitishOptions [ ^ { '/src'. "Without commitish" @@ -15,30 +16,30 @@ IceMetacelloNoProjectSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #testing } +{ #category : 'testing' } IceMetacelloNoProjectSourcePropertiesTonel class >> commitishToUse [ ^ CommitishToUse ifNil: [ '/src' ] ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> repositoryName [ ^ 'test-noproject-source-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloNoProjectSourcePropertiesTonel >> shouldBeDirty [ ^ true diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st index 7f52ee155b..b6574c4c5b 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectNoSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectNoSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectNoSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { ':61024d7e81eac0b752ade9f3e03f6e2bd34ee5bf' "With commit"} @@ -12,24 +13,24 @@ IceMetacelloProjectNoSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> repositoryName [ ^ 'test-project-nosource-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesFiletree >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st index 9e328145e9..469de17508 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectNoSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectNoSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectNoSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectNoSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { ':06f2b9e4833d38770b11c9126987266a3d757843' "With commit"} @@ -12,24 +13,24 @@ IceMetacelloProjectNoSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> repositoryName [ ^ 'test-project-nosource-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectNoSourcePropertiesTonel >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st index 4782cc463c..1e0b50d4fa 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesFiletree.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectSourcePropertiesFiletree, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectSourcePropertiesFiletree', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectSourcePropertiesFiletree class >> commitishOptions [ ^ super commitishOptions , { @@ -20,24 +21,24 @@ IceMetacelloProjectSourcePropertiesFiletree class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> expectedFileFormat [ ^ IceLibgitFiletreeWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> repositoryName [ ^ 'test-project-source-properties-filetree' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesFiletree >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st index 8c915cbccd..7df489bf1e 100644 --- a/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st +++ b/Iceberg-Tests-MetacelloIntegration/IceMetacelloProjectSourcePropertiesTonel.class.st @@ -1,10 +1,11 @@ Class { - #name : #IceMetacelloProjectSourcePropertiesTonel, - #superclass : #IceMetacelloIntegrationTests, - #category : 'Iceberg-Tests-MetacelloIntegration' + #name : 'IceMetacelloProjectSourcePropertiesTonel', + #superclass : 'IceMetacelloIntegrationTests', + #category : 'Iceberg-Tests-MetacelloIntegration', + #package : 'Iceberg-Tests-MetacelloIntegration' } -{ #category : #testing } +{ #category : 'testing' } IceMetacelloProjectSourcePropertiesTonel class >> commitishOptions [ ^ super commitishOptions , { @@ -20,24 +21,24 @@ IceMetacelloProjectSourcePropertiesTonel class >> commitishOptions [ ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> expectedFileFormat [ ^ IceLibgitTonelWriter ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> hasProject [ ^ true ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> repositoryName [ ^ 'test-project-source-properties-tonel' ] -{ #category : #configuring } +{ #category : 'configuring' } IceMetacelloProjectSourcePropertiesTonel >> shouldBeDirty [ ^ false diff --git a/Iceberg-Tests-MetacelloIntegration/package.st b/Iceberg-Tests-MetacelloIntegration/package.st index 082c617b64..c3d7d8d3cf 100644 --- a/Iceberg-Tests-MetacelloIntegration/package.st +++ b/Iceberg-Tests-MetacelloIntegration/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Tests-MetacelloIntegration' } +Package { #name : 'Iceberg-Tests-MetacelloIntegration' } diff --git a/Iceberg-Tests/IceAbstractTestCase.class.st b/Iceberg-Tests/IceAbstractTestCase.class.st index c358683866..90abd2de5e 100644 --- a/Iceberg-Tests/IceAbstractTestCase.class.st +++ b/Iceberg-Tests/IceAbstractTestCase.class.st @@ -1,111 +1,113 @@ Class { - #name : #IceAbstractTestCase, - #superclass : #IceParameterizedTestCase, + #name : 'IceAbstractTestCase', + #superclass : 'IceParameterizedTestCase', #instVars : [ 'fixture' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertClassExists: aString [ self assert: (self repository workingCopy environment ask includesClassNamed: aString) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertMethodExists: aMethodName inClass: aClassName [ self assert: ((self repository workingCopy environment ask classNamed: aClassName) includesSelector: aMethodName) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> assertPackageExists: aString [ self assert: (self repository workingCopy environment ask includesPackageNamed: aString) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> denyClassExists: aString [ self deny: (self repository workingCopy environment ask includesClassNamed: aString) ] -{ #category : #asserting } +{ #category : 'asserting' } IceAbstractTestCase >> denyMethodExists: aMethodName inClass: aClassName [ self deny: ((self repository workingCopy environment ask classNamed: aClassName) includesSelector: aMethodName) ] -{ #category : #assertions } +{ #category : 'assertions' } IceAbstractTestCase >> denyPackageExists: aString [ self deny: (self repository workingCopy environment ask includesPackageNamed: aString) ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> newFixture [ self subclassResponsibility ] -{ #category : #factory } +{ #category : 'factory' } IceAbstractTestCase >> newRemoteNamed: aString [ ^ fixture newRemoteNamed: aString ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> packageName1 [ ^ fixture packageName1 ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> packageName2 [ ^ fixture packageName2 ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remote [ ^ fixture remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remoteBranchName [ ^ fixture remoteBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> remoteRepository [ ^ fixture remoteRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> repository [ ^ fixture repository ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> setUp [ super setUp. fixture := self newFixture. fixture setUp ] -{ #category : #running } +{ #category : 'running' } IceAbstractTestCase >> tearDown [ - fixture tearDown. + fixture ifNotNil: [ fixture tearDown ]. super tearDown. ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestCase >> workingCopy [ ^ self repository workingCopy diff --git a/Iceberg-Tests/IceAbstractTestFactory.class.st b/Iceberg-Tests/IceAbstractTestFactory.class.st index 8a4bebf73d..1bd35ca1a2 100644 --- a/Iceberg-Tests/IceAbstractTestFactory.class.st +++ b/Iceberg-Tests/IceAbstractTestFactory.class.st @@ -1,46 +1,48 @@ Class { - #name : #IceAbstractTestFactory, - #superclass : #Object, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceAbstractTestFactory', + #superclass : 'Object', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #accessing } +{ #category : 'accessing' } IceAbstractTestFactory >> ensureRemoteRepository [ self subclassResponsibility ] -{ #category : #testing } +{ #category : 'testing' } IceAbstractTestFactory >> isGit [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRemoteNamed: aName toRepository: aRepository [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRepositoryNamed: projectName [ ^ self newRepositoryNamed: projectName withSubdirectory: '' ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ self subclassResponsibility ] -{ #category : #initialization } +{ #category : 'initialization' } IceAbstractTestFactory >> tearDownWithRepository: aRepository [ self subclassResponsibility diff --git a/Iceberg-Tests/IceBasicCherryPickingFixture.class.st b/Iceberg-Tests/IceBasicCherryPickingFixture.class.st index d3264849bc..25e9773fa2 100644 --- a/Iceberg-Tests/IceBasicCherryPickingFixture.class.st +++ b/Iceberg-Tests/IceBasicCherryPickingFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceBasicCherryPickingFixture, - #superclass : #IceBasicRepositoryFixture, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceBasicCherryPickingFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #running } +{ #category : 'running' } IceBasicCherryPickingFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceBasicRepositoryFixture.class.st b/Iceberg-Tests/IceBasicRepositoryFixture.class.st index e41f987c8b..c299f52fe4 100644 --- a/Iceberg-Tests/IceBasicRepositoryFixture.class.st +++ b/Iceberg-Tests/IceBasicRepositoryFixture.class.st @@ -1,14 +1,16 @@ Class { - #name : #IceBasicRepositoryFixture, - #superclass : #IceNotYetClonedRepositoryFixture, + #name : 'IceBasicRepositoryFixture', + #superclass : 'IceNotYetClonedRepositoryFixture', #instVars : [ 'repository', 'subdirectory' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture class >> inGit [ ^ self new @@ -16,7 +18,7 @@ IceBasicRepositoryFixture class >> inGit [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture class >> inMemory [ ^ self new @@ -24,43 +26,43 @@ IceBasicRepositoryFixture class >> inMemory [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture >> initialize [ super initialize. subdirectory := ''. ] -{ #category : #initialization } +{ #category : 'initialization' } IceBasicRepositoryFixture >> newRemoteNamed: aName [ ^ factory newRemoteNamed: aName toRepository: repository ] -{ #category : #accessing } +{ #category : 'accessing' } IceBasicRepositoryFixture >> repository [ ^ repository ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> setUp [ super setUp. repository := factory newRepositoryNamed: projectName withSubdirectory: self subdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> subdirectory [ ^ subdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> subdirectory: aSubdirectory [ subdirectory := aSubdirectory ] -{ #category : #running } +{ #category : 'running' } IceBasicRepositoryFixture >> tearDown [ factory tearDownWithRepository: repository. diff --git a/Iceberg-Tests/IceBornRepositoryTest.class.st b/Iceberg-Tests/IceBornRepositoryTest.class.st index 46a8125840..82f23a18a2 100644 --- a/Iceberg-Tests/IceBornRepositoryTest.class.st +++ b/Iceberg-Tests/IceBornRepositoryTest.class.st @@ -1,23 +1,25 @@ Class { - #name : #IceBornRepositoryTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceBornRepositoryTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceBornRepositoryTest class >> isAbstract [ ^ self == IceBornRepositoryTest ] -{ #category : #accessing } +{ #category : 'accessing' } IceBornRepositoryTest >> expectedCommitsInNewBranch [ "A git repository has just the initial commit" ^ 1 ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testAccessingNonExistingTagRaisesException [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -25,7 +27,7 @@ IceBornRepositoryTest >> testAccessingNonExistingTagRaisesException [ self should: [self repository tagNamed: 'nonExisting'] raise: IceTagNotFound ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testAddNewRemoteListsRemote [ | remote | @@ -35,7 +37,7 @@ IceBornRepositoryTest >> testAddNewRemoteListsRemote [ self assert: (self repository remotes includes: remote). ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testAddTwoRemotesWithSameNameRaiseError [ | remote | @@ -46,7 +48,7 @@ IceBornRepositoryTest >> testAddTwoRemotesWithSameNameRaiseError [ self should: [ self repository addRemote: remote ] raise: IceRemoteAlreadyExistsError ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchAlreadyExistsErrorInformsExistingBranchName [ | branchName | @@ -59,7 +61,7 @@ IceBornRepositoryTest >> testBranchAlreadyExistsErrorInformsExistingBranchName [ do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchNotFoundErrorInformsNotFoundBranchName [ | branchName | @@ -70,7 +72,7 @@ IceBornRepositoryTest >> testBranchNotFoundErrorInformsNotFoundBranchName [ do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testBranchWithSlashesNotFoundErrorInformsNotFoundBranchName [ | branchName | @@ -81,7 +83,7 @@ IceBornRepositoryTest >> testBranchWithSlashesNotFoundErrorInformsNotFoundBranch do: [ :error | self assert: error branchName equals: branchName ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateExistingBranchRaisesError [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -89,7 +91,7 @@ IceBornRepositoryTest >> testCreateExistingBranchRaisesError [ self should: [self repository createBranch: 'master'] raise: IceBranchAlreadyExists ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testCreateExistingTagRaisesError [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -98,7 +100,7 @@ IceBornRepositoryTest >> testCreateExistingTagRaisesError [ self should: [self repository createTag: 'v1.0'] raise: IceTagAlreadyExists ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateNewBranchSwitchesToBranch [ | createdBranch | @@ -106,7 +108,7 @@ IceBornRepositoryTest >> testCreateNewBranchSwitchesToBranch [ self assert: self repository head equals: createdBranch ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testCreateNewBranchWithSlashesSwitchesToBranch [ | createdBranch | @@ -114,7 +116,7 @@ IceBornRepositoryTest >> testCreateNewBranchWithSlashesSwitchesToBranch [ self assert: self repository head equals: createdBranch ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testDeleteRepositoryDeletesLocation [ "Test valid only for git backend. Other backends may not have location" @@ -126,7 +128,7 @@ IceBornRepositoryTest >> testDeleteRepositoryDeletesLocation [ self deny: self repository location exists. ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testDeleteTagDoesNotListListsDeletedTag [ | tagName | @@ -139,7 +141,7 @@ IceBornRepositoryTest >> testDeleteTagDoesNotListListsDeletedTag [ self assert: self repository tags isEmpty ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsExistingBranches [ | branches | @@ -148,7 +150,7 @@ IceBornRepositoryTest >> testListBranchesListsExistingBranches [ self assert: branches first name equals: 'master' ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsNewBranch [ | branches branchName | @@ -164,7 +166,7 @@ IceBornRepositoryTest >> testListBranchesListsNewBranch [ ifNone: [ self fail ] ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testListBranchesListsNewBranchWithSlashes [ | branches branchName | @@ -180,7 +182,7 @@ IceBornRepositoryTest >> testListBranchesListsNewBranchWithSlashes [ ifNone: [ self fail ] ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsListsNewTag [ | tags tagName | @@ -196,7 +198,7 @@ IceBornRepositoryTest >> testListTagsListsNewTag [ ifNone: [ self fail ] ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsOfACommitWithNoTagsReturnsEmptyCollection [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -204,7 +206,7 @@ IceBornRepositoryTest >> testListTagsOfACommitWithNoTagsReturnsEmptyCollection [ self assert: self repository headCommit tags isEmpty ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testListTagsOfACommitWithTagsReturnsTagCollection [ self repository head isUnbornBranch ifTrue: [ ^ self skip ]. @@ -213,7 +215,7 @@ IceBornRepositoryTest >> testListTagsOfACommitWithTagsReturnsTagCollection [ self assert: self repository headCommit tags first name equals: 'test' ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testNewBranchReferencesCurrentCommitAtBranchTime [ | commitAtBranchTime createdBranch | @@ -222,7 +224,7 @@ IceBornRepositoryTest >> testNewBranchReferencesCurrentCommitAtBranchTime [ self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testNewBranchWithSlashReferencesCurrentCommitAtBranchTime [ | commitAtBranchTime createdBranch | @@ -231,13 +233,13 @@ IceBornRepositoryTest >> testNewBranchWithSlashReferencesCurrentCommitAtBranchTi self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testNewRepositoryHasNoRemotes [ self assert: self repository remotes isEmpty ] -{ #category : #'tests-remotes' } +{ #category : 'tests-remotes' } IceBornRepositoryTest >> testRemoteAlreadyExistsErrorReferencesExistingRemote [ | remote remoteName | @@ -252,7 +254,7 @@ IceBornRepositoryTest >> testRemoteAlreadyExistsErrorReferencesExistingRemote [ do: [ :error | self assert: error remoteName equals: remoteName ] ] -{ #category : #'tests-project' } +{ #category : 'tests-project' } IceBornRepositoryTest >> testRepositoryHasProjectFile [ fixture factory isGit ifFalse: [ ^ self skip ]. @@ -261,7 +263,7 @@ IceBornRepositoryTest >> testRepositoryHasProjectFile [ self assert: (self repository location / '.project') exists ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToExistingBranchNameChangesRepositoryHead [ | branchName newBranch masterBranch | @@ -278,7 +280,7 @@ IceBornRepositoryTest >> testSwitchToExistingBranchNameChangesRepositoryHead [ self assert: newBranch equals: self repository head. ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToExistingBranchNameWithSlashesChangesRepositoryHead [ | branchName newBranch masterBranch | @@ -295,19 +297,19 @@ IceBornRepositoryTest >> testSwitchToExistingBranchNameWithSlashesChangesReposit self assert: newBranch equals: self repository head. ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToUnexistingBranchRaisesError [ self should: [self repository switchToBranchNamed: 'nonexisting'] raise: IceBranchNotFound ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceBornRepositoryTest >> testSwitchToUnexistingBranchWithSlashesRaisesError [ self should: [self repository switchToBranchNamed: 'feature/nonexisting'] raise: IceBranchNotFound ] -{ #category : #'tests-tags' } +{ #category : 'tests-tags' } IceBornRepositoryTest >> testTagAlreadyExistsErrorInformsExistingTagName [ | tagName | diff --git a/Iceberg-Tests/IceCherryPickBrowserTest.class.st b/Iceberg-Tests/IceCherryPickBrowserTest.class.st index 0a8da366c2..fcf654b9fa 100644 --- a/Iceberg-Tests/IceCherryPickBrowserTest.class.st +++ b/Iceberg-Tests/IceCherryPickBrowserTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCherryPickBrowserTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickBrowserTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceCherryPickBrowserTest >> testWindowOnMethodConflict [ | commitToCherryPick presenter | diff --git a/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st b/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st index 86cf8a48da..4ee15245c0 100644 --- a/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st +++ b/Iceberg-Tests/IceCherryPickingInitialDependencies.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCherryPickingInitialDependencies, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickingInitialDependencies', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceCherryPickingInitialDependencies >> testAddClassWithMethod [ | commitToCherryPick initialDiff commonAncestor extendedDiff receiverDiff cherrypicker | self repository createBranch: 'b2'. @@ -45,7 +47,7 @@ IceCherryPickingInitialDependencies >> testAddClassWithMethod [ equals: 1. ] -{ #category : #tests } +{ #category : 'tests' } IceCherryPickingInitialDependencies >> testRemoveClassWithMethod [ | commitToCherryPick initialDiff commonAncestor extendedDiff receiverDiff cherrypicker | diff --git a/Iceberg-Tests/IceCherryPickingTest.class.st b/Iceberg-Tests/IceCherryPickingTest.class.st index 3b99e430b6..24a1c8ef29 100644 --- a/Iceberg-Tests/IceCherryPickingTest.class.st +++ b/Iceberg-Tests/IceCherryPickingTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceCherryPickingTest, - #superclass : #IceAbstractTestCase, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceCherryPickingTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #testing } +{ #category : 'testing' } IceCherryPickingTest class >> isAbstract [ ^ self name = #IceCherryPickingTest ] -{ #category : #running } +{ #category : 'running' } IceCherryPickingTest >> newFixture [ ^ IceBasicCherryPickingFixture inGit diff --git a/Iceberg-Tests/IceClassesCherryPickingTest.class.st b/Iceberg-Tests/IceClassesCherryPickingTest.class.st index 43ae0f7d63..3d880b95fe 100644 --- a/Iceberg-Tests/IceClassesCherryPickingTest.class.st +++ b/Iceberg-Tests/IceClassesCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceClassesCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceClassesCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassDependingInATrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -23,8 +25,8 @@ IceClassesCherryPickingTest >> testAddClassDependingInATrait [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait' for: composition. class traitComposition: composition. @@ -52,7 +54,7 @@ IceClassesCherryPickingTest >> testAddClassDependingInATrait [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -69,8 +71,8 @@ IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait - {#hello. #world}' for: composition. @@ -102,7 +104,7 @@ IceClassesCherryPickingTest >> testAddClassDependingInATraitWithComposition [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassSideMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -134,7 +136,7 @@ IceClassesCherryPickingTest >> testAddClassSideMethodInExistingClass [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassUsingASharedPool [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -186,7 +188,7 @@ IceClassesCherryPickingTest >> testAddClassUsingASharedPool [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithMethod [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -215,7 +217,7 @@ IceClassesCherryPickingTest >> testAddClassWithMethod [ assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithSuperclassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -263,7 +265,7 @@ IceClassesCherryPickingTest >> testAddClassWithSuperclassAsDependency [ isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testAddClassWithoutDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -292,7 +294,7 @@ IceClassesCherryPickingTest >> testAddClassWithoutDependencies [ definition isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testModifyClassWithoutDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -323,7 +325,7 @@ IceClassesCherryPickingTest >> testModifyClassWithoutDependencies [ definition isClassDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testRemoveClassWithSubclasses [ | commitToCherryPick diff mergeTree | @@ -360,7 +362,7 @@ IceClassesCherryPickingTest >> testRemoveClassWithSubclasses [ (diff / self packageName1 / 'TestSubclass') value isRemoval . ] -{ #category : #tests } +{ #category : 'tests' } IceClassesCherryPickingTest >> testRemoveClassWithSubclassesAndIntermediarySubclass [ | commitToCherryPick diff mergeTree | self repository workingCopy diff --git a/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st b/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st index efe7321fa1..c6a56eafae 100644 --- a/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceCleanWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceCleanWorkingCopyFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceCleanWorkingCopyFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceCleanWorkingCopyFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceCleanWorkingCopyTest.class.st index d7c635d903..5678308dcb 100644 --- a/Iceberg-Tests/IceCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceCleanWorkingCopyTest.class.st @@ -1,41 +1,43 @@ Class { - #name : #IceCleanWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceCleanWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceCleanWorkingCopyTest class >> isAbstract [ ^ self == IceCleanWorkingCopyTest ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> commit1 [ ^ self currentCommitOfPackage: self packageName1 ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> commit2 [ ^ self currentCommitOfPackage: self packageName2 ] -{ #category : #helpers } +{ #category : 'helpers' } IceCleanWorkingCopyTest >> currentCommitOfPackage: aPackageName [ ^ (self repository workingCopy packageNamed: aPackageName) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyHasSingleCommit [ self repository workingCopy initializePackagesFromRepository. self assert: self repository workingCopy hasSingleCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenNewPackageIsCreated [ self repository workingCopy initializePackagesFromRepository. @@ -48,7 +50,7 @@ IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenNewPackageIsC self shouldnt: [self repository workingCopy validateCanCommit] raise: IceWorkingCopyDesyncronized ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenPackageIsNotLoaded [ (self repository packageNamed: self packageName1) unload. @@ -65,14 +67,14 @@ IceCleanWorkingCopyTest >> testWorkingCopyIsInSingleCommitStateWhenPackageIsNotL self shouldnt: [self repository workingCopy validateCanCommit] raise: IceWorkingCopyDesyncronized ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopyIsNotUnknownCommot [ self repository workingCopy initializePackagesFromRepository. self deny: self repository workingCopy hasUnknownCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage1Commit [ self repository workingCopy initializePackagesFromRepository. @@ -81,7 +83,7 @@ IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage1Commit [ equals: (self repository packageNamed: self packageName1) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage2Commit [ self repository workingCopy initializePackagesFromRepository. @@ -90,14 +92,14 @@ IceCleanWorkingCopyTest >> testWorkingCopySingleCommitIsPackage2Commit [ equals: (self repository packageNamed: self packageName2) currentCommit ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingStateIncludesPackage1CurrentCommit [ self repository workingCopy initializePackagesFromRepository. self assert: (self repository workingCopy workingCopyState includesCommit: self commit1). ] -{ #category : #tests } +{ #category : 'tests' } IceCleanWorkingCopyTest >> testWorkingStateIncludesPackage2CurrentCommit [ self repository workingCopy initializePackagesFromRepository. diff --git a/Iceberg-Tests/IceClonedFromRemoteFixture.class.st b/Iceberg-Tests/IceClonedFromRemoteFixture.class.st index 38c8159f4c..3268c450cc 100644 --- a/Iceberg-Tests/IceClonedFromRemoteFixture.class.st +++ b/Iceberg-Tests/IceClonedFromRemoteFixture.class.st @@ -1,47 +1,49 @@ Class { - #name : #IceClonedFromRemoteFixture, - #superclass : #IceNotYetClonedRepositoryFixture, + #name : 'IceClonedFromRemoteFixture', + #superclass : 'IceNotYetClonedRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName', 'repository', 'pushRepository' ], - #category : #'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> pushRepository [ ^ pushRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceClonedFromRemoteFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceClonedFromRemoteFixture >> repository [ ^ repository ] -{ #category : #running } +{ #category : 'running' } IceClonedFromRemoteFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. @@ -79,7 +81,7 @@ IceClonedFromRemoteFixture >> setUp [ repository commitWithMessage: 'Initial local commit'." ] -{ #category : #running } +{ #category : 'running' } IceClonedFromRemoteFixture >> tearDown [ factory tearDownWithRepository: repository. factory tearDownWithRepository: remoteRepository. diff --git a/Iceberg-Tests/IceConflictsCherryPickingTest.class.st b/Iceberg-Tests/IceConflictsCherryPickingTest.class.st index c74c72ed69..f16d06239b 100644 --- a/Iceberg-Tests/IceConflictsCherryPickingTest.class.st +++ b/Iceberg-Tests/IceConflictsCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceConflictsCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceConflictsCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceConflictsCherryPickingTest >> testAddPackageConflict [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceConflictsCherryPickingTest >> testAddPackageConflict [ deny: (mergeTree / self packageName2) value isConflict ] -{ #category : #tests } +{ #category : 'tests' } IceConflictsCherryPickingTest >> testMethodModificationConflict [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceCredentialStoreTest.class.st b/Iceberg-Tests/IceCredentialStoreTest.class.st index 23290389f0..b6ccb11423 100644 --- a/Iceberg-Tests/IceCredentialStoreTest.class.st +++ b/Iceberg-Tests/IceCredentialStoreTest.class.st @@ -1,21 +1,23 @@ Class { - #name : #IceCredentialStoreTest, - #superclass : #TestCase, + #name : 'IceCredentialStoreTest', + #superclass : 'TestCase', #instVars : [ 'store', 'file', 'dir' ], - #category : #'Iceberg-Tests-Security' + #category : 'Iceberg-Tests-Security', + #package : 'Iceberg-Tests', + #tag : 'Security' } -{ #category : #running } +{ #category : 'running' } IceCredentialStoreTest >> setUp [ super setUp. store := IceCredentialStore new ] -{ #category : #running } +{ #category : 'running' } IceCredentialStoreTest >> tearDown [ file ifNotNil: [ file ensureDelete ]. dir ifNotNil: [ dir ensureDeleteAll ]. @@ -23,7 +25,7 @@ IceCredentialStoreTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testEmptySShStore [ | cred | @@ -34,7 +36,7 @@ IceCredentialStoreTest >> testEmptySShStore [ self assert: cred privateKey equals: IceSshCredentials defaultPrivateKey. ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testEmptyStore [ | cred | @@ -42,7 +44,7 @@ IceCredentialStoreTest >> testEmptyStore [ self deny: cred isPresent. ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testLoadNonExistingFile [ | newStore cred | @@ -60,7 +62,7 @@ IceCredentialStoreTest >> testLoadNonExistingFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testLookupHostname [ | cred orig | @@ -78,7 +80,7 @@ IceCredentialStoreTest >> testLookupHostname [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testSaveAndLoadEmptyStore [ | newStore cred | @@ -98,7 +100,7 @@ IceCredentialStoreTest >> testSaveAndLoadEmptyStore [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreInNonExistingDirectory [ | newStore cred otherStore | @@ -130,7 +132,7 @@ IceCredentialStoreTest >> testStoreInNonExistingDirectory [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreInNonExistingFile [ | newStore cred otherStore | @@ -159,7 +161,7 @@ IceCredentialStoreTest >> testStoreInNonExistingFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testStorePlainText [ | cred orig | @@ -177,7 +179,7 @@ IceCredentialStoreTest >> testStorePlainText [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStorePlainTextSavingInFile [ | cred orig newStore | @@ -203,7 +205,7 @@ IceCredentialStoreTest >> testStorePlainTextSavingInFile [ ] -{ #category : #tests } +{ #category : 'tests' } IceCredentialStoreTest >> testStoreSSH [ | cred orig | @@ -224,7 +226,7 @@ IceCredentialStoreTest >> testStoreSSH [ self assert: cred keyPassphrase equals: 'aPassword'. ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreToken [ | original | @@ -243,7 +245,7 @@ IceCredentialStoreTest >> testStoreToken [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> testStoreTokenSavingInFile [ | original newStore | @@ -270,13 +272,13 @@ IceCredentialStoreTest >> testStoreTokenSavingInFile [ ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> tokenForTesting [ ^ 'e72e16c7e42f292c6912e7710c838347ae178b4a' ] -{ #category : #'tests - store' } +{ #category : 'tests - store' } IceCredentialStoreTest >> usernameForTesting [ ^ 'aUsername' diff --git a/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st b/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st index 19730594ba..80f68d238b 100644 --- a/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceDetachedWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDetachedWorkingCopyFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceDetachedWorkingCopyFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceDetachedWorkingCopyFixture >> setUp [ | head | diff --git a/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st index efc79d6b90..0cc36b4c68 100644 --- a/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceDetachedWorkingCopyTest.class.st @@ -1,36 +1,38 @@ Class { - #name : #IceDetachedWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceDetachedWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceDetachedWorkingCopyTest class >> isAbstract [ ^ self == IceDetachedWorkingCopyTest ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testIsDetached [ self assert: self repository workingCopy isDetached ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testPackageIsNotDirty [ "There is no difference between the code in the image and the checkout'd code" self deny: self repository workingCopy isModified ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDetached [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self deny: self repository workingCopy isDetached. ] -{ #category : #tests } +{ #category : 'tests' } IceDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDirty [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. diff --git a/Iceberg-Tests/IceDiffTests.class.st b/Iceberg-Tests/IceDiffTests.class.st index 7f95c49c78..036f623b6b 100644 --- a/Iceberg-Tests/IceDiffTests.class.st +++ b/Iceberg-Tests/IceDiffTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDiffTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceDiffTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfEmptyTreesGivesEmptyDiff [ | left right diff | @@ -16,7 +18,7 @@ IceDiffTests >> testSimmetricDifferenceOfEmptyTreesGivesEmptyDiff [ self deny: diff notEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileAdditionCreatesAdditionOperation [ | left right diff | @@ -29,7 +31,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileAdditionCreatesAdditionOperation [ self assert: (diff / 'Readme.md') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationCreatesModificationOperation [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef | @@ -54,7 +56,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationCreatesModificationOper self assert: (diff / 'Readme.md') value rightDefinition contents equals: 'right'. ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesModificationOnDirectory [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef | @@ -77,7 +79,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesM self assert: (diff / 'src') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesModificationOperationOnFile [ | left right diff leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef leftSrc rightSrc | @@ -104,7 +106,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileModificationWithinDirectoryCreatesM self assert: (diff / 'src' / 'Readme.md') value rightDefinition contents equals: 'right'. ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testSimmetricDifferenceOfFileRemovalCreatesRemovalOperation [ | left right diff | @@ -117,7 +119,7 @@ IceDiffTests >> testSimmetricDifferenceOfFileRemovalCreatesRemovalOperation [ self assert: (diff / 'Readme.md') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceDiffTests >> testTwoSimmetricDifferencesShouldGiveTheSameResult [ | left right leftMemoryFileSystem leftFileRef rightMemoryFileSystem rightFileRef diff1 diff2 leftSrc rightSrc | diff --git a/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st b/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st index bf743e1d5e..1dbb526ebc 100644 --- a/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st +++ b/Iceberg-Tests/IceDirtyDetachedWorkingCopyFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceDirtyDetachedWorkingCopyFixture, - #superclass : #IceDetachedWorkingCopyFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceDirtyDetachedWorkingCopyFixture', + #superclass : 'IceDetachedWorkingCopyFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceDirtyDetachedWorkingCopyFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st index a5f2a215e9..fcd32eddf9 100644 --- a/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceDirtyDetachedWorkingCopyTest.class.st @@ -1,43 +1,45 @@ Class { - #name : #IceDirtyDetachedWorkingCopyTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceDirtyDetachedWorkingCopyTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceDirtyDetachedWorkingCopyTest class >> isAbstract [ ^ self == IceDirtyDetachedWorkingCopyTest ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testIsDetached [ self assert: self repository workingCopy isDetached ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testPackageIsDirty [ "There are uncommited changes" self assert: self repository workingCopy isModified ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testReattachInNewBranchIsStillDirty [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self assert: self repository workingCopy isModified. ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testReattachInNewBranchMakesNoMoreDetached [ self repository createBranch: 'test' inCommit: self repository workingCopy referenceCommit. self deny: self repository workingCopy isDetached. ] -{ #category : #tests } +{ #category : 'tests' } IceDirtyDetachedWorkingCopyTest >> testWorkingCopyDiffIsAgainstReferenceCommitAndNotHead [ self assert: self repository workingCopyDiff targetVersion equals: self repository workingCopy referenceCommit. diff --git a/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st b/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st index 275bbae6b1..7aa8ce38a9 100644 --- a/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st +++ b/Iceberg-Tests/IceExtensionMethodCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceExtensionMethodCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceExtensionMethodCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingClass [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -65,7 +67,7 @@ IceExtensionMethodCherryPickingTest >> testAddExtensionMethodInExistingTrait [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -96,7 +98,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass assert: (diff / self packageName2 / 'TestClass' / 'm2') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClasses [ | commitToCherryPick diff mergeTree | @@ -137,7 +139,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInExistingClass assert: (diff / self packageName2 / 'TestClass2' / 'm2') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInNonExistingClasses [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -188,7 +190,7 @@ IceExtensionMethodCherryPickingTest >> testAddTwoExtensionMethodsInNonExistingCl assert: (diff / self packageName2 / 'TestClass2' / 'm2') value isAddition. ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testModifyExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -223,7 +225,7 @@ IceExtensionMethodCherryPickingTest >> testModifyExtensionMethodInExistingClass assert: (diff / self packageName2 / 'TestClass' / 'm1') value isModification. ] -{ #category : #tests } +{ #category : 'tests' } IceExtensionMethodCherryPickingTest >> testRemoveExtensionMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. diff --git a/Iceberg-Tests/IceFileDefinitionTests.class.st b/Iceberg-Tests/IceFileDefinitionTests.class.st index a2d6690a41..a4fcf4b1c6 100644 --- a/Iceberg-Tests/IceFileDefinitionTests.class.st +++ b/Iceberg-Tests/IceFileDefinitionTests.class.st @@ -1,23 +1,25 @@ Class { - #name : #IceFileDefinitionTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceFileDefinitionTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceFileDefinitionTests class >> bytesWithIlegalLeadingBytes [ ^ #[102 111 111 160 102 111 111] ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> hexDumped: bytesWithIlegalLeadingBytes [ ^ String streamContents: [ :str | bytesWithIlegalLeadingBytes hexDumpOn: str max: Float infinity ]. ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfBinaryTextFileDefinitionInUtf8IsHexDumped [ | definition hexDumped | @@ -31,7 +33,7 @@ IceFileDefinitionTests >> testContentsOfBinaryTextFileDefinitionInUtf8IsHexDumpe self assert: definition contents equals: hexDumped. ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf16IsHexDumped [ | text definition bytes | @@ -46,7 +48,7 @@ IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf16IsHexDumped [ self assert: definition contents equals: (self hexDumped: bytes). ] -{ #category : #tests } +{ #category : 'tests' } IceFileDefinitionTests >> testContentsOfTextFileDefinitionInUtf8IsDecoded [ | text definition | diff --git a/Iceberg-Tests/IceFileRemoteTest.class.st b/Iceberg-Tests/IceFileRemoteTest.class.st index 7dc03d5fc2..f385cd7b49 100644 --- a/Iceberg-Tests/IceFileRemoteTest.class.st +++ b/Iceberg-Tests/IceFileRemoteTest.class.st @@ -2,12 +2,14 @@ An IceFileRemoteTest is a test class for testing the behavior of IceFileRemote " Class { - #name : #IceFileRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceFileRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #tests } +{ #category : 'tests' } IceFileRemoteTest >> testCanHandleFileUrl [ | url | self assert: (IceGitFileRemote canHandleUrl: 'file:///Users/pharo/some-repo-name'). @@ -22,7 +24,7 @@ IceFileRemoteTest >> testCanHandleFileUrl [ ifFalse: [ '/Users/pharo/some-repo-name' ]). ] -{ #category : #tests } +{ #category : 'tests' } IceFileRemoteTest >> testCanHandleUnixPath [ "git clone existing-repo tmp-repo produces a url = /..../existing-repo remote" | url | diff --git a/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st index 3a19db3937..b676a0aa26 100644 --- a/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitCleanWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitCleanWorkingCopyTest, - #superclass : #IceCleanWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitCleanWorkingCopyTest', + #superclass : 'IceCleanWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCleanWorkingCopyTest >> newFixture [ ^ IceCleanWorkingCopyFixture inGit ] diff --git a/Iceberg-Tests/IceGitCloneTest.class.st b/Iceberg-Tests/IceGitCloneTest.class.st index 4b8caa1da5..567026f166 100644 --- a/Iceberg-Tests/IceGitCloneTest.class.st +++ b/Iceberg-Tests/IceGitCloneTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceGitCloneTest, - #superclass : #IceAbstractTestCase, + #name : 'IceGitCloneTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'oldProviderType' ], - #category : #'Iceberg-Tests-Git' + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCloneTest >> newFixture [ ^ IceNotYetClonedRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> setUp [ super setUp. @@ -21,14 +23,14 @@ IceGitCloneTest >> setUp [ IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> tearDown [ IceCredentialsProvider providerType: oldProviderType. super tearDown. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testCloneErrorRemovesLocation [ fixture ensureRemoteRepository. @@ -41,7 +43,7 @@ IceGitCloneTest >> testCloneErrorRemovesLocation [ self deny: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testClonedRepositoryIsGitClone [ fixture ensureRemoteRepository. @@ -54,7 +56,7 @@ IceGitCloneTest >> testClonedRepositoryIsGitClone [ self assert: (fixture location / '.git') exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationAlreadyExistsThrowsException [ | action | @@ -70,13 +72,13 @@ IceGitCloneTest >> testLocationAlreadyExistsThrowsException [ self should: [ action execute ] raise: IceCloneLocationAlreadyExists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationDoesNotInitiallyExist [ self deny: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testLocationExistsAfterClone [ fixture ensureRemoteRepository. @@ -89,7 +91,7 @@ IceGitCloneTest >> testLocationExistsAfterClone [ self assert: fixture location exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitCloneTest >> testRemoteDoesNotExistsShouldThrowException [ self isCI ifTrue: [ self skip ]. diff --git a/Iceberg-Tests/IceGitCommand.class.st b/Iceberg-Tests/IceGitCommand.class.st index be17760405..4e73aefd1a 100644 --- a/Iceberg-Tests/IceGitCommand.class.st +++ b/Iceberg-Tests/IceGitCommand.class.st @@ -31,22 +31,23 @@ The latter is useful for simplifying the specification of optional parameters, f " Class { - #name : #IceGitCommand, - #superclass : #Object, + #name : 'IceGitCommand', + #superclass : 'Object', #instVars : [ 'directory', 'command' ], - #category : #'Iceberg-Tests' + #category : 'Iceberg-Tests', + #package : 'Iceberg-Tests' } -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand class >> gitCommand [ ^ Smalltalk os isWindows ifTrue: [ 'git' ] ifFalse:[ '/usr/bin/git' ] ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> in: directory execute: commandDescription [ "See class comments for the specification of possible command descriptions" ^ self new @@ -56,7 +57,7 @@ IceGitCommand class >> in: directory execute: commandDescription [ ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> preprocess: commandDescription [ commandDescription ifNil: [ ^ {} ]. commandDescription isString ifTrue: [ @@ -69,37 +70,37 @@ IceGitCommand class >> preprocess: commandDescription [ self error: ('Unknown argument type in git command: {1}' format: commandDescription) ] -{ #category : #execute } +{ #category : 'execute' } IceGitCommand class >> preprocessString: commandDescription [ ^ (commandDescription withoutPrefix: '"') withoutSuffix: '"' ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> command [ ^ command ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> command: anObject [ command := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> directory [ ^ directory ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> directory: anObject [ directory := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceGitCommand >> gitCommand [ ^ self class gitCommand ] -{ #category : #running } +{ #category : 'running' } IceGitCommand >> run [ UIManager default informUserDuring: [ :bar | @@ -108,7 +109,7 @@ IceGitCommand >> run [ ] -{ #category : #running } +{ #category : 'running' } IceGitCommand >> runLibCGitCommand [ | exitCode aCommandString | diff --git a/Iceberg-Tests/IceGitCommitMessageTest.class.st b/Iceberg-Tests/IceGitCommitMessageTest.class.st index a8a39dd12b..6c3fd745be 100644 --- a/Iceberg-Tests/IceGitCommitMessageTest.class.st +++ b/Iceberg-Tests/IceGitCommitMessageTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitCommitMessageTest, - #superclass : #IceAbstractTestCase, - #category : #'Iceberg-Tests-Git' + #name : 'IceGitCommitMessageTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitCommitMessageTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitEmptyString [ self repository commitWithMessage: ''. @@ -17,14 +19,14 @@ IceGitCommitMessageTest >> testCommitEmptyString [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitNullString [ self should: [self repository commitWithMessage: nil] raise: Error. ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWideString [ | msg | msg := ZnUTF8Encoder new decodeBytes: (ByteArray readHexFrom: 'e38182e38184e38186'). "Japanese vowels a,i, and u - 'あいう'" @@ -33,7 +35,7 @@ IceGitCommitMessageTest >> testCommitWideString [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWithEndingPesosSign [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | @@ -43,7 +45,7 @@ IceGitCommitMessageTest >> testCommitWithEndingPesosSign [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testCommitWithoutPesosSign [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | @@ -53,7 +55,7 @@ IceGitCommitMessageTest >> testCommitWithoutPesosSign [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitCommitMessageTest >> testDifferentSizes [ "We used to have a problem that in some messages (depending of padding) the $ was added at the end" | msg | diff --git a/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st index 1a5b386afc..e51f533659 100644 --- a/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitDetachedWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitDetachedWorkingCopyTest, - #superclass : #IceDetachedWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitDetachedWorkingCopyTest', + #superclass : 'IceDetachedWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitDetachedWorkingCopyTest >> newFixture [ ^ IceDetachedWorkingCopyFixture inGit diff --git a/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st b/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st index 70346261fa..bf2e677114 100644 --- a/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceGitDirtyDetachedWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitDirtyDetachedWorkingCopyTest, - #superclass : #IceDirtyDetachedWorkingCopyTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitDirtyDetachedWorkingCopyTest', + #superclass : 'IceDirtyDetachedWorkingCopyTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitDirtyDetachedWorkingCopyTest >> newFixture [ ^ IceDirtyDetachedWorkingCopyFixture inGit diff --git a/Iceberg-Tests/IceGitFileFormatTest.class.st b/Iceberg-Tests/IceGitFileFormatTest.class.st index 311c313664..2a54e25fd6 100644 --- a/Iceberg-Tests/IceGitFileFormatTest.class.st +++ b/Iceberg-Tests/IceGitFileFormatTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitFileFormatTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitFileFormatTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitFileFormatTest >> newFixture [ ^ IceMultiplePackageFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeFilesCalledAsPackages [ | fileRef | @@ -28,7 +30,7 @@ IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeFilesCalledAsPackages self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { #FileTreePackage } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeTonelPackages [ self repository project fileFormat: IceLibgitFiletreeWriter. @@ -39,7 +41,7 @@ IceGitFileFormatTest >> testRepositoryInFileTreeDoesNotSeeTonelPackages [ self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { #FileTreePackage } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryWithFilesInUppercaseAreNotRecognizedAsPackages [ | fileRef | @@ -53,7 +55,7 @@ IceGitFileFormatTest >> testRepositoryWithFilesInUppercaseAreNotRecognizedAsPack self assertCollection: (self repository workingCopy packages collect: #name) hasSameElements: { self packageName1 asSymbol. self packageName2 asSymbol } ] -{ #category : #tests } +{ #category : 'tests' } IceGitFileFormatTest >> testRepositoryWithFiletreePackageNotRecognizedAsPackages [ self repository project fileFormat: IceLibgitFiletreeWriter. diff --git a/Iceberg-Tests/IceGitMergeTest.class.st b/Iceberg-Tests/IceGitMergeTest.class.st index 6ee068d5ba..b0e1239310 100644 --- a/Iceberg-Tests/IceGitMergeTest.class.st +++ b/Iceberg-Tests/IceGitMergeTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitMergeTest, - #superclass : #IceMergeTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitMergeTest', + #superclass : 'IceMergeTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitMergeTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testConflictFile [ | fileRef branchMaster branchRemove | @@ -33,7 +35,7 @@ IceGitMergeTest >> testConflictFile [ self should: [ branchRemove merge ] raise: IceMergeResolutionRequest ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeBinaryFileAdditionCreatesFileInWorkingCopy [ | fileRef branchMaster newBranch | @@ -59,7 +61,7 @@ IceGitMergeTest >> testMergeBinaryFileAdditionCreatesFileInWorkingCopy [ self assert: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeOfInnessaryMergeCommit [ | c1 c2 c3 c4 i1 fileRef| @@ -135,7 +137,7 @@ IceGitMergeTest >> testMergeOfInnessaryMergeCommit [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeTextFileAdditionCreatesFileInWorkingCopy [ | fileRef branchMaster newBranch | @@ -160,7 +162,7 @@ IceGitMergeTest >> testMergeTextFileAdditionCreatesFileInWorkingCopy [ self assert: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedOnOneBranchButNotOtherCausesConflict [ | fileRef otherFileRef branchMaster branchRemove | @@ -187,7 +189,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedOnOneBranchButNotOtherCausesConf self should: [ branchRemove merge ] raise: IceMergeResolutionRequest ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedWithFastForward [ | fileRef branchMaster branchRemove | @@ -211,7 +213,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedWithFastForward [ self deny: fileRef parent exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithDirectoryRemovedWithMerge [ | fileRef otherFileRef branchMaster branchRemove | @@ -240,7 +242,7 @@ IceGitMergeTest >> testMergeWithDirectoryRemovedWithMerge [ self deny: fileRef parent exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithEmptyIncomingCommitCreatesMergeCommit [ | incomingBranch | @@ -262,7 +264,7 @@ IceGitMergeTest >> testMergeWithEmptyIncomingCommitCreatesMergeCommit [ self assert: self repository workingCopy referenceCommit comment equals: 'Merge ' , incomingBranch commit id ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithFileRemovedWithFastForward [ | fileRef branchMaster branchRemove | @@ -285,7 +287,7 @@ IceGitMergeTest >> testMergeWithFileRemovedWithFastForward [ self deny: fileRef exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithFileRemovedWithMerge [ | fileRef otherFileRef branchMaster branchRemove | @@ -313,7 +315,7 @@ IceGitMergeTest >> testMergeWithFileRemovedWithMerge [ self deny: fileRef exists. ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testMergeWithMissingProjectFile [ | incomingBranch fileRef | @@ -325,7 +327,7 @@ IceGitMergeTest >> testMergeWithMissingProjectFile [ fileRef := self repository location / 'test1.txt'. fileRef writeStreamDo: [ :stream | stream << 'test1' ]. self repository index addPath: (fileRef relativeTo: self repository location). - self repository commitWithMessage: 'commiting something'. + self repository commitWithMessage: 'committing something'. incomingBranch := self repository branch. self repository checkoutBranch: 'master'. @@ -340,7 +342,7 @@ IceGitMergeTest >> testMergeWithMissingProjectFile [ self assert: self repository workingCopy referenceCommit comment equals: 'Merge ' , incomingBranch commit id ] -{ #category : #tests } +{ #category : 'tests' } IceGitMergeTest >> testResolveConflictInFileCreatesCorrectMergeCommit [ | fileRef branchMaster conflictingCommit baseCommit | diff --git a/Iceberg-Tests/IceGitPropertiesFileTest.class.st b/Iceberg-Tests/IceGitPropertiesFileTest.class.st index ba83484cb3..39de743538 100644 --- a/Iceberg-Tests/IceGitPropertiesFileTest.class.st +++ b/Iceberg-Tests/IceGitPropertiesFileTest.class.st @@ -1,15 +1,17 @@ Class { - #name : #IceGitPropertiesFileTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitPropertiesFileTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitPropertiesFileTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testCommitSavesPropertiesFile [ self repository properties at: #bla put: #blo. @@ -18,7 +20,7 @@ IceGitPropertiesFileTest >> testCommitSavesPropertiesFile [ self assert: (self repository head properties at: #bla) equals: #blo ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testPropertiesFileIsStoredInMemory [ | ston | @@ -29,7 +31,7 @@ IceGitPropertiesFileTest >> testPropertiesFileIsStoredInMemory [ self assert: (self repository properties at: #bla) equals: #blo ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfDiskIsDifferent [ self repository properties at: #bla put: #old. @@ -44,7 +46,7 @@ IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfDiskIsDiffer self assert: (self repository head properties at: #bla) equals: #old ] -{ #category : #tests } +{ #category : 'tests' } IceGitPropertiesFileTest >> testRecoverPropertiesFromOldCommitEvenIfHeadIsDifferent [ self repository properties at: #bla put: #old. diff --git a/Iceberg-Tests/IceGitRemoteTest.class.st b/Iceberg-Tests/IceGitRemoteTest.class.st index 44dc1891f6..50912e21cb 100644 --- a/Iceberg-Tests/IceGitRemoteTest.class.st +++ b/Iceberg-Tests/IceGitRemoteTest.class.st @@ -1,86 +1,88 @@ Class { - #name : #IceGitRemoteTest, - #superclass : #TestCase, - #category : #'Iceberg-Tests-Core-Remotes' + #name : 'IceGitRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleGithubImplicitScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'git@github.com:npasserini/iceberg.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleGithubSSHUrl [ self assert: (IceGitSshRemote canHandleUrl: 'git://github.com/pharo-vcs/iceberg.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleGithubSSHUrlWithExplicitPort [ self assert: (IceGitSshRemote canHandleUrl: 'git://github.com:8372/pharo-vcs/iceberg'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleGithubScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://git@github.com/npasserini/iceberg.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleNonGithubImplicitScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git') ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testCanHandleNonGithubSSHUrl [ self assert: (IceGitSshRemote canHandleUrl: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testCanHandleNonGithubScpUrl [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://git@git.fremont.lamrc.net/diffuse/300/rdebug.git'). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url path equals: #( ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'git@github.com:pharo-vcs/iceberg.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubImplicitScpUrlShouldBeTransformableToHttps [ | remote | @@ -88,49 +90,49 @@ IceGitRemoteTest >> testGithubImplicitScpUrlShouldBeTransformableToHttps [ self assert: remote httpsUrl equals: 'https://github.com/npasserini/iceberg.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsFullUrlPath [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsOwner [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsPath [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url path equals: OrderedCollection new ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsPort [ | url | url := IceGitSshRemote new url: 'git://github.com:8372/pharo-vcs/iceberg.git'. self assert: url port equals: 8372 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlExtractsProjectName [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlHasDefaultPort [ | url | url := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. self assert: url port equals: 9418 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testGithubSSHUrlShouldBeTransformableToHttps [ | url | @@ -138,42 +140,42 @@ IceGitRemoteTest >> testGithubSSHUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://github.com/pharo-vcs/iceberg.git' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url projectPath equals: 'pharo-vcs/iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url owner equals: 'pharo-vcs'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url path asArray equals: #( ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url projectName equals: 'iceberg' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'ssh://git@github.com/pharo-vcs/iceberg.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testGithubScpUrlShouldBeTransformableToHttps [ | remote | @@ -181,7 +183,7 @@ IceGitRemoteTest >> testGithubScpUrlShouldBeTransformableToHttps [ self assert: remote httpsUrl equals: 'https://github.com/npasserini/iceberg.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testHTTPSRemoteEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitHttpsRemote new url: 'https://github.com/pharo-vcs/iceberg.git'. @@ -189,7 +191,7 @@ IceGitRemoteTest >> testHTTPSRemoteEqualsLocationThanSCPRemote [ self assert: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testHTTPSRemoteNotEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitHttpsRemote new url: 'https://github.com/pharo-vcs/iceberg.git'. @@ -197,42 +199,42 @@ IceGitRemoteTest >> testHTTPSRemoteNotEqualsLocationThanSCPRemote [ self deny: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url path equals: #( diffuse ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url projectName equals: 'rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'git@git.fremont.lamrc.net:diffuse/300/rdebug.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubImplicitScpUrlShouldBeTransformableToHttps [ | url | @@ -240,42 +242,42 @@ IceGitRemoteTest >> testNonGithubImplicitScpUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsFullUrlPath [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsOwner [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsPath [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url path asArray equals: #( diffuse ) ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlExtractsPort [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net:8372/diffuse/300/rdebug.git'. self assert: url port equals: 8372 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlHasDefaultPort [ | url | url := IceGitSshRemote new url: 'git://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url port equals: 9418 ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testNonGithubSSHUrlShouldBeTransformableToHttps [ | url | @@ -283,42 +285,42 @@ IceGitRemoteTest >> testNonGithubSSHUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsFullUrlPath [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectPath equals: 'diffuse/300/rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsOwner [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url owner equals: '300'. ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsPath [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url path asArray equals: #( diffuse ) ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlExtractsProjectName [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url projectName equals: 'rdebug' ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlHasDefaultPort [ | url | url := IceGitScpRemote new url: 'ssh://git.fremont.lamrc.net/diffuse/300/rdebug.git'. self assert: url port equals: 22 ] -{ #category : #'tests-scp' } +{ #category : 'tests-scp' } IceGitRemoteTest >> testNonGithubScpUrlShouldBeTransformableToHttps [ | url | @@ -326,7 +328,7 @@ IceGitRemoteTest >> testNonGithubScpUrlShouldBeTransformableToHttps [ self assert: url httpsUrl equals: 'https://git.fremont.lamrc.net/diffuse/300/rdebug.git' ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testSSHRemoteEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. @@ -334,7 +336,7 @@ IceGitRemoteTest >> testSSHRemoteEqualsLocationThanSCPRemote [ self assert: (sshremote referencesSameRemoteLocationAs: scpremote). ] -{ #category : #'tests-ssh' } +{ #category : 'tests-ssh' } IceGitRemoteTest >> testSSHRemoteNotEqualsLocationThanSCPRemote [ | sshremote scpremote | sshremote := IceGitSshRemote new url: 'git://github.com/pharo-vcs/iceberg.git'. diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st index ec4245a695..87422e91ab 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest, - #superclass : #IceGitRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest', + #superclass : 'IceGitRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteAndBranchWithSlashesTest >> newFixture [ ^ IceWithRemoteFixture inGit remoteBranchName: 'feature/master' diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st index 5a23100940..49e55c7c5e 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteAndMergeConflictTest >> newFixture [ ^ IceWithRemoteAndMergeConflictFixture inGit ] diff --git a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st index 4d81d5d0b4..6d122a2c2d 100644 --- a/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceGitRepositoryWithSingleRemoteTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitRepositoryWithSingleRemoteTest, - #superclass : #IceRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitRepositoryWithSingleRemoteTest', + #superclass : 'IceRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteTest >> newFixture [ ^ IceWithRemoteFixture inGit remoteBranchName: 'newBranch' ] -{ #category : #running } +{ #category : 'running' } IceGitRepositoryWithSingleRemoteTest >> testPushPushesTags [ "We can only push if the repository is bare" diff --git a/Iceberg-Tests/IceGitTestFactory.class.st b/Iceberg-Tests/IceGitTestFactory.class.st index bee23a4f7d..d7af8c424d 100644 --- a/Iceberg-Tests/IceGitTestFactory.class.st +++ b/Iceberg-Tests/IceGitTestFactory.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceGitTestFactory, - #superclass : #IceAbstractTestFactory, - #category : #'Iceberg-Tests-Git' + #name : 'IceGitTestFactory', + #superclass : 'IceAbstractTestFactory', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> defaultRemoteUrl [ ^ self remoteFileUrl asString ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> ensureRemoteRepository [ | remoteRepository | remoteRepository := self remoteFileUrl asFileReference exists @@ -31,19 +33,19 @@ IceGitTestFactory >> ensureRemoteRepository [ ^ remoteRepository ] -{ #category : #testing } +{ #category : 'testing' } IceGitTestFactory >> isGit [ ^ true ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> location [ ^ FileLocator imageDirectory / 'test' ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newBareRepositoryNamed: projectName withSubdirectory: aSubdirectory [ | repository | (self location / projectName) ensureDeleteAll. @@ -69,13 +71,13 @@ IceGitTestFactory >> newBareRepositoryNamed: projectName withSubdirectory: aSubd ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newRemoteNamed: aName toRepository: aRepository [ ^ IceGitRemote name: aName url: aRepository location resolve asUrl asString ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ | repository | (self location / projectName) ensureDeleteAll. @@ -96,13 +98,13 @@ IceGitTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirec ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> remoteFileUrl [ ^ (IceLibgitRepository repositoriesLocation / 'remote') resolve asUrl. ] -{ #category : #initialization } +{ #category : 'initialization' } IceGitTestFactory >> tearDownWithRepository: aRepository [ aRepository ifNotNil: [ diff --git a/Iceberg-Tests/IceGitUnbornProjectTest.class.st b/Iceberg-Tests/IceGitUnbornProjectTest.class.st index c74eb78c7c..a67a9ed8c5 100644 --- a/Iceberg-Tests/IceGitUnbornProjectTest.class.st +++ b/Iceberg-Tests/IceGitUnbornProjectTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceGitUnbornProjectTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitUnbornProjectTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitUnbornProjectTest >> newFixture [ ^ IceUnbornProjectFixture inGit ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testCommitNewProjectCreatesProjectFile [ self repository workingCopy project: (IceBasicProject onRepository: self repository withSourceDirectory: fixture subdirectory). @@ -18,7 +20,7 @@ IceGitUnbornProjectTest >> testCommitNewProjectCreatesProjectFile [ self assert: (self repository headCommit fileSystem / '.project') exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testCommitNewProjectFindsPropertiesFile [ self repository workingCopy project: (IceBasicProject onRepository: self repository withSourceDirectory: fixture subdirectory). @@ -27,7 +29,7 @@ IceGitUnbornProjectTest >> testCommitNewProjectFindsPropertiesFile [ self assert: (self repository headCommit fileSystem resolve: self repository properties propertiesFilePath) exists ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testDiffContainsNewProject [ | diff | @@ -37,7 +39,7 @@ IceGitUnbornProjectTest >> testDiffContainsNewProject [ self assert: (diff tree / '.project') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testInvalidProjectReturnsSameSourceDirectoryThanCurrentProject [ "Create a new commit" @@ -50,7 +52,7 @@ IceGitUnbornProjectTest >> testInvalidProjectReturnsSameSourceDirectoryThanCurre self assert: self repository headCommit parent project isInvalid ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectCurrentCommitAfterChangeIsUnborn [ "Create a new commit" @@ -64,13 +66,13 @@ IceGitUnbornProjectTest >> testProjectCurrentCommitAfterChangeIsUnborn [ self assert: self repository headCommit project isInvalid. ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectIsUnborn [ self assert: self repository project isUnborn ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testProjectOlderCommitIsInvalid [ "Create a new commit" @@ -84,7 +86,7 @@ IceGitUnbornProjectTest >> testProjectOlderCommitIsInvalid [ self assert: self repository headCommit parent project sourceDirectory equals: 'test' ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testPropertiesFileIsNotEmpty [ | props | @@ -95,7 +97,7 @@ IceGitUnbornProjectTest >> testPropertiesFileIsNotEmpty [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitUnbornProjectTest >> testRepositoryHasNoProjectFile [ self deny: (self repository location / '.project') exists diff --git a/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st b/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st index 8de925c226..98089cff91 100644 --- a/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st +++ b/Iceberg-Tests/IceGitUnknownCommitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceGitUnknownCommitRepositoryTest, - #superclass : #IceUnknownCommitRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceGitUnknownCommitRepositoryTest', + #superclass : 'IceUnknownCommitRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitUnknownCommitRepositoryTest >> newFixture [ ^ IceWithRemoteAndUnknownCommitFixture inGit diff --git a/Iceberg-Tests/IceGitWithoutUserNameTest.class.st b/Iceberg-Tests/IceGitWithoutUserNameTest.class.st index 2edd92ae5e..ad23f9bed6 100644 --- a/Iceberg-Tests/IceGitWithoutUserNameTest.class.st +++ b/Iceberg-Tests/IceGitWithoutUserNameTest.class.st @@ -1,19 +1,21 @@ Class { - #name : #IceGitWithoutUserNameTest, - #superclass : #IceAbstractTestCase, + #name : 'IceGitWithoutUserNameTest', + #superclass : 'IceAbstractTestCase', #instVars : [ 'username', 'email' ], - #category : #'Iceberg-Tests-Git' + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> setUp [ | global | @@ -30,7 +32,7 @@ IceGitWithoutUserNameTest >> setUp [ email: 'mock mail'. ] -{ #category : #running } +{ #category : 'running' } IceGitWithoutUserNameTest >> tearDown [ | global | @@ -42,7 +44,7 @@ IceGitWithoutUserNameTest >> tearDown [ ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithEmptyUserMailThrowsException [ (self repository getConfigurationGlobal: false) @@ -54,7 +56,7 @@ IceGitWithoutUserNameTest >> testCommitWithEmptyUserMailThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithEmptyUserNameThrowsException [ (self repository getConfigurationGlobal: false) @@ -66,7 +68,7 @@ IceGitWithoutUserNameTest >> testCommitWithEmptyUserNameThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithoutUserMailThrowsException [ (self repository getConfigurationGlobal: false) @@ -78,7 +80,7 @@ IceGitWithoutUserNameTest >> testCommitWithoutUserMailThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testCommitWithoutUserNameThrowsException [ (self repository getConfigurationGlobal: false) @@ -90,7 +92,7 @@ IceGitWithoutUserNameTest >> testCommitWithoutUserNameThrowsException [ raise: IceGitUsernameOrEmailNotFound ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixEmptyUserMailAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) email: ''. @@ -107,7 +109,7 @@ IceGitWithoutUserNameTest >> testFixEmptyUserMailAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixEmptyUserNameAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) username: ''. @@ -124,7 +126,7 @@ IceGitWithoutUserNameTest >> testFixEmptyUserNameAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixUnsetUserMailAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) unset: 'user.email'. @@ -141,7 +143,7 @@ IceGitWithoutUserNameTest >> testFixUnsetUserMailAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testFixUnsetUserNameAndResumeDoesCommit [ | before after | (self repository getConfigurationGlobal: false) unset: 'user.name'. @@ -158,7 +160,7 @@ IceGitWithoutUserNameTest >> testFixUnsetUserNameAndResumeDoesCommit [ self fail ] -{ #category : #tests } +{ #category : 'tests' } IceGitWithoutUserNameTest >> testUtf8Username [ | after utf8Username | utf8Username := 'Yn-aë éé'. diff --git a/Iceberg-Tests/IceHttpRemoteTest.class.st b/Iceberg-Tests/IceHttpRemoteTest.class.st index d2a351e756..9efcce63e0 100644 --- a/Iceberg-Tests/IceHttpRemoteTest.class.st +++ b/Iceberg-Tests/IceHttpRemoteTest.class.st @@ -2,26 +2,28 @@ Tests for IceHTTPRemote " Class { - #name : #IceHttpRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceHttpRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpRemoteTest >> defaultTestClass [ "Return the default test class" ^IceGitHttpRemote ] -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpRemoteTest >> protocolID [ "Return the protocol identifier" ^self defaultTestClass protocolID ] -{ #category : #'private - utilities' } +{ #category : 'private - utilities' } IceHttpRemoteTest >> protocolURLFor: aString [ ^IceGitRemote url: self protocolID, '://', aString @@ -29,7 +31,7 @@ IceHttpRemoteTest >> protocolURLFor: aString [ ] -{ #category : #'tests - providers' } +{ #category : 'tests - providers' } IceHttpRemoteTest >> testBitBucketURL [ |remote| remote := self protocolURLFor: 'bitbucket.org/owner/repo.git'. @@ -40,13 +42,13 @@ IceHttpRemoteTest >> testBitBucketURL [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testCanHandleProtocol [ self assert: (self defaultTestClass canHandleUrl: self protocolID ,'://') ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testFullURL [ | remote | remote := self protocolURLFor: 'user@hostname.com:1234/subpath1/subpath2/owner/repo.git'. @@ -57,7 +59,7 @@ IceHttpRemoteTest >> testFullURL [ assert: remote projectName equals: 'repo' ] -{ #category : #'tests - providers' } +{ #category : 'tests - providers' } IceHttpRemoteTest >> testGitHubURL [ |remote| remote := self protocolURLFor: 'github.com/owner/repo.git'. @@ -68,7 +70,7 @@ IceHttpRemoteTest >> testGitHubURL [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testLocalhostRepo [ |remote| remote := self protocolURLFor: 'hostname/owner/repo.git'. @@ -79,7 +81,7 @@ IceHttpRemoteTest >> testLocalhostRepo [ assert: remote projectName equals: 'repo' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithDeepPath [ |remote| remote := self protocolURLFor: 'hostname:8080/sub1/sub2/sub3/owner/repo.git'. @@ -90,7 +92,7 @@ IceHttpRemoteTest >> testURLWithDeepPath [ assert: remote path third equals: 'sub3' ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithEmpty [ |remote| remote := self protocolURLFor: 'hostname:8080/owner/repo.git'. @@ -98,7 +100,7 @@ IceHttpRemoteTest >> testURLWithEmpty [ assert: remote path isEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceHttpRemoteTest >> testURLWithSinglePath [ |remote| remote := self protocolURLFor: 'hostname:8080/path/owner/repo.git'. diff --git a/Iceberg-Tests/IceHttpsRemoteTest.class.st b/Iceberg-Tests/IceHttpsRemoteTest.class.st index c11442365b..66947c7ea8 100644 --- a/Iceberg-Tests/IceHttpsRemoteTest.class.st +++ b/Iceberg-Tests/IceHttpsRemoteTest.class.st @@ -2,19 +2,21 @@ Test for IceHttpsRemoteTest " Class { - #name : #IceHttpsRemoteTest, - #superclass : #IceHttpRemoteTest, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceHttpsRemoteTest', + #superclass : 'IceHttpRemoteTest', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #'private - defaults' } +{ #category : 'private - defaults' } IceHttpsRemoteTest >> defaultTestClass [ "Return the default test class" ^IceGitHttpsRemote ] -{ #category : #tests } +{ #category : 'tests' } IceHttpsRemoteTest >> testSameRemoteReference [ | r1 r2 | @@ -23,7 +25,7 @@ IceHttpsRemoteTest >> testSameRemoteReference [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceHttpsRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ | r1 r2 | diff --git a/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st b/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st index 7544b33816..13ff6fe38d 100644 --- a/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st +++ b/Iceberg-Tests/IceInMemoryCleanWorkingCopyTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceInMemoryCleanWorkingCopyTest, - #superclass : #IceCleanWorkingCopyTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceInMemoryCleanWorkingCopyTest', + #superclass : 'IceCleanWorkingCopyTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceInMemoryCleanWorkingCopyTest >> newFixture [ ^ IceCleanWorkingCopyFixture inMemory ] diff --git a/Iceberg-Tests/IceInMemoryTestFactory.class.st b/Iceberg-Tests/IceInMemoryTestFactory.class.st index 2638cdabba..9491041f1b 100644 --- a/Iceberg-Tests/IceInMemoryTestFactory.class.st +++ b/Iceberg-Tests/IceInMemoryTestFactory.class.st @@ -1,28 +1,30 @@ Class { - #name : #IceInMemoryTestFactory, - #superclass : #IceAbstractTestFactory, - #category : 'Iceberg-Tests-Memory' + #name : 'IceInMemoryTestFactory', + #superclass : 'IceAbstractTestFactory', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory class >> setUp [ ^ self new setUp ] -{ #category : #accessing } +{ #category : 'accessing' } IceInMemoryTestFactory >> ensureRemoteRepository [ ^ self newRepositoryNamed: 'remoteRepo' ] -{ #category : #testing } +{ #category : 'testing' } IceInMemoryTestFactory >> isGit [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> newRemoteNamed: aName toRepository: remoteRepository [ ^ IceMemoryRemote @@ -31,7 +33,7 @@ IceInMemoryTestFactory >> newRemoteNamed: aName toRepository: remoteRepository [ branchRepository: MCDictionaryRepository new ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSubdirectory [ "Ignore the subdirectory in memory" | repository | @@ -40,7 +42,7 @@ IceInMemoryTestFactory >> newRepositoryNamed: projectName withSubdirectory: aSub ^ repository ] -{ #category : #initialization } +{ #category : 'initialization' } IceInMemoryTestFactory >> tearDownWithRepository: aRepository [ "Nothing" diff --git a/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st b/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st index 77e4799f58..dc6cb632f8 100644 --- a/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st +++ b/Iceberg-Tests/IceInitialPropertiesFileTestCase.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceInitialPropertiesFileTestCase, - #superclass : #IceParameterizedTestCase, - #category : 'Iceberg-Tests-Formats' + #name : 'IceInitialPropertiesFileTestCase', + #superclass : 'IceParameterizedTestCase', + #category : 'Iceberg-Tests-Formats', + #package : 'Iceberg-Tests', + #tag : 'Formats' } -{ #category : #running } +{ #category : 'running' } IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithFileTreeInIndex [ | format | format := IceLibgitRepository defaultFileFormatType. @@ -19,7 +21,7 @@ IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithFileTr ensure: [ IceLibgitRepository defaultFileFormatType: format ] ] -{ #category : #running } +{ #category : 'running' } IceInitialPropertiesFileTestCase >> testNewRepositoryHasPropertiesFileWithTonelInIndex [ | format | format := IceLibgitRepository defaultFileFormatType. diff --git a/Iceberg-Tests/IceLibGitIndexTestCase.class.st b/Iceberg-Tests/IceLibGitIndexTestCase.class.st index 772004e5b9..2699e8aae5 100644 --- a/Iceberg-Tests/IceLibGitIndexTestCase.class.st +++ b/Iceberg-Tests/IceLibGitIndexTestCase.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceLibGitIndexTestCase, - #superclass : #IceMergeTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceLibGitIndexTestCase', + #superclass : 'IceMergeTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> assertIndexIsClean [ | diff | @@ -15,12 +17,12 @@ IceLibGitIndexTestCase >> assertIndexIsClean [ self assert: diff numberOfDeltas equals: 0 ] -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> newFixture [ ^ IceBasicRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceLibGitIndexTestCase >> testGitIndexIsCleanAfterCheckoutBranch [ "If we checkout a branch, git's index should be clean. @@ -48,56 +50,56 @@ IceLibGitIndexTestCase >> testGitIndexIsCleanAfterCheckoutBranch [ self assertIndexIsClean ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead [ super testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ super testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ super testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testImageBehindHeadShouldOnlyMergeInImage [ super testImageBehindHeadShouldOnlyMergeInImage. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeAheadImageCommitShouldFastForwardHEAD [ super testMergeAheadImageCommitShouldFastForwardHEAD. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeCommitInHistoryShouldDoNothing [ super testMergeCommitInHistoryShouldDoNothing. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ super testMergeImageReferenceCommitInHistoryShouldDoNothing. self assertIndexIsClean. ] -{ #category : #tests } +{ #category : 'tests' } IceLibGitIndexTestCase >> testTrimergeShouldRaiseError [ super testTrimergeShouldRaiseError. diff --git a/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st b/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st index 7eac232243..333a810c01 100644 --- a/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st +++ b/Iceberg-Tests/IceLocalRepositoryMissingTest.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceLocalRepositoryMissingTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceLocalRepositoryMissingTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> newFixture [ ^ IceMissingLocalRepositoryFixture inGit ] -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> testDeleteDoesNothing [ self shouldnt: [ self repository delete ] raise: Error ] -{ #category : #running } +{ #category : 'running' } IceLocalRepositoryMissingTest >> testRepositoryIsMissing [ self assert: self repository isMissing diff --git a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st index 6e4a0beb88..f9251a5dfd 100644 --- a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMemoryRepositoryWithSingleRemoteAndMergeConflictTest >> newFixture [ ^ IceWithRemoteAndMergeConflictFixture inMemory ] diff --git a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st index 7664074f1c..ecb5cf04a5 100644 --- a/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceMemoryRepositoryWithSingleRemoteTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMemoryRepositoryWithSingleRemoteTest, - #superclass : #IceRepositoryWithSingleRemoteTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMemoryRepositoryWithSingleRemoteTest', + #superclass : 'IceRepositoryWithSingleRemoteTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMemoryRepositoryWithSingleRemoteTest >> newFixture [ ^ IceWithRemoteFixture inMemory ] diff --git a/Iceberg-Tests/IceMergeTest.class.st b/Iceberg-Tests/IceMergeTest.class.st index 28e1a5b024..ab96f6b67a 100644 --- a/Iceberg-Tests/IceMergeTest.class.st +++ b/Iceberg-Tests/IceMergeTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceMergeTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceMergeTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceMergeTest class >> isAbstract [ ^ self == IceMergeTest ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testFastForwardApplyChangesCorrectly [ "This is a Ring working copy" @@ -36,7 +38,7 @@ IceMergeTest >> testFastForwardApplyChangesCorrectly [ self assert: (self repository workingCopy environment ask includesClassNamed: #IceGeneratedClassForTesting2) ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHead [ "If the image and HEAD are behind the commit to merge, we need to advance HEAD and update the image so they correspond. @@ -80,7 +82,7 @@ IceMergeTest >> testImageAndHeadBehindMergeCommitShouldMergeInImageAndAdvanceHea self assert: self workingCopy isModified not. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ "If we want to merge the image into the head commit the usual thing would be to: @@ -142,7 +144,7 @@ IceMergeTest >> testImageAndHeadInverseMergeDivergingCommitShouldCreateMergeComm self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvanceHeadAndImage [ "If the image and HEAD diverted from the merge commit, we need to create a merge commit and advance both HEAD and the image to it. @@ -200,7 +202,7 @@ IceMergeTest >> testImageAndHeadMergeDivergingCommitShouldCreateMergeCommitAdvan self deny: self repository workingCopy isModified. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testImageBehindHeadShouldOnlyMergeInImage [ "If the image is behind HEAD and we want to merge HEAD we need to update the image to be in HEAD. @@ -245,7 +247,7 @@ IceMergeTest >> testImageBehindHeadShouldOnlyMergeInImage [ self assert: headCommit equals: self repository workingCopy referenceCommit. ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeAheadImageCommitShouldFastForwardHEAD [ "If the image corresponds to the head commit and the commit we want to merge is in the history of the head commit, the merge should be ignored. @@ -288,7 +290,7 @@ IceMergeTest >> testMergeAheadImageCommitShouldFastForwardHEAD [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentClassesButSamePackageCausesNoConflicts [ "This is a Ring working copy" @@ -320,7 +322,7 @@ IceMergeTest >> testMergeChangesInDifferentClassesButSamePackageCausesNoConflict self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentMethodsButSameClassCausesNoConflicts [ "This is a Ring working copy" @@ -353,7 +355,7 @@ IceMergeTest >> testMergeChangesInDifferentMethodsButSameClassCausesNoConflicts self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInDifferentPackagesCausesNoConflicts [ "This is a Ring working copy" @@ -386,7 +388,7 @@ IceMergeTest >> testMergeChangesInDifferentPackagesCausesNoConflicts [ self assert: (self repository headCommit ancestors includes: change2Commit). ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInSameClassesSamePackageCausesConflicts [ "This is a Ring working copy" @@ -418,7 +420,7 @@ IceMergeTest >> testMergeChangesInSameClassesSamePackageCausesConflicts [ self should: [self repository workingCopy mergeCommit: change2Commit] raise: IceMergeResolutionRequest ] -{ #category : #'merge-conflicts' } +{ #category : 'merge-conflicts' } IceMergeTest >> testMergeChangesInSameMethodSameClassSamePackageCausesConflicts [ "This is a Ring working copy" @@ -449,7 +451,7 @@ IceMergeTest >> testMergeChangesInSameMethodSameClassSamePackageCausesConflicts self should: [self repository workingCopy mergeCommit: change2Commit] raise: IceMergeResolutionRequest ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeCommitInHistoryShouldDoNothing [ "If the image corresponds to the head commit and the commit we want to merge is in the history of the head commit, the merge should be ignored. @@ -489,7 +491,7 @@ IceMergeTest >> testMergeCommitInHistoryShouldDoNothing [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeFastForwardClassRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -511,7 +513,7 @@ IceMergeTest >> testMergeFastForwardClassRemovalIsAppliedToWorkingCopy [ self denyClassExists: 'IceGeneratedClassForTesting'. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeFastForwardMethodRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -537,7 +539,7 @@ IceMergeTest >> testMergeFastForwardMethodRemovalIsAppliedToWorkingCopy [ ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ "If the image corresponds to the merge commit and is in the history of the head commit, the merge should be ignored. @@ -580,7 +582,7 @@ IceMergeTest >> testMergeImageReferenceCommitInHistoryShouldDoNothing [ self assert: self repository workingCopy isModified not. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardClassRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -610,7 +612,7 @@ IceMergeTest >> testMergeNonFastForwardClassRemovalIsAppliedToWorkingCopy [ self denyClassExists: 'IceGeneratedClassForTesting'. ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodAdditionIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -647,7 +649,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodAdditionIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodModificationIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -684,7 +686,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodModificationIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardLocalMethodRemovalIsNotInMergeTree [ | headCommit mergeCommit mergeTree | @@ -721,7 +723,7 @@ IceMergeTest >> testMergeNonFastForwardLocalMethodRemovalIsNotInMergeTree [ ] -{ #category : #'merge-operations' } +{ #category : 'merge-operations' } IceMergeTest >> testMergeNonFastForwardMethodRemovalIsAppliedToWorkingCopy [ | headCommit mergeCommit | @@ -753,7 +755,7 @@ IceMergeTest >> testMergeNonFastForwardMethodRemovalIsAppliedToWorkingCopy [ ] -{ #category : #'merge-cases' } +{ #category : 'merge-cases' } IceMergeTest >> testTrimergeShouldRaiseError [ "If the image, HEAD and merge commit are three different commits, we should avoid merging. diff --git a/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st b/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st index 2aa18ab1ae..674dd33c19 100644 --- a/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st +++ b/Iceberg-Tests/IceMetaClassCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMetaClassCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceMetaClassCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testAddExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -34,7 +36,7 @@ IceMetaClassCherryPickingTest >> testAddExtensionMethodInMetaSideOfExistingClass assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testAddMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | @@ -61,7 +63,7 @@ IceMetaClassCherryPickingTest >> testAddMethodInMetaSideOfExistingClass [ assert: (diff / self packageName1 / 'TestClass class' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testModifyExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName2. @@ -104,7 +106,7 @@ IceMetaClassCherryPickingTest >> testModifyExtensionMethodInMetaSideOfExistingCl assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testModifyMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -143,7 +145,7 @@ IceMetaClassCherryPickingTest >> testModifyMethodInMetaSideOfExistingClass [ assert: (diff / self packageName1 / 'TestClass class' / 'm1') value isModification ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testRemoveExtensionMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | @@ -182,7 +184,7 @@ IceMetaClassCherryPickingTest >> testRemoveExtensionMethodInMetaSideOfExistingCl assert: (diff / self packageName2 / 'TestClass class' / 'm1') value isRemoval . ] -{ #category : #tests } +{ #category : 'tests' } IceMetaClassCherryPickingTest >> testRemoveMethodInMetaSideOfExistingClass [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceMethodCherryPickingTest.class.st b/Iceberg-Tests/IceMethodCherryPickingTest.class.st index c89134e1f5..c69707c3b0 100644 --- a/Iceberg-Tests/IceMethodCherryPickingTest.class.st +++ b/Iceberg-Tests/IceMethodCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMethodCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceMethodCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInClassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -47,7 +49,7 @@ IceMethodCherryPickingTest >> testAddMethodInClassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInExistingClass [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -82,7 +84,7 @@ IceMethodCherryPickingTest >> testAddMethodInExistingClass [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -122,7 +124,7 @@ IceMethodCherryPickingTest >> testAddMethodInExistingTrait [ / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodInTraitAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -165,7 +167,7 @@ IceMethodCherryPickingTest >> testAddMethodInTraitAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodReferingAnAddedMethod [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -209,7 +211,7 @@ IceMethodCherryPickingTest >> testAddMethodReferingAnAddedMethod [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodThatVariablesThatAreNotDependencies [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -235,7 +237,7 @@ IceMethodCherryPickingTest >> testAddMethodThatVariablesThatAreNotDependencies [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -293,7 +295,7 @@ IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependency [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependencyWithClassAlreadyCommited [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -360,7 +362,7 @@ IceMethodCherryPickingTest >> testAddMethodUsingASharedPoolAsDependencyWithClass equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassAndSuperclassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -423,8 +425,9 @@ IceMethodCherryPickingTest >> testAddMethodWithClassAndSuperclassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ + | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -432,29 +435,19 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ self repository workingCopy createClass: 'TestClass2' inPackage: self packageName1 asSymbol - with: [ :class | - class - addClassVariable: - (RG2ClassVariableDefinition - named: 'TestClassVariable' asSymbol - parent: class) ]. - self repository - commitWithMessage: 'Adding a test class with class variable'. + with: [ :class | class addClassVariable: (RGClassVariable named: 'TestClassVariable' asSymbol parent: class) ]. + self repository commitWithMessage: 'Adding a test class with class variable'. self repository workingCopy addPackageNamed: self packageName1. self repository workingCopy createClass: 'TestClass3' inPackage: self packageName1 asSymbol - with: - [ :class | class superclass: (class environment ask behaviorNamed: #TestClass2) ]. + with: [ :class | class superclass: (class environment ask behaviorNamed: #TestClass2) ]. self repository commitWithMessage: 'Adding another test class'. self repository workingCopy addPackageNamed: self packageName1. - self repository workingCopy - createMethod: 'm1 ^TestClassVariable' - inClass: 'TestClass3' asSymbol. - self repository - commitWithMessage: 'Adding method using test class variable'. + self repository workingCopy createMethod: 'm1 ^TestClassVariable' inClass: 'TestClass3' asSymbol. + self repository commitWithMessage: 'Adding method using test class variable'. commitToCherryPick := fixture repository head. @@ -463,38 +456,20 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependency [ diff := mergeTree collect: [ :each | each chosenOperation ]. self assert: diff children size equals: 1. - self - assert: (diff / self packageName1) children size - equals: 4. + self assert: (diff / self packageName1) children size equals: 4. - self - assert: - (diff / self packageName1 / 'TestClass2') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass2') - children size - equals: 0. + self assert: (diff / self packageName1 / 'TestClass2') value isAddition. + self assert: (diff / self packageName1 / 'TestClass2') children size equals: 0. - self - assert: - (diff / self packageName1 / 'TestClass3') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass3') - children size - equals: 1. + self assert: (diff / self packageName1 / 'TestClass3') value isAddition. + self assert: (diff / self packageName1 / 'TestClass3') children size equals: 1. - self - assert: - (diff / self packageName1 / 'TestClass3' / 'm1') - value isAddition + self assert: (diff / self packageName1 / 'TestClass3' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSuperclassAlreadyCommited [ + | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -502,29 +477,19 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSupe self repository workingCopy createClass: 'TestClass' inPackage: self packageName1 asSymbol - with: [ :class | - class - addClassVariable: - (RG2ClassVariableDefinition - named: 'TestClassVariable' asSymbol - parent: class) ]. - self repository - commitWithMessage: 'Adding a test class with class variable'. + with: [ :class | class addClassVariable: (RGClassVariable named: 'TestClassVariable' asSymbol parent: class) ]. + self repository commitWithMessage: 'Adding a test class with class variable'. self repository workingCopy addPackageNamed: self packageName1. self repository workingCopy createClass: 'TestClass2' inPackage: self packageName1 asSymbol - with: - [ :class | class superclass: (class environment ask behaviorNamed: #TestClass) ]. + with: [ :class | class superclass: (class environment ask behaviorNamed: #TestClass) ]. self repository commitWithMessage: 'Adding another test class'. self repository workingCopy addPackageNamed: self packageName1. - self repository workingCopy - createMethod: 'm1 ^TestClassVariable' - inClass: 'TestClass2' asSymbol. - self repository - commitWithMessage: 'Adding method using test class variable'. + self repository workingCopy createMethod: 'm1 ^TestClassVariable' inClass: 'TestClass2' asSymbol. + self repository commitWithMessage: 'Adding method using test class variable'. commitToCherryPick := fixture repository head. @@ -533,31 +498,16 @@ IceMethodCherryPickingTest >> testAddMethodWithClassVariableAsDependencyWithSupe diff := mergeTree collect: [ :each | each chosenOperation ]. self assert: diff children size equals: 1. - self - assert: (diff / self packageName1) children size - equals: 3. + self assert: (diff / self packageName1) children size equals: 3. - self - assert: - (diff / self packageName1 / 'TestClass') value - isModification. + self assert: (diff / self packageName1 / 'TestClass') value isModification. - self - assert: - (diff / self packageName1 / 'TestClass2') value - isAddition. - self - assert: - (diff / self packageName1 / 'TestClass2') - children size - equals: 1. - self - assert: - (diff / self packageName1 / 'TestClass2' / 'm1') - value isAddition + self assert: (diff / self packageName1 / 'TestClass2') value isAddition. + self assert: (diff / self packageName1 / 'TestClass2') children size equals: 1. + self assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -622,7 +572,7 @@ IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependencyWithSuperclassAlreadyCommited [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -681,7 +631,7 @@ IceMethodCherryPickingTest >> testAddMethodWithInstanceVariableAsDependencyWithS value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithReferencedClassAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -724,7 +674,7 @@ IceMethodCherryPickingTest >> testAddMethodWithReferencedClassAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithReferencedTraitAsDependency [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -767,7 +717,7 @@ IceMethodCherryPickingTest >> testAddMethodWithReferencedTraitAsDependency [ value isAddition ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testAddMethodWithTwoCommits [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -799,7 +749,7 @@ IceMethodCherryPickingTest >> testAddMethodWithTwoCommits [ assert: (diff / self packageName1 / 'TestClass' / 'm1') value definition sourceCode equals: 'm1 ^36'. ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveClassWithMethods [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. @@ -835,7 +785,7 @@ IceMethodCherryPickingTest >> testRemoveClassWithMethods [ assert: (diff / self packageName1 / 'TestClass2' / 'm1') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveMethodInExistingClass [ | commitToCherryPick diff mergeTree | @@ -869,7 +819,7 @@ IceMethodCherryPickingTest >> testRemoveMethodInExistingClass [ assert: (diff / self packageName1 / 'TestClass' / 'm1') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceMethodCherryPickingTest >> testRemoveMethodInExistingTrait [ | commitToCherryPick diff mergeTree | self repository workingCopy addPackageNamed: self packageName1. diff --git a/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st b/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st index 6435ef07a8..bfa4c2f531 100644 --- a/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st +++ b/Iceberg-Tests/IceMissingLocalRepositoryFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMissingLocalRepositoryFixture, - #superclass : #IceCleanWorkingCopyFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceMissingLocalRepositoryFixture', + #superclass : 'IceCleanWorkingCopyFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceMissingLocalRepositoryFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceMultiplePackageFixture.class.st b/Iceberg-Tests/IceMultiplePackageFixture.class.st index 34dfe281ab..9058aeb221 100644 --- a/Iceberg-Tests/IceMultiplePackageFixture.class.st +++ b/Iceberg-Tests/IceMultiplePackageFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceMultiplePackageFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st index 3f2a39a079..49a6ce1303 100644 --- a/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageLocalGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageLocalGitRepositoryTest, - #superclass : #IceMultiplePackageRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceMultiplePackageLocalGitRepositoryTest', + #superclass : 'IceMultiplePackageRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageLocalGitRepositoryTest >> newFixture [ ^ IceMultiplePackageFixture inGit ] diff --git a/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st index 8ff976bc72..a506ebff4c 100644 --- a/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageLocalMemoryRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceMultiplePackageLocalMemoryRepositoryTest, - #superclass : #IceMultiplePackageRepositoryTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceMultiplePackageLocalMemoryRepositoryTest', + #superclass : 'IceMultiplePackageRepositoryTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceMultiplePackageLocalMemoryRepositoryTest >> newFixture [ ^ IceMultiplePackageFixture inMemory ] diff --git a/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st b/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st index 6b171374ff..70329cfddb 100644 --- a/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st +++ b/Iceberg-Tests/IceMultiplePackageRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceMultiplePackageRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : #'Iceberg-Tests-Common' + #name : 'IceMultiplePackageRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceMultiplePackageRepositoryTest class >> isAbstract [ ^ self == IceMultiplePackageRepositoryTest ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitChangesWorkingCopyCommit [ | message commitToAdopt | @@ -27,7 +29,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitChangesWorkingCopyCommit [ self assert: self repository workingCopy referenceCommit equals: commitToAdopt ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeBranchCommit [ | message commitToAdopt branchCommitBeforeAdopt | @@ -45,7 +47,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeBranchCommit [ self assert: self repository branch commit equals: branchCommitBeforeAdopt ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeCheckedOutCodeInImage [ | message commitToAdopt | @@ -62,7 +64,7 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitDoesNotChangeCheckedOutCodeIn self assert: (self repository workingCopy environment ask includesClassNamed: 'IceGeneratedClassForTesting') ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testAdoptCommitMarksPackagesAsDirty [ | message commitToAdopt | @@ -79,14 +81,14 @@ IceMultiplePackageRepositoryTest >> testAdoptCommitMarksPackagesAsDirty [ self assert: (self repository workingCopy packageNamed: self packageName1 asSymbol) isDirty ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchDoesNotLeaveDetachedHead [ self repository branch checkout. self deny: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ | message | @@ -117,7 +119,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self repository branch checkout. @@ -125,7 +127,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self assertPackageExists: self packageName2. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImage [ | message | @@ -154,7 +156,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImag self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInImage [ self repository checkoutAllPackages. @@ -162,7 +164,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInI self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ | message | @@ -191,7 +193,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self repository branch commit checkout. @@ -199,7 +201,7 @@ IceMultiplePackageRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self assertPackageExists: self packageName2 ] -{ #category : #'tests-branch' } +{ #category : 'tests-branch' } IceMultiplePackageRepositoryTest >> testCheckoutDoesNotAffectBranchCommit [ | commitAtBranchTime createdBranch message | @@ -221,14 +223,14 @@ IceMultiplePackageRepositoryTest >> testCheckoutDoesNotAffectBranchCommit [ self assert: createdBranch commit equals: commitAtBranchTime ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutLatestBranchCommitLeavesDetachedHead [ self repository branch commit checkoutAllPackages. self assert: self repository head isDetached. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDetachedMode [ | message | @@ -250,14 +252,14 @@ IceMultiplePackageRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDet self assert: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceMultiplePackageRepositoryTest >> testCheckoutRepositoryDoesNotLeaveDetachedHead [ self repository checkoutAllPackages. self deny: self repository head isDetached ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitModificationsCreatesNewCommit [ | message | @@ -272,7 +274,7 @@ IceMultiplePackageRepositoryTest >> testCommitModificationsCreatesNewCommit [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitModificationsDoNotCreateBranch [ | message | @@ -287,7 +289,7 @@ IceMultiplePackageRepositoryTest >> testCommitModificationsDoNotCreateBranch [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testCommitWithDetachedHeadRaisesException [ | message | @@ -303,7 +305,7 @@ IceMultiplePackageRepositoryTest >> testCommitWithDetachedHeadRaisesException [ self should: [self repository commitWithMessage: message] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageInNotManagedPackageKeepChangesEmpty [ "This is a Ring working copy" @@ -313,7 +315,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageInNotManagedPackageKee self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesContainClassDefinition [ | diff | @@ -330,7 +332,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesContainCla self assert: (diff tree / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ "This is a Ring working copy" @@ -340,7 +342,7 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ self deny: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesRespositoryModifications [ "This is a Ring working copy" @@ -350,13 +352,13 @@ IceMultiplePackageRepositoryTest >> testCreateClassInImageMakesRespositoryModifi self assert: self repository isModified ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testCurrentBranchIsDefaultMasterBranch [ self assert: self repository branch name equals: 'master' ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testDetachedHeadCannotCommit [ self repository branch commit checkout. @@ -364,7 +366,7 @@ IceMultiplePackageRepositoryTest >> testDetachedHeadCannotCommit [ self should: [self repository validateCanCommit] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ | branches commits | @@ -375,7 +377,7 @@ IceMultiplePackageRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ self assert: commits first comment equals: 'Initial commit'. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceMultiplePackageRepositoryTest >> testListPackagesListExistingPackage [ | packages | @@ -385,19 +387,19 @@ IceMultiplePackageRepositoryTest >> testListPackagesListExistingPackage [ self assert: (packages includes: self packageName2). ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testNoChangesInImageMakesChangesEmpty [ self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceMultiplePackageRepositoryTest >> testNoChangesInImageMakesNoModifications [ self deny: self repository isModified ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCodeInImage [ | message commitToReset | @@ -415,7 +417,7 @@ IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCodeIn self assert: (self repository workingCopy environment ask includesClassNamed: 'IceGeneratedClassForTesting') ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCommit [ | message commitToReset workingCopyCommitBeforeReset | @@ -433,7 +435,7 @@ IceMultiplePackageRepositoryTest >> testResetBranchDoesNotChangeCheckedOutCommit self assert: self repository workingCopy referenceCommit equals: workingCopyCommitBeforeReset ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceMultiplePackageRepositoryTest >> testResetBranchRestoresBranchCommit [ | message commitToReset | diff --git a/Iceberg-Tests/IceNewGitRepositoryTest.class.st b/Iceberg-Tests/IceNewGitRepositoryTest.class.st index 5bb748076a..aeaab2d00a 100644 --- a/Iceberg-Tests/IceNewGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceNewGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceNewGitRepositoryTest, - #superclass : #IceNewRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceNewGitRepositoryTest', + #superclass : 'IceNewRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceNewGitRepositoryTest >> newFixture [ ^ IceBasicRepositoryFixture inGit ] diff --git a/Iceberg-Tests/IceNewRepositoryTest.class.st b/Iceberg-Tests/IceNewRepositoryTest.class.st index fa9129508a..3e4bd973f5 100644 --- a/Iceberg-Tests/IceNewRepositoryTest.class.st +++ b/Iceberg-Tests/IceNewRepositoryTest.class.st @@ -1,34 +1,36 @@ Class { - #name : #IceNewRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : 'Iceberg-Tests-Common' + #name : 'IceNewRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #running } +{ #category : 'running' } IceNewRepositoryTest class >> isAbstract [ ^ self == IceNewRepositoryTest ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryBranchIsNamedMaster [ self assert: self repository branch name equals: 'master' ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryHasNoTags [ self assert: self repository tags isEmpty ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryPushDoesNothing [ self shouldnt: [ self repository push ] raise: Error ] -{ #category : #tests } +{ #category : 'tests' } IceNewRepositoryTest >> testNewRepositoryPushToExplicitRemoteDoesNothing [ self shouldnt: [ self repository pushTo: (IceGitRemote url: 'git@github.com:pharo-vcs/testing.git') ] raise: Error diff --git a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st index 057abf06dd..744e62fc7e 100644 --- a/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st +++ b/Iceberg-Tests/IceNotYetClonedRepositoryFixture.class.st @@ -1,6 +1,6 @@ Class { - #name : #IceNotYetClonedRepositoryFixture, - #superclass : #Object, + #name : 'IceNotYetClonedRepositoryFixture', + #superclass : 'Object', #instVars : [ 'factory', 'projectName', @@ -10,10 +10,12 @@ Class { 'remoteRepository', 'location' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture class >> inGit [ ^ self new @@ -21,7 +23,7 @@ IceNotYetClonedRepositoryFixture class >> inGit [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture class >> inMemory [ ^ self new @@ -29,24 +31,24 @@ IceNotYetClonedRepositoryFixture class >> inMemory [ yourself ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> ensureRemoteRepository [ ^ remoteRepository := factory ensureRemoteRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> factory [ ^ factory ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> factory: aFactory [ factory := aFactory ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> initialize [ super initialize. location := FileLocator imageDirectory / 'test' / UUID new asString. @@ -55,57 +57,57 @@ IceNotYetClonedRepositoryFixture >> initialize [ packageName2 := 'IceMockPackage2'. ] -{ #category : #testing } +{ #category : 'testing' } IceNotYetClonedRepositoryFixture >> isGit [ ^ factory isGit ] -{ #category : #testing } +{ #category : 'testing' } IceNotYetClonedRepositoryFixture >> isUnbornProjectFixture [ ^ false ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> location [ ^ location ] -{ #category : #initialization } +{ #category : 'initialization' } IceNotYetClonedRepositoryFixture >> newRemoteNamed: aName toRepository: aRepository [ ^ factory newRemoteNamed: aName toRepository: aRepository ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName1 [ ^ packageName1 ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName1: anObject [ packageName1 := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName2 [ ^ packageName2 ] -{ #category : #accessing } +{ #category : 'accessing' } IceNotYetClonedRepositoryFixture >> packageName2: anObject [ packageName2 := anObject ] -{ #category : #running } +{ #category : 'running' } IceNotYetClonedRepositoryFixture >> setUp [ projectName := 'test-project'. ] -{ #category : #running } +{ #category : 'running' } IceNotYetClonedRepositoryFixture >> tearDown [ Smalltalk garbageCollect. diff --git a/Iceberg-Tests/IceParameterizedTestCase.class.st b/Iceberg-Tests/IceParameterizedTestCase.class.st index e2bc3be42a..ad43de34cb 100644 --- a/Iceberg-Tests/IceParameterizedTestCase.class.st +++ b/Iceberg-Tests/IceParameterizedTestCase.class.st @@ -6,17 +6,19 @@ If #parameters method is not overriden, I will be run as a normal test case. To run with the parameterization you have to use Test Runner. If you run tests from Nautilus, they will ignore parameterization and run with current global configuration. For example if you ran IceBranchTest from the test runner it will be run with every Iceberg backend loaded in the image (see #parameters class method in IceBranchTest). But if you run it from Nautilus it will run the test only once with the current backend, as specified by IceRepository class>>defaultBackendType. " Class { - #name : #IceParameterizedTestCase, - #superclass : #TestCase, + #name : 'IceParameterizedTestCase', + #superclass : 'TestCase', #instVars : [ 'testParameters', 'oldShareRepositoriesBetweenImages', 'provider' ], - #category : #'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuite [ ^ self buildSuiteNamed: self name asString withGlobals: #() @@ -24,7 +26,7 @@ IceParameterizedTestCase class >> buildSuite [ ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: globals andConfigurations: configs [ | suite | configs ifEmpty: [ @@ -48,7 +50,7 @@ IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: global ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: globalParameterValues andSubsuites: moreParameters [ | suite | moreParameters ifEmpty: [ @@ -72,18 +74,18 @@ IceParameterizedTestCase class >> buildSuiteNamed: suiteName withGlobals: global ] -{ #category : #history } +{ #category : 'history' } IceParameterizedTestCase class >> lastStoredRun [ ^ ((Dictionary new) add: (#timeStamp->(DateAndTime basicNew instVarAt: 1 put: 72896; instVarAt: 2 put: (Duration seconds: 3600 nanoSeconds: 0); instVarAt: 3 put: 2457731; instVarAt: 4 put: 823745000; yourself)); add: (#passed->((Set new) add: #testParameters; yourself)); add: (#failures->((Set new))); add: (#errors->((Set new))); yourself) ] -{ #category : #'building suites' } +{ #category : 'building suites' } IceParameterizedTestCase class >> parameters [ "No parameters will make this tests work like a normal TestCase" ^ #() ] -{ #category : #configurations } +{ #category : 'configurations' } IceParameterizedTestCase class >> remoteTypeConfiguration [ ^ IceTestParameter withOptions: { #httpsUrl. #scpUrl } @@ -91,12 +93,12 @@ IceParameterizedTestCase class >> remoteTypeConfiguration [ selector: #remoteTypeSelector ] -{ #category : #configurations } +{ #category : 'configurations' } IceParameterizedTestCase class >> repositoryBackendConfiguration [ ^ IceTestParameter withOptions: {1} ] -{ #category : #private } +{ #category : 'private' } IceParameterizedTestCase >> cleanUpInstanceVariables [ | instanceVariablesNames | instanceVariablesNames := #('testSelector' 'testParameters'). @@ -106,22 +108,22 @@ IceParameterizedTestCase >> cleanUpInstanceVariables [ ifFalse: [ self instVarNamed: name put: nil ] ] ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> isCI [ ^ (OSEnvironment current at: 'CI' ifAbsent: [ 'false' ]) asLowercase = 'true' ] -{ #category : #accessing } +{ #category : 'accessing' } IceParameterizedTestCase >> parameters [ ^ testParameters ifNil: [ testParameters := #() ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceParameterizedTestCase >> parameters: anObject [ testParameters := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceParameterizedTestCase >> printOn: aStream [ super printOn: aStream. @@ -133,20 +135,18 @@ IceParameterizedTestCase >> printOn: aStream [ ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> setUp [ super setUp. - oldShareRepositoriesBetweenImages := IceLibgitRepository - shareRepositoriesBetweenImages. + oldShareRepositoriesBetweenImages := IceLibgitRepository shareRepositoriesBetweenImages. IceLibgitRepository shareRepositoriesBetweenImages: false. provider := IceCredentialsProvider providerType. - IceCredentialsProvider providerType: - IceNonInteractiveCredentialsProvider. + IceCredentialsProvider providerType: IceNonInteractiveCredentialsProvider. self parameters do: [ :each | each activate ] ] -{ #category : #running } +{ #category : 'running' } IceParameterizedTestCase >> tearDown [ self parameters do: [ :parameter | diff --git a/Iceberg-Tests/IceProxySettingsTest.class.st b/Iceberg-Tests/IceProxySettingsTest.class.st new file mode 100644 index 0000000000..7a4560f482 --- /dev/null +++ b/Iceberg-Tests/IceProxySettingsTest.class.st @@ -0,0 +1,81 @@ +Class { + #name : 'IceProxySettingsTest', + #superclass : 'TestCase', + #instVars : [ + 'oldNetworkSettingsHost', + 'oldNetworkSettingsPort' + ], + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' +} + +{ #category : 'asserting' } +IceProxySettingsTest >> assertProxyURLExternalStringHasValue: aString [ + + | value | + value := Iceberg proxyURLExternalString. + + self assert: value isExternalAddress. + self deny: value isNull. + + self assert: value utf8StringFromCString equals: aString +] + +{ #category : 'running' } +IceProxySettingsTest >> setUp [ + + super setUp. + + oldNetworkSettingsHost := NetworkSystemSettings httpProxyServer. + oldNetworkSettingsPort := NetworkSystemSettings httpProxyPort. +] + +{ #category : 'running' } +IceProxySettingsTest >> tearDown [ + + NetworkSystemSettings httpProxyServer: oldNetworkSettingsHost. + NetworkSystemSettings httpProxyPort: oldNetworkSettingsPort. + + super tearDown +] + +{ #category : 'tests' } +IceProxySettingsTest >> testConfigureProxyOptWithCorrectProxyUrl [ + + | proxyOpt | + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + NetworkSystemSettings httpProxyPort: 8080. + + proxyOpt := LGitProxyOptions defaults. + Iceberg configureLGitProxyOpt: proxyOpt. + + self assert: proxyOpt prim_url value equals: Iceberg proxyURLExternalString value. + self assert: proxyOpt prim_url utf8StringFromCString equals: 'https://myproxy.company.com:8080'. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testEmptyHostReturnsNullPointer [ + + NetworkSystemSettings httpProxyServer: ''. + + self assert: Iceberg proxyURLExternalString isNull. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testHostAndDefaultPortHasCorrectAddress [ + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + + self assertProxyURLExternalStringHasValue: 'https://myproxy.company.com:80'. +] + +{ #category : 'tests' } +IceProxySettingsTest >> testHostAndPortHasCorrectAddress [ + + NetworkSystemSettings httpProxyServer: 'myproxy.company.com'. + NetworkSystemSettings httpProxyPort: 8080. + + self assertProxyURLExternalStringHasValue: 'https://myproxy.company.com:8080'. +] diff --git a/Iceberg-Tests/IceRepository.extension.st b/Iceberg-Tests/IceRepository.extension.st index 2688b0acbb..90ab367f8c 100644 --- a/Iceberg-Tests/IceRepository.extension.st +++ b/Iceberg-Tests/IceRepository.extension.st @@ -1,12 +1,12 @@ -Extension { #name : #IceRepository } +Extension { #name : 'IceRepository' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } IceRepository >> latestVersion: packageName [ ^ (self packageNamed: packageName) latestVersion ] -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } IceRepository >> loadPackageNamed: packageName [ self workingCopy diff --git a/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st b/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st index ef88da2467..e43d4b6e2a 100644 --- a/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st +++ b/Iceberg-Tests/IceRepositoryWithSingleRemoteAndMergeConflictTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceRepositoryWithSingleRemoteAndMergeConflictTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceRepositoryWithSingleRemoteAndMergeConflictTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryWithSingleRemoteAndMergeConflictTest class >> isAbstract [ ^ self == IceRepositoryWithSingleRemoteAndMergeConflictTest ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasIncomingCommitsAfterFetch [ self repository fetch. @@ -18,19 +20,19 @@ IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasIncomingCo self assert: self repository hasIncomingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasNoIncomingCommitsIfNoFetch [ self deny: self repository hasIncomingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasNoOutgoingCommitsIfNoFetch [ self deny: self repository hasOutgoingCommits ] -{ #category : #tests } +{ #category : 'tests' } IceRepositoryWithSingleRemoteAndMergeConflictTest >> testRepositoryHasOutgoingCommitsAfterFetch [ self repository fetch. diff --git a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st index 9e3409ebfe..191a0481f3 100644 --- a/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st +++ b/Iceberg-Tests/IceRepositoryWithSingleRemoteTest.class.st @@ -1,42 +1,44 @@ Class { - #name : #IceRepositoryWithSingleRemoteTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceRepositoryWithSingleRemoteTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceRepositoryWithSingleRemoteTest class >> isAbstract [ ^ self == IceRepositoryWithSingleRemoteTest ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testAfterFetchingARepositoryTracksRemoteBranch [ self repository fetch. self assert: self repository remoteTrackedBranches notEmpty ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testBeforeFetchingARepositoryHasNoRemoteTrackedBranches [ self assert: self repository remoteTrackedBranches isEmpty ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testFetchUpdatesTrackedRemoteBranch [ | newCommit remoteTrackedBranches | self remoteRepository workingCopy addPackageNamed: 'AnotherPackage'. newCommit := self remoteRepository commitWithMessage: 'Another commit message'. - + self repository fetch. remoteTrackedBranches := self repository remoteTrackedBranches. self assert: remoteTrackedBranches size equals: 1. - self assert: self repository remoteTrackedBranches anyOne commit equals: newCommit + self assert: remoteTrackedBranches anyOne commit equals: newCommit ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceRepositoryWithSingleRemoteTest >> testLocalBranchDoesNotTrackARemoteBranchBeforeFetching [ "We commit to force the creation of the local branch" @@ -46,7 +48,7 @@ IceRepositoryWithSingleRemoteTest >> testLocalBranchDoesNotTrackARemoteBranchBef self deny: (self repository branchNamed: self remoteBranchName) tracksRemoteBranch. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceRepositoryWithSingleRemoteTest >> testLocalCheckedOutBranchIsEqualsToHEAD [ "We commit to force the creation of the local branch" @@ -56,7 +58,7 @@ IceRepositoryWithSingleRemoteTest >> testLocalCheckedOutBranchIsEqualsToHEAD [ self assert: (self repository branchNamed: self repository head name) equals: self repository head. ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testPushPushesTags [ (self repository isKindOf: IceMemoryRepository) @@ -71,40 +73,40 @@ IceRepositoryWithSingleRemoteTest >> testPushPushesTags [ self assert: (self remoteRepository tagNames includes: 'exampleTag') ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testRemoteTrackedBranchHasSameNameAsRemoteBranch [ self repository fetch. self assert: self repository remoteTrackedBranches anyOne shortname equals: self remoteBranchName ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasIncomingCommits [ self assert: self repository hasIncomingCommits ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasNoMoreIncomingCommitsAfterPull [ self repository pull. self deny: self repository hasIncomingCommits ] -{ #category : #'tests-push' } +{ #category : 'tests-push' } IceRepositoryWithSingleRemoteTest >> testRepositoryHasNoOutgoingCommits [ self deny: self repository hasOutgoingCommits ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullDoesFetchAndMergeFromOrigin [ self repository pull. self assert: self repository head commit equals: self remoteRepository head commit. ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromBranchThatDoesNotHaveACorrespondingRemoteBranchDoesNothing [ | prePullCommit | @@ -117,7 +119,7 @@ IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromBranchThatDoesNotHave self assert: self repository head commit equals: prePullCommit. ] -{ #category : #'tests-pull' } +{ #category : 'tests-pull' } IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromUnbornBranchThatDoesNotHaveACorrespondingRemoteBranchDoesNothing [ | prePullCommit | @@ -129,7 +131,7 @@ IceRepositoryWithSingleRemoteTest >> testRepositoryPullFromUnbornBranchThatDoesN self assert: self repository head commit equals: prePullCommit. ] -{ #category : #'tests-fetch' } +{ #category : 'tests-fetch' } IceRepositoryWithSingleRemoteTest >> testWithoutFetchTrackedRemoteBranchIsNotUpdated [ | newCommit | diff --git a/Iceberg-Tests/IceScpRemoteTest.class.st b/Iceberg-Tests/IceScpRemoteTest.class.st index 7b856a50cc..1ee59c73be 100644 --- a/Iceberg-Tests/IceScpRemoteTest.class.st +++ b/Iceberg-Tests/IceScpRemoteTest.class.st @@ -2,44 +2,46 @@ Unit test for IceScpRemote " Class { - #name : #IceScpRemoteTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'IceScpRemoteTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #support } +{ #category : 'support' } IceScpRemoteTest >> gitoliteUrl1 [ ^ 'gitolite3@server.bogus.edu:reponame' ] -{ #category : #support } +{ #category : 'support' } IceScpRemoteTest >> gitoliteUrl2 [ ^ 'ssh://gitolite3@server.bogus.edu/reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitProtocol [ self assert: (IceGitScpRemote canHandleUrl: 'git@github.com:owner/repo.git') ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitoliteProtocol1 [ self assert: (IceGitScpRemote canHandleUrl: self gitoliteUrl1) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleGitoliteProtocol2 [ self assert: (IceGitScpRemote canHandleUrl: self gitoliteUrl2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testCanHandleSSHProtocol [ self assert: (IceGitScpRemote canHandleUrl: 'ssh://github.com:owner/repo.git') ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitHubURL [ | remote | remote := IceGitRemote url: 'git@github.com:owner/repo.git'. @@ -50,7 +52,7 @@ IceScpRemoteTest >> testGitHubURL [ assert: remote projectName equals: 'repo'. ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitoliteURL1 [ | remote | remote := IceGitRemote url: self gitoliteUrl1. @@ -61,7 +63,7 @@ IceScpRemoteTest >> testGitoliteURL1 [ assert: remote projectName equals: 'reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testGitoliteURL2 [ | remote | remote := IceGitRemote url: self gitoliteUrl2. @@ -72,7 +74,7 @@ IceScpRemoteTest >> testGitoliteURL2 [ assert: remote projectName equals: 'reponame' ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSameRemoteReference [ | r1 r2 | @@ -81,7 +83,7 @@ IceScpRemoteTest >> testSameRemoteReference [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ | r1 r2 | @@ -90,7 +92,7 @@ IceScpRemoteTest >> testSameRemoteReferenceWithoutGitExtension [ self assert: (r1 referencesSameRemoteLocationAs: r2) ] -{ #category : #tests } +{ #category : 'tests' } IceScpRemoteTest >> testSshUrl [ | remote | remote := IceGitRemote url: 'git@github.com:npasserini/pharo-git.git'. diff --git a/Iceberg-Tests/IceSinglePackageFixture.class.st b/Iceberg-Tests/IceSinglePackageFixture.class.st index a673fefb0b..b835599320 100644 --- a/Iceberg-Tests/IceSinglePackageFixture.class.st +++ b/Iceberg-Tests/IceSinglePackageFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageFixture, - #superclass : #IceBasicRepositoryFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceSinglePackageFixture', + #superclass : 'IceBasicRepositoryFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st index 48b876bbb9..6037b24786 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryTest >> newFixture [ ^ IceSinglePackageFixture inGit ] diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st index 691212f3f2..ba6b3d3aad 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithComplexSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st index 3ba9702855..c5f2831c8b 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest.class.st @@ -1,17 +1,19 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit subdirectory: '.'; yourself ] -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithDotSubdirectoryTest >> testCodeSubdirectoryIsRoot [ self assert: self repository location equals: self repository subdirectoryReference diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st index 47d785b5ae..e819bc5278 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithLowerCasePackageTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st index c1602ee15d..5d33056cc3 100644 --- a/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalGitRepositoryWithSubdirectoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalGitRepositoryWithSubdirectoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Git' + #name : 'IceSinglePackageLocalGitRepositoryWithSubdirectoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalGitRepositoryWithSubdirectoryTest >> newFixture [ ^ IceSinglePackageFixture inGit diff --git a/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st index 5c2dc91d44..27046034e5 100644 --- a/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalMemoryRepositoryTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceSinglePackageLocalMemoryRepositoryTest, - #superclass : #IceSinglePackageLocalRepositoryTest, - #category : 'Iceberg-Tests-Memory' + #name : 'IceSinglePackageLocalMemoryRepositoryTest', + #superclass : 'IceSinglePackageLocalRepositoryTest', + #category : 'Iceberg-Tests-Memory', + #package : 'Iceberg-Tests', + #tag : 'Memory' } -{ #category : #running } +{ #category : 'running' } IceSinglePackageLocalMemoryRepositoryTest >> newFixture [ ^ IceSinglePackageFixture inMemory ] diff --git a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st index a85b82fc31..c0825ed05c 100644 --- a/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st +++ b/Iceberg-Tests/IceSinglePackageLocalRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceSinglePackageLocalRepositoryTest, - #superclass : #IceBornRepositoryTest, - #category : #'Iceberg-Tests-Common' + #name : 'IceSinglePackageLocalRepositoryTest', + #superclass : 'IceBornRepositoryTest', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceSinglePackageLocalRepositoryTest class >> isAbstract [ ^ self == IceSinglePackageLocalRepositoryTest ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInCommit [ | diff | @@ -36,7 +38,7 @@ IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInC self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInCommitSecondVariable [ | diff | @@ -69,7 +71,7 @@ IceSinglePackageLocalRepositoryTest >> testAddClassInstanceVariableIsExportedInC self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesChangesContainClassDefinition [ | diff | @@ -93,7 +95,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesChangesContainCla self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommit [ | diff | @@ -119,7 +121,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommi self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommitSecondVariable [ | diff | @@ -152,7 +154,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassSideMakesIsExportedInCommi self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsCompositionIsExported [ | diff | @@ -163,14 +165,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -190,7 +192,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsCompositionIsExportedInSecondCommit [ | diff | @@ -201,14 +203,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -219,14 +221,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -247,7 +249,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithClassSideTraitsComposi ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExportedInCommit [ | diff | @@ -258,8 +260,8 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ] @@ -282,7 +284,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExportedInCommitSecondVariable [ | diff | @@ -293,8 +295,8 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ] @@ -324,7 +326,7 @@ IceSinglePackageLocalRepositoryTest >> testChangeClassWithTraitsSideMakesIsExpor self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsCompositionIsExportedInSecondCommit [ | diff | @@ -335,14 +337,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi self repository workingCopy createTrait: 'T2' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -353,14 +355,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi self repository workingCopy createTrait: 'T2' inPackage: self packageName1 asSymbol with: [ :class | | composition transformations classSideComposition classSideTransformations| - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new parse: 'T1' for: composition. + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'T1' for: composition. class traitComposition: composition. transformations do: [ :each | composition addTransformation: each ]. - classSideComposition := RG2TraitCompositionDefinition parent: class classSide. - classSideTransformations := RG2TraitCompositionVisitor new + classSideComposition := RGTraitComposition parent: class classSide. + classSideTransformations := RGTraitCompositionVisitor new parse: 'T1 classTrait - {#m1}' for: classSideComposition. class classSide traitComposition: classSideComposition. classSideTransformations do: [ :each | @@ -379,14 +381,14 @@ IceSinglePackageLocalRepositoryTest >> testChangeTraitWithClassSideTraitsComposi ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchDoesNotLeaveDetachedHead [ self repository branch checkout. self deny: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ | message | @@ -407,77 +409,73 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsCodeInImage [ self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutBranchInstallsPackageInImage [ self repository branch checkout. self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsCodeInImage [ | message | message := 'Added IceGeneratedClassForTesting'. - + "This is a Ring working copy" - self repository workingCopy - createClass: 'IceGeneratedClassForTesting' - inPackage: self packageName1 asSymbol. - + self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. + self repository commitWithMessage: message. - + self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (RPackageOrganizer default hasPackage: self packageName1). + self repository head checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. - self assertPackageExists: self packageName1. + self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCodeRepositoryInstallsPackageInImage [ self repository checkoutAllPackages. self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsCodeInImage [ | message | message := 'Added IceGeneratedClassForTesting'. "This is a Ring working copy" - self repository workingCopy - createClass: 'IceGeneratedClassForTesting' - inPackage: self packageName1 asSymbol. + self repository workingCopy createClass: 'IceGeneratedClassForTesting' inPackage: self packageName1 asSymbol. self repository commitWithMessage: message. - + self repository unload. - self deny: (RPackageOrganizer default includesPackageNamed: self packageName1). - + self deny: (RPackageOrganizer default hasPackage: self packageName1). + self repository branch commit checkoutAllPackages. self assertClassExists: #IceGeneratedClassForTesting. - self assertPackageExists: self packageName1. + self assertPackageExists: self packageName1 ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutCommitInstallsPackageInImage [ self repository branch commit checkout. self assertPackageExists: self packageName1. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutLatestBranchCommitLeavesDetachedHead [ self repository branch commit checkout. self assert: self repository head isDetached. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryInDetachedMode [ | message | @@ -502,14 +500,14 @@ IceSinglePackageLocalRepositoryTest >> testCheckoutOlderCommitLeavesRepositoryIn self assert: self repository head isDetached ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testCheckoutRepositoryDoesNotLeaveDetachedHead [ self repository checkoutAllPackages. self deny: self repository head isDetached ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitModificationsCreatesNewCommit [ | message | @@ -526,7 +524,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitModificationsCreatesNewCommit [ self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitModificationsDoNotCreateBranch [ | message | @@ -543,7 +541,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitModificationsDoNotCreateBranch self deny: self repository workingCopy isDetached. ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testCommitWithDetachedHeadRaisesException [ | message | @@ -559,7 +557,7 @@ IceSinglePackageLocalRepositoryTest >> testCommitWithDetachedHeadRaisesException self should: [self repository commitWithMessage: message] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesContainClassDefinition [ | diff | @@ -576,7 +574,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesContain self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesNonEmpty [ "This is a Ring working copy" @@ -586,7 +584,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesChangesNonEmpt self deny: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesRespositoryModifications [ "This is a Ring working copy" @@ -596,7 +594,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassInImageMakesRespositoryMod self assert: self repository isModified ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateClassWithClassInstanceVariableInImageMakesChangesContainClassAndMetaclassDefinition [ | diff | @@ -614,7 +612,7 @@ IceSinglePackageLocalRepositoryTest >> testCreateClassWithClassInstanceVariableI self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting') value definition name equals: #IceGeneratedClassForTesting. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testCreateExtensionMethodMakesExtensionMethodAsAddition [ | diff | @@ -634,13 +632,13 @@ IceSinglePackageLocalRepositoryTest >> testCreateExtensionMethodMakesExtensionMe self assert: (diff codeSubdirectoryNode / self packageName1 / 'ToBeExtended' / 'method') value definition isMethodDefinition. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testCurrentBranchIsDefaultMasterBranch [ self assert: self repository branch name equals: 'master' ] -{ #category : #'tests-commit' } +{ #category : 'tests-commit' } IceSinglePackageLocalRepositoryTest >> testDetachedHeadCannotCommit [ self repository branch commit checkout. @@ -648,7 +646,7 @@ IceSinglePackageLocalRepositoryTest >> testDetachedHeadCannotCommit [ self should: [self repository validateCanCommit] raise: IceWorkingCopyDesyncronized. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListBranchCommitsListsCommitsInBranch [ | branches commits | @@ -659,7 +657,7 @@ IceSinglePackageLocalRepositoryTest >> testListBranchCommitsListsCommitsInBranch self assert: commits first comment equals: 'Initial commit'. ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListBranchesListsExistingBranches [ | branches | @@ -668,7 +666,7 @@ IceSinglePackageLocalRepositoryTest >> testListBranchesListsExistingBranches [ self assert: branches first name equals: 'master' ] -{ #category : #'tests-queries' } +{ #category : 'tests-queries' } IceSinglePackageLocalRepositoryTest >> testListPackagesListExistingPackage [ | packages | @@ -677,19 +675,19 @@ IceSinglePackageLocalRepositoryTest >> testListPackagesListExistingPackage [ self assert: packages first equals: self packageName1 ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testNoChangesInImageMakesChangesEmpty [ self assert: self repository workingCopyDiff isEmpty ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testNoChangesInImageMakesNoModifications [ self deny: self repository isModified ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveClassInstanceVariableIsExportedInCommit [ | diff | @@ -722,7 +720,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveClassInstanceVariableIsExported self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class') value definition name equals: #'IceGeneratedClassForTesting class'. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveClassWithClassMethodIsExportedInCommit [ | diff | @@ -749,7 +747,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveClassWithClassMethodIsExportedI self assert: (diff codeSubdirectoryNode / self packageName1 / 'IceGeneratedClassForTesting class' / 'foo') value isRemoval. ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodDoesNotRemoveExtendedClass [ | commitWithExtension commitWithoutExtension | @@ -777,7 +775,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodDoesNotRemoveExt self assertClassExists: #ToBeExtended ] -{ #category : #'tests-changes' } +{ #category : 'tests-changes' } IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodMakesExtensionRemoval [ | diff | @@ -805,7 +803,7 @@ IceSinglePackageLocalRepositoryTest >> testRemoveExtensionMethodMakesExtensionRe self assert: (diff codeSubdirectoryNode / self packageName1 / 'ToBeExtended' / 'method') value definition isMethodDefinition. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testRemovePackageRemovesIt [ | package | @@ -815,7 +813,7 @@ IceSinglePackageLocalRepositoryTest >> testRemovePackageRemovesIt [ self assert: (self repository workingCopyDiff codeSubdirectoryNode / self packageName1) value isRemoval ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassAddition [ | className | @@ -831,7 +829,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassAddition [ self denyClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassRemoval [ | className | @@ -852,7 +850,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassRemoval [ self assertClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassSlotModification [ | className class | @@ -878,7 +876,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsClassSlotModification environment ask behaviorNamed: className) instVarNames includes: #slot). ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodAddition [ | className | @@ -899,7 +897,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodAddition [ self denyMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodModification [ | className | @@ -929,7 +927,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodModification [ equals: 'method' ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodRemoval [ | className | @@ -953,7 +951,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertAllRevertsMethodRemoval [ self assertMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassAddition [ | className | @@ -969,7 +967,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassAdd self denyClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassRemoval [ | className | @@ -990,7 +988,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassRem self assertClassExists: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassSlotModification [ | className class | @@ -1016,7 +1014,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsClassSlo environment ask behaviorNamed: className) instVarNames includes: #slot). ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodAddition [ | className | @@ -1037,7 +1035,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodAd self denyMethodExists: 'method' inClass: className. ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodModification [ | className | @@ -1067,7 +1065,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodMo equals: 'method' ] -{ #category : #'tests-revert' } +{ #category : 'tests-revert' } IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodRemoval [ | className | @@ -1091,7 +1089,7 @@ IceSinglePackageLocalRepositoryTest >> testRevertSingleDefinitionRevertsMethodRe self assertMethodExists: 'method' inClass: className. ] -{ #category : #'tests-checkout' } +{ #category : 'tests-checkout' } IceSinglePackageLocalRepositoryTest >> testUnloadDoesNotRemovePackage [ | package | diff --git a/Iceberg-Tests/IceTestDefinition.class.st b/Iceberg-Tests/IceTestDefinition.class.st index b34bce7170..2228369635 100644 --- a/Iceberg-Tests/IceTestDefinition.class.st +++ b/Iceberg-Tests/IceTestDefinition.class.st @@ -1,13 +1,15 @@ Class { - #name : #IceTestDefinition, - #superclass : #IceDefinition, + #name : 'IceTestDefinition', + #superclass : 'IceDefinition', #instVars : [ 'contents' ], - #category : 'Iceberg-Tests-Changes' + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'as yet unclassified' } +{ #category : 'as yet unclassified' } IceTestDefinition class >> named: aString contents: aContensts [ ^ self new @@ -16,32 +18,32 @@ IceTestDefinition class >> named: aString contents: aContensts [ yourself ] -{ #category : #comparing } +{ #category : 'comparing' } IceTestDefinition >> = aTestDefinition [ ^ super = aTestDefinition and: [ contents = aTestDefinition contents ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestDefinition >> contents [ ^ contents ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestDefinition >> contents: aString [ contents := aString ] -{ #category : #comparing } +{ #category : 'comparing' } IceTestDefinition >> hash [ ^ super hash + contents hash ] -{ #category : #initialization } +{ #category : 'initialization' } IceTestDefinition >> initialize [ super initialize. name := 'test' diff --git a/Iceberg-Tests/IceTestParameter.class.st b/Iceberg-Tests/IceTestParameter.class.st index 8829feb960..bb435b5cdd 100644 --- a/Iceberg-Tests/IceTestParameter.class.st +++ b/Iceberg-Tests/IceTestParameter.class.st @@ -2,20 +2,22 @@ I represent a test parameter, including a set of possible values for each parameter. See ParameterizedTest for more information about usage. " Class { - #name : #IceTestParameter, - #superclass : #Object, + #name : 'IceTestParameter', + #superclass : 'Object', #instVars : [ 'options' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTestParameter class >> withOptions: aCollection [ ^ self new options: (aCollection collect: #asTestParameterValue); yourself ] -{ #category : #'instance creation' } +{ #category : 'instance creation' } IceTestParameter class >> withOptions: aCollection on: target selector: selector [ ^ self new options: (aCollection collect: [:value | @@ -26,17 +28,17 @@ IceTestParameter class >> withOptions: aCollection on: target selector: selector yourself ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameter >> options [ ^ options ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameter >> options: anObject [ options := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameter >> printOn: aStream [ aStream print: self class; diff --git a/Iceberg-Tests/IceTestParameterValue.class.st b/Iceberg-Tests/IceTestParameterValue.class.st index 3ef6462909..5dc23d9550 100644 --- a/Iceberg-Tests/IceTestParameterValue.class.st +++ b/Iceberg-Tests/IceTestParameterValue.class.st @@ -18,44 +18,46 @@ Internal Representation and Key Implementation Points. " Class { - #name : #IceTestParameterValue, - #superclass : #Object, + #name : 'IceTestParameterValue', + #superclass : 'Object', #instVars : [ 'value', 'target', 'selector', 'previousValue' ], - #category : 'Iceberg-Tests-Base' + #category : 'Iceberg-Tests-Base', + #package : 'Iceberg-Tests', + #tag : 'Base' } -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> activate [ self previousValue: self getValue. self setValue: self value ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> deactivate [ self setValue: self previousValue ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> getValue [ ^ self target perform: self selector ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> previousValue [ ^ previousValue ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> previousValue: anObject [ previousValue := anObject ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameterValue >> printOn: aStream [ aStream print: self class; @@ -64,44 +66,44 @@ IceTestParameterValue >> printOn: aStream [ nextPut: $) ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> selector [ ^ selector ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> selector: anObject [ selector := anObject ] -{ #category : #activating } +{ #category : 'activating' } IceTestParameterValue >> setValue: newValue [ ^ self target perform: self selector asMutator with: newValue ] -{ #category : #printing } +{ #category : 'printing' } IceTestParameterValue >> shortName [ ^ (self value respondsTo: #shortName) ifTrue: [ self value shortName ] ifFalse: [ self value printString ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> target [ ^ target ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> target: anObject [ target := anObject ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> value [ ^ value ] -{ #category : #accessing } +{ #category : 'accessing' } IceTestParameterValue >> value: anObject [ value := anObject ] diff --git a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st index 7cf8ca36e1..d9871e5d3b 100644 --- a/Iceberg-Tests/IceTraitsCherryPickingTest.class.st +++ b/Iceberg-Tests/IceTraitsCherryPickingTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTraitsCherryPickingTest, - #superclass : #IceCherryPickingTest, - #category : #'Iceberg-Tests-Cherrypicking' + #name : 'IceTraitsCherryPickingTest', + #superclass : 'IceCherryPickingTest', + #category : 'Iceberg-Tests-Cherrypicking', + #package : 'Iceberg-Tests', + #tag : 'Cherrypicking' } -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ | commitToCherryPick diff mergeTree | self repository createBranch: 'b2'. @@ -21,8 +23,8 @@ IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ inPackage: self packageName1 asSymbol with: [ :class | | composition transformations | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTrait' for: composition. class traitComposition: composition. @@ -62,7 +64,7 @@ IceTraitsCherryPickingTest >> testAddTraitDependingInATrait [ equals: 0 ] -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ | commitToCherryPick diff mergeTree | self repository workingCopy @@ -70,8 +72,8 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ inPackage: self packageName1 asSymbol with: [ :class | | transformations composition | - composition := RG2TraitCompositionDefinition parent: class. - transformations := RG2TraitCompositionVisitor new + composition := RGTraitComposition parent: class. + transformations := RGTraitCompositionVisitor new parse: 'TestTraitInitial' for: composition. class traitComposition: composition. @@ -102,7 +104,7 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByAClass [ assert: (diff / self packageName1 / 'TestClassUsingTrait') value isRemoval ] -{ #category : #tests } +{ #category : 'tests' } IceTraitsCherryPickingTest >> testRemoveTraitUsedByATrait [ | commitToCherryPick diff mergeTree | self repository workingCopy @@ -110,8 +112,8 @@ IceTraitsCherryPickingTest >> testRemoveTraitUsedByATrait [ inPackage: self packageName1 asSymbol with: [ :class | | transformations composition | - composition := (RG2TraitCompositionDefinition parent: class). - transformations := RG2TraitCompositionVisitor new + composition := (RGTraitComposition parent: class). + transformations := RGTraitCompositionVisitor new parse: 'TestTraitInitial' for: composition. diff --git a/Iceberg-Tests/IceTreeConstructionTests.class.st b/Iceberg-Tests/IceTreeConstructionTests.class.st index 43e59570d8..3816f38482 100644 --- a/Iceberg-Tests/IceTreeConstructionTests.class.st +++ b/Iceberg-Tests/IceTreeConstructionTests.class.st @@ -1,22 +1,24 @@ Class { - #name : #IceTreeConstructionTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeConstructionTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #helpers } +{ #category : 'helpers' } IceTreeConstructionTests >> includesPackageNamed: aString [ ^ aString = 'MonticelloMocks' ] -{ #category : #helpers } +{ #category : 'helpers' } IceTreeConstructionTests >> snapshotForPackage: anIcePackage [ ^ anIcePackage name asPackage mcWorkingCopy snapshot ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithDirectory [ | tree child | @@ -27,7 +29,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithDirectory [ self assert: (tree / 'src' / 'tmp') value isDirectoryDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithFile [ | tree child | @@ -38,7 +40,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithFile [ self assert: (tree / 'src' / 'tmp') value isFileDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateDirectoryWithPackage [ | tree importer child | @@ -63,7 +65,7 @@ IceTreeConstructionTests >> testCreateDirectoryWithPackage [ self assert: (tree / 'src' / 'MonticelloMocks' / 'MCSnapshotTest' / 'mockClassExtension') value isMethodDefinition. ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithDirectory [ | tree | @@ -73,7 +75,7 @@ IceTreeConstructionTests >> testCreateTreeWithDirectory [ self assert: (tree / 'src') value isDirectoryDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithFile [ | tree | @@ -83,7 +85,7 @@ IceTreeConstructionTests >> testCreateTreeWithFile [ self assert: (tree / 'Readme.md') value isFileDefinition ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testCreateTreeWithPackage [ | tree importer | @@ -107,7 +109,7 @@ IceTreeConstructionTests >> testCreateTreeWithPackage [ self assert: (tree / 'MonticelloMocks' / 'MCSnapshotTest' / 'mockClassExtension') value isMethodDefinition. ] -{ #category : #tests } +{ #category : 'tests' } IceTreeConstructionTests >> testEmptyTreeIsRootNode [ | tree | diff --git a/Iceberg-Tests/IceTreeMergeTests.class.st b/Iceberg-Tests/IceTreeMergeTests.class.st index 23821a149e..530b765c89 100644 --- a/Iceberg-Tests/IceTreeMergeTests.class.st +++ b/Iceberg-Tests/IceTreeMergeTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTreeMergeTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeMergeTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> buildTestTreeWithOperation: anOperation [ ^ (IceNode value: (IceNoModification definition: IceRootDefinition new)) @@ -12,7 +14,7 @@ IceTreeMergeTests >> buildTestTreeWithOperation: anOperation [ yourself ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingModificationWithRemoval [ | rightTree leftTree mergedTree conflictOperation | @@ -31,7 +33,7 @@ IceTreeMergeTests >> testConflictingModificationWithRemoval [ self assert: conflictOperation rightContents equals: ''. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingNoModificationWithRemoval [ | rightTree leftTree mergedTree conflictOperation | @@ -48,7 +50,7 @@ IceTreeMergeTests >> testConflictingNoModificationWithRemoval [ self assert: conflictOperation rightContents equals: ''. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingRemovalWithModification [ | rightTree leftTree mergedTree conflictOperation | @@ -68,7 +70,7 @@ IceTreeMergeTests >> testConflictingRemovalWithModification [ self assert: conflictOperation rightContents equals: 'new'. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testConflictingRemovalWithNoModification [ | rightTree leftTree mergedTree conflictOperation | @@ -85,7 +87,7 @@ IceTreeMergeTests >> testConflictingRemovalWithNoModification [ self assert: conflictOperation rightContents equals: 'old'. ] -{ #category : #'test-additions' } +{ #category : 'test-additions' } IceTreeMergeTests >> testMergeConflictingAdditions [ | rightTree leftTree mergedTree conflictOperation | @@ -102,7 +104,7 @@ IceTreeMergeTests >> testMergeConflictingAdditions [ self assert: conflictOperation rightContents equals: 'new2'. ] -{ #category : #'tests-basic' } +{ #category : 'tests-basic' } IceTreeMergeTests >> testMergeEmptyRootNodesReturnsNewEmptyRootNode [ | rightTree leftTree mergedTree | @@ -112,7 +114,7 @@ IceTreeMergeTests >> testMergeEmptyRootNodesReturnsNewEmptyRootNode [ self assert: mergedTree isEmpty. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testMergeTwoEqualAdditionsIsNoModification [ | rightTree leftTree mergedTree operation | @@ -126,7 +128,7 @@ IceTreeMergeTests >> testMergeTwoEqualAdditionsIsNoModification [ self deny: operation chosenOperation isModification. ] -{ #category : #'test-removals' } +{ #category : 'test-removals' } IceTreeMergeTests >> testMergeTwoEqualRemovalsIsNoModification [ | rightTree leftTree mergedTree operation | @@ -140,7 +142,7 @@ IceTreeMergeTests >> testMergeTwoEqualRemovalsIsNoModification [ self deny: operation chosenOperation isModification. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsInverseIsConflict [ | rightTree leftTree mergedTree conflictOperation | @@ -159,7 +161,7 @@ IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsInverseIsCon self assert: conflictOperation leftContents equals: 'new'. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsIsConflict [ | rightTree leftTree mergedTree conflictOperation | @@ -179,7 +181,7 @@ IceTreeMergeTests >> testMergeTwoModificationsToDifferentDefinitionsIsConflict [ self assert: conflictOperation rightContents equals: 'old'. ] -{ #category : #'test-modifications' } +{ #category : 'test-modifications' } IceTreeMergeTests >> testMergeTwoModificationsToTheSameDefinitionIsNoModification [ | rightTree leftTree mergedTree operation | diff --git a/Iceberg-Tests/IceTreeTests.class.st b/Iceberg-Tests/IceTreeTests.class.st index 7343ccd4ef..78e0a488de 100644 --- a/Iceberg-Tests/IceTreeTests.class.st +++ b/Iceberg-Tests/IceTreeTests.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceTreeTests, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Changes' + #name : 'IceTreeTests', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Changes', + #package : 'Iceberg-Tests', + #tag : 'Changes' } -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testDetectFoundElement [ | selected | @@ -13,12 +15,12 @@ IceTreeTests >> testDetectFoundElement [ self assert: selected equals: 2 ] -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testDetectNotFoundElement [ self should: [ (IceNode value: 1) detect: [ :e | e value even ] ] raise: NotFound ] -{ #category : #tests } +{ #category : 'tests' } IceTreeTests >> testSelect [ | selected | diff --git a/Iceberg-Tests/IceUnbornProjectFixture.class.st b/Iceberg-Tests/IceUnbornProjectFixture.class.st index b3d5bd58ed..ba5d2ec21e 100644 --- a/Iceberg-Tests/IceUnbornProjectFixture.class.st +++ b/Iceberg-Tests/IceUnbornProjectFixture.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceUnbornProjectFixture, - #superclass : #IceSinglePackageFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceUnbornProjectFixture', + #superclass : 'IceSinglePackageFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceUnbornProjectFixture >> isUnbornProjectFixture [ ^ true ] -{ #category : #running } +{ #category : 'running' } IceUnbornProjectFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st b/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st index 1c7fed5678..9e550e0b05 100644 --- a/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st +++ b/Iceberg-Tests/IceUnknownCommitRepositoryTest.class.st @@ -1,16 +1,18 @@ Class { - #name : #IceUnknownCommitRepositoryTest, - #superclass : #IceAbstractTestCase, - #category : 'Iceberg-Tests-Common' + #name : 'IceUnknownCommitRepositoryTest', + #superclass : 'IceAbstractTestCase', + #category : 'Iceberg-Tests-Common', + #package : 'Iceberg-Tests', + #tag : 'Common' } -{ #category : #testing } +{ #category : 'testing' } IceUnknownCommitRepositoryTest class >> isAbstract [ ^ self == IceUnknownCommitRepositoryTest ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testFetchFixesUnknownCommit [ self repository fetch. @@ -18,13 +20,13 @@ IceUnknownCommitRepositoryTest >> testFetchFixesUnknownCommit [ self assert: self repository workingCopy workingCopyState isSingleCommitState ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testReferenceCommitIsUnknown [ self assert: self repository workingCopy referenceCommit isUnknownCommit ] -{ #category : #running } +{ #category : 'running' } IceUnknownCommitRepositoryTest >> testWorkingCopyIsUnknownVersionWorkingCopy [ self assert: self repository workingCopy workingCopyState isUnknownCommitState diff --git a/Iceberg-Tests/IceUrlBuilderTest.class.st b/Iceberg-Tests/IceUrlBuilderTest.class.st index 8c8cf0e95b..6798ad9769 100644 --- a/Iceberg-Tests/IceUrlBuilderTest.class.st +++ b/Iceberg-Tests/IceUrlBuilderTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceUrlBuilderTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Git' + #name : 'IceUrlBuilderTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Git', + #package : 'Iceberg-Tests', + #tag : 'Git' } -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testArbitraryHttpsUrl [ | url | @@ -17,7 +19,7 @@ IceUrlBuilderTest >> testArbitraryHttpsUrl [ self assert: url equals: 'https://localhost/repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testArbitrarySSHUrl [ | url | @@ -30,7 +32,7 @@ IceUrlBuilderTest >> testArbitrarySSHUrl [ self assert: url equals: 'git@localhost:repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testBitbucketHttpsUrl [ | url | @@ -43,7 +45,7 @@ IceUrlBuilderTest >> testBitbucketHttpsUrl [ self assert: url equals: 'https://bitbucket.org/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testBitbucketSSHUrl [ | url | @@ -56,7 +58,7 @@ IceUrlBuilderTest >> testBitbucketSSHUrl [ self assert: url equals: 'git@bitbucket.org:username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testExplicitHttpsProtocolUrl [ | url | @@ -69,7 +71,7 @@ IceUrlBuilderTest >> testExplicitHttpsProtocolUrl [ self assert: url equals: 'https://localhost/repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testExplicitSSHProtocolUrl [ | url | @@ -82,7 +84,7 @@ IceUrlBuilderTest >> testExplicitSSHProtocolUrl [ self assert: url equals: 'git@localhost:repo.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitHubHttpsUrl [ | url | @@ -95,7 +97,7 @@ IceUrlBuilderTest >> testGitHubHttpsUrl [ self assert: url equals: 'https://github.com/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitHubSSHUrl [ | url | @@ -108,7 +110,7 @@ IceUrlBuilderTest >> testGitHubSSHUrl [ self assert: url equals: 'git@github.com:username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitLabHttpsUrl [ | url | @@ -121,7 +123,7 @@ IceUrlBuilderTest >> testGitLabHttpsUrl [ self assert: url equals: 'https://gitlab.com/username/project.git' ] -{ #category : #tests } +{ #category : 'tests' } IceUrlBuilderTest >> testGitLabSSHUrl [ | url | diff --git a/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st b/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st index c71e632103..6af7c7a28c 100644 --- a/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndLocalCommitAndUpstreamFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndLocalCommitAndUpstreamFixture, - #superclass : #IceWithRemoteAndLocalCommitFixture, - #category : #'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndLocalCommitAndUpstreamFixture', + #superclass : 'IceWithRemoteAndLocalCommitFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndLocalCommitAndUpstreamFixture >> setUp [ super setUp. repository branch setUpstream: remoteRepository branch. diff --git a/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st b/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st index 74f79571f9..d6ed37a2ab 100644 --- a/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndLocalCommitFixture.class.st @@ -1,35 +1,37 @@ Class { - #name : #IceWithRemoteAndLocalCommitFixture, - #superclass : #IceBasicRepositoryFixture, + #name : 'IceWithRemoteAndLocalCommitFixture', + #superclass : 'IceBasicRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName' ], - #category : #'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteAndLocalCommitFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndLocalCommitFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. diff --git a/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st b/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st index 0fa00a3299..79c3f1d4ff 100644 --- a/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndMergeConflictFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndMergeConflictFixture, - #superclass : #IceWithRemoteFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndMergeConflictFixture', + #superclass : 'IceWithRemoteFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndMergeConflictFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st b/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st index a024bd2fdc..1ade452c5d 100644 --- a/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteAndUnknownCommitFixture.class.st @@ -1,10 +1,12 @@ Class { - #name : #IceWithRemoteAndUnknownCommitFixture, - #superclass : #IceWithRemoteFixture, - #category : 'Iceberg-Tests-Common-Fixtures' + #name : 'IceWithRemoteAndUnknownCommitFixture', + #superclass : 'IceWithRemoteFixture', + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #running } +{ #category : 'running' } IceWithRemoteAndUnknownCommitFixture >> setUp [ super setUp. diff --git a/Iceberg-Tests/IceWithRemoteFixture.class.st b/Iceberg-Tests/IceWithRemoteFixture.class.st index 2dafc0be23..ac084576af 100644 --- a/Iceberg-Tests/IceWithRemoteFixture.class.st +++ b/Iceberg-Tests/IceWithRemoteFixture.class.st @@ -1,35 +1,37 @@ Class { - #name : #IceWithRemoteFixture, - #superclass : #IceBasicRepositoryFixture, + #name : 'IceWithRemoteFixture', + #superclass : 'IceBasicRepositoryFixture', #instVars : [ 'remote', 'remoteBranchName' ], - #category : 'Iceberg-Tests-Common-Fixtures' + #category : 'Iceberg-Tests-Common-Fixtures', + #package : 'Iceberg-Tests', + #tag : 'Common-Fixtures' } -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remote [ ^ remote ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteBranchName [ ^ remoteBranchName ifNil: [ remoteBranchName := 'master' ] ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteBranchName: aBranchName [ remoteBranchName := aBranchName ] -{ #category : #accessing } +{ #category : 'accessing' } IceWithRemoteFixture >> remoteRepository [ ^ remoteRepository ] -{ #category : #running } +{ #category : 'running' } IceWithRemoteFixture >> setUp [ super setUp. remoteRepository := self ensureRemoteRepository. diff --git a/Iceberg-Tests/MCClassDefinition.extension.st b/Iceberg-Tests/MCClassDefinition.extension.st index 90e54c3283..a8f54d3426 100644 --- a/Iceberg-Tests/MCClassDefinition.extension.st +++ b/Iceberg-Tests/MCClassDefinition.extension.st @@ -1,6 +1,6 @@ -Extension { #name : #MCClassDefinition } +Extension { #name : 'MCClassDefinition' } -{ #category : #'*Iceberg-Tests' } +{ #category : '*Iceberg-Tests' } MCClassDefinition >> ensureRing2DefinitionIn: aRG2Environment package: aRG2PackageDefinition [ | def | diff --git a/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st b/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st index 2bccddd0c0..643bf2468b 100644 --- a/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st +++ b/Iceberg-Tests/MCGitlabRepositoryIcebergExtensionsTest.class.st @@ -1,10 +1,12 @@ Class { - #name : #MCGitlabRepositoryIcebergExtensionsTest, - #superclass : #TestCase, - #category : 'Iceberg-Tests-Core-Remotes' + #name : 'MCGitlabRepositoryIcebergExtensionsTest', + #superclass : 'TestCase', + #category : 'Iceberg-Tests-Core-Remotes', + #package : 'Iceberg-Tests', + #tag : 'Core-Remotes' } -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrl [ | repository | @@ -13,7 +15,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrl [ self assert: repository httpsUrl equals: 'https://gitlab.com/pharo-project/pharo.git' ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrlForSelfHostedGitlab [ | repository | @@ -24,7 +26,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testHttpsUrlForSelfHostedGitlab [ ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrl [ | repository | @@ -33,7 +35,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testScpUrl [ self assert: repository scpUrl equals: 'git@gitlab.com:pharo-project/pharo.git' ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlab [ | repository | @@ -44,7 +46,7 @@ MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlab [ ] -{ #category : #running } +{ #category : 'running' } MCGitlabRepositoryIcebergExtensionsTest >> testScpUrlForSelfHostedGitlabWithNonDefaultSSHPort [ | repository | SystemVersion current major <= 6 ifTrue: [ self skip ]. diff --git a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st b/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st deleted file mode 100644 index 3a75af1456..0000000000 --- a/Iceberg-Tests/RG2MetaclassTraitDefinition.extension.st +++ /dev/null @@ -1,10 +0,0 @@ -Extension { #name : #RG2MetaclassTraitDefinition } - -{ #category : #'*Iceberg-Tests' } -RG2MetaclassTraitDefinition >> asMCDefinition [ - - ^ MCClassTraitDefinition - baseTraitName: baseTrait name - classTraitComposition: self traitCompositionString - category: self category -] diff --git a/Iceberg-Tests/RG2PackageDefinition.extension.st b/Iceberg-Tests/RG2PackageDefinition.extension.st deleted file mode 100644 index 93d826948c..0000000000 --- a/Iceberg-Tests/RG2PackageDefinition.extension.st +++ /dev/null @@ -1,20 +0,0 @@ -Extension { #name : #RG2PackageDefinition } - -{ #category : #'*Iceberg-Tests' } -RG2PackageDefinition >> asMCSnapshot [ - - | definitions | - definitions := ((((self definedBehaviors reject: #isMeta) sorted: [ :a :b | a name < b name ]) collect: #asMCDefinition) - , (self extensionMethods collect: #asMCDefinition)) asOrderedCollection. - definitions addAll: (self definedBehaviors - select: [ :each | each isTrait and: [ each classSide hasTraitComposition ] ] - thenCollect: [ :aTrait | aTrait classSide asMCDefinition ]). - - definitions addAll: (self definedBehaviors , (self definedBehaviors collect: #classSide) flatCollect: [ :behavior | - behavior localMethods - select: [ :each | each parent instanceSide package = each package ] - thenCollect: [ :method | method asMCDefinition ] ]). - definitions add: (MCOrganizationDefinition packageName: name). - - ^ MCSnapshot fromDefinitions: definitions -] diff --git a/Iceberg-Tests/RG2TraitDefinition.extension.st b/Iceberg-Tests/RG2TraitDefinition.extension.st deleted file mode 100644 index f70ff20dc1..0000000000 --- a/Iceberg-Tests/RG2TraitDefinition.extension.st +++ /dev/null @@ -1,15 +0,0 @@ -Extension { #name : #RG2TraitDefinition } - -{ #category : #'*Iceberg-Tests' } -RG2TraitDefinition >> asMCDefinition [ - - ^ MCTraitDefinition - name: self name - traitComposition: self traitCompositionString - category: self category - instVarNames: '' - classInstVarNames: '' - classTraitComposition: self classSide traitCompositionString - comment: self comment content - commentStamp: '' -] diff --git a/Iceberg-Tests/RG2UnresolvedValue.extension.st b/Iceberg-Tests/RG2UnresolvedValue.extension.st deleted file mode 100644 index 790070f126..0000000000 --- a/Iceberg-Tests/RG2UnresolvedValue.extension.st +++ /dev/null @@ -1,7 +0,0 @@ -Extension { #name : #RG2UnresolvedValue } - -{ #category : #'*Iceberg-Tests' } -RG2UnresolvedValue >> remove: aRG2MethodDefinition [ - - "I am undefined, removing something is futil" -] diff --git a/Iceberg-Tests/package.st b/Iceberg-Tests/package.st index 5ce11db7f6..cd00971291 100644 --- a/Iceberg-Tests/package.st +++ b/Iceberg-Tests/package.st @@ -1 +1 @@ -Package { #name : #'Iceberg-Tests' } +Package { #name : 'Iceberg-Tests' } diff --git a/Iceberg-TipUI/IceTipCommentPanel.class.st b/Iceberg-TipUI/IceTipCommentPanel.class.st index efad87e23a..49adb26e1c 100644 --- a/Iceberg-TipUI/IceTipCommentPanel.class.st +++ b/Iceberg-TipUI/IceTipCommentPanel.class.st @@ -87,14 +87,14 @@ IceTipCommentPanel >> initializePresenters [ add: (self newToolbarToggleButton icon: (self application iconNamed: #smallSave); label: 'Save image'; - help: 'Save image when commiting'; + help: 'Save image when committing'; state: self isSaving; whenChangedDo: [ :aBoolean | self saveOnCommit: aBoolean ]; yourself); add: (self newToolbarToggleButton icon: (self application iconNamed: #smallError); label: 'Run critics'; - help: 'Run critics when commiting'; + help: 'Run critics when committing'; state: self isRunningCriticsOnCommit; whenChangedDo: [ :aBoolean | self runCriticsOnCommit: aBoolean ]; yourself); @@ -115,7 +115,7 @@ IceTipCommentPanel >> initializePresenters [ placeholder: 'A comment for your commit'; yourself. - fixesHelpString := 'Enter the number of the issue that you fixed. Github will close it when it will be commited or merged in the default branch'. + fixesHelpString := 'Enter the number of the issue that you fixed. Github will close it when it will be committed or merged in the default branch'. fixesLabel := self newLabel label: 'Fixes #'; help: fixesHelpString; diff --git a/Iceberg-TipUI/IceTipCommitAction.class.st b/Iceberg-TipUI/IceTipCommitAction.class.st index af2aaf285c..de9362e209 100644 --- a/Iceberg-TipUI/IceTipCommitAction.class.st +++ b/Iceberg-TipUI/IceTipCommitAction.class.st @@ -18,7 +18,7 @@ Class { IceTipCommitAction >> basicExecute [ self validateCanCommit. UIManager default - informUser: 'Commiting...' + informUser: 'Committing...' during: [ self repository commitChanges: (diff copyWithOnly: items) diff --git a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st index 1fe0a37770..a420c950b2 100644 --- a/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st +++ b/Iceberg-TipUI/IceTipInteractiveErrorVisitor.class.st @@ -230,7 +230,7 @@ IceTipInteractiveErrorVisitor >> visitShouldCommitBeforePullError: anError [ | continue | continue := context application newConfirm label: - 'Your repository has uncommited changes. Merging incoming commits will change + 'Your repository has uncommitted changes. Merging incoming commits will change your current working copy and your current state will not be recoverable. We recommend that you commit first and then pull incoming changes again.'; title: 'You might loose your current changes!'; diff --git a/Iceberg-TipUI/IceTipPackageModel.class.st b/Iceberg-TipUI/IceTipPackageModel.class.st index a71afe257c..080c19e5b6 100644 --- a/Iceberg-TipUI/IceTipPackageModel.class.st +++ b/Iceberg-TipUI/IceTipPackageModel.class.st @@ -116,7 +116,7 @@ IceTipPackageModel >> status [ [ self entity repository isMissing ifTrue: [ ^ 'Local repository missing' ]. self entity isLoaded ifFalse: [ ^ 'Not loaded' ]. - self entity isModified ifTrue: [ ^ 'Uncommited changes' ]. + self entity isModified ifTrue: [ ^ 'Uncommitted changes' ]. ^ 'Up to date' ] on: Error do: [ :e | ^ e description ] diff --git a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st index cb040b7b29..ff31e7a499 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutBranch.class.st @@ -22,7 +22,7 @@ This situation happens because the code loaded in your image does not correspond This action opens a preview window before doing any change. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st index f843cc3782..acfd0b145a 100644 --- a/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairCheckoutNewBranch.class.st @@ -21,7 +21,7 @@ This will not lose any change in the image. This situation happens because the code loaded in your image does not correspond with the status of your repository. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st index a0d2a6921c..9329155783 100644 --- a/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st +++ b/Iceberg-TipUI/IceTipRepairCreateSubdirectory.class.st @@ -17,9 +17,9 @@ IceTipRepairCreateSubdirectory class >> help [ ^ 'Create a new subdirectory for the code. The configured source directory does not exist in the repository. -It is possible that the directory has been deleted or never commited after creating the meta-data. +It is possible that the directory has been deleted or never committed after creating the meta-data. -This operation will modify the state of your working copy on disk. All non-commited changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy on disk. All non-committed changes in your disk working copy that are not in the image will be lost (this can happen if you edited the repository from outside). If you want to keep them, perform a commit from outside before.' ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st index 3fc00951ed..afc8e2f488 100644 --- a/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st +++ b/Iceberg-TipUI/IceTipRepairDiscardAndLoad.class.st @@ -19,7 +19,7 @@ IceTipRepairDiscardAndLoad class >> help [ This action will synchronize your image with the code in the repository. -All the changes in the image that have not been commited will be lost. +All the changes in the image that have not been committed will be lost. This situation happens because loaded code in your image is from a different commit than the current commit (HEAD) in the repository. diff --git a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st index 0f258921e7..6cbe2c40af 100644 --- a/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairMergeWithBranch.class.st @@ -20,7 +20,7 @@ This will not lose any change in the image but may lead to conflicts. If there a This situation happens because loaded code in your image is from a different commit than the current commit (HEAD) in the repository. -This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-commited changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy in disk, the checkouted branch will replace the disk working copy. All non-committed changes in your disk working copy will be lost. If you want to keep them, perform a commit from outside before.' ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st index 8ace58c44b..39dab6c93d 100644 --- a/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st +++ b/Iceberg-TipUI/IceTipRepairPullRemoteBranch.class.st @@ -19,7 +19,7 @@ This will not lose any change in the image. This situation happens because the code loaded in your image is not in the branch currently selected on your repository. -This operation will modify the state of your working copy in disk. All non-commited changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' +This operation will modify the state of your working copy in disk. All non-committed changes in your disk working copy that are not in the image will be lost. If you want to keep them, perform a commit from outside before.' ] { #category : 'accessing' } diff --git a/Iceberg-TipUI/IceTipRepositoryModel.class.st b/Iceberg-TipUI/IceTipRepositoryModel.class.st index a9dab849ef..50453d5757 100644 --- a/Iceberg-TipUI/IceTipRepositoryModel.class.st +++ b/Iceberg-TipUI/IceTipRepositoryModel.class.st @@ -452,7 +452,7 @@ IceTipRepositoryModel >> status [ self isLoaded ifFalse: [ ^ 'Not loaded' ]. status := OrderedCollection new. - entity isModified ifTrue: [ status add: 'Uncommited changes' ]. + entity isModified ifTrue: [ status add: 'Uncommitted changes' ]. incoming := self incomingCommits size. incoming > 0 ifTrue: [ status add: ('{1} incoming' format: { incoming })]. @@ -512,7 +512,7 @@ IceTipRepositoryModel >> statusString [ self isLoaded ifFalse: [ ^ 'Not loaded' ]. status := OrderedCollection new. - entity isModified ifTrue: [ status add: 'Uncommited changes' ]. + entity isModified ifTrue: [ status add: 'Uncommitted changes' ]. incoming := self incomingCommits size. incoming > 0 ifTrue: [ status add: ('{1} incoming' format: { incoming })]. diff --git a/Iceberg/IceTipCommitSettings.class.st b/Iceberg/IceTipCommitSettings.class.st index 55041b99bf..fa9ee01677 100644 --- a/Iceberg/IceTipCommitSettings.class.st +++ b/Iceberg/IceTipCommitSettings.class.st @@ -80,21 +80,21 @@ IceTipCommitSettings class >> settingsOn: aBuilder [ noOrdering; target: self; default: self critiquesOnCommitDefaultValue; - label: 'Run Code Critiques when commiting'; + label: 'Run Code Critiques when committing'; description: 'Check if you want to run the code critiques on the changes each time you commit them'. (aBuilder setting: #saveImageOnCommit) noOrdering; target: self; default: self saveImageOnCommitDefaultValue; - label: 'Save the image when commiting'; + label: 'Save the image when committing'; description: 'Check if you want to save the image each time you commit something'. (aBuilder setting: #pushOnCommit) noOrdering; target: self; default: self pushOnCommitDefaultValue; - label: 'Push when commiting'; + label: 'Push when committing'; description: 'Check if you want to push your changes each time you commit something' ] ] diff --git a/Iceberg/IceWorkingCopy.class.st b/Iceberg/IceWorkingCopy.class.st index 8d7a44daba..0d6ffe7727 100644 --- a/Iceberg/IceWorkingCopy.class.st +++ b/Iceberg/IceWorkingCopy.class.st @@ -206,16 +206,13 @@ IceWorkingCopy >> changesTo: aCommitish [ | removedPackages changes | changes := Set new. - + changes addAll: (aCommitish changesFromCommit: self referenceCommit). removedPackages := aCommitish packages \ self packages. - changes addAll: (((self modifiedPackages, removedPackages) collect: [ :each | - IceImageChange package: each ])). - - self project isDirty - ifTrue: [ changes add: IceProjectChange new ]. - self repositoryProperties isDirty - ifTrue: [ changes add: IceCypressPropertiesChange new ]. + changes addAll: (self modifiedPackages , removedPackages collect: [ :each | IceImageChange package: each ]). + + self project isDirty ifTrue: [ changes add: IceProjectChange new ]. + self repositoryProperties isDirty ifTrue: [ changes add: IceCypressPropertiesChange new ]. ^ changes ] diff --git a/Iceberg/Iceberg.class.st b/Iceberg/Iceberg.class.st index 4bce23fd51..3227b7b320 100644 --- a/Iceberg/Iceberg.class.st +++ b/Iceberg/Iceberg.class.st @@ -19,6 +19,7 @@ Class { #superclass : 'Object', #classVars : [ 'EnableMetacelloIntegration', + 'ProxyURLExternalString', 'RemoteTypeSelector', 'ShowSystemRepositories' ], @@ -66,6 +67,27 @@ Iceberg class >> bootstrapWithCommitId: commitId packageList: packageNameList [ repository register ] +{ #category : 'proxy' } +Iceberg class >> configureLGitProxyOpt: aLGitProxyOptions [ + + | proxyURL | + proxyURL := self proxyURLExternalString. + + "If there is not configured proxy, let's return" + proxyURL isNull ifTrue: [ ^ self ]. + + aLGitProxyOptions prim_url: proxyURL +] + +{ #category : 'proxy' } +Iceberg class >> createProxyURLExternalString [ + + NetworkSystemSettings httpProxyServer isEmpty + ifTrue: [ ^ ProxyURLExternalString := ExternalAddress null ]. + + ProxyURLExternalString := ExternalAddress fromString: self formatNetworkSettingsProxyServer. +] + { #category : 'settings' } Iceberg class >> enableMetacelloIntegration [ ^ EnableMetacelloIntegration ifNil: [ EnableMetacelloIntegration := true ] @@ -76,6 +98,31 @@ Iceberg class >> enableMetacelloIntegration: anObject [ EnableMetacelloIntegration := anObject ] +{ #category : 'proxy' } +Iceberg class >> ensureProxyURLExternalString [ + + + "If we have a valid string in the external memory, we check its value" + (ProxyURLExternalString isNotNil and: [ ProxyURLExternalString isNull not ]) ifTrue: [ + + "If it is the same that we want, let's just continue. If it is different, we need to free it so, we can allocate a new one" + ProxyURLExternalString utf8StringFromCString = self formatNetworkSettingsProxyServer + ifTrue: [ ^ self ] + ifFalse: [ ProxyURLExternalString free ] ]. + + ^ self createProxyURLExternalString +] + +{ #category : 'proxy' } +Iceberg class >> formatNetworkSettingsProxyServer [ + + ^ String streamContents: [ :s | + s nextPutAll: 'https://'. + s nextPutAll: NetworkSystemSettings httpProxyServer. + s nextPutAll: ':'. + s nextPutAll: NetworkSystemSettings httpProxyPort printString ] +] + { #category : 'accessing' } Iceberg class >> icebergRepositoriesURLs [ ^ { @@ -105,6 +152,13 @@ Iceberg class >> mcRepositoryFor: aLocationString [ ^ (IceMetacelloRepositoryType for: aLocationString) mcRepository ] +{ #category : 'proxy' } +Iceberg class >> proxyURLExternalString [ + + self ensureProxyURLExternalString. + ^ ProxyURLExternalString +] + { #category : 'accessing' } Iceberg class >> remoteTypeSelector [ "Should be #scpURL or #httpsURL" diff --git a/scripts/preLoading.st b/scripts/preLoading.st index a7027be304..2714f931b9 100644 --- a/scripts/preLoading.st +++ b/scripts/preLoading.st @@ -12,12 +12,8 @@ Smalltalk globals at: #IceSystemEventListener ifPresent: #unregisterSystemAnnoun "Remove iceberg from system (so I can reload it)" MetacelloPharoPlatform select. #( - 'BaselineOfTonel' 'BaselineOfLibGit' 'BaselineOfIceberg' - 'MonticelloTonel-Core' - 'MonticelloTonel-FileSystem' - 'MonticelloTonel-Tests' 'Iceberg-UI' 'Iceberg-TipUI' 'Iceberg-Plugin-Pharo' @@ -46,22 +42,4 @@ do: [ :each | nil ]) ifNotNil: [ :package | ('Removing ', each) traceCr. - package removeFromSystem ] ]. - -"Loading Tonel before trying to load Iceberg. -This is required to load iceberg packages and dependencies in Tonel format" -Metacello new - baseline: 'Tonel'; - repository: 'github://pharo-vcs/tonel:v1.0.17'; - load. - -"Development branch requires latest Spec2" -" -Metacello new - githubUser: 'pharo-spec' project: 'Spec' commitish: 'Pharo10' path: 'src'; - baseline: 'Spec2'; - onConflict: [ :e | e useIncoming ]; - onUpgrade: [ :e | e useIncoming ]; - ignoreImage; - load -" + package removeFromSystem ] ]