This post originated from an RSS feed registered with Ruby Buzz
by Jake Scruggs.
Original Post: Rails Conf 2009 First Day of Sessions (Afternoon)
Feed Title: Jake Scruggs
Feed URL: http://jakescruggs.blogspot.com/feeds/posts/default
Feed Description: Ruby, Rails, Metrics, Testing, and pursuit of clean code.
Did you know the Las Vegas Hilton charges you 3 dollars to print out a boarding pass? Jerks.
JavaScript Testing in Rails: Fast, Headless, In-Browser. Pick Any Three. Larry Karnowski
So blue_ridge is a javascript testing tool that mashes up a bunch of other tools to make testing javascript more or less like writing RSpec test. It's pretty cool. It uses Screw.Unit for the RSpec like lingo, Smoke for mocking, and Rhino to run the javascript tests without a browser (so you can integrate it into your Cruise Control build).
master^1 is parent of master master~2 is two commits ago on master
Ranges: [old]..[new] ce04.. Means everything since then
git log orgin/master.. What am I going to push? git log master ^orign/master Same as above
git log master bacon ^origin/master What is in the 'bacon' and 'master' branches that is not in origin master.
git log --graph Produces an ascii graph gitk Produces visual graphs and takes pretty much the same arguments things as git log
git diff topic Means how do I make topic look like head -- probably not what you want
git diff HEAD...topic What happens if I merge in the topic branch -- useful
No rebasing on any commit you've pushed upstream! It messes everything up.
Subtree merging is an alternate to submodules. Tim Dysinger has a write-up on how to use it. Find it at: http://www.tinyurl.com/braidgit
git blame -C a_file.rb If a line was moved from another file then give me the last time it was changed from another file. Cool. You can even adjust how hard it looks for that line in another file.
git bisect is a binary search where a bug was introduced
git bisect start git bisect bad The current commit is bad git bisect good ae03efg... The last time you know it worked
Bisect will now take the range and check out the middle one, you run the code to see if the bug is there. If it still is: git bisect bad And you get a new commit
if the bug isn't there: git bisect good And you get a new commit
It keeps doing a binary search of commits (using your feedback) until you narrow it down to exactly the commit that caused the problem. Neat.
Then 'git bisect reset' to get back to normal.
git config --global color.ui auto For Colors
There's a way to set up git to diff word docs. Which is cool. See the link to the slides to see how (it went by rather fast).
Previous Topic
