diff options
| -rw-r--r-- | .rbenv-version | 2 | ||||
| -rw-r--r-- | .rvmrc | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 | ||||
| -rw-r--r-- | Rakefile | 4 | ||||
| -rw-r--r-- | plugins/octopress_filters.rb | 4 |
5 files changed, 11 insertions, 9 deletions
diff --git a/.rbenv-version b/.rbenv-version index 0a95b9f5..f3a9c9a8 100644 --- a/.rbenv-version +++ b/.rbenv-version @@ -1 +1 @@ -1.9.2-p290 +1.9.3-p194 @@ -1 +1 @@ -rvm use 1.9.2 +rvm use 1.9.3 diff --git a/Gemfile.lock b/Gemfile.lock index 1c1bf8d5..5060be1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GEM chunky_png (1.2.5) classifier (1.3.3) fast-stemmer (>= 1.0.0) - compass (0.12.1) + compass (0.12.2) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) @@ -24,12 +24,12 @@ GEM kramdown (~> 0.13) liquid (~> 2.3) maruku (~> 0.5) - kramdown (0.13.6) + kramdown (0.13.7) liquid (2.3.0) maruku (0.6.0) syntax (>= 1.0.0) posix-spawn (0.3.6) - pygments.rb (0.2.12) + pygments.rb (0.2.13) rubypython (~> 0.5.3) rack (1.4.1) rack-protection (1.2.0) @@ -41,7 +41,7 @@ GEM rubypython (0.5.3) blankslate (>= 2.1.2.3) ffi (~> 1.0.7) - sass (3.1.18) + sass (3.1.20) sinatra (1.3.2) rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) @@ -299,7 +299,9 @@ task :setup_github_pages, :repo do |t, args| if args.repo repo_url = args.repo else - repo_url = get_stdin("Enter the read/write url for your repository: ") + puts "Enter the read/write url for your repository" + puts "(For example, 'git@github.com:your_username/your_username.github.com)" + repo_url = get_stdin("Repository url: ") end user = repo_url.match(/:([^\/]+)/)[1] branch = (repo_url.match(/\/[\w-]+.github.com/).nil?) ? 'gh-pages' : 'master' diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb index 2ba93e9e..091f75aa 100644 --- a/plugins/octopress_filters.rb +++ b/plugins/octopress_filters.rb @@ -24,12 +24,12 @@ module Jekyll class ContentFilters < PostFilter include OctopressFilters def pre_render(post) - if post.ext.match('html|textile|markdown|haml|slim|xml') + if post.ext.match('html|textile|markdown|md|haml|slim|xml') post.content = pre_filter(post.content) end end def post_render(post) - if post.ext.match('html|textile|markdown|haml|slim|xml') + if post.ext.match('html|textile|markdown|md|haml|slim|xml') post.content = post_filter(post.content) end end |