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

Prepare documentation using site in GitHub Pages #1189

Merged
merged 1 commit into from
Dec 8, 2016

Conversation

mroderick
Copy link
Member

@mroderick mroderick commented Nov 16, 2016

This is a PR for master, it implements a new documentation site using GitHub Pages (well Jekyll underneath).

This is the squashed version of my work-in-progress branch. I can't imagine anyone being interested in seeing all the detours I took to get here... if I am wrong, please speak up and I'll post a link to it.

I (now) think we can do everything that we need to with GitHub Pages, so there's really no reason to complicate things by having yet another system to manage.


There's still a lot of work left to do on the new documentation website, however I think we should merge this branch, as it will:

  • allow me to finish configuring GitHub Pages, so we can see that the site actually works there
  • allow others to contribute to finishing the documentation site

If this PR is merged, I will update #991 to track the remaining work. Specifically, I will (as a minimum) add these tasks.

I will try to convince the creator of the new favicon to create a better design and some illustrations for the site.


To verify

  1. Check out this branch
  2. cd docs
  3. gem install bundler
  4. bundle install
  5. bundle exec jekyll serve
  6. Navigate to http://localhost:4000/
  7. Click around, and see if you can find any errors

@mroderick mroderick added this to the New sinon.org milestone Nov 16, 2016
@coveralls
Copy link

coveralls commented Nov 16, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling 7b522c9 on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

@coveralls
Copy link

coveralls commented Nov 16, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling d3124b5 on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

@mroderick mroderick force-pushed the docs-in-github-pages branch from d3124b5 to a87f59f Compare November 17, 2016 10:24
@coveralls
Copy link

Coverage Status

Coverage remained the same at 96.319% when pulling a87f59f on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

1 similar comment
@coveralls
Copy link

coveralls commented Nov 17, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling a87f59f on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

@coveralls
Copy link

coveralls commented Nov 17, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling 896d140 on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

Copy link
Contributor

@fatso83 fatso83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a tremendous amount of great work, Morgan! Fantastic! This makes a 2.0 release feel a lot closer (finally) :-D

Just a few typos I saw when glancing over the changes.


Compile interesting highlights from [`git changelog`](https://github.com/tj/git-extras/blob/master/Commands.md#git-changelog) into Changelog.md
1. `npm version [keyword]`
- Updates `Changlelog.txt` - you will need to edit this
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that was fixed in a later commit, I can't find it in the source

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bah, looking in the wrong project ..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -0,0 +1,41 @@
# Contribruting to documentation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo. also the name of the file is missing an r.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@mantoni
Copy link
Member

mantoni commented Nov 17, 2016

Just played around with the website a little. Looks really good. I like it 👍

The only thing that I found are some funny quotes in APIs. I guess that is macOS being clever about quotations. Especially the matchers page has some and in the spy and stub pages some double quotes have a leading backslash.

Solid work Morgan. Very simple to get started. Thanks!

Requires the value to be a `String`.


#### `sinon.match.object"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Closing quote should be a backtick.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Replaces the spy with the original method. Only available if the spy replaced an existing method.


#### `spy.printf(format string\", [arg1, arg2, ...])`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it should be spy.printf("format string", [arg1, arg2, ...])

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@mroderick
Copy link
Member Author

@mantoni @fatso83 I've addressed all comments so far. I would prefer to merge all of this as one commit, so we don't end up with all the Review: commits in history

@coveralls
Copy link

coveralls commented Nov 17, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling d114ad4 on mroderick:docs-in-github-pages into 235abb4 on sinonjs:master.

@fatso83
Copy link
Contributor

fatso83 commented Dec 7, 2016

Crap. Sorry that I held this up. I had no idea I was the one stalling it. And now it seems there have arisen some conflicts in the docs ...

@mroderick
Copy link
Member Author

No worries, I wasn't sure myself. I'll rebate it tomorrow

@mroderick
Copy link
Member Author

Rebase even. Damn autocorrect

@mroderick mroderick force-pushed the docs-in-github-pages branch from d114ad4 to 7bd43c9 Compare December 8, 2016 13:59
@coveralls
Copy link

coveralls commented Dec 8, 2016

Coverage Status

Coverage remained the same at 96.319% when pulling 7bd43c9 on mroderick:docs-in-github-pages into f6e7916 on sinonjs:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage remained the same at 96.319% when pulling 7bd43c9 on mroderick:docs-in-github-pages into f6e7916 on sinonjs:master.

@mroderick
Copy link
Member Author

Rebased. I think this is good to go now

@fatso83 fatso83 merged commit e3d0836 into sinonjs:master Dec 8, 2016
@mroderick mroderick deleted the docs-in-github-pages branch December 14, 2016 16:18
@mroderick
Copy link
Member Author

Thanks!

@mroderick mroderick mentioned this pull request Jan 21, 2017
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants