Try upgrading jekyll

This commit is contained in:
hadley 2016-02-17 05:37:57 +11:00
parent bc2fb306a8
commit b8abb5e88e
6 changed files with 23 additions and 49 deletions

View File

@ -1,3 +1,3 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'mime-types' gem 'mime-types'
gem 'jekyll', '~>2.5.3' gem 'jekyll', '~>3.1'

View File

@ -1,69 +1,41 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
blankslate (2.1.2.4)
classifier-reborn (2.0.4)
fast-stemmer (~> 1.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
colorator (0.1) colorator (0.1)
execjs (2.6.0)
fast-stemmer (1.0.2)
ffi (1.9.10) ffi (1.9.10)
jekyll (2.5.3) jekyll (3.1.1)
classifier-reborn (~> 2.0)
colorator (~> 0.1) colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1) jekyll-watch (~> 1.1)
kramdown (~> 1.3) kramdown (~> 1.3)
liquid (~> 2.6.1) liquid (~> 3.0)
mercenary (~> 0.3.3) mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0) rouge (~> 1.7)
redcarpet (~> 3.1)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
toml (~> 0.1.0) jekyll-sass-converter (1.4.0)
jekyll-coffeescript (1.0.1) sass (~> 3.4)
coffee-script (~> 2.2) jekyll-watch (1.3.1)
jekyll-gist (1.3.5)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-watch (1.3.0)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.9.0) kramdown (1.9.0)
liquid (2.6.3) liquid (3.0.6)
listen (3.0.4) listen (3.0.6)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9.7)
mercenary (0.3.5) mercenary (0.3.5)
mime-types (2.6.2) mime-types (2.6.2)
parslet (1.5.0) rb-fsevent (0.9.7)
blankslate (~> 2.0) rb-inotify (0.9.7)
posix-spawn (0.3.11)
pygments.rb (0.6.3)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.2.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.3.3) rouge (1.10.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.19) sass (3.4.21)
toml (0.1.2)
parslet (~> 1.5.0)
yajl-ruby (1.2.1)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
jekyll (~> 2.5.3) jekyll (~> 3.1)
mime-types mime-types
BUNDLED WITH BUNDLED WITH
1.10.6 1.11.2

View File

@ -1,5 +1,3 @@
name: R for data science name: R for data science
markdown: redcarpet
highlighter: pygments
exclude: ["CONTRIBUTING.md", "README.md", "book", "vendor"] exclude: ["CONTRIBUTING.md", "README.md", "book", "vendor"]

View File

@ -20,7 +20,7 @@ module Jekyll
f.flush f.flush
# http://rubyquicktips.com/post/5862861056/execute-shell-commands # http://rubyquicktips.com/post/5862861056/execute-shell-commands
content = `cd _plugins && ./knit.r ../temp.Rmd` content = `_plugins/knit.r temp.Rmd`
if $?.exitstatus != 0 if $?.exitstatus != 0
raise "Knitting failed" raise "Knitting failed"

View File

@ -682,7 +682,7 @@ Think about a data frame as a list of columns (we'll make this definition precis
That makes our for loop quite simple: That makes our for loop quite simple:
```{r} ```{r, eval = FALSE}
for (i in seq_along(df)) { for (i in seq_along(df)) {
df[[i]] <- rescale01(df[[i]]) df[[i]] <- rescale01(df[[i]])
} }
@ -690,7 +690,7 @@ for (i in seq_along(df)) {
For loops are not as important in R as they are in other languages as rather than writing your own for loops, you'll typically use prewritten functions that wrap up common for-loop patterns. You'll learn about those in the next chapter. These functions are important because they wrap up the book-keeping code related to the for loop, focussing purely on what's happening. For example the two for-loops we wrote above can be rewritten as: For loops are not as important in R as they are in other languages as rather than writing your own for loops, you'll typically use prewritten functions that wrap up common for-loop patterns. You'll learn about those in the next chapter. These functions are important because they wrap up the book-keeping code related to the for loop, focussing purely on what's happening. For example the two for-loops we wrote above can be rewritten as:
```{r} ```{r, eval = FALSE}
library(purrr) library(purrr)
map_dbl(df, median) map_dbl(df, median)

4
www/.gitignore vendored
View File

@ -1 +1,5 @@
bootstrap-2.3.2 bootstrap-2.3.2
bootstrap-3.3.5
htmlwidgets-0.5.2
jquery-1.11.3
navigation-1.0