Permalink
Browse files

Upgrade to Jekyll 1.0.0.rc1 and redcarpet 2

  • Loading branch information...
1 parent e263aff commit 1b47fb05cb685004a1e378a1b7cfd553fea87cdb Michael Klishin committed Apr 30, 2013
Showing with 39 additions and 65 deletions.
  1. +6 −1 Gemfile
  2. +26 −18 Gemfile.lock
  3. +4 −10 README.md
  4. +3 −1 _config.yml
  5. +0 −35 _plugins/gist.rb
View
@@ -1,4 +1,9 @@
source "https://rubygems.org"
-gem "jekyll"
+gem "jekyll", ">= 1.0.0.rc1"
gem "redcarpet"
+# with Ruby 2.0 on OS X, you may need to install
+# it manually with --with-iconv-dir:
+#
+# gem install iconv -- --with-iconv-dir=~/.rvm/usr
+gem "iconv"
View
@@ -1,34 +1,42 @@
GEM
- remote: http://rubygems.org/
+ remote: https://rubygems.org/
specs:
- RedCloth (4.2.9)
- albino (1.3.3)
- posix-spawn (>= 0.3.6)
classifier (1.3.3)
fast-stemmer (>= 1.0.0)
+ colorator (0.1)
+ commander (4.1.3)
+ highline (~> 1.6.11)
directory_watcher (1.4.1)
- fast-stemmer (1.0.0)
- haml (3.1.4)
- jekyll (0.11.2)
- albino (~> 1.3)
+ fast-stemmer (1.0.2)
+ highline (1.6.18)
+ iconv (1.0.3)
+ jekyll (1.0.0.rc1)
classifier (~> 1.3)
- directory_watcher (~> 1.1)
- kramdown (~> 0.13)
+ colorator (~> 0.1)
+ commander (~> 4.1.3)
+ directory_watcher (~> 1.4.1)
+ kramdown (~> 0.14)
liquid (~> 2.3)
maruku (~> 0.5)
- kramdown (0.13.5)
- liquid (2.3.0)
- maruku (0.6.0)
+ pygments.rb (~> 0.4.2)
+ safe_yaml (~> 0.7.0)
+ kramdown (0.14.2)
+ liquid (2.5.0)
+ maruku (0.6.1)
syntax (>= 1.0.0)
posix-spawn (0.3.6)
- rdiscount (1.6.8)
+ pygments.rb (0.4.2)
+ posix-spawn (~> 0.3.6)
+ yajl-ruby (~> 1.1.0)
+ redcarpet (2.2.2)
+ safe_yaml (0.7.1)
syntax (1.0.0)
+ yajl-ruby (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
- RedCloth
- haml
- jekyll
- rdiscount
+ iconv
+ jekyll (>= 1.0.0.rc1)
+ redcarpet
View
@@ -9,24 +9,18 @@ With Bundler:
bundle install --binstubs
-
## How to run a development server
- ./bin/jekyll --server
+ ./bin/jekyll serve --watch
+then navigate to [localhost:4000](http://localhost:4000)
## How to regenerate the site
-In order to modify contents and launch dev environment, run:
-
- ./bin/jekyll
-
-In order to recompile haml and sass files for publishing, run
-
- ./recompile_haml.sh
+ ./bin/jekyll build
## License & Copyright
-Copyright (C) 2011-2012 Alexander Petrov, Michael S. Klishin.
+Copyright (C) 2011-2013 Alexander Petrov, Michael S. Klishin.
Distributed under the Eclipse Public License, the same as Clojure.
View
@@ -3,5 +3,7 @@ destination: ./_site
plugins: ./_plugins
auto: true
exclude: [bin, CNAME, Gemfile, Gemfile.lock, README.md]
-markdown: rdiscount
+markdown: redcarpet
permalink: /:title
+redcarpet:
+ extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
View
@@ -1,35 +0,0 @@
-module Jekyll
-
- #
- # Render gist
- #
- # Usage:
- #
- # {% gist gist_id %} =>
- #
- # Raises: Liquid::SyntaxError
- class Gist < ::Liquid::Tag
-
- Syntax = /(#{::Liquid::Expression}+)?/
-
- def initialize(tag_name, markup, tokens)
- if markup =~ Syntax
- @gist_id = $1
- @options = {}
- markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
- else
- raise ::Liquid::SyntaxError.new("Syntax Error in 'link' - Valid syntax: gist <id> <options>")
- end
-
- super
- end
-
- def render(context)
- %{<script src="http://gist.github.com/#{@gist_id}.js"></script>}
- end
- end
-
-end
-
-
-Liquid::Template.register_tag('gist', Jekyll::Gist)

0 comments on commit 1b47fb0

Please sign in to comment.