Skip to content

Commit 7c21dd7

Browse files
libjohnlibjohn
committed
update for fall 2018 - alpha
1 parent 56135e8 commit 7c21dd7

File tree

141 files changed

+3958
-752
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+3958
-752
lines changed

‎docs/slides/index.Rmd‎

Lines changed: 0 additions & 653 deletions
This file was deleted.

‎docs/slides/index.html‎

Lines changed: 61 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Hands-on: Configuring and Using Git with RStudio</title>
4+
<title>Git: Hands-on</title>
55
<meta charset="utf-8">
66
<meta name="author" content="John Little" />
7-
<meta name="date" content="2018-01-29" />
8-
<link href="libs/remark-css-0.0.1/example.css" rel="stylesheet" />
9-
<script src="libs/htmlwidgets-0.9/htmlwidgets.js"></script>
7+
<meta name="date" content="2018-09-25" />
8+
<link href="libs/remark-css-0.0.1/default.css" rel="stylesheet" />
9+
<script src="libs/htmlwidgets-1.2/htmlwidgets.js"></script>
1010
<script src="libs/jquery-1.12.4/jquery.min.js"></script>
11-
<script src="libs/datatables-binding-0.2/datatables.js"></script>
12-
<link href="libs/dt-core-1.10.12/css/jquery.dataTables.min.css" rel="stylesheet" />
13-
<link href="libs/dt-core-1.10.12/css/jquery.dataTables.extra.css" rel="stylesheet" />
14-
<script src="libs/dt-core-1.10.12/js/jquery.dataTables.min.js"></script>
11+
<link href="libs/datatables-css-0.0.0/datatables-crosstalk.css" rel="stylesheet" />
12+
<script src="libs/datatables-binding-0.4/datatables.js"></script>
13+
<link href="libs/dt-core-1.10.16/css/jquery.dataTables.min.css" rel="stylesheet" />
14+
<link href="libs/dt-core-1.10.16/css/jquery.dataTables.extra.css" rel="stylesheet" />
15+
<script src="libs/dt-core-1.10.16/js/jquery.dataTables.min.js"></script>
16+
<link href="libs/crosstalk-1.0.0/css/crosstalk.css" rel="stylesheet" />
17+
<script src="libs/crosstalk-1.0.0/js/crosstalk.min.js"></script>
1518
<link rel="stylesheet" href="duke_color_pallettes_slides.css" type="text/css" />
1619
<link rel="stylesheet" href="cc-fonts.css" type="text/css" />
1720
<link rel="stylesheet" href="figures.css" type="text/css" />
@@ -20,10 +23,10 @@
2023
<textarea id="source">
2124
class: center, middle, inverse, title-slide
2225

23-
# Hands-on:<br>Configuring and Using Git with RStudio
26+
# Git: Hands-on
2427
## <br>Practical Reproducibility
2528
### John Little
26-
### 2018-01-29
29+
### 2018-09-25
2730

2831
---
2932

@@ -35,17 +38,13 @@
3538
---
3639
class: middle, center
3740

38-
Hands-on portion of the workshop:
39-
40-
## Reproducibility: Data Management, Git, &amp; RStudio Workshop
41-
https://osf.io/r6wfk/
41+
Part of the
42+
### Building Blocks for Reproducibility
4243

43-
&amp;nbsp;
44+
&amp;
4445

45-
Part of the
4646
### [RFun](http://rfun.library.duke.edu) Learning Series
4747

