Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.

Commit 8cdcef1

Browse files
author
David Dooling
committed
Move to rug-rugs, update README, CHANGELOG, code
Change name of project to rug-rugs. Delint and clean up the NewRugProject tests.
1 parent 5620b67 commit 8cdcef1

File tree

8 files changed

+120
-221
lines changed

8 files changed

+120
-221
lines changed

‎.atomist/editors/UpdateSupportFiles.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export class UpdateSupportFiles implements EditProject {
5252
project.copyEditorBackingFileOrFail(f);
5353
}
5454

55+
// TODO update manifest.yml requires
56+
5557
const travisYml = project.findFile(".travis.yml");
5658
if (travisYml != null) {
5759
travisYml.regexpReplace("install:\\s*?-?\\s*?nvm install 6.9.2\\s*?\n",
@@ -66,7 +68,7 @@ export class UpdateSupportFiles implements EditProject {
6668
const pkgJsonObj = JSON.parse(project.findFile(tmpFile).content);
6769
project.deleteFile(tmpFile);
6870
const rugsName = "@atomist/rugs";
69-
const rugsVersion = pkgJsonObj.dependencies[rugsName];
71+
const rugsVersion: string = pkgJsonObj.dependencies[rugsName];
7072
pkgJson.regexpReplace(`"@atomist/rugs"\\s*:\\s*"[^"]+"(,?)`, `"@atomist/rugs": "${rugsVersion}"$1`);
7173
if (!pkgJson.containsMatch(`"test"\s*:\s*"rug test"`)) {
7274
pkgJson.regexpReplace(`(?m)^ \}$`, ` },

‎.atomist/generators/RugGeneratorFunctions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ export function cleanReadMe(project: Project, description: string, owner: string
5050

5151
const readMePE = new PathExpression<Project, File>("/*[@name='README.md']");
5252
const readMe: File = eng.scalar(project, readMePE);
53-
readMe.replace("# Atomist 'rug-editors'", "# " + project.name);
53+
readMe.replace("# Atomist 'rug-rugs'", "# " + project.name);
5454
readMe.regexpReplace("generators for creating a Rug archive[\\s\\S]*?\n## Rugs\n", description + "\n\n## Rugs\n\n");
5555
readMe.regexpReplace("\n## Rugs\n[\\s\\S]*\n## Support\n", "\n## Rugs\n\n## Support\n");
56-
readMe.replace("/rug-editors", `/${project.name}`);
56+
readMe.replace("/rug-rugs", `/${project.name}`);
5757
readMe.replace("/atomist/", `/${owner}/`);
5858
readMe.replace(`/${owner}/rug-cli`, "/atomist/rug-cli");
5959
}
@@ -72,6 +72,6 @@ export function cleanChangeLog(project: Project, owner: string): void {
7272
changeLog.regexpReplace("\\d+\\.\\d+\\.\\d+\\.\\.\\.HEAD\n\n[\\S\\s]*## \\[0\\.1\\.0\\]",
7373
"0.1.0...HEAD\n\n## [0.1.0]");
7474
changeLog.regexpReplace("\n### Added[\\S\\s]*", "\nAdded\n\n- Everything\n");
75-
changeLog.replace("rug-editors", project.name);
75+
changeLog.replace("rug-rugs", project.name);
7676
changeLog.replace("/atomist/", `/${owner}/`);
7777
}

‎.atomist/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group: atomist
2-
artifact: rug-editors
2+
artifact: rug-rugs
33
version: "0.28.0"
44
requires: "[0.26.1,0.27.0)"
55
dependencies:

‎.atomist/tests/project/NewRugProjectSteps.ts‎

Lines changed: 48 additions & 162 deletions
Large diffs are not rendered by default.

‎.atomist/tests/project/NewRugProjectTest.feature‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ Feature: Tests from NewRugProject.rt
2323
Given an empty project
2424
When NewRugProject for NewRugProjectSetParameters
2525
Then parameters were valid
26-
Then fileExists atomist manifest yml for NewRugProjectSetParameters
26+
Then the Rug archive manifest file exists
2727
Then fileContains atomist manifest yml version for NewRugProjectSetParameters
28-
Then fileContains atomist manifest yml pName for NewRugProjectSetParameters
28+
Then the Rug archive manifest file contains the project name
2929
Then fileContains atomist manifest yml owner for NewRugProjectSetParameters
3030
Then not result fileExists CHANGELOG md for NewRugProjectSetParameters
3131
Then not result fileExists CODE OF CONDUCT md for NewRugProjectSetParameters
@@ -37,7 +37,7 @@ Feature: Tests from NewRugProject.rt
3737
Then not result fileContains README md editors to create a Rug archive project for NewRugProjectSetParameters
3838
Then not result fileContains README md AddTypeScript editor adds support files for NewRugProjectSetParameters
3939
Then fileContains README md https travis ci org owner pName svg branch master for NewRugProjectSetParameters
40-
Then fileContains README md not Slack Status https join atomist com badge svg https join atomist com for NewRugProjectSetParameters
40+
Then the README contains the Slack badge
4141
Then not result fileContains README md NewRugProject for NewRugProjectSetParameters
4242
Then not result fileContains README md ruggery for NewRugProjectSetParameters
4343
Then fileContains README md rug http docs atomist com for NewRugProjectSetParameters
@@ -51,9 +51,9 @@ Feature: Tests from NewRugProject.rt
5151
Given an empty project
5252
When NewRugProject for NewRugProjectDefaultParameters
5353
Then parameters were valid
54-
Then fileExists atomist manifest yml for NewRugProjectDefaultParameters
54+
Then the Rug archive manifest file exists
5555
Then fileContains atomist manifest yml 0 1 0 for NewRugProjectDefaultParameters
56-
Then fileContains atomist manifest yml pName for NewRugProjectDefaultParameters
56+
Then the Rug archive manifest file contains the project name
5757
Then fileContains atomist manifest yml owner for NewRugProjectDefaultParameters
5858
Then not result fileExists CHANGELOG md for NewRugProjectDefaultParameters
5959
Then not result fileExists CODE OF CONDUCT md for NewRugProjectDefaultParameters
@@ -65,7 +65,7 @@ Feature: Tests from NewRugProject.rt
6565
Then not result fileContains README md editors to create a Rug archive project for NewRugProjectDefaultParameters
6666
Then not result fileContains README md AddTypeScript editor adds support files for NewRugProjectDefaultParameters
6767
Then fileContains README md https travis ci org owner pName svg branch master for NewRugProjectDefaultParameters
68-
Then fileContains README md not Slack Status https join atomist com badge svg https join atomist com for NewRugProjectDefaultParameters
68+
Then the README contains the Slack badge
6969
Then not result fileContains README md NewRugProject for NewRugProjectDefaultParameters
7070
Then not result fileContains README md ruggery for NewRugProjectDefaultParameters
7171
Then fileContains README md rug http docs atomist com for NewRugProjectDefaultParameters

‎.atomist/tests/project/NewStarterRugProjectSteps.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Then("the change log contains the proper compare link", (p, world) => {
5858
});
5959

6060
Then("not result fileContains CHANGELOG md rug editors for NewStarterRugProjectTestProject", (p, world) => {
61-
return !p.fileContains("CHANGELOG.md", "rug-editors");
61+
return !p.fileContains("CHANGELOG.md", "rug-rugs");
6262
});
6363

6464
Then("not result fileContains CHANGELOG md 0 2 0 for NewStarterRugProjectTestProject", (p, world) => {
@@ -90,7 +90,7 @@ Then("fileContains README md pName for NewStarterRugProjectTestProject", (p, wor
9090
});
9191

9292
Then("not result fileContains README md Atomist rug editors for NewStarterRugProjectTestProject", (p, world) => {
93-
return !p.fileContains("README.md", "Atomist 'rug-editors'");
93+
return !p.fileContains("README.md", "Atomist 'rug-rugs'");
9494
});
9595

9696
Then("fileContains README md Atomist Rug archive project for NewStarterRugProjectTestProject", (p, world) => {

‎CHANGELOG.md‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10-
[Unreleased]: https://github.com/atomist/rug-editors/compare/0.27.1...HEAD
10+
[Unreleased]: https://github.com/atomist/rug-rugs/compare/0.28.0...HEAD
11+
12+
## [0.28.0] - 2017-04-25
13+
14+
[0.28.0]: https://github.com/atomist/rug-rugs/compare/0.27.1...0.28.0
15+
16+
New name release
17+
18+
### Changed
19+
20+
- Changed archive name from rug-editors to more accurate rug-rugs
1121

1222
### Removed
1323

1424
- Code of conduct is now references from the atomist/welcome repo
1525

1626
## [0.27.1] - 2017-04-24
1727

18-
[0.27.1]: https://github.com/atomist/rug-editors/compare/0.27.0...0.27.1
28+
[0.27.1]: https://github.com/atomist/rug-rugs/compare/0.27.0...0.27.1
1929

2030
Safer release
2131

@@ -25,7 +35,7 @@ Safer release
2535

2636
## [0.27.0] - 2017-04-24
2737

28-
[0.27.0]: https://github.com/atomist/rug-editors/compare/0.26.0...0.27.0
38+
[0.27.0]: https://github.com/atomist/rug-rugs/compare/0.26.0...0.27.0
2939

3040
Publish release
3141

@@ -44,7 +54,7 @@ Publish release
4454

4555
## [0.26.0] - 2017-04-22
4656

47-
[0.26.0]: https://github.com/atomist/rug-editors/compare/0.25.0...0.26.0
57+
[0.26.0]: https://github.com/atomist/rug-rugs/compare/0.25.0...0.26.0
4858

4959
Update release
5060

@@ -64,7 +74,7 @@ Update release
6474

6575
## [0.25.0] - 2017-04-11
6676

67-
[0.25.0]: https://github.com/atomist/rug-editors/compare/0.24.0...0.25.0
77+
[0.25.0]: https://github.com/atomist/rug-rugs/compare/0.24.0...0.25.0
6878

6979
Springtime release
7080

@@ -74,7 +84,7 @@ Springtime release
7484

7585
## [0.24.0] - 2017-03-31
7686

77-
[0.24.0]: https://github.com/atomist/rug-editors/compare/0.23.0...0.24.0
87+
[0.24.0]: https://github.com/atomist/rug-rugs/compare/0.23.0...0.24.0
7888

7989
Rugs release
8090

@@ -92,7 +102,7 @@ Rugs release
92102

93103
## [0.23.0] - 2017-03-29
94104

95-
[0.23.0]: https://github.com/atomist/rug-editors/compare/0.22.0...0.23.0
105+
[0.23.0]: https://github.com/atomist/rug-rugs/compare/0.22.0...0.23.0
96106

97107
Uptest release
98108

@@ -102,7 +112,7 @@ Uptest release
102112

103113
## [0.22.0] - 2017-03-27
104114

105-
[0.22.0]: https://github.com/atomist/rug-editors/compare/0.21.0...0.22.0
115+
[0.22.0]: https://github.com/atomist/rug-rugs/compare/0.21.0...0.22.0
106116

107117
Handler tests release
108118

@@ -112,7 +122,7 @@ Handler tests release
112122

113123
## [0.21.0] - 2017-03-27
114124

115-
[0.21.0]: https://github.com/atomist/rug-editors/compare/0.20.0...0.21.0
125+
[0.21.0]: https://github.com/atomist/rug-rugs/compare/0.20.0...0.21.0
116126

117127
Handlers release
118128

@@ -135,7 +145,7 @@ Handlers release
135145

136146
## [0.20.0] - 2017-03-26
137147

138-
[0.20.0]: https://github.com/atomist/rug-editors/compare/0.19.0...0.20.0
148+
[0.20.0]: https://github.com/atomist/rug-rugs/compare/0.19.0...0.20.0
139149

140150
Format release
141151

@@ -147,7 +157,7 @@ Format release
147157

148158
## [0.19.0] - 2017-03-26
149159

150-
[0.19.0]: https://github.com/atomist/rug-editors/compare/0.18.0...0.19.0
160+
[0.19.0]: https://github.com/atomist/rug-rugs/compare/0.18.0...0.19.0
151161

152162
Hidden release
153163

@@ -159,13 +169,13 @@ Hidden release
159169

160170
## [0.18.0] - 2017-03-24
161171

162-
[0.18.0]: https://github.com/atomist/rug-editors/compare/0.17.0...0.18.0
172+
[0.18.0]: https://github.com/atomist/rug-rugs/compare/0.17.0...0.18.0
163173

164174
Nothing release
165175

166176
## [0.17.0] - 2017-03-21
167177

168-
[0.17.0]: https://github.com/atomist/rug-editors/compare/0.16.0...0.17.0
178+
[0.17.0]: https://github.com/atomist/rug-rugs/compare/0.16.0...0.17.0
169179

170180
Spring has sprung release
171181

@@ -176,7 +186,7 @@ Spring has sprung release
176186

177187
## [0.16.0] - 2017-03-15
178188

179-
[0.16.0]: https://github.com/atomist/rug-editors/compare/0.15.0...0.16.0
189+
[0.16.0]: https://github.com/atomist/rug-rugs/compare/0.15.0...0.16.0
180190

181191
Beware the ides of March release
182192

@@ -190,7 +200,7 @@ Beware the ides of March release
190200

191201
## [0.15.0] - 2017-03-13
192202

193-
[0.15.0]: https://github.com/atomist/rug-editors/compare/0.14.0...0.15.0
203+
[0.15.0]: https://github.com/atomist/rug-rugs/compare/0.14.0...0.15.0
194204

195205
Look ma, no tests release
196206

@@ -210,7 +220,7 @@ Look ma, no tests release
210220

211221
## [0.14.0] - 2017-03-07
212222

213-
[0.14.0]: https://github.com/atomist/rug-editors/compare/0.13.0...0.14.0
223+
[0.14.0]: https://github.com/atomist/rug-rugs/compare/0.13.0...0.14.0
214224

215225
Less is more release
216226

@@ -230,7 +240,7 @@ Less is more release
230240

231241
## [0.13.0] - 2017-03-03
232242

233-
[0.13.0]: https://github.com/atomist/rug-editors/compare/0.12.0...0.13.0
243+
[0.13.0]: https://github.com/atomist/rug-rugs/compare/0.12.0...0.13.0
234244

235245
One-step generator release
236246

@@ -240,7 +250,7 @@ One-step generator release
240250

241251
## [0.12.0] - 2017-03-01
242252

243-
[0.12.0]: https://github.com/atomist/rug-editors/compare/0.11.0...0.12.0
253+
[0.12.0]: https://github.com/atomist/rug-rugs/compare/0.11.0...0.12.0
244254

245255
README release
246256

@@ -251,7 +261,7 @@ README release
251261

252262
## [0.11.0] - 2017-02-27
253263

254-
[0.11.0]: https://github.com/atomist/rug-editors/compare/0.10.0...0.11.0
264+
[0.11.0]: https://github.com/atomist/rug-rugs/compare/0.10.0...0.11.0
255265

256266
Non-DSL release
257267

@@ -278,7 +288,7 @@ Non-DSL release
278288

279289
## [0.10.0] - 2017-02-24
280290

281-
[0.10.0]: https://github.com/atomist/rug-editors/compare/0.9.0...0.10.0
291+
[0.10.0]: https://github.com/atomist/rug-rugs/compare/0.9.0...0.10.0
282292

283293
### Added
284294

@@ -292,7 +302,7 @@ Non-DSL release
292302

293303
## [0.9.0] - 2017-02-17
294304

295-
[0.9.0]: https://github.com/atomist/rug-editors/compare/0.8.0...0.9.0
305+
[0.9.0]: https://github.com/atomist/rug-rugs/compare/0.8.0...0.9.0
296306

297307
TypeScript is good
298308

@@ -308,7 +318,7 @@ TypeScript is good
308318

309319
## [0.8.0] - 2017-02-09
310320

311-
[0.8.0]: https://github.com/atomist/rug-editors/compare/0.7.0...0.8.0
321+
[0.8.0]: https://github.com/atomist/rug-rugs/compare/0.7.0...0.8.0
312322

313323
Templates are bad, mkay release
314324

@@ -318,7 +328,7 @@ Templates are bad, mkay release
318328

319329
## [0.7.0] - 2017-02-09
320330

321-
[0.7.0]: https://github.com/atomist/rug-editors/compare/0.6.0...0.7.0
331+
[0.7.0]: https://github.com/atomist/rug-rugs/compare/0.6.0...0.7.0
322332

323333
TypeScripty release
324334

@@ -333,7 +343,7 @@ TypeScripty release
333343

334344
## [0.6.0] - 2017-02-06
335345

336-
[0.6.0]: https://github.com/atomist/rug-editors/compare/0.5.0...0.6.0
346+
[0.6.0]: https://github.com/atomist/rug-rugs/compare/0.5.0...0.6.0
337347

338348
Repair release
339349

@@ -343,7 +353,7 @@ Repair release
343353

344354
## [0.5.0] - 2017-01-31
345355

346-
[0.5.0]: https://github.com/atomist/rug-editors/compare/0.4.0...0.5.0
356+
[0.5.0]: https://github.com/atomist/rug-rugs/compare/0.4.0...0.5.0
347357

348358
Added an editor that introduces a Rug executor to an existing Rug Archive.
349359

@@ -353,7 +363,7 @@ Added an editor that introduces a Rug executor to an existing Rug Archive.
353363

354364
## [0.4.0] - 2017-01-24
355365

356-
[0.4.0]: https://github.com/atomist/rug-editors/compare/0.3.0...0.4.0
366+
[0.4.0]: https://github.com/atomist/rug-rugs/compare/0.3.0...0.4.0
357367

358368
Lengthy release
359369

@@ -364,7 +374,7 @@ Lengthy release
364374

365375
## [0.3.0] - 2017-01-05
366376

367-
[0.3.0]: https://github.com/atomist/rug-editors/compare/0.2.0...0.3.0
377+
[0.3.0]: https://github.com/atomist/rug-rugs/compare/0.2.0...0.3.0
368378

369379
Brand new Rug release
370380

@@ -374,7 +384,7 @@ Brand new Rug release
374384

375385
## [0.2.0] - 2016-12-19
376386

377-
[0.2.0]: https://github.com/atomist/rug-editors/compare/0.1.0...0.2.0
387+
[0.2.0]: https://github.com/atomist/rug-rugs/compare/0.1.0...0.2.0
378388

379389
Update your Rug release
380390

@@ -384,7 +394,7 @@ Update your Rug release
384394

385395
## [0.1.0] - 2016-12-13
386396

387-
[0.1.0]: https://github.com/atomist/rug-editors/tree/0.1.0
397+
[0.1.0]: https://github.com/atomist/rug-rugs/tree/0.1.0
388398

389399
Initial release
390400

0 commit comments

Comments
 (0)