Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First pass at framework with testing, rake, etc #249

Merged
merged 1 commit into from Oct 22, 2014

Conversation

martinb3
Copy link
Contributor

  • Due to Foodcritic and how Supermarket renders README.md, rename README.markdown to README.md
  • Add some default files for .gitignore, .rubocop.yml, .kitchen.yml, etc
  • Added a default recipe to install curl and create a dummy chef resource, just as an example to start with
  • Add chefspec and test-kitchen/serverspec default test suites that just test the current default recipe
  • Add test fixtures like a wrapper cookbook to test how downstream cookbooks might use this one
  • Add lengthy documentation on testing, how it works in this cookbook, etc

- Due to Foodcritic and how Supermarket renders README.md, rename README.markdown to README.md
- Add some default files for .gitignore, .rubocop.yml, .kitchen.yml, etc
- Added a default recipe to install curl and create a dummy chef resource, just as an example to start with
- Add chefspec and test-kitchen/serverspec default test suites that just test the current default recipe
- Add test fixtures like a wrapper cookbook to test how downstream cookbooks might use this one
- Add lengthy documentation on testing, how it works in this cookbook, etc
@bai
Copy link

bai commented Oct 20, 2014

This looks promising. Also glad that we don't depend on build-essential/ark. Should we get this merged and start from there?

bai added a commit that referenced this pull request Oct 22, 2014
First pass at framework with testing, rake, etc
@bai bai merged commit 23c0cf3 into sous-chefs:next Oct 22, 2014
@karmi
Copy link
Contributor

karmi commented Oct 22, 2014

Ah, about to merge this... you beat me to it, @bai :)

martinb3 added a commit that referenced this pull request Oct 22, 2014
First pass at framework with testing infrastructure, Rake tasks, etc

- Due to Foodcritic and how Supermarket renders README.md, rename README.markdown to README.md
- Add some default files for .gitignore, .rubocop.yml, .kitchen.yml, etc
- Added a default recipe to install curl and create a dummy chef resource, just as an example to start with
- Add chefspec and test-kitchen/serverspec default test suites that just test the current default recipe
- Add test fixtures like a wrapper cookbook to test how downstream cookbooks might use this one
- Add lengthy documentation on testing, how it works in this cookbook, etc

Closes #249
@karmi
Copy link
Contributor

karmi commented Oct 22, 2014

@martinb3 @bai I force-pushed the branch -- I changed the commit message a bit (sorry, I'm that crazy) and added the PR number to the commit, so we keep track of everything.

@karmi
Copy link
Contributor

karmi commented Oct 22, 2014

@martinb3 @bai @vhyza Also, a question -- can we close (and reference) issues by the Closes #XXX notation in the commit message? And can we not use the "merge button", since it doesn't do a fast-forward merge (AFAIK)?

So, ideally, the process would be:

  • Create a branch directly in this repo, something like karmi/install_from_deb
  • Create an issue/open a PR
  • Keep pushing commits to the initial branch
  • When everything is ready for merge, clean up the branch (rebase with next to synchronize, squash, edit commits, etc) and merge it into next
  • When it's couple of commits which are to be considered a logical whole, merge it with --no-ff switch, so it's indicated in the Git history

Does it sound OK?

@martinb3
Copy link
Contributor Author

@karmi that'd be fine with me. I normally do tag the commits with the PRs... Not sure why I didn't here :-)

@martinb3
Copy link
Contributor Author

Actually, let's put a CONTRIBUTING.md in the repo and document the workflow @karmi suggests, along with standard stuff like linking commit messages and pull requests and issues, and using 'closes' / 'fixes'.

@martinb3 martinb3 deleted the next branch October 22, 2014 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants