Server Development
Workflow For PicCollage
Software We Need
● Ruby
● PostgreSQL
● Redis
● Memcache
● Git
● Terminal (iTerm 2)
● Text Editor (Sublime Text 2)
Service We need
● Github
● Heroku
● NewRelic
● Mailgun
Setup Working Copy
git clone git@github.com:collage.git
Setup Database
cd pic-collage/
git checkout dev
rake db:create
rake db:schema:load
rake test
Work on Feature Branch
git checkout -b feature-branch
vim ...
vim ...
rake test
vim ...
rake test
git add -p
git commit
gi...
Send Pull Request
# go to Github and send a pull request
# wait for review and review others
# after everything is settle....
Merge and Push
git checkout feature-branch
git merge dev
vim ... # fix conflict if any
git add .
git commit # resolve conf...
Deployment
git checkout dev
git pull
git checkout master
git pull
git merge dev
rake test
git push github master
git push ...
Utilities
./bin/heroku-log
./bin/push-staging
./bin/migrate-staging
./bin/psql
Q?
Upcoming SlideShare
Loading in …5
×

Server Development Workflow For PicCollage

488 views
396 views

Published on

Published in: Technology
0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
488
On SlideShare
0
From Embeds
0
Number of Embeds
4
Actions
Shares
0
Downloads
1
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide

Server Development Workflow For PicCollage

  1. 1. Server Development Workflow For PicCollage
  2. 2. Software We Need ● Ruby ● PostgreSQL ● Redis ● Memcache ● Git ● Terminal (iTerm 2) ● Text Editor (Sublime Text 2)
  3. 3. Service We need ● Github ● Heroku ● NewRelic ● Mailgun
  4. 4. Setup Working Copy git clone git@github.com:collage.git
  5. 5. Setup Database cd pic-collage/ git checkout dev rake db:create rake db:schema:load rake test
  6. 6. Work on Feature Branch git checkout -b feature-branch vim ... vim ... rake test vim ... rake test git add -p git commit git push github feature-branch
  7. 7. Send Pull Request # go to Github and send a pull request # wait for review and review others # after everything is settle...
  8. 8. Merge and Push git checkout feature-branch git merge dev vim ... # fix conflict if any git add . git commit # resolve conflict rake test # make sure again git push github feature-branch git checkout dev git merge feature-branch # fast-forward git push github dev
  9. 9. Deployment git checkout dev git pull git checkout master git pull git merge dev rake test git push github master git push heroku master
  10. 10. Utilities ./bin/heroku-log ./bin/push-staging ./bin/migrate-staging ./bin/psql
  11. 11. Q?

×