diff --git a/Gemfile.lock b/Gemfile.lock index abc709c..6adfac0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,127 +1,130 @@ GEM remote: https://rubygems.org/ specs: - RedCloth (4.2.9) - activesupport (4.2.0) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - blankslate (2.1.2.4) - celluloid (0.16.0) - timers (~> 4.0.0) - classifier-reborn (2.0.3) - fast-stemmer (~> 1.0) - coffee-script (2.3.0) + addressable (2.4.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.10.0) colorator (0.1) - execjs (2.3.0) - fast-stemmer (1.0.2) - ffi (1.9.6) + ethon (0.9.0) + ffi (>= 1.3.0) + execjs (2.7.0) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + ffi (1.9.14) gemoji (2.1.0) - github-pages (33) - RedCloth (= 4.2.9) - github-pages-health-check (~> 0.2) - jekyll (= 2.4.0) + github-pages (89) + activesupport (= 4.2.7) + github-pages-health-check (= 1.1.0) + jekyll (= 3.1.6) jekyll-coffeescript (= 1.0.1) - jekyll-mentions (= 0.2.1) - jekyll-redirect-from (= 0.6.2) - jekyll-sass-converter (= 1.2.0) - jekyll-sitemap (= 0.6.3) - jemoji (= 0.4.0) - kramdown (= 1.5.0) - liquid (= 2.6.1) - maruku (= 0.7.0) + jekyll-feed (= 0.5.1) + jekyll-gist (= 1.4.0) + jekyll-github-metadata (= 2.0.2) + jekyll-mentions (= 1.1.3) + jekyll-paginate (= 1.1.0) + jekyll-redirect-from (= 0.11.0) + jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 2.0.0) + jekyll-sitemap (= 0.10.0) + jemoji (= 0.7.0) + kramdown (= 1.11.1) + liquid (= 3.0.6) + listen (= 3.0.6) mercenary (~> 0.3) - pygments.rb (= 0.6.1) - rdiscount (= 2.1.7) - redcarpet (= 3.1.2) + rouge (= 1.11.1) terminal-table (~> 1.4) - github-pages-health-check (0.2.1) - net-dns (~> 0.6) + github-pages-health-check (1.1.0) + addressable (~> 2.3) + net-dns (~> 0.8) + octokit (~> 4.0) public_suffix (~> 1.4) - hitimes (1.2.2) - html-pipeline (1.9.0) + typhoeus (~> 0.7) + html-pipeline (2.4.2) activesupport (>= 2) - nokogiri (~> 1.4) + nokogiri (>= 1.4) i18n (0.7.0) - jekyll (2.4.0) - classifier-reborn (~> 2.0) + jekyll (3.1.6) colorator (~> 0.1) - jekyll-coffeescript (~> 1.0) - jekyll-gist (~> 1.0) - jekyll-paginate (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) - liquid (~> 2.6.1) + liquid (~> 3.0) mercenary (~> 0.3.3) - pygments.rb (~> 0.6.0) - redcarpet (~> 3.1) + rouge (~> 1.7) safe_yaml (~> 1.0) - toml (~> 0.1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-gist (1.1.0) - jekyll-mentions (0.2.1) - html-pipeline (~> 1.9.0) - jekyll (~> 2.0) + jekyll-feed (0.5.1) + jekyll-gist (1.4.0) + octokit (~> 4.2) + jekyll-github-metadata (2.0.2) + jekyll (~> 3.1) + octokit (~> 4.0) + jekyll-mentions (1.1.3) + html-pipeline (~> 2.3) + jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.6.2) - jekyll (~> 2.0) - jekyll-sass-converter (1.2.0) + jekyll-redirect-from (0.11.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-sitemap (0.6.3) - jekyll-watch (1.2.1) - listen (~> 2.7) - jemoji (0.4.0) + jekyll-seo-tag (2.0.0) + jekyll (~> 3.1) + jekyll-sitemap (0.10.0) + jekyll-watch (1.5.0) + listen (~> 3.0, < 3.1) + jemoji (0.7.0) + activesupport (~> 4.0) gemoji (~> 2.0) - html-pipeline (~> 1.9) - jekyll (~> 2.0) - json (1.8.2) - kramdown (1.5.0) - liquid (2.6.1) - listen (2.8.5) - celluloid (>= 0.15.2) + html-pipeline (~> 2.2) + jekyll (>= 3.0) + json (1.8.3) + kramdown (1.11.1) + liquid (3.0.6) + listen (3.0.6) rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - maruku (0.7.0) - mercenary (0.3.5) - mini_portile (0.6.2) - minitest (5.5.1) + rb-inotify (>= 0.9.7) + mercenary (0.3.6) + mini_portile2 (2.1.0) + minitest (5.9.0) + multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) - parslet (1.5.0) - blankslate (~> 2.0) - posix-spawn (0.3.10) - public_suffix (1.4.6) - pygments.rb (0.6.1) - posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.2.0) - rb-fsevent (0.9.4) - rb-inotify (0.9.5) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + pkg-config (1.1.7) + public_suffix (1.5.3) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) ffi (>= 0.5.0) - rdiscount (2.1.7) - redcarpet (3.1.2) + rouge (1.11.1) safe_yaml (1.0.4) - sass (3.4.12) - terminal-table (1.4.5) - thread_safe (0.3.4) - timers (4.0.1) - hitimes - toml (0.1.2) - parslet (~> 1.5.0) + sass (3.4.22) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + terminal-table (1.6.0) + thread_safe (0.3.5) + typhoeus (0.8.0) + ethon (>= 0.8.0) tzinfo (1.2.2) thread_safe (~> 0.1) - yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - github-pages (= 33) - json + github-pages (= 89) + +BUNDLED WITH + 1.12.5 diff --git a/Makefile b/Makefile index 44d813f..cf66913 100644 --- a/Makefile +++ b/Makefile @@ -4,20 +4,25 @@ # When run as just 'make', build the HTML from markdown w/ Jekyll default: build -JEKYLLOPTS=--baseurl="" +JEKYLLBASEURL="/screenplays/" +JEKYLLOPTS= +#JEKYLLOPTS=--baseurl="" clean: rm -rf ./_site/ build: # Build HTML from markdown w/ Jekyll - jekyll build $(JEKYLLOPTS) + jekyll build -V $(JEKYLLOPTS) serve: # Auto-rebuild HTML from markdown w/ Jekyll and serve jekyll serve $(JEKYLLOPTS) #x-www-browser http://localhost:4000/ +open: + web "http://localhost:4000$(JEKYLLBASEURL)" + pull: # Pull latest changes from origin gh-pages branch git pull origin gh-pages diff --git a/_config.yml b/_config.yml index 9a8dc28..05eafa4 100644 --- a/_config.yml +++ b/_config.yml @@ -15,4 +15,4 @@ markdown_ext: "markdown,mkdown,mkdn,mkd,md" # extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "strikethrough", "superscript"] # Build settings -markdown: redcarpet +markdown: kramdown