Skip to content

Commit

Permalink
Merge branch 'issue_299'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dalehenrich
dalehenrich committed Oct 13, 2014
2 parents 2c7a0a1 + 8c8a391 commit 91bddf6
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ...o-Platform.gemstone.package/MetacelloGemStonePlatform.class/instance/gitBranchNameFor..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ gitBranchNameFor: gitPath
| command result |
command := 'cd ' , gitPath , '; git rev-parse --abbrev-ref HEAD'.
result := System performOnServer: command.
^ result trimBoth
^ result trimWhiteSpace
2 changes: 1 addition & 1 deletion ...lo-Platform.gemstone.package/MetacelloGemStonePlatform.class/instance/gitCommitShaFor..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gitCommitShaFor: gitPath
result := System performOnServer: command.
(result beginsWith: 'fatal:')
ifTrue: [ ^ nil ].
^ result trimBoth
^ result trimWhiteSpace
2 changes: 1 addition & 1 deletion ...atform.gemstone.package/MetacelloGemStonePlatform.class/instance/gitRootDirectoryPath..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gitRootDirectoryPath: directoryPath
performOnServer: 'cd ' , directoryPath , '; git rev-parse --show-toplevel'.
(gitPath beginsWith: 'fatal:')
ifTrue: [ ^ self error: 'not a git directory' ].
^ gitPath trimBoth
^ gitPath trimWhiteSpace
6 changes: 3 additions & 3 deletions ...Metacello-Platform.gemstone.package/MetacelloGemStonePlatform.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"extractRepositoryFrom:to:" : "dkh 09/29/2014 12:36",
"extractTypeFromDescription:" : "dkh 03/23/2013 08:54",
"fileDirectoryClass" : "dkh 07/09/2012 04:46",
"gitBranchNameFor:" : "dkh 05/15/2014 20:52",
"gitCommitShaFor:" : "dkh 05/15/2014 20:49",
"gitBranchNameFor:" : "dkh 10/12/2014 15:46",
"gitCommitShaFor:" : "dkh 10/12/2014 15:46",
"gitIsGitDirectoryPath:" : "dkh 05/15/2014 18:33",
"gitRootDirectoryPath:" : "dkh 05/22/2014 13:31",
"gitRootDirectoryPath:" : "dkh 10/12/2014 15:46",
"gitStatusFor:" : "dkh 05/15/2014 20:46",
"processPID" : "dkh 09/26/2014 14:58",
"stoneVersionAttributes" : "dkh 11/10/2011 09:52",
Expand Down
2 changes: 1 addition & 1 deletion repository/Metacello-Platform.gemstone.package/monticello.meta/version
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions ...tform.gemstone.package/MetacelloRepositoryGemStoneTestCase.class/instance/testIssue299.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
tests
testIssue299
"execute without error ... verify that #trimWhiteSpace is implemented in base GemStone"