48-
[Other Rfun Workshops](https://rfun.library.duke.edu/categories/workshops/)
4948

5049
???
5150

@@ -61,10 +60,14 @@
6160

6261
# Compose a Reproducible Document
6362

63+
Use Git to manage version control
64+
65+
Pull &amp;#8226; Commit &amp;#8226; Push &amp;#8226; Branch &amp;#8226; Merge &amp;#8226; Revert
66+
6467
---
65-
class: middle
68+
class: middle, center
6669

67-
## Literate Code --&gt; Reproducible Research
70+
## Reproducible Research (Literate Code)
6871

6972
## Collaborative
7073

@@ -77,16 +80,24 @@
7780

7881
- **Reproducibility** is a Top Priority
7982

80-
- R / RStudio for Composition, Analysis, Reproducible Publishing
81-
82-
- **RStudio orchestrates Git**
83+
- Seamless operation with Markdown
8384

8485
- **Git for Version Control**
8586

8687
- Git can be a pain to configure but works well in the background
8788
- Leapfrog beyond the barrier of a painful configuration
8889

89-
- **GitLab (GitHub) for open sharing and collaborating** via repositories
90+
- **RStudio orchestrates Git**
91+
92+
- Alternative: GitKracken (if you have the [GitHub Student](https://education.github.com/pack) Pack)
93+
- Alternative: [SourceTree](https://www.sourcetreeapp.com/) (defaults with [BitBucket](https://bitbucket.org/))
94+
95+
96+
- **Social Coding**
97+
98+
- GitHub (especially with Student Pack)
99+
- GitLab (OIT instance)
100+
- Bitbucket.org or GitLab.com
90101

91102
---
92103
class: middle
@@ -388,8 +399,8 @@
388399

389400

390401

391-
<div id="htmlwidget-19e488c4d2b9f3f5f59b" style="width:100%;height:auto;" class="datatables html-widget"></div>
392-
<script type="application/json" data-for="htmlwidget-19e488c4d2b9f3f5f59b">{"x":{"filter":"none","data":[["Private Repo","Public Repo","Duke NetId","User Community"],["by Default","Yes","Yes","Duke University -- &lt;br&gt;can syncronize &lt;br&gt;to public hubs"],["$$ @ GitHub","by Default","No","Largest Available"]],"container":"<table class=\"display\">\n <thead>\n <tr>\n <th>Category<\/th>\n <th>Duke's GitLab<\/th>\n <th>Public Hubs<\/th>\n <\/tr>\n <\/thead>\n<\/table>","options":{"dom":"t","order":[],"autoWidth":false,"orderClasses":false,"rowCallback":"function(row, data) {\nvar value=data[2]; if (value!==null) $(this.api().cell(row, 2).node()).css({'background-color':'lightblue'});\nvar value=data[1]; if (value!==null) $(this.api().cell(row, 1).node()).css({'font-weight':'bold','color':'silver','background-color':'navy'});\n}"}},"evals":["options.rowCallback"],"jsHooks":[]}</script>
402+
<div id="htmlwidget-ddc602756d762c8a7951" style="width:100%;height:auto;" class="datatables html-widget"></div>
403+
<script type="application/json" data-for="htmlwidget-ddc602756d762c8a7951">{"x":{"filter":"none","data":[["Private Repo","Public Repo","Duke NetId","User Community"],["by Default","Yes","Yes","Duke University -- &lt;br&gt;can syncronize &lt;br&gt;to public hubs"],["$$ @ GitHub","by Default","No","Largest Available"]],"container":"<table class=\"display\">\n <thead>\n <tr>\n <th>Category<\/th>\n <th>Duke's GitLab<\/th>\n <th>Public Hubs<\/th>\n <\/tr>\n <\/thead>\n<\/table>","options":{"dom":"t","order":[],"autoWidth":false,"orderClasses":false,"rowCallback":"function(row, data) {\nvar value=data[2]; $(this.api().cell(row, 2).node()).css({'background-color':'lightblue'});\nvar value=data[1]; $(this.api().cell(row, 1).node()).css({'font-weight':'bold','color':'silver','background-color':'navy'});\n}"}},"evals":["options.rowCallback"],"jsHooks":[]}</script>
393404

394405
Public Hubs are defined as GitHub, BitBucket, and the public GitLab.
395406

@@ -650,15 +661,33 @@
650661
"highlightLines": true,
651662
"countIncrementalSlides": false
652663
});
653-
if (window.HTMLWidgets) slideshow.on('afterShowSlide', function (slide) {window.dispatchEvent(new Event('resize'));});
654-
(function() {var d = document, s = d.createElement("style"), r = d.querySelector(".remark-slide-scaler"); if (!r) return; s.type = "text/css"; s.innerHTML = "@page {size: " + r.style.width + " " + r.style.height +"; }"; d.head.appendChild(s);})();</script>
664+
if (window.HTMLWidgets) slideshow.on('afterShowSlide', function (slide) {
665+
window.dispatchEvent(new Event('resize'));
666+
});
667+
(function() {
668+
var d = document, s = d.createElement("style"), r = d.querySelector(".remark-slide-scaler");
669+
if (!r) return;
670+
s.type = "text/css"; s.innerHTML = "@page {size: " + r.style.width + " " + r.style.height +"; }";
671+
d.head.appendChild(s);
672+
})();</script>
655673

656-
<script type="text/x-mathjax-config">
657-
MathJax.Hub.Config({
658-
tex2jax: {
659-
skipTags: ['script', 'noscript', 'style', 'textarea', 'pre']
674+
<script>
675+
(function() {
676+
var i, text, code, codes = document.getElementsByTagName('code');
677+
for (i = 0; i < codes.length;) {
678+
code = codes[i];
679+
if (code.parentNode.tagName !== 'PRE' && code.childElementCount === 0) {
680+
text = code.textContent;
681+
if (/^\\\((.|\s)+\\\)$/.test(text) || /^\\\[(.|\s)+\\\]$/.test(text) ||
682+
/^\$\$(.|\s)+\$\$$/.test(text) ||
683+
/^\\begin\{([^}]+)\}(.|\s)+\\end\{[^}]+\}$/.test(text)) {
684+
code.outerHTML = code.innerHTML; // remove <code></code>
685+
continue;
686+
}
687+
}
688+
i++;
660689
}
661-
});
690+
})();
662691
</script>
663692
<!-- dynamically load mathjax for compatibility with self-contained -->
664693
<script>

‎slides/index.Rmd‎

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
title: "Hands-on:<br>Configuring and Using Git with RStudio"
2+
title: "Git: Hands-on"
33
subtitle: "<br>Practical Reproducibility"
44
author: "John Little"
5-
date: "2018-01-29"
5+
date: "2018-09-25"
66
output:
77
xaringan::moon_reader:
88
lib_dir: libs
@@ -27,17 +27,13 @@ library(DT)
2727
---
2828
class: middle, center
2929

30-
Hands-on portion of the workshop:
31-
32-
## Reproducibility: Data Management, Git, & RStudio Workshop
33-
https://osf.io/r6wfk/
30+
Part of the
31+
### Building Blocks for Reproducibility
3432

35-
&nbsp;
33+
&
3634

37-
Part of the
3835
### [RFun](http://rfun.library.duke.edu) Learning Series
3936

40-
[Other Rfun Workshops](https://rfun.library.duke.edu/categories/workshops/)
4137

4238
???
4339

@@ -53,10 +49,16 @@ class: middle, center
5349

5450
# Compose a Reproducible Document
5551

52+
Use Git to manage version control
53+
54+
Add &#8226; Commit &#8226; Branch &#8226; Merge &#8226; Revert
55+
56+
(Pull &#8226; Push &#8226; Clone &#8226; Fork &#8226; Collaborate)
57+
5658
---
57-
class: middle
59+
class: middle, center
5860

59-
## Literate Code --> Reproducible Research
61+
## Reproducible Research<br>(Literate Code)
6062

6163
## Collaborative
6264

@@ -69,16 +71,24 @@ class: middle
6971

7072
- **Reproducibility** is a Top Priority
7173

72-
- R / RStudio for Composition, Analysis, Reproducible Publishing
73-
74-
- **RStudio orchestrates Git**
74+
- Seamless operation with [Markdown](https://rmarkdown.rstudio.com/)
7575

7676
- **Git for Version Control**
7777

7878
- Git can be a pain to configure but works well in the background
7979
- Leapfrog beyond the barrier of a painful configuration
8080

81-
- **GitLab (GitHub) for open sharing and collaborating** via repositories
81+
- **RStudio orchestrates Git**
82+
83+
- Alternative: GitKracken (if you have the [GitHub Student](https://education.github.com/pack) Pack)
84+
- Alternative: [SourceTree](https://www.sourcetreeapp.com/) (defaults with [BitBucket](https://bitbucket.org/))
85+
86+
87+
- **Social Coding**
88+
89+
- GitHub (especially with Student Pack)
90+
- GitLab (OIT instance)
91+
- Bitbucket.org or GitLab.com
8292

8393
---
8494
class: middle
@@ -117,6 +127,7 @@ class: middle, center
117127

118128
RStudio will manage the most commonly used Git commands
119129
---
130+
exclude: true
120131
class: middle, center
121132

122133
## Version Control
@@ -149,7 +160,7 @@ For Example...
149160

150161
5. Integrate Excel Table into **Word > PDF**
151162
---
152-
163+
exclude: true
153164
## Outline
154165

155166
.pull-left[1. Git
@@ -204,6 +215,8 @@ Versioning can be used
204215

205216
- Track changes in any file set
206217

218+
- Add &#8226; Commit &#8226; Branch &#8226; Merge &#8226; Revert
219+
207220
]
208221

209222
.pull-right[
@@ -228,6 +241,7 @@ background-image: url(images/git_push_pull.png)
228241

229242

230243
---
244+
exclude: true
231245
class: center, middle, softblue
232246

233247
## Social **git Repositories**
@@ -243,7 +257,7 @@ class: center, middle, softblue
243257
- even if you are only **sharing with yourself**
244258

245259
---
246-
260+
exclude: true
247261
.pull-left[
248262
<figure><img src="images/The_Bookworm_-_Grohmann_Museum.jpg"><figcaption> Image Credit: Der Bücherwurm (The Bookworm) by Carl Spitzweg <br><a href="https://commons.wikimedia.org/wiki/File:The_Bookworm_-_Grohmann_Museum.jpg">Wikimedia Commons</a></figcaption></figure>
249263
]
@@ -269,6 +283,7 @@ How does this process **affect Reproducibility?**
269283
Library ~= Repository
270284

271285
---
286+
exclude: true
272287
class: bottom
273288
background-image: url(images/Edit-a-thon_lrg.jpg)
274289

@@ -336,6 +351,7 @@ Image Credit: [PixaBay](https://pixabay.com/en/social-media-personal-1635581/)
336351
Effective collaboration extends the diversity of input and feedback available to you.
337352

338353
---
354+
exclude: true
339355
class: center
340356
.pull-left[ ![](images/gitlab.png) ]
341357
.pull-right[ ![](images/github.png) ]
@@ -352,6 +368,7 @@ class: center
352368

353369

354370
---
371+
exclude: true
355372
class: green, middle, center
356373

357374

@@ -375,6 +392,7 @@ I mostly use Duke's GitLab for private work and development. But I like my publ
375392

376393

377394
---
395+
exclude: true
378396
## Duke's GitLab v Public Hubs
379397

380398
```{r, message=FALSE, warning=FALSE, include=FALSE}
@@ -402,6 +420,7 @@ datatable(hubs, rownames = FALSE, options = list(dom = 't')) %>%
402420
Public Hubs are defined as GitHub, BitBucket, and the public GitLab.
403421

404422
---
423+
exclude: true
405424
class: softblue, middle, center
406425

407426
## Markdown
@@ -412,7 +431,15 @@ Literate Code = R Notebooks + R Markdown
412431

413432
Turn scripts into reproducible reports
414433

434+
415435
---
436+
class: softblue, middle, center
437+
438+
## Markdown
439+
440+
---
441+
442+
416443
class: bottom
417444
background-image: url(images/rmarkdown.png)
418445

@@ -480,6 +507,7 @@ Numbered list:
480507
]
481508

482509
---
510+
exclude: true
483511
class: orange, middle, center
484512

485513
## **Literate Code**
@@ -500,6 +528,7 @@ slides: 4, 11, 25
500528

501529

502530
---
531+
exclude: true
503532
class: softblue, middle, center
504533

505534
## RStudio & Git
@@ -512,7 +541,7 @@ Why R
512541
- Version Control, via Git, orchestrated by RStudio
513542

514543
---
515-
544+
exclude: true
516545
## Orchestrating with RStudio
517546

518547
- Masks the CLI
@@ -535,6 +564,14 @@ Now move to the [hands-on](/handson.html) guided exercises.
535564
slide: 8, (9), 27
536565

537566
---
567+
class: middle, center
568+
569+
## Hands-on
570+
571+
[Excercise](../handson.html)
572+
573+
---
574+
exclude: true
538575
class: orange
539576
## R/RStudio
540577
@@ -556,6 +593,7 @@ class: orange
556593
## Why R
557594

558595
---
596+
exclude: true
559597
class: orange
560598
## Reproducibility
561599

0 commit comments

Comments
 (0)