Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Adding content and cleaning up some of the build process #16

Open
wants to merge 72 commits into from

2 participants

@jimschubert

Hey TJ,

I've been working on adding some content to Mastering Node and updating it to v0.4.x. It's pretty well-organized and stubbed out, and I think when the empty sections are completed it will be a necessity in the toolset of node.js beginners. In fact, I found the book while looking for resources because I wanted to start learning node.

I've cleaned up the build process and structure a little. For instance, I removed the ronn dependency in favor of using markup-js and the doctool.js that is available in the current joyent/node/tools/doctools directory. This is really clean and I plan to modify the file to include more options. I also mimicked the node.js markup structure (using @include) to move the structure of the document out of the make file into chapters/all.md.

My next task, aside from adding more content, is to look for (or write) an html to pdf conversion module written in node.js to remove the htmldoc dependency. I think that having the book about node.js being compiled entirely by node scripts is completely meta. When i was in programming classes in college, one of my instructors gave us the answers to a test as code that we had to compile and run for the answers. I think it fires up interest, more than anything.

The main thing I did to the structure was to move the book.* files to a /doc directory. This would change the gh-pages references, which I didn't touch.

Thanks,

Jim

jimschubert added some commits
@jimschubert jimschubert Modified module example to use require.extensions, because require.r…
…egisterExtension() was removed in node 0.3.0
8638e89
@jimschubert jimschubert Updated modules chapter to reflect node 0.3.0 remove of require.regis…
…terExtension
4837b17
@jimschubert jimschubert Updated installation instructions in markdown file 74f9be2
@jimschubert jimschubert Updated modules.md by explaining how to example pseudo-globals in nod…
…e console
ebdc2a5
@jimschubert jimschubert Updated section on globals: console d2427c3
@jimschubert jimschubert Updated some grammar and functionality for globals: process 9c1ebd5
@jimschubert jimschubert Updated events and buffers, mostly grammar and formatting. These sect…
…ions still need to be expanded a little more.
cc13650
@jimschubert jimschubert Regenerated book files and updated makefile slightly a50b9af
@jimschubert jimschubert Updated Readme.md to show Jim Schubert as an author and introduce rep…
…l (node console)
5802836
@jimschubert jimschubert Cleaning up the project and make process b46345c
@jimschubert jimschubert Regenerated book e420ce7
@jimschubert jimschubert Removed generated html files which don't need to be tracked by git 826aa16
@jimschubert jimschubert Updated .gitignore to ignore the html files generated from markdown e610df6
@jimschubert jimschubert Updated readme to support multiple authors ;) 62e9c7c
@jimschubert jimschubert Updated book.html generation to reflect the removal of ronn dependency. d046097
@jimschubert jimschubert Added an events example from the nodejs documentation which provides …
…a little more insight on the nature of events
1d9b3b3
@jimschubert jimschubert Added to the intro and cleaned up the make process a little 8187db9
@jimschubert jimschubert removed redundant files and test files. Whoops 0203928
@jimschubert jimschubert Removed toc.md, which was replaced by all.md and auto-generated tocs.…
… Updated styles
0271718
@jimschubert jimschubert Added an initial Hello World example like we're basically obligated t…
…o do. Added a simple tcp example
3901478
@tj
Owner
tj commented

cool man nice stuff, might be a little but until I can review, but thanks! appreciated :)

jimschubert added some commits
@jimschubert jimschubert Added meta to html to specify encoding, description, keywords, author(s) 7546996
@jimschubert jimschubert Added example standards explanation to intro.md 804d1af
@jimschubert jimschubert modified .gitignore to ignore files and directories added by ndistro e9f6e32
@jimschubert jimschubert Updated Makefile to clean/build property for each book. Removed impro…
…per style.css comment
4d59da3
@jimschubert jimschubert Updated Makefile to clean/build property for each book. Removed impro…
…per style.css comment

