Contributing to Insoshi with Git and GitHub. Michael Hartl

Transcription

1 Contributing to Insoshi with Git and GitHub Michael Hartl

2

3

4 + Winter 08

5 + Winter 08

6 + = Winter 08 Open-source social networking platform

7 dogfood.insoshi.com

8

9

10 #1

11 #1 #2

12

13

14 Common Contacts

15 class Person < ActiveRecord::Base... has_many :connections has_many :contacts, :through => :connections... # Return the common contacts with the given person. def common_contacts_with(other_person) # Fill this in! end... end

16 class Person < ActiveRecord::Base... has_many :connections has_many :contacts, :through => :connections... # Return the common contacts with the given person. def common_contacts_with(other_person) # Fill this in! end... end current_person.common_contacts_with(@person)

17 From a contributor (cleaned up and tested by mhartl) # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT connections.*, COUNT(contact_id) FROM `connections` end WHERE ((person_id =? OR person_id =?) AND status=?) GROUP BY contact_id HAVING count(contact_id) = 2) conditions = [sql, id, other_person.id, Connection::ACCEPTED] Connection.find_by_sql(conditions)

18 From a contributor (cleaned up and tested by mhartl) # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT connections.*, COUNT(contact_id) FROM `connections` end WHERE ((person_id =? OR person_id =?) AND status=?) GROUP BY contact_id HAVING count(contact_id) = 2) conditions = [sql, id, other_person.id, Connection::ACCEPTED] Connection.find_by_sql(conditions)

19 From a contributor (cleaned up and tested by mhartl) # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT connections.*, COUNT(contact_id) FROM `connections` end WHERE ((person_id =? OR person_id =?) AND status=?) GROUP BY contact_id HAVING count(contact_id) = 2) conditions = [sql, id, other_person.id, Connection::ACCEPTED] Connection.find_by_sql(conditions)

20 Rewritten by mhartl # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT DISTINCT contact_id FROM connections end INNER JOIN people contact ON connections.contact_id = contact.id WHERE ((person_id =? OR person_id =?) AND status =? AND contact.deactivated =? AND (contact. _verified IS NULL OR contact. _verified =?))) conditions = [sql, id, other_person.id, Connection::ACCEPTED, false, true] Person.find(Connection.find_by_sql(conditions).map(&:contact_id))

21 Rewritten by mhartl # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT DISTINCT contact_id FROM connections end INNER JOIN people contact ON connections.contact_id = contact.id WHERE ((person_id =? OR person_id =?) AND status =? AND contact.deactivated =? AND (contact. _verified IS NULL OR contact. _verified =?))) conditions = [sql, id, other_person.id, Connection::ACCEPTED, false, true] Person.find(Connection.find_by_sql(conditions).map(&:contact_id))

22 Rewritten by mhartl # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT DISTINCT contact_id FROM connections end INNER JOIN people contact ON connections.contact_id = contact.id WHERE ((person_id =? OR person_id =?) AND status =? AND contact.deactivated =? AND (contact. _verified IS NULL OR contact. _verified =?))) conditions = [sql, id, other_person.id, Connection::ACCEPTED, false, true] Person.find(Connection.find_by_sql(conditions).map(&:contact_id))

23 Rewritten by mhartl # Return the common contacts with the given person. def common_contacts_with(other_person) sql = %(SELECT DISTINCT contact_id FROM connections end INNER JOIN people contact ON connections.contact_id = contact.id WHERE ((person_id =? OR person_id =?) AND status =? AND contact.deactivated =? AND (contact. _verified IS NULL OR contact. _verified =?))) conditions = [sql, id, other_person.id, Connection::ACCEPTED, false, true] Person.find(Connection.find_by_sql(conditions).map(&:contact_id))

24

25 fork

26

27

28

29

30 $ git clone git://github.com/insoshi/insoshi.git $ cd insoshi $ git branch --track edge origin/edge $ git branch rubytalk edge $ git checkout rubytalk $ git remote add rubytalk git@github.com:rubytalk/insoshi.git $ git fetch rubytalk $ git push rubytalk rubytalk:refs/heads/rubytalk $ git config branch.rubytalk.remote rubytalk $ git config branch.rubytalk.merge refs/heads/rubytalk

31 $./configure_insoshi_local.sh rubytalk

32 $./configure_insoshi_local.sh rubytalk

33 $./configure_insoshi_local.sh rubytalk Cloning official insoshi repository... Initialized empty Git repository in /Users/mhartl/tmp/insoshi/.git/ remote: Counting objects: 17595, done. remote: Compressing objects: 100% (6800/6800), done. remote: Total (delta 10420), reused (delta 9999) Receiving objects: 100% (17595/17595), MiB 418 KiB/s, done. Resolving deltas: 100% (10420/10420), done. Checking out files: 100% (2802/2802), done. Creating local tracking branch for edge... Branch edge set up to track remote branch refs/remotes/origin/edge. Creating local branch rubytalk... Switched to branch "rubytalk" Adding remote connection to forked repository... Fetching remote branch information... From * [new branch] edge -> rubytalk/edge * [new branch] master -> rubytalk/master Pushing local branch rubytalk to remote rubytalk... Counting objects: 7, done. Compressing objects: 100% (4/4), done. Writing objects: 100% (4/4), 4.08 KiB, done. Total 4 (delta 1), reused 3 (delta 0) To git@github.com:rubytalk/insoshi.git * [new branch] rubytalk -> rubytalk Configuring remote connection for local branch rubytalk...

34

35 Live demo! Fixing the bug using RSpec and autotest

36 $ git commit -a -m Fixed common_contacts_with $ git push Counting objects: 38, done. Compressing objects: 100% (19/19), done. Writing objects: 100% (20/20), 2.25 KiB, done. Total 20 (delta 16), reused 2 (delta 1) To git@github.com:rubytalk/insoshi.git 35fb6c9..62bcf56 edge -> edge b3b6f5f..e22a271 master -> master 62bcf56..bb28588 rubytalk -> rubytalk

37

38

39 pull request

40

41 1. Fork a repository at GitHub 2. Clone and connect your local repository 3. Write a failing test 4. Get the test to pass 5. Commit your local changes 6. Push your changes to your GitHub fork 7. Make a pull request 8. Profit!!!

42 Michael Hartl Founder, Insoshi