From 6b9204311de6e06c390e9feddbeb413f57fa32c4 Mon Sep 17 00:00:00 2001 From: David Dooling Date: Tue, 25 Apr 2017 10:10:46 -0500 Subject: [PATCH] Rename project spring-rugs, updates 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. --- .atomist.yml | 13 ++++ .atomist/build/travis-build.bash | 15 +++-- .atomist/generators/RugGeneratorFunctions.ts | 6 +- .atomist/manifest.yml | 4 +- .atomist/package.json | 5 +- .atomist/tslint.json | 3 +- .atomist/yarn.lock | 24 +++---- .travis.yml | 2 +- CHANGELOG.md | 37 +++++++---- CODE_OF_CONDUCT.md | 69 -------------------- README.md | 18 +++-- 11 files changed, 85 insertions(+), 111 deletions(-) delete mode 100644 CODE_OF_CONDUCT.md diff --git a/.atomist.yml b/.atomist.yml index 5e7b896..8a68296 100644 --- a/.atomist.yml +++ b/.atomist.yml @@ -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" + diff --git a/.atomist/build/travis-build.bash b/.atomist/build/travis-build.bash index 87c65a8..a5660bd 100644 --- a/.atomist/build/travis-build.bash +++ b/.atomist/build/travis-build.bash @@ -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: $*" @@ -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" @@ -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 diff --git a/.atomist/generators/RugGeneratorFunctions.ts b/.atomist/generators/RugGeneratorFunctions.ts index a969ef5..6bfed51 100644 --- a/.atomist/generators/RugGeneratorFunctions.ts +++ b/.atomist/generators/RugGeneratorFunctions.ts @@ -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); } @@ -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); } diff --git a/.atomist/manifest.yml b/.atomist/manifest.yml index 9699c75..6371596 100644 --- a/.atomist/manifest.yml +++ b/.atomist/manifest.yml @@ -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: diff --git a/.atomist/package.json b/.atomist/package.json index 2de6357..e7dbd7e 100644 --- a/.atomist/package.json +++ b/.atomist/package.json @@ -1,5 +1,8 @@ { "dependencies": { - "@atomist/rugs": "^0.24.3" + "@atomist/rugs": "^0.25.0" + }, + "scripts": { + "test": "rug test" } } diff --git a/.atomist/tslint.json b/.atomist/tslint.json index 006fdd8..aa9faa1 100644 --- a/.atomist/tslint.json +++ b/.atomist/tslint.json @@ -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": [] } diff --git a/.atomist/yarn.lock b/.atomist/yarn.lock index fd3a063..c792430 100644 --- a/.atomist/yarn.lock +++ b/.atomist/yarn.lock @@ -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: diff --git a/.travis.yml b/.travis.yml index 5796f8d..35d85d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index a0eb382..ab7826c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md deleted file mode 100644 index 933e47d..0000000 --- a/CODE_OF_CONDUCT.md +++ /dev/null @@ -1,69 +0,0 @@ -# Contributor Covenant Code of Conduct - - -In the interest of fostering an open and welcoming environment, we as -contributors and maintainers pledge to making participation in our project and -our community a harassment-free experience for everyone, regardless of age, body -size, disability, ethnicity, gender identity and expression, level of experience, -nationality, personal appearance, race, religion, or sexual identity and -orientation. - - -Examples of behavior that contributes to creating a positive environment -include: - -* Using welcoming and inclusive language -* Being respectful of differing viewpoints and experiences -* Gracefully accepting constructive criticism -* Focusing on what is best for the community -* Showing empathy towards other community members - -Examples of unacceptable behavior by participants include: - -* The use of sexualized language or imagery and unwelcome sexual attention or -advances -* Trolling, insulting/derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or electronic - address, without explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - - -Project maintainers are responsible for clarifying the standards of acceptable -behavior and are expected to take appropriate and fair corrective action in -response to any instances of unacceptable behavior. - -Project maintainers have the right and responsibility to remove, edit, or -reject comments, commits, code, wiki edits, issues, and other contributions -that are not aligned to this Code of Conduct, or to ban temporarily or -permanently any contributor for other behaviors that they deem inappropriate, -threatening, offensive, or harmful. - - -This Code of Conduct applies both within project spaces and in public spaces -when an individual is representing the project or its community. Examples of -representing a project or community include using an official project e-mail -address, posting via an official social media account, or acting as an appointed -representative at an online or offline event. Representation of a project may be -further defined and clarified by project maintainers. - - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at [code-of-conduct@atomist.com][email]. All -complaints will be reviewed and investigated and will result in a response that -is deemed necessary and appropriate to the circumstances. The project team is -obligated to maintain confidentiality with regard to the reporter of an incident. -Further details of specific enforcement policies may be posted separately. - -Project maintainers who do not follow or enforce the Code of Conduct in good -faith may face temporary or permanent repercussions as determined by other -members of the project's leadership. - - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, -available at [http://contributor-covenant.org/version/1/4][version] - -[homepage]: http://contributor-covenant.org -[version]: http://contributor-covenant.org/version/1/4/ -[email]: mailto:code-of-conduct@atomist.com diff --git a/README.md b/README.md index 8bef7aa..460c15c 100644 --- a/README.md +++ b/README.md @@ -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] @@ -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 \ @@ -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 @@ -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