Also, updated installation instructions to remove nDistro (I couldn't get it work properly with the current node release).  Now, installation instructions are based on installing directly from source and using npm to install dependencies throughout the book.
a1913d0
@jimschubert jimschubert Merge branch 'master' of github.com:jimschubert/masteringnode c819531
@jimschubert jimschubert Updated intro with more standardized formatting, removed nDistro link…
… from intro, and updated modules to reflect the standardized formatting
a6b7153
@jimschubert

These files should have been a part of the previous commit (to which the comment refers)

jimschubert added some commits
@jimschubert jimschubert Updated intro with more standardized formatting, removed nDistro link…
… from intro, and updated modules to reflect the standardized formatting
169889d
@jimschubert jimschubert globals code conventions c3bdd9b
@jimschubert jimschubert Updated events with standard code block conventions 1cf67f7
@jimschubert jimschubert Some minor grammar edits 8ee4d31
@jimschubert jimschubert Code block standards eb6cdd7
@jimschubert jimschubert fs code block standards 3737c8d
@jimschubert jimschubert Began on testing chapter and some minor modifications to other chapters 56fcc08
@jimschubert jimschubert Merge branch 'master' of github.com:jimschubert/masteringnode
Conflicts:
	docs/assets/style.css
77722db
@jimschubert jimschubert Working on http and testing 9b5ccfd
@jimschubert jimschubert Started on TCP dae8692
@jimschubert jimschubert Merge branch 'master' of github.com:jimschubert/masteringnode e77dbfe
@jimschubert jimschubert Added a start to the nodeunit section 39d3cdb
@jimschubert jimschubert Regenerated book 04f09b7
@jimschubert jimschubert Updated http example to allow for shutting down the server and writin…
…g output to the correct directory
139762c
@jimschubert jimschubert Added an example for http server cbdbf1f
@jimschubert jimschubert Merge branch 'master' of github.com:jimschubert/masteringnode f7612c4
@jimschubert jimschubert Finished an explanation of the http server example 074a767
@jimschubert jimschubert Updated the mobi output 2e53efb
@jimschubert jimschubert Added a slightly cleaner server example which emits events 93be198
@jimschubert jimschubert Regenerated book f6c458c
@jimschubert jimschubert Updated http and section in globals related to constants 6be6c50
@jimschubert jimschubert Fixed a buffer example that was missing the buffer creation 1f8543d
@jimschubert

Also, I modified the slice length because I didn't remember what I used as the buffer string!

jimschubert added some commits
@jimschubert jimschubert Added the addon example from node docs 7032c9c
@jimschubert jimschubert Added new function example and updated chapter 4226e80
@jimschubert jimschubert Regenerated book cbe9615
@jimschubert jimschubert Modified some typos and grammar 5ab4edb
@jimschubert jimschubert Regenerated book 3c7e6d3
@jimschubert jimschubert Updated Readme.md from visionmedia/masteringnode changes 556b9b1
@jimschubert jimschubert Regenerated book 7268f7f
@jimschubert jimschubert Added debugging section and regenerated book 5682204
@jimschubert jimschubert Changed markdown.js to submodule and updated doctool to properly load…
… markdown dep
34c4537
@jimschubert jimschubert Regenerated book ad8b11e
@jimschubert jimschubert Added section on deploying to Heroku, vim configurations, and regener…
…ated books
2d858f5
@jimschubert jimschubert Added uuid generator node addon example and corresponding update to F…
…unctionTemplate section in addons.md

Regenerated book
07acd72
@jimschubert jimschubert crlf a730721
@jimschubert jimschubert Fix CRLF 6166b38
@jimschubert jimschubert Added gh-pages to /site 0e1d265
@jimschubert jimschubert Trying out some syntax highlighter changes to prettyprint 811f70d
@jimschubert jimschubert Regenerated book 63ea2d7
@jimschubert jimschubert Changed background on site and updated fork me link ccc48cf
@jimschubert jimschubert Added 'make gh-pages' to easily copy /site to gh-pages branch e6718c9
@jimschubert jimschubert Merge remote-tracking branch 'origin/master'
* origin/master:
  Added 'make gh-pages' to easily copy /site to gh-pages branch
  Changed background on site and updated fork me link
  Regenerated book
  Trying out some syntax highlighter changes to prettyprint
  Added gh-pages to /site
  Fix CRLF
51f3653
@jimschubert jimschubert Updating tcp examples f0820ea
@jimschubert

I apologize for the divergence in the graph on this commit. I had previously botched a git rebase -i on the gh-pages branch. After switching back to the master branch, I didn't realize I was in a disconnected state. These files were the three outstanding commits that I diff'd off and reapplied after aborting the botched rebase:

git diff HEAD~3 > ~/tmp/diffs
git rebase -i --abort
patch -p1 < ~/tmp/diffs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 13, 2011
  1. @jimschubert

    Modified module example to use require.extensions, because require.r…

    jimschubert authored
    …egisterExtension() was removed in node 0.3.0
  2. @jimschubert
  3. @jimschubert
  4. @jimschubert
  5. @jimschubert
  6. @jimschubert
  7. @jimschubert

    Updated events and buffers, mostly grammar and formatting. These sect…

    jimschubert authored
    …ions still need to be expanded a little more.
Commits on Mar 14, 2011
  1. @jimschubert
  2. @jimschubert
Commits on Mar 15, 2011
  1. @jimschubert
  2. @jimschubert

    Regenerated book

    jimschubert authored
  3. @jimschubert
  4. @jimschubert
  5. @jimschubert
  6. @jimschubert
Commits on Mar 17, 2011
  1. @jimschubert

    Added an events example from the nodejs documentation which provides …

    jimschubert authored
    …a little more insight on the nature of events
  2. @jimschubert
  3. @jimschubert
  4. @jimschubert
Commits on Mar 18, 2011
  1. @jimschubert

    Added an initial Hello World example like we're basically obligated t…

    jimschubert authored
    …o do. Added a simple tcp example
Commits on Mar 19, 2011
  1. @jimschubert
  2. @jimschubert
  3. @jimschubert
  4. @jimschubert
  5. @jimschubert

    Updated Makefile to clean/build property for each book. Removed impro…

    jimschubert authored
    …per style.css comment
    
    Also, updated installation instructions to remove nDistro (I couldn't get it work properly with the current node release).  Now, installation instructions are based on installing directly from source and using npm to install dependencies throughout the book.
  6. @jimschubert
Commits on Mar 20, 2011
  1. @jimschubert

    Updated intro with more standardized formatting, removed nDistro link…

    jimschubert authored
    … from intro, and updated modules to reflect the standardized formatting
  2. @jimschubert

    Updated intro with more standardized formatting, removed nDistro link…

    jimschubert authored
    … from intro, and updated modules to reflect the standardized formatting
  3. @jimschubert

    globals code conventions

    jimschubert authored
  4. @jimschubert
  5. @jimschubert

    Some minor grammar edits

    jimschubert authored
  6. @jimschubert

    Code block standards

    jimschubert authored
  7. @jimschubert

    fs code block standards

    jimschubert authored
Commits on Mar 22, 2011
  1. @jimschubert
  2. @jimschubert

    Merge branch 'master' of github.com:jimschubert/masteringnode

    jimschubert authored
    Conflicts:
    	docs/assets/style.css
Commits on Mar 23, 2011
  1. @jimschubert
  2. @jimschubert

    Started on TCP

    jimschubert authored
  3. @jimschubert
  4. @jimschubert
  5. @jimschubert

    Regenerated book

    jimschubert authored
  6. @jimschubert

    Updated http example to allow for shutting down the server and writin…

    jimschubert authored
    …g output to the correct directory
Commits on Mar 25, 2011
  1. @jimschubert
  2. @jimschubert
  3. @jimschubert
  4. @jimschubert

    Updated the mobi output

    jimschubert authored
Commits on Mar 27, 2011
  1. @jimschubert
  2. @jimschubert

    Regenerated book

    jimschubert authored
Commits on Mar 29, 2011
  1. @jimschubert
Commits on Mar 30, 2011
  1. @jimschubert
Commits on Apr 1, 2011
  1. @jimschubert
Commits on Apr 7, 2011
  1. @jimschubert
  2. @jimschubert

    Regenerated book

    jimschubert authored
Commits on Apr 8, 2011
  1. @jimschubert
Commits on May 3, 2011
  1. @jimschubert

    Regenerated book

    jimschubert authored
Commits on May 21, 2011
  1. @jimschubert
Commits on May 29, 2011
  1. @jimschubert

    Regenerated book

    jimschubert authored
Commits on Jun 10, 2011
  1. @jimschubert
Commits on Jul 30, 2011
  1. @jimschubert
  2. @jimschubert

    Regenerated book

    jimschubert authored
Commits on Feb 3, 2012
  1. @jimschubert
Commits on Feb 6, 2012
  1. @jimschubert

    Added uuid generator node addon example and corresponding update to F…

    jimschubert authored
    …unctionTemplate section in addons.md
    
    Regenerated book
Commits on Feb 7, 2012
  1. @jimschubert

    crlf

    jimschubert authored
Commits on Feb 9, 2012
  1. @jimschubert

    Fix CRLF

    jimschubert authored
Commits on Feb 10, 2012
  1. @jimschubert

    Added gh-pages to /site

    jimschubert authored
  2. @jimschubert
  3. @jimschubert

    Regenerated book

    jimschubert authored
  4. @jimschubert
Commits on Feb 11, 2012
  1. @jimschubert
Commits on Feb 18, 2012
  1. @jimschubert

    Merge remote-tracking branch 'origin/master'

    jimschubert authored
    * origin/master:
      Added 'make gh-pages' to easily copy /site to gh-pages branch
      Changed background on site and updated fork me link
      Regenerated book
      Trying out some syntax highlighter changes to prettyprint
      Added gh-pages to /site
      Fix CRLF
  2. @jimschubert

    Updating tcp examples

    jimschubert authored
Commits on Feb 20, 2012
  1. @jimschubert
  2. @jimschubert

    Regenerated book

    jimschubert authored
Something went wrong with that request. Please try again.