Git and Drush: Best Friends Forever

A short introduction to git (the distributed version control system) and drush (the command-line interface for Drupal) and how they can play nicely together.

This presentation was delivered to the Drupal Western Australia User Group in May, 2012.

Transcript

3. Git and Drush
4. Git and Drush — — — Best Friends
 Forever!
5. A bit about git
6. A bit about git • Free & open source software.
7. A bit about git • Free & open source software. • Distributed version control system.
8. A bit about git • Free & open source software. • Distributed version control system. • Every clone is a full-fledged repository.
9. A bit about git • Free & open source software. • Distributed version control system. • Every clone is a full-fledged repository. • Branches and tags are first class and working with them is easy.
10. A bit about git • Free & open source software. • Distributed version control system. • Every clone is a full-fledged repository. • Branches and tags are first class and working with them is easy. • The Drupal community standard.
11. Use git to:
12. Use git to: • Track the development history of a project.
13. Use git to: • Track the development history of a project. • Tag builds, releases, etc.
14. Use git to: • Track the development history of a project. • Tag builds, releases, etc. • Share and transfer code between people, organisations, etc.
15. Use git to: • Track the development history of a project. • Tag builds, releases, etc. • Share and transfer code between people, organisations, etc. • Deploy code.
16. Platform releases
17. Platform releases • Store platforms in a git repository.
18. Platform releases • Store platforms in a git repository. • (Restricted write access.)
19. Platform releases • Store platforms in a git repository. • (Restricted write access.) • Use this repository as a remote in project repositories.
20. Platform releases • Store platforms in a git repository. • (Restricted write access.) • Use this repository as a remote in project repositories. • Now code upgrades are just merge, cherry- pick, rebase, etc.
21. Platform releases
22. Platform releases • Starting a new project is just a clone:
 git clone \
 --origin platform \
 --branch 6.x \
 git@gorilla:drupal.git \
 example.com
 git checkout -b master
23. Platform releases
24. Platform releases • Or, manually:
 git init
 git remote add platform ...
 git fetch platform
 git checkout \
 -b master \
 remotes/platform/7.x
25. Platform releases
26. Platform releases • After it’s created, you just do your normal thing:
 git remote add origin ...
 git add .
 git commit -m “Make it awesome”
 git push origin master
27. Platform releases
28. Platform releases • When it’s time to upgrade a project to a new platform release:
 git fetch platform
 git merge remotes/platform/7.x
29. Platform releases • When it’s time to upgrade a project to a new platform release:
 git fetch platform
 git merge remotes/platform/7.x • Or use rebase:
 git fetch platform
 git rebase remotes/platform/7.x
30. A bit about drush
31. A bit about drush • A command-line interface for Drupal.
32. A bit about drush • A command-line interface for Drupal. • Built-in commands for core Drupal functionality.
33. A bit about drush • A command-line interface for Drupal. • Built-in commands for core Drupal functionality. • Extension system for other modules to provide commands (Features, Migrate, etc.)
34. A bit about drush • A command-line interface for Drupal. • Built-in commands for core Drupal functionality. • Extension system for other modules to provide commands (Features, Migrate, etc.) • Underpins systems like Aegir.
35. Use drush to:
36. Use drush to: • Download, enable, disable and upgrade themes and modules.
37. Use drush to: • Download, enable, disable and upgrade themes and modules. • Build and install complete sites.
38. Use drush to: • Download, enable, disable and upgrade themes and modules. • Build and install complete sites. • Manage users and roles.
39. Use drush to: • Download, enable, disable and upgrade themes and modules. • Build and install complete sites. • Manage users and roles. • Operate on your database.
40. Use drush to: • Download, enable, disable and upgrade themes and modules. • Build and install complete sites. • Manage users and roles. • Operate on your database. • Transfer databases and files.
41. Project management
42. Project management •drush pm-download
43. Project management •drush pm-download •drush pm-enable
44. Project management •drush pm-download •drush pm-enable •drush pm-disable
45. Project management •drush pm-download •drush pm-enable •drush pm-disable •drush pm-update
46. Users & Roles
47. Users & Roles •drush user-create
48. Users & Roles •drush user-create •drush user-password
49. Users & Roles •drush user-create •drush user-password •drush user-block
50. Users & Roles •drush user-create •drush user-password •drush user-block •drush user-login
51. Databases
52. Databases • drush sql-cli
53. Databases • drush sql-cli • drush sql-drop
54. Databases • drush sql-cli • drush sql-drop • drush sql-dump
55. Databases • drush sql-cli • drush sql-drop • drush sql-dump • drush sql-sync
56. Other useful stuff
57. Other useful stuff •drush core-cron
58. Other useful stuff •drush core-cron •drush cache-clear
59. Other useful stuff •drush core-cron •drush cache-clear •drush variable-set
60. Other useful stuff •drush core-cron •drush cache-clear •drush variable-set •drush variable-get
61. Other useful stuff •drush core-cron •drush cache-clear •drush variable-set •drush variable-get •drush watchdog-show
62. Other useful stuff •drush core-cron •drush cache-clear •drush variable-set •drush variable-get •drush watchdog-show •drush php-script
63. Scripts
64. Scripts • Here’s an example script:
 <?php node_delete(1);
65. Scripts • Here’s an example script:
 <?php node_delete(1); • When you save it as example.php (in a specific directory).
66. Scripts • Here’s an example script:
 <?php node_delete(1); • When you save it as example.php (in a specific directory). • You run it like this:
 drush php-script example
67. Scripts • Here’s an example script:
 <?php node_delete(1); • When you save it as example.php (in a specific directory). • You run it like this:
 drush php-script example • Easy!
68. Database diff
69. Database diff • Lets go back to the sql-dump command.
70. Database diff • Lets go back to the sql-dump command. • It has a few options:
71. Database diff • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out.
72. Database diff • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out. • structure-tables-key - leave the data out.
73. Database diff • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out. • structure-tables-key - leave the data out. • ordered-dump - make the dump line- based.
74. Database diff 2
75. Database diff 2 • Lets go back to the sql-dump command.
76. Database diff 2 • Lets go back to the sql-dump command. • It has a few options:
77. Database diff 2 • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out.
78. Database diff 2 • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out. • structure-tables-key - leave the data out.
79. Database diff 2 • Lets go back to the sql-dump command. • It has a few options: • skip-tables-key - leave tables out. • structure-tables-key - leave the data out. • ordered-dump - make the dump line- based.
80. Database diff 3
81. Database diff 3 • The “key” options reference values in your drushrc.php configuration file.
82. Database diff 3 • The “key” options reference values in your drushrc.php configuration file. • Your drushrc.php can also contain defaults values for all drush command arguments.
83. Database diff 3 • The “key” options reference values in your drushrc.php configuration file. • Your drushrc.php can also contain defaults values for all drush command arguments. • Setting defaults for these makes sql- dump much more useful!
84. Database diff 4
85. Git and Drush • Both are extremely flexible. • Both are easy to extended. • Both are great fun. • Bend them to your will! • (But please read the documentation first.)
86. Questions & Comments?