search

davidchambers / tutor

JavaScript interface for the Gatherer card database
https://gatherer.wizards.com/
Do What The F*ck You Want To Public License
149 stars 18 forks source link

Updated CLI to optionally provide the full-JSON representation of a card #50

Closed robdennis closed 11 years ago

robdennis commented 11 years ago

re-done pull request after merging upstream in. Tests all pass after merge, including the new CLI tests.

robdennis commented 11 years ago

the first two @nicknovitski commits were putting things in command_line.coffee, even though it's since been renamed to command.coffee

6d93920/2c6062d accounted for that rename, and 92244e7 deleted the now defunct command_line.coffe/js file

davidchambers commented 11 years ago

I've cleaned up your branch's history. Please run the following commands to update the pull request:

$ git checkout master
$ git branch cli-json             # save current master as cli-json
$ git reset --hard 6166774        # reset to common commit
$ git pull upstream cli-json      # pull the cleaner history
$ git push origin master --force  # update this pull request

Once we've dealt with the merge commits, I'll review the actual code changes. :)

robdennis commented 11 years ago

took a look at the resulting 4 commits and it looks good and the tests pass. Appreciate the cleanup, I'm more familiar with Mercurial so this is a good learning exercise

davidchambers commented 11 years ago

I added a few comments, all of which are minor. I'm happy to make these changes myself before pulling the branch into master, if you're sick of making tweaks. :)

robdennis commented 11 years ago

Not sick at all, but if you would be able to take that on, I'd appreciate it :).

Today's my solo kid-watching evening and knowing that it was all pulled would allow me to use my next free development evening on converting my projects to use the new tutor version, which would be nice.

On Tue, Apr 2, 2013 at 1:14 PM, David Chambers notifications@github.comwrote:

I added a few comments, all of which are minor. I'm happy to make these changes myself before pulling the branch into master, if you're sick of making tweaks. :)

— Reply to this email directly or view it on GitHubhttps://github.com/davidchambers/tutor/pull/50#issuecomment-15789097 .

davidchambers commented 11 years ago

No worries. I'll get these changes into master tonight. :)

davidchambers commented 11 years ago

Closed via 920c073094094e72bc6022122ab52b10f7eb40ac.