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

Commit

Permalink
Rename project spring-rugs, updates
Browse files Browse the repository at this point in the history
Rename project to spring-rugs to be more consistent across our Rug
repos.  Fix files and code as necessary to support.

Update rug and @atomist/rugs dependencies.

Update Travis CI build and TypeScript support files.
  • Loading branch information
David Dooling committed Apr 25, 2017
1 parent 3ce3ce6 commit 6b92043
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 111 deletions.
13 changes: 13 additions & 0 deletions .atomist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,16 @@ editor:
branch: "7789ecdaccd329e70fde3bd77acf2215bc3ba5d2"
sha: "7789ecd"

---
kind: "operation"
client: "rug-cli 0.33.4"
editor:
name: "UpdateSupportFiles"
group: "atomist"
artifact: "rug-editors"
version: "0.27.1"
origin:
repo: "https://github.com/atomist/rug-editors.git"
branch: "3de333b4aefd678ae14f196ab155647241de3746"
sha: "3de333b"

15 changes: 10 additions & 5 deletions .atomist/build/travis-build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
set -o pipefail

declare Pkg=travis-build
declare Version=0.3.0
declare Version=0.4.0

function msg() {
echo "$Pkg: $*"
Expand Down Expand Up @@ -33,6 +33,11 @@ function main () {
fi
msg "rug CLI version: $version"

if ! ( cd .atomist && tslint **/*.ts ); then
err "tslint failed"
return 1
fi

local rug=$HOME/.atomist/rug-cli-$version/bin/rug
if [[ ! -x $rug ]]; then
msg "downloading rug CLI"
Expand All @@ -54,12 +59,12 @@ function main () {
fi
fi
rug="$rug --timer --quiet --update --resolver-report --error --settings=$PWD/.atomist/build/cli.yml"
export TEAM_ID=rugs-dev
export TEAM_ID=T1L0VDKJP

if [[ -f .atomist/package.json ]]; then
msg "running yarn install"
if ! ( cd .atomist && yarn install ); then
err "yarn install failed"
msg "running yarn"
if ! ( cd .atomist && yarn ); then
err "yarn failed"
return 1
fi
fi
Expand Down
6 changes: 3 additions & 3 deletions .atomist/generators/RugGeneratorFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ import { PathExpressionEngine } from "@atomist/rug/tree/PathExpression";
*/
export function cleanReadMe(project: Project, description: string, owner: string): void {
const readMe: File = project.findFile("README.md");
readMe.replace("# Atomist 'spring-boot-rest-service'", "# " + project.name);
readMe.replace("# Atomist 'spring-rugs'", "# " + project.name);
const descRE = "This .*?Rug.*? project contains a generator for a .*?Spring Boot[\\s\\S]*?\n" +
"## Spring Boot REST Service\n";
const newDescription = `This project contains a [Spring Boot][boot] [REST][rest] service for ${description}.`;
readMe.regexpReplace(descRE, newDescription);
readMe.replace("spring-boot-rest-service", project.name);
readMe.replace("spring-rugs", project.name);
readMe.replace("atomist-rugs", owner);
}

Expand All @@ -51,7 +51,7 @@ export function cleanChangeLog(project: Project, owner: string): void {
const middleContentRE = "\\d+\\.\\d+\\.\\d+\\.\\.\\.HEAD\n\n[\\S\\s]*## \\[0\\.1\\.0\\]";
changeLog.regexpReplace(middleContentRE, "0.1.0...HEAD\n\n## [0.1.0]");
changeLog.regexpReplace("\n### Added[\\S\\s]*", "\nAdded\n\n- Everything\n");
changeLog.replace("spring-boot-rest-service", project.name);
changeLog.replace("spring-rugs", project.name);
changeLog.replace("atomist-rugs", owner);
}

Expand Down
4 changes: 2 additions & 2 deletions .atomist/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
group: atomist
artifact: spring-boot-rest-service
artifact: spring-rugs
version: "0.12.0"
requires: "[0.25.0,0.26.0)"
requires: "[0.26.1,0.27.0)"
dependencies:
extensions:
5 changes: 4 additions & 1 deletion .atomist/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{
"dependencies": {
"@atomist/rugs": "^0.24.3"
"@atomist/rugs": "^0.25.0"
},
"scripts": {
"test": "rug test"
}
}
3 changes: 2 additions & 1 deletion .atomist/tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"rules": {
"interface-name": [true, "never-prefix"],
"max-classes-per-file": false,
"object-literal-sort-keys": false
"object-literal-sort-keys": false,
"no-console": false
},
"rulesDirectory": []
}
24 changes: 12 additions & 12 deletions .atomist/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# yarn lockfile v1


"@atomist/cortex@0.31.0":
version "0.31.0"
resolved "https://registry.yarnpkg.com/@atomist/cortex/-/cortex-0.31.0.tgz#e6e9ac33fe061f19d70d1c7c2884948acca20a18"
"@atomist/cortex@0.33.0":
version "0.33.0"
resolved "https://registry.yarnpkg.com/@atomist/cortex/-/cortex-0.33.0.tgz#a622b59729aa17297e452fcc96ab36cdb0f6892d"
dependencies:
"@atomist/rug" "0.25.1"
"@atomist/rug" "0.26.1"

"@atomist/rug@0.25.1":
version "0.25.1"
resolved "https://registry.yarnpkg.com/@atomist/rug/-/rug-0.25.1.tgz#1b55d4dbf96964a866a43cf40da646ae9be4af34"
"@atomist/rug@0.26.1":
version "0.26.1"
resolved "https://registry.yarnpkg.com/@atomist/rug/-/rug-0.26.1.tgz#35b021b3793cf60bc693d5aa7c77ae9df3e0a359"

"@atomist/rugs@^0.24.3":
version "0.24.3"
resolved "https://registry.yarnpkg.com/@atomist/rugs/-/rugs-0.24.3.tgz#ce946f53e0af6f16651e4ed2f98eb5d16f805ad6"
"@atomist/rugs@^0.25.0":
version "0.25.0"
resolved "https://registry.yarnpkg.com/@atomist/rugs/-/rugs-0.25.0.tgz#0f133854822aa3a8560fd74dc1710485ad07c348"
dependencies:
"@atomist/cortex" "0.31.0"
"@atomist/rug" "0.25.1"
"@atomist/cortex" "0.33.0"
"@atomist/rug" "0.26.1"
mustache "^2.3.0"

mustache@^2.3.0:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
- secure: iHhl4aqh9T7RqyCGuERh4zUHKe6wwLxmGAIMlo8YTEXvyb9X9Tl4hQ+wjaDvlkSmEZKG9QXtIOVyDYBfexSbfnYhQkF9+a1Hs4CZQL1O7rbmoIMXZVD+51EcKXF1pwXSEaJ83BMiyC/B8OF/jt4zcxH4n1vnTVGTytHCSgN88ZULb02/PLJaBbsA4S7Z86iCLj9QXpZw9a+h866fEYz0Mv6qTCr20CckhkAHor+A/4REa7b32ZX4teXLII8pY9R61x+yHsjcD4loTn/G1qCcxjSetd4w+C1m/EsOOg7wE1GWy6NT5w8THCpnk8a2yz6ecOPRJ2E8LWLhl1UG3FusO5Yz6LgaGe8lauJsIJn13wCZXswhAbfCaZqqlG7tucUz8ipqRk0k/1rLlD0vQXSyhnNPfTRDmQBqv1Yf8/shLqHKJX1USZsKlv/Ro9dPKUHVwmPiK4pfq+d0ITgb4Zu9JpWkYRzBPiJQJo/9Lzi1u/CPhdBU1Kffv/psoADX/xTTMRpzbINCyw7sIs/NMIQAsYf3s7XhZzBuFj3bo0WUXpp3nEo0ppz0mIayEdRk/a7bRh0+MujBhb+avN9b/qx5KAjJmK9Tkp2+3fqkKkCurCgq6S8icN2Y1RZIAehl4m+OTQF+1SYPTvG4CiHbKPX3tpGDdIqgTM6pyogwFnVP0Ck=
- secure: HihdS39P8yFITiDaA2laT8FgjEqdpQGiepWFwTzOAL/wNFuIynNzBsE0+LpN/ZvFnILv/B8kBfclZbILLyKqLGUiessWj+FHAq2HAf2TXeG2O+yrSk5elyjVWcxrdokRzQaRz91ZSFNzReu0XN1R04pP3dBUQaO2xn8DX7WuYdNCsrMD9r6JmLHJCr7jFDA7Rvva8tZNttG1Hx6FIf17oC8toCD1SlcNXHeuuMuTvnP6UrdIgqCEFylnN4LRSxh364PoX5pax1Hr+0Sj/cjaumhZ6zml5iEKKMOB6kxlTGR2Yx2Ce2IVARi5gyCfhwOvOVhCTiObUY7LURfZLFgsNLvL4PYhk2KZ6KNGQrk7EhNzyxb6EiEAoHK8T36MeqUhmc9bQUTDdQfCeXjI0/Tux90RVEgj/NMfiH5791zB+73iw3o0NmvXc+MWtnrgRsVN4lab35NWxKFkZhf1u09wPgtW0kpMS2cZdVNMHtuStjZ36uQlqCuPjrO9hot8I00nnoXQtvw7Ttgx7SR/44V6iu8KWIXiGbhFAJLf5+kKac/0LSwERQwMc+wTk56fXaDCP2AzgU007+L2RLngieh04gFsvFSAn9Him1W8yc32kTFE6krEwJSJ8bCTDAgy2exjnwYZbj6fWkpUVylIK+epcPXzLIwCqYtWuFdKxADNlgI=
install:
- nvm install 6.9.2 && npm install -g yarn
- nvm install 6.9.2 && npm install -g yarn && yarn global add tslint typescript
script: bash .atomist/build/travis-build.bash
notifications:
email: false
Expand Down
37 changes: 25 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,24 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

[Unreleased]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.11.0...HEAD
[Unreleased]: https://github.com/atomist-rugs/spring-rugs/compare/0.12.0...HEAD

## [0.12.0] - 2017-04-25

[0.12.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.11.0...0.12.0

New name release

### Changed

- Renamed project to spring-rugs
- Update rug and @atomist/rugs dependencies
- Update Travis CI build
- Update TypeScript support files

## [0.11.0] - 2017-04-21

[0.11.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.10.0...0.11.0
[0.11.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.10.0...0.11.0

Lint release

Expand All @@ -22,7 +35,7 @@ Lint release

## [0.10.0] - 2017-04-12

[0.10.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.9.0...0.10.0
[0.10.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.9.0...0.10.0

Spring release

Expand All @@ -32,7 +45,7 @@ Spring release

## [0.9.0] - 2017-03-26

[0.9.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.8.0...0.9.0
[0.9.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.8.0...0.9.0

Tidy release

Expand All @@ -42,7 +55,7 @@ Tidy release

## [0.8.0] - 2017-03-24

[0.8.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.7.1...0.8.0
[0.8.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.7.1...0.8.0

TypeScript release

Expand All @@ -59,13 +72,13 @@ TypeScript release

## [0.7.1] - 2017-01-03

[0.7.1]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.6.0...0.7.1
[0.7.1]: https://github.com/atomist-rugs/spring-rugs/compare/0.6.0...0.7.1

Set the Spring Boot version on the parent block in any pom in a project

## [0.6.0] - 2017-01-24

[0.6.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.5.0...0.6.0
[0.6.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.5.0...0.6.0

Remove Atomist standard project files

Expand All @@ -77,7 +90,7 @@ Remove Atomist standard project files

## [0.5.0] - 2017-01-05

[0.5.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.3.0...0.5.0
[0.5.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.3.0...0.5.0

Brand new rug release

Expand All @@ -87,7 +100,7 @@ Brand new rug release

## [0.3.0] - 2016-12-14

[0.3.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.2.0...0.3.0
[0.3.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.2.0...0.3.0

Brand new rug release

Expand All @@ -101,7 +114,7 @@ Brand new rug release

## [0.2.0] - 2016-12-11

[0.2.0]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.1.1...0.2.0
[0.2.0]: https://github.com/atomist-rugs/spring-rugs/compare/0.1.1...0.2.0

Conformity to convention release

Expand All @@ -117,7 +130,7 @@ Conformity to convention release

Describe release

[0.1.1]: https://github.com/atomist-rugs/spring-boot-rest-service/compare/0.1.0...0.1.1
[0.1.1]: https://github.com/atomist-rugs/spring-rugs/compare/0.1.0...0.1.1

### Fixed

Expand All @@ -127,7 +140,7 @@ Describe release

Initial release

[0.1.0]: https://github.com/atomist-rugs/spring-boot-rest-service/tree/0.1.0
[0.1.0]: https://github.com/atomist-rugs/spring-rugs/tree/0.1.0

### Added

Expand Down
69 changes: 0 additions & 69 deletions CODE_OF_CONDUCT.md

This file was deleted.

18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Atomist 'spring-boot-rest-service'
# Atomist 'spring-rugs'

[![Build Status](https://travis-ci.org/atomist/spring-boot-rest-service.svg?branch=master)](https://travis-ci.org/atomist/spring-boot-rest-service)
[![Build Status](https://travis-ci.org/atomist/spring-rugs.svg?branch=master)](https://travis-ci.org/atomist/spring-rugs)
[![Slack Status](https://join.atomist.com/badge.svg)](https://join.atomist.com)

This [Rug][rug] project contains a generator for a [Spring Boot][boot]
Expand Down Expand Up @@ -44,7 +44,7 @@ Run it as follows:

```
$ cd parent/directory
$ rug generate atomist:spring-boot-rest-service:NewSpringBootRestService \
$ rug generate atomist:spring-rugs:NewSpringBootRestService \
pet-shop-service \
artifactId=pet-shop \
groupId=uk.co.lndn \
Expand Down Expand Up @@ -78,7 +78,16 @@ at [atomist-community.slack.com][slack].

If you find a problem, please create an [issue][].

[issue]: https://github.com/atomist/spring-boot-rest-service/issues
[issue]: https://github.com/atomist/spring-rugs/issues

## Rug Contributing

If you are interested in contributing to the Atomist open source
projects, please see our [contributing guidelines][contrib] and
our [code of conduct][code].

[contrib]: https://github.com/atomist/welcome/blob/master/CONTRIBUTING.md
[code]: https://github.com/atomist/welcome/blob/master/CODE_OF_CONDUCT.md

## Rug Development

Expand Down Expand Up @@ -110,7 +119,6 @@ artifacts.

## Spring Boot REST Service


[boot]: https://projects.spring.io/spring-boot/
[rest]: https://en.wikipedia.org/wiki/Representational_state_transfer

Expand Down

0 comments on commit 6b92043

Please sign in to comment.