| str |
str := 'abcdefg'.
self assert: str trimWhiteSpace equals: str
1 change: 1 addition & 0 deletions ...Platform.gemstone.package/MetacelloRepositoryGemStoneTestCase.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@
"testExtractAttributesFrom" : "dkh 10/11/2011 14:07",
"testFileTreeRepository" : "07/11/2013 21:47",
"testHttpRepository" : "dkh 01/19/2012 12:35",
"testIssue299" : "dkh 10/12/2014 17:20",
"testServerDirectoryRepository" : "dkh 01/19/2012 12:33" } }
2 changes: 1 addition & 1 deletion repository/Metacello-TestsPlatform.gemstone.package/monticello.meta/version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Metacello-TestsPlatform.gemstone-dkh.8' message 'split out Metacello-GemStone-TestsMCB so that Metacello-TestsMCB doesn''t get loaded with both TravisCI_1 and TravisCI_3 (for GemStone)' id '850d3d61-e84e-4321-85a5-9e48498e16fe' date '07/05/2014' time '20:02:39' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.7' message 'finish work on unregistering removed configuration/baseline classes- gemstone only for now ..- tests in Metacello-TestsPlatform.gemstone, for platform isolation- tweak baseline so that Metacello-TestsPlatform requires Metacello-TestsMCB' id '25a4a7b3-7704-45da-8d73-9a858716fa75' date '05/14/2014' time '07:27:22' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-.6' message 'some more tweaks for FileTree test' id '5a0c8851-0384-4721-a008-221f1c3daebc' date '07/11/2013' time '21:48:04' author '' ancestors ((name 'Metacello-TestsPlatform.gemstone-.5' message 'rewrite MetacelloRepositoryGemStoneTestCase>>testFileTreeRepository to create directory before creating repository' id '1d514cd0-a981-4dee-a3ba-35d04adf28f2' date '07/11/2013' time '21:42:30' author '' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.4' message '- filetree support' id 'ce006cc4-ddc7-4e23-b268-71a1448093ce' date '01/30/2012' time '14:04:51' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.3' message '1.0-beta.32 (dkh.665):- fix Issue 109: pkgSpec for Metacello configuration doesn''t work for GemStone ServerDirectory repository http://code.google.com/p/metacello/issues/detail?id=109' id '665f86f2-a444-42b0-b77a-c2de218c76ef' date '01/19/2012' time '15:13:02' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.2' message '1.0-beta.31 (dkh.634):- fix for GemStone version of Pharo Issue 4613 .... derive attributes from GemStone version string' id 'f48ab7f3-078f-4bc2-a14a-2e3c2aae089c' date '10/11/2011' time '14:32:21' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-DaleHenrichs.1' message '- fix Issue 32: http://code.google.com/p/metacello/issues/detail?id=32 "Connect repositories as MCServerDirectory rather than MCDirectory"' id 'c14414cf-8b78-499e-abd7-ef04857da87f' date '03/12/1910' time '01:44:50' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Metacello-TestsPlatform.gemstone-dkh.11' message 'Issue #299: spell the method correctly..' id '5b8c91d8-6af0-4e4b-879a-9d8a2937f392' date '10/12/2014' time '17:21:18' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.10' message 'Issue #299: make test portable to older versions of GemStone' id 'c9459456-c8e5-46a3-88c8-bed3dfc7be5e' date '10/12/2014' time '16:57:11' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.9' message 'Issue #299: proposed bugfix and test' id '142a3638-75a5-41a7-b9f0-edf2f9b4e2eb' date '10/12/2014' time '16:06:53' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.8' message 'split out Metacello-GemStone-TestsMCB so that Metacello-TestsMCB doesn''t get loaded with both TravisCI_1 and TravisCI_3 (for GemStone)' id '850d3d61-e84e-4321-85a5-9e48498e16fe' date '07/05/2014' time '20:02:39' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.7' message 'finish work on unregistering removed configuration/baseline classes- gemstone only for now ..- tests in Metacello-TestsPlatform.gemstone, for platform isolation- tweak baseline so that Metacello-TestsPlatform requires Metacello-TestsMCB' id '25a4a7b3-7704-45da-8d73-9a858716fa75' date '05/14/2014' time '07:27:22' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-.6' message 'some more tweaks for FileTree test' id '5a0c8851-0384-4721-a008-221f1c3daebc' date '07/11/2013' time '21:48:04' author '' ancestors ((name 'Metacello-TestsPlatform.gemstone-.5' message 'rewrite MetacelloRepositoryGemStoneTestCase>>testFileTreeRepository to create directory before creating repository' id '1d514cd0-a981-4dee-a3ba-35d04adf28f2' date '07/11/2013' time '21:42:30' author '' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.4' message '- filetree support' id 'ce006cc4-ddc7-4e23-b268-71a1448093ce' date '01/30/2012' time '14:04:51' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.3' message '1.0-beta.32 (dkh.665):- fix Issue 109: pkgSpec for Metacello configuration doesn''t work for GemStone ServerDirectory repository http://code.google.com/p/metacello/issues/detail?id=109' id '665f86f2-a444-42b0-b77a-c2de218c76ef' date '01/19/2012' time '15:13:02' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-dkh.2' message '1.0-beta.31 (dkh.634):- fix for GemStone version of Pharo Issue 4613 .... derive attributes from GemStone version string' id 'f48ab7f3-078f-4bc2-a14a-2e3c2aae089c' date '10/11/2011' time '14:32:21' author 'dkh' ancestors ((name 'Metacello-TestsPlatform.gemstone-DaleHenrichs.1' message '- fix Issue 32: http://code.google.com/p/metacello/issues/detail?id=32 "Connect repositories as MCServerDirectory rather than MCDirectory"' id 'c14414cf-8b78-499e-abd7-ef04857da87f' date '03/12/1910' time '01:44:50' author 'DaleHenrichs' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Expand Down

0 comments on commit 91bddf6

Please sign in to comment.