Upgrading to latest Octopress

Author: stevenharman

.themes/classic/source/index.html

@@ -12,11 +12,11 @@
   {% endfor %}
   <div class="pagination">
     {% if paginator.next_page %}
-      <a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
+      <a class="prev" href="{{paginator.next_page_path}}">&larr; Older</a>
     {% endif %}
     <a href="/blog/archives">Blog Archives</a>
     {% if paginator.previous_page %}
-    <a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
+    <a class="next" href="{{paginator.previous_page_path}}">Newer &rarr;</a>
     {% endif %}
   </div>
 </div>

.themes/classic/source/javascripts/octopress.js

@@ -17,11 +17,7 @@ function addSidebarToggler() {
     $('#content').append('<span class="toggle-sidebar"></span>');
     $('.toggle-sidebar').bind('click', function(e) {
       e.preventDefault();
-      if ($('body').hasClass('collapse-sidebar')) {
-        $('body').removeClass('collapse-sidebar');
-      } else {
-        $('body').addClass('collapse-sidebar');
-      }
+      $('body').toggleClass('collapse-sidebar');
     });
   }
   var sections = $('aside.sidebar > section');

Gemfile

@@ -2,18 +2,18 @@ source "https://rubygems.org"
 
   ruby '2.1.1'
 
-  gem 'rake'
-  gem 'jekyll', '~> 0.12'
+  gem 'rake', '~> 10.0'
+  gem 'jekyll', '~> 2.0'
+  gem 'jekyll-page-hooks', '~> 1.2'
+  gem 'jekyll-date-format', '~> 1.0'
+  gem 'jekyll-sitemap'
   gem 'rdiscount', '~> 2.0'
-# gem 'pygments.rb', '~> 0.3.4'
   gem 'RedCloth', '~> 4.2.9'
-  gem 'haml', '~> 3.1'
+  gem 'haml', '~> 4.0'
   gem 'compass', '~> 0.12.2'
-  gem 'sass', '~> 3.2'
-  gem 'sass-globbing', '~> 1.0'
+  gem 'sass-globbing', '~> 1.0.0'
   gem 'rubypants', '~> 0.2.0'
   gem 'stringex', '~> 1.4.0'
-  gem 'liquid', '~> 2.3.0'
 
 # Used for Heroku deploys
   gem 'rack', '~> 1.4'
@@ -25,5 +25,4 @@ group :development do
   gem 'rb-fsevent', '~> 0.9'
   gem 'heroku'
   gem 'shotgun'
-  gem 'directory_watcher', '1.4.1'
 end

Gemfile.lock

@@ -2,66 +2,111 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    addressable (2.3.5)
-    chunky_png (1.3.0)
+    addressable (2.3.6)
+    blankslate (2.1.2.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.3.1)
     classifier (1.3.4)
       fast-stemmer (>= 1.0.0)
-    compass (0.12.3)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
+    colorator (0.1)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (= 3.2.14)
+      sass (~> 3.2.19)
     daemons (1.1.9)
-    directory_watcher (1.4.1)
     eventmachine (1.0.3)
-    excon (0.32.1)
+    excon (0.38.0)
+    execjs (2.2.1)
     fast-stemmer (1.0.2)
+    ffi (1.9.3)
     fssm (0.2.10)
-    haml (3.1.8)
-    heroku (3.6.0)
+    haml (4.0.5)
+      tilt
+    heroku (3.9.1)
       heroku-api (~> 0.3.17)
       launchy (>= 0.3.2)
       netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.3.17)
+    heroku-api (0.3.18)
       excon (~> 0.27)
-      multi_json (~> 1.8.2)
-    jekyll (0.12.1)
+      multi_json (~> 1.8)
+    jekyll (2.1.0)
       classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.14)
-      liquid (~> 2.3)
-      maruku (~> 0.5)
-      pygments.rb (~> 0.3.2)
-    kramdown (0.14.2)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.0)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.0.0)
+      coffee-script (~> 2.2)
+    jekyll-date-format (1.0.0)
+      jekyll (>= 1.0.0)
+    jekyll-gist (1.1.0)
+    jekyll-page-hooks (1.3.0)
+      jekyll (>= 2.0.0)
+    jekyll-paginate (1.0.0)
+    jekyll-sass-converter (1.0.0)
+      sass (~> 3.2)
+    jekyll-sitemap (0.5.0)
+    jekyll-watch (1.0.0)
+      listen (~> 2.7)
+    json (1.8.1)
+    kramdown (1.4.0)
     launchy (2.4.2)
       addressable (~> 2.3)
-    liquid (2.3.0)
-    maruku (0.7.1)
-    mime-types (2.2)
-    multi_json (1.8.4)
+    liquid (2.6.1)
+    listen (2.7.9)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mercenary (0.3.3)
+    mime-types (1.25.1)
+    multi_json (1.10.1)
     netrc (0.7.7)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     posix-spawn (0.3.8)
-    pygments.rb (0.3.7)
+    pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-rewrite (1.5.0)
-    rake (10.1.1)
+    rake (10.3.2)
     rb-fsevent (0.9.4)
-    rdiscount (2.1.7)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rdiscount (2.1.7.1)
+    rdoc (4.1.1)
+      json (~> 1.4)
+    redcarpet (3.1.2)
+    rest-client (1.6.8)
+      mime-types (~> 1.16)
+      rdoc (>= 2.4.2)
     rubypants (0.2.0)
-    rubyzip (1.1.2)
-    sass (3.2.14)
-    sass-globbing (1.1.0)
+    rubyzip (1.1.6)
+    safe_yaml (1.0.3)
+    sass (3.2.19)
+    sass-globbing (1.0.0)
       sass (>= 3.1)
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
@@ -71,6 +116,9 @@ GEM
       eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     tilt (1.4.1)
+    timers (1.1.0)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -79,19 +127,19 @@ PLATFORMS
 DEPENDENCIES
   RedCloth (~> 4.2.9)
   compass (~> 0.12.2)
-  directory_watcher (= 1.4.1)
-  haml (~> 3.1)
+  haml (~> 4.0)
   heroku
-  jekyll (~> 0.12)
-  liquid (~> 2.3.0)
+  jekyll (~> 2.0)
+  jekyll-date-format (~> 1.0)
+  jekyll-page-hooks (~> 1.2)
+  jekyll-sitemap
   rack (~> 1.4)
   rack-rewrite
-  rake
+  rake (~> 10.0)
   rb-fsevent (~> 0.9)
   rdiscount (~> 2.0)
   rubypants (~> 0.2.0)
-  sass (~> 3.2)
-  sass-globbing (~> 1.0)
+  sass-globbing (~> 1.0.0)
   shotgun
   sinatra (~> 1.4)
   stringex (~> 1.4.0)

Rakefile

@@ -25,7 +25,7 @@ posts_dir       = "_posts"    # directory for blog files
 themes_dir      = ".themes"   # directory for blog files
 new_post_ext    = "markdown"  # default new post file extension when using the new_post task
 new_page_ext    = "markdown"  # default new page file extension when using the new_page task
-server_port     = "4000"      # port for preview server eg. localhost:4000
+server_port     = "5000"      # port for preview server eg. localhost:4000
 
 if (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
   puts '## Set the codepage to 65001 for Windows machines'
@@ -57,15 +57,15 @@ task :generate do
   raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
   puts "## Generating Site with Jekyll"
   system "compass compile --css-dir #{source_dir}/stylesheets"
-  system "jekyll"
+  system "jekyll build"
 end
 
 desc "Watch the site and regenerate when it changes"
 task :watch do
   raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
   puts "Starting to watch source with Jekyll and Compass."
   system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
-  jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto")
+  jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll build --watch")
   compassPid = Process.spawn("compass watch")
 
   trap("INT") {
@@ -81,7 +81,7 @@ task :preview do
   raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." unless File.directory?(source_dir)
   puts "Starting to watch source with Jekyll and Compass. Starting Rack on port #{server_port}"
   system "compass compile --css-dir #{source_dir}/stylesheets" unless File.exist?("#{source_dir}/stylesheets/screen.css")
-  jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll --auto")
+  jekyllPid = Process.spawn({"OCTOPRESS_ENV"=>"preview"}, "jekyll build --watch")
   compassPid = Process.spawn("compass watch")
   rackupPid = Process.spawn("rackup --port #{server_port}")
 
@@ -187,8 +187,8 @@ task :update_style, :theme do |t, args|
   end
   mv "sass", "sass.old"
   puts "## Moved styles into sass.old/"
-  cp_r "#{themes_dir}/"+theme+"/sass/", "sass"
-  cp_r "sass/custom/.", "sass.old/custom"
+  cp_r "#{themes_dir}/"+theme+"/sass/", "sass", :remove_destination=>true
+  cp_r "sass.old/custom/.", "sass/custom/", :remove_destination=>true
   puts "## Updated Sass ##"
 end
 
@@ -261,8 +261,8 @@ multitask :push do
   cp_r "#{public_dir}/.", deploy_dir
   cd "#{deploy_dir}" do
     system "git add -A"
-    puts "\n## Committing: Site updated at #{Time.now.utc}"
     message = "Site updated at #{Time.now.utc}"
+    puts "\n## Committing: #{message}"
     system "git commit -m \"#{message}\""
     puts "\n## Pushing generated #{deploy_dir} website"
     system "git push origin #{deploy_branch}"

_config.yml

@@ -39,12 +39,13 @@ rdiscount:
     - autolink
     - footnotes
     - smart
-pygments: false # default python pygments have been replaced by pygments.rb
+highlighter: pygments # default python pygments have been replaced by pygments.rb
 
 paginate: 10          # Posts per page on the blog index
-pagination_dir:       # Directory base for pagination URLs eg. /blog/page/2/
+paginate_path: "posts/:num"  # Directory base for pagination URLs eg. /posts/2/
 recent_posts: 5       # Posts in the sidebar Recent Posts section
 excerpt_link: "Read on →"  # "Continue reading" link text at the bottom of excerpted articles
+excerpt_separator: "<!--more-->"
 
 titlecase: true       # Converts page and post titles to titlecase