Skip to content

Commit 2f56a25

Browse files
committed
latest video ; fix typo git_sitrep()
1 parent 0dfd7c9 commit 2f56a25

File tree

10 files changed

+10924
-32
lines changed

10 files changed

+10924
-32
lines changed

docs/index.html

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
}
5757
code span.al { color: #ad0000; } /* Alert */
5858
code span.an { color: #5e5e5e; } /* Annotation */
59-
code span.at { color: #20794d; } /* Attribute */
59+
code span.at { } /* Attribute */
6060
code span.bn { color: #ad0000; } /* BaseN */
6161
code span.bu { } /* BuiltIn */
6262
code span.cf { color: #007ba5; } /* ControlFlow */
@@ -77,14 +77,15 @@
7777
code span.op { color: #5e5e5e; } /* Operator */
7878
code span.ot { color: #007ba5; } /* Other */
7979
code span.pp { color: #ad0000; } /* Preprocessor */
80-
code span.sc { color: #20794d; } /* SpecialChar */
80+
code span.sc { color: #5e5e5e; } /* SpecialChar */
8181
code span.ss { color: #20794d; } /* SpecialString */
8282
code span.st { color: #20794d; } /* String */
8383
code span.va { color: #111111; } /* Variable */
8484
code span.vs { color: #20794d; } /* VerbatimString */
8585
code span.wa { color: #5e5e5e; font-style: italic; } /* Warning */
8686
</style>
8787

88+
8889
<!--radix_placeholder_meta_tags-->
8990
<title>RStudio &amp; Version Control: Git, GitHub &amp; RStudio</title>
9091

@@ -458,7 +459,7 @@
458459

459460
</style>
460461

461-
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
462+
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
462463
<link href="site_libs/font-awesome-5.1.0/css/all.css" rel="stylesheet"/>
463464
<link href="site_libs/font-awesome-5.1.0/css/v4-shims.css" rel="stylesheet"/>
464465
<script src="site_libs/headroom-0.9.4/headroom.min.js"></script>
@@ -1865,7 +1866,10 @@ <h3>${suggestion.title}</h3>
18651866

18661867
// hoverable references
18671868
$('span.citation[data-cites]').each(function() {
1868-
var refHtml = $('#ref-' + $(this).attr('data-cites')).html();
1869+
var refs = $(this).attr('data-cites').split(" ");
1870+
var refHtml = refs.map(function(ref) {
1871+
return "<p>" + $('#ref-' + ref).html() + "</p>";
1872+
}).join("\n");
18691873
window.tippy(this, {
18701874
allowHTML: true,
18711875
content: refHtml,
@@ -2036,7 +2040,7 @@ <h3>${suggestion.title}</h3>
20362040
</script>
20372041

20382042
<!--/radix_placeholder_distill-->
2039-
<script src="site_libs/header-attrs-2.8/header-attrs.js"></script>
2043+
<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
20402044
<script src="site_libs/popper-2.6.0/popper.min.js"></script>
20412045
<link href="site_libs/tippy-6.2.7/tippy.css" rel="stylesheet" />
20422046
<link href="site_libs/tippy-6.2.7/tippy-light-border.css" rel="stylesheet" />
@@ -2105,7 +2109,8 @@ <h1>Git, GitHub &amp; RStudio</h1>
21052109
<p>The <a href="https://usethis.r-lib.org/"><code>usethis</code></a> package and the RStudio IDE will help you orchestrate your version control repositories as RStudio projects.</p>
21062110
<iframe width="560" height="315" src="https://www.youtube.com/embed/r5_v5f6128M" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
21072111
</iframe>
2108-
<iframe width="560" height="315" src="https://warpwire.duke.edu/w/t0oFAA/" frameborder="0" scrolling="0" allow="autoplay; encrypted-media; fullscreen; picture-in-picture;" allowfullscreen>
2112+
<!-- <iframe width="560" height="315" src="https://warpwire.duke.edu/w/t0oFAA/" frameborder="0" scrolling="0" allow="autoplay; encrypted-media; fullscreen; picture-in-picture;" allowfullscreen></iframe> -->
2113+
<iframe width="560" height="315" src="https://www.youtube.com/embed/Cn-72tbRNFc" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen>
21092114
</iframe>
21102115
<h3 id="setup">Setup</h3>
21112116
<p>To get started, make a free GitHub.com account. Make sure you have the latest versions of R, RStudio, and usethis. Then, setup your RStudio configuration using two key documents: <a href="https://usethis.r-lib.org/articles/articles/usethis-setup.html">Setup</a>, and <a href="https://usethis.r-lib.org/articles/articles/git-credentials.html">Managing Git(Hub) Credentials</a>.</p>
@@ -2140,7 +2145,7 @@ <h4 id="set-up-git-and-manage-github-credentials">set-up git and manage GitHub c
21402145
<span class='fu'>gh</span><span class='fu'>::</span><span class='fu'><a href='https://gh.r-lib.org/reference/gh_whoami.html'>gh_whoami</a></span><span class='op'>(</span><span class='op'>)</span>
21412146
<span class='fu'>usethis</span><span class='fu'>::</span><span class='fu'><a href='https://usethis.r-lib.org/reference/git_sitrep.html'>git_sitrep</a></span><span class='op'>(</span><span class='op'>)</span>
21422147
<span class='fu'>usethis</span><span class='fu'>::</span><span class='fu'><a href='https://usethis.r-lib.org/reference/use_git_config.html'>use_git_config</a></span><span class='op'>(</span>user.name <span class='op'>=</span> <span class='st'>"Jane Doe"</span>, user.email <span class='op'>=</span> <span class='st'>"[email protected]"</span><span class='op'>)</span>
2143-
<span class='fu'>gh</span><span class='fu'>::</span><span class='fu'>git_sitrep</span><span class='op'>(</span><span class='op'>)</span>
2148+
<span class='fu'>usethis</span><span class='fu'>::</span><span class='fu'><a href='https://usethis.r-lib.org/reference/git_sitrep.html'>git_sitrep</a></span><span class='op'>(</span><span class='op'>)</span>
21442149
</code></pre>
21452150
</div>
21462151
</div>
@@ -2151,12 +2156,12 @@ <h4 id="quick_publish-your-code-in-a-binder.org-container">Quick_Publish your co
21512156
<p>Use the <a href="https://karthik.github.io/holepunch/"><code>holepunch</code> package</a></p>
21522157
<div class="layout-chunk" data-layout="l-body">
21532158
<div class="sourceCode">
2154-
<pre class="sourceCode r"><code class="sourceCode r"><span class='kw'><a href='https://rdrr.io/r/base/library.html'>library</a></span><span class='op'>(</span><span class='va'><a href='https://github.com/karthik/holepunch'>holepunch</a></span><span class='op'>)</span>
2159+
<pre class="sourceCode r"><code class="sourceCode r"><span class='kw'><a href='https://rdrr.io/r/base/library.html'>library</a></span><span class='op'>(</span><span class='va'>holepunch</span><span class='op'>)</span>
21552160

2156-
<span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/write_compendium_description.html'>write_compendium_description</a></span><span class='op'>(</span><span class='op'>)</span>
2157-
<span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/write_dockerfile.html'>write_dockerfile</a></span><span class='op'>(</span><span class='op'>)</span>
2158-
<span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/generate_badge.html'>generate_badge</a></span><span class='op'>(</span><span class='op'>)</span>
2159-
<span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/build_binder.html'>build_binder</a></span><span class='op'>(</span><span class='op'>)</span>
2161+
<span class='fu'>write_compendium_description</span><span class='op'>(</span><span class='op'>)</span>
2162+
<span class='fu'>write_dockerfile</span><span class='op'>(</span><span class='op'>)</span>
2163+
<span class='fu'>generate_badge</span><span class='op'>(</span><span class='op'>)</span>
2164+
<span class='fu'>build_binder</span><span class='op'>(</span><span class='op'>)</span>
21602165
</code></pre>
21612166
</div>
21622167
</div>
@@ -2165,10 +2170,10 @@ <h4 id="bespoke_publish-your-code-in-a-binder">Bespoke_Publish your code in a bi
21652170
<p><strong>Step 1</strong></p>
21662171
<div class="layout-chunk" data-layout="l-body">
21672172
<div class="sourceCode">
2168-
<pre class="sourceCode r"><code class="sourceCode r"><span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/write_compendium_description.html'>write_compendium_description</a></span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is a DESCRIPTION file in the project root</span>
2169-
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/write_runtime.html'>write_runtime</a></span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is .binder/runtime.txt</span>
2170-
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/write_install.html'>write_install</a></span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is .binder/install.R</span>
2171-
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'><a href='https://rdrr.io/pkg/holepunch/man/generate_badge.html'>generate_badge</a></span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is a badge to be found in the README file(s)</span>
2173+
<pre class="sourceCode r"><code class="sourceCode r"><span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'>write_compendium_description</span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is a DESCRIPTION file in the project root</span>
2174+
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'>write_runtime</span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is .binder/runtime.txt</span>
2175+
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'>write_install</span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is .binder/install.R</span>
2176+
<span class='fu'>holepunch</span><span class='fu'>::</span><span class='fu'>generate_badge</span><span class='op'>(</span><span class='op'>)</span> <span class='co'># output is a badge to be found in the README file(s)</span>
21722177
</code></pre>
21732178
</div>
21742179
</div>

docs/resources.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
}
5757
code span.al { color: #ad0000; } /* Alert */
5858
code span.an { color: #5e5e5e; } /* Annotation */
59-
code span.at { color: #20794d; } /* Attribute */
59+
code span.at { } /* Attribute */
6060
code span.bn { color: #ad0000; } /* BaseN */
6161
code span.bu { } /* BuiltIn */
6262
code span.cf { color: #007ba5; } /* ControlFlow */
@@ -77,14 +77,15 @@
7777
code span.op { color: #5e5e5e; } /* Operator */
7878
code span.ot { color: #007ba5; } /* Other */
7979
code span.pp { color: #ad0000; } /* Preprocessor */
80-
code span.sc { color: #20794d; } /* SpecialChar */
80+
code span.sc { color: #5e5e5e; } /* SpecialChar */
8181
code span.ss { color: #20794d; } /* SpecialString */
8282
code span.st { color: #20794d; } /* String */
8383
code span.va { color: #111111; } /* Variable */
8484
code span.vs { color: #20794d; } /* VerbatimString */
8585
code span.wa { color: #5e5e5e; font-style: italic; } /* Warning */
8686
</style>
8787

88+
8889
<!--radix_placeholder_meta_tags-->
8990
<title>RStudio &amp; Version Control: Resources</title>
9091

@@ -455,7 +456,7 @@
455456

456457
</style>
457458

458-
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
459+
<script src="site_libs/jquery-3.6.0/jquery-3.6.0.min.js"></script>
459460
<link href="site_libs/font-awesome-5.1.0/css/all.css" rel="stylesheet"/>
460461
<link href="site_libs/font-awesome-5.1.0/css/v4-shims.css" rel="stylesheet"/>
461462
<script src="site_libs/headroom-0.9.4/headroom.min.js"></script>
@@ -1862,7 +1863,10 @@ <h3>${suggestion.title}</h3>
18621863

18631864
// hoverable references
18641865
$('span.citation[data-cites]').each(function() {
1865-
var refHtml = $('#ref-' + $(this).attr('data-cites')).html();
1866+
var refs = $(this).attr('data-cites').split(" ");
1867+
var refHtml = refs.map(function(ref) {
1868+
return "<p>" + $('#ref-' + ref).html() + "</p>";
1869+
}).join("\n");
18661870
window.tippy(this, {
18671871
allowHTML: true,
18681872
content: refHtml,
@@ -2033,7 +2037,7 @@ <h3>${suggestion.title}</h3>
20332037
</script>
20342038

20352039
<!--/radix_placeholder_distill-->
2036-
<script src="site_libs/header-attrs-2.8/header-attrs.js"></script>
2040+
<script src="site_libs/header-attrs-2.11/header-attrs.js"></script>
20372041
<script src="site_libs/popper-2.6.0/popper.min.js"></script>
20382042
<link href="site_libs/tippy-6.2.7/tippy.css" rel="stylesheet" />
20392043
<link href="site_libs/tippy-6.2.7/tippy-light-border.css" rel="stylesheet" />

docs/search.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"title": "Git, GitHub & RStudio",
66
"description": "RStudio users can leverage git Version control to enhance reproducibility.",
77
"author": [],
8-
"contents": "\r\nThe usethis package and the RStudio IDE will help you orchestrate your version control repositories as RStudio projects.\r\n\r\n\r\n\r\n\r\nSetup\r\nTo get started, make a free GitHub.com account. Make sure you have the latest versions of R, RStudio, and usethis. Then, setup your RStudio configuration using two key documents: Setup, and Managing Git(Hub) Credentials.\r\nTips\r\nClone or fork from GitHub\r\n\r\n\r\nusethis::create_from_github(\"https://github.com/data-and-visualization/git-tutorial\")\r\n\r\n\r\n\r\nCreate the GitHub repo from local\r\n\r\n\r\nlibrary(usethis)\r\nuse_git() # initialize a git repo\r\nuse_git_ignore()\r\nuse_readme.Rmd()\r\nuse_ccby_license()\r\nuse_github() # Connect local repo to GitHub\r\n\r\n\r\n\r\nset-up git and manage GitHub credentials\r\n\r\n\r\n# Sign-in to your GitHub account\r\n# Read: https://usethis.r-lib.org/articles/articles/git-credentials.html\r\n# Read: https://usethis.r-lib.org/articles/articles/usethis-setup.html\r\nusethis::create_github_token()\r\ngitcreds::gitcreds_set()\r\ngh::gh_whoami()\r\nusethis::git_sitrep()\r\nusethis::use_git_config(user.name = \"Jane Doe\", user.email = \"[email protected]\")\r\ngh::git_sitrep()\r\n\r\n\r\n\r\nNext Level…\r\nTake your reproducibility to the next level. Make your code citable by connecting your GitHub repo and your ORCID (unique author ID) through to the Zenodo archival repository. Now, every time you commit a milestone release, you also mint a DOI.\r\nContainerize your repository with binder.org using the holepunch package.\r\nQuick_Publish your code in a binder.org container\r\nUse the holepunch package\r\n\r\n\r\nlibrary(holepunch)\r\n\r\nwrite_compendium_description()\r\nwrite_dockerfile()\r\ngenerate_badge()\r\nbuild_binder()\r\n\r\n\r\n\r\nBespoke_Publish your code in a binder\r\nI recently found my QuickPublish approach didn’t quite work. So I RTFMed the binder.org docs and it seemed to imply a preference for NOT using a .binder/Dockerfile. Therefore, here is an approach that is slightly less automated but more bulletproof.\r\nStep 1\r\n\r\n\r\nholepunch::write_compendium_description() # output is a DESCRIPTION file in the project root\r\nholepunch::write_runtime() # output is .binder/runtime.txt\r\nholepunch::write_install() # output is .binder/install.R\r\nholepunch::generate_badge() # output is a badge to be found in the README file(s)\r\n\r\n\r\n\r\nStep 2\r\nEdit the .binder/install.R file using the following model.\r\nEdit the binder/install.R file based on this model or the documentation\r\nEdit the DESCRIPTION file using this basic model. Modify all the fields. You may want to base the Depends and Remotes sections on your .binder/install.R file\r\nThe old documentation from this site can be found in the v.0.2019 release on GitHub.\r\n\r\n\r\n\r\n",
9-
"last_modified": "2021-06-14T17:16:39-04:00"
8+
"contents": "\r\nThe usethis package and the RStudio IDE will help you orchestrate your version control repositories as RStudio projects.\r\n\r\n\r\n\r\n\r\n\r\nSetup\r\nTo get started, make a free GitHub.com account. Make sure you have the latest versions of R, RStudio, and usethis. Then, setup your RStudio configuration using two key documents: Setup, and Managing Git(Hub) Credentials.\r\nTips\r\nClone or fork from GitHub\r\n\r\n\r\nusethis::create_from_github(\"https://github.com/data-and-visualization/git-tutorial\")\r\n\r\n\r\n\r\nCreate the GitHub repo from local\r\n\r\n\r\nlibrary(usethis)\r\nuse_git() # initialize a git repo\r\nuse_git_ignore()\r\nuse_readme.Rmd()\r\nuse_ccby_license()\r\nuse_github() # Connect local repo to GitHub\r\n\r\n\r\n\r\nset-up git and manage GitHub credentials\r\n\r\n\r\n# Sign-in to your GitHub account\r\n# Read: https://usethis.r-lib.org/articles/articles/git-credentials.html\r\n# Read: https://usethis.r-lib.org/articles/articles/usethis-setup.html\r\nusethis::create_github_token()\r\ngitcreds::gitcreds_set()\r\ngh::gh_whoami()\r\nusethis::git_sitrep()\r\nusethis::use_git_config(user.name = \"Jane Doe\", user.email = \"[email protected]\")\r\nusethis::git_sitrep()\r\n\r\n\r\n\r\nNext Level…\r\nTake your reproducibility to the next level. Make your code citable by connecting your GitHub repo and your ORCID (unique author ID) through to the Zenodo archival repository. Now, every time you commit a milestone release, you also mint a DOI.\r\nContainerize your repository with binder.org using the holepunch package.\r\nQuick_Publish your code in a binder.org container\r\nUse the holepunch package\r\n\r\n\r\nlibrary(holepunch)\r\n\r\nwrite_compendium_description()\r\nwrite_dockerfile()\r\ngenerate_badge()\r\nbuild_binder()\r\n\r\n\r\n\r\nBespoke_Publish your code in a binder\r\nI recently found my QuickPublish approach didn’t quite work. So I RTFMed the binder.org docs and it seemed to imply a preference for NOT using a .binder/Dockerfile. Therefore, here is an approach that is slightly less automated but more bulletproof.\r\nStep 1\r\n\r\n\r\nholepunch::write_compendium_description() # output is a DESCRIPTION file in the project root\r\nholepunch::write_runtime() # output is .binder/runtime.txt\r\nholepunch::write_install() # output is .binder/install.R\r\nholepunch::generate_badge() # output is a badge to be found in the README file(s)\r\n\r\n\r\n\r\nStep 2\r\nEdit the .binder/install.R file using the following model.\r\nEdit the binder/install.R file based on this model or the documentation\r\nEdit the DESCRIPTION file using this basic model. Modify all the fields. You may want to base the Depends and Remotes sections on your .binder/install.R file\r\nThe old documentation from this site can be found in the v.0.2019 release on GitHub.\r\n\r\n\r\n\r\n",
9+
"last_modified": "2021-11-19T13:27:26-05:00"
1010
},
1111
{
1212
"path": "resources.html",
1313
"title": "Resources",
1414
"author": [],
1515
"contents": "\r\nSlides\r\nResearch Reproducibility, 2021\r\nSocial Coding Sites\r\nhttps://github.com\r\nhttps://gitlab.com\r\nhttps://bitbucket.org\r\nDuke’s GitLab Instance\r\nManaging SSH keys\r\n\r\nGUI Git Clients\r\nRStudio – Free. Great for useRs\r\nSublime’s Merge – Downloaded and evaluated for free. $100 / 3-years of upgrades.\r\nGitKracken – Free if you have the GitHub Student Pack or the GitHub Teacher toolbox\r\nSourceTree – Free. (defaults to use with BitBucket)\r\nPackages\r\nhttps://usethis.r-lib.org/\r\nholepunch to make your reproducible code a container on binder.org\r\nFree Book\r\nHappy Git and GitHub for the useR\r\nHandy Article\r\n10 Common Problems / Solutions\r\nReproducibility\r\nWriting clear code: Tools for Reproducible Research\r\nInitial Steps Toward Reproducible Research\r\nMaking your research reproducible with TIER + R + GitHub Slides. Cetinkaya-Rundel, M. (2016). Open Science Framework. Retrieved from https://osf.io/phyau\r\n\r\n\r\n\r\n",
16-
"last_modified": "2021-06-14T17:16:40-04:00"
16+
"last_modified": "2021-11-19T13:27:26-05:00"
1717
}
1818
],
1919
"collections": []
File renamed without changes.

docs/site_libs/jquery-1.11.3/jquery.min.js

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

0 commit comments

Comments
 (0)