Merge branch 'hotfix-1.7.3' into develop

Gemfile

@@ -1,10 +1,10 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem 'coderay' # for syntax highlighting
 gem 'compass' # for advanced CSS
 gem 'haml' # for layouts with clean sources
 gem 'kramdown' # for advanced markdown
-gem 'nanoc', '3.4.0' # for compiling the site
+gem 'nanoc', '3.6.5' # for compiling the site
 gem 'nokogiri' # for parsing HTML
 gem 'rainpress' # for compact CSS
 gem 'rubypants-unicode' # for pretty typography
@@ -18,6 +18,9 @@ gem 'builder'
 gem 'adsf'
 gem 'systemu'
 gem 'shortly' # For URL shortening
-gem 'hunspell-ffi', :git => 'git://github.com/cdchapman/hunspell-ffi.git'
-gem 'html_spellchecker', :git => 'git://github.com/cdchapman/HTML-Spellchecker.git' # To check spelling
+gem 'html_spellchecker'
 gem 'json'
+
+group :development do
+  gem 'listen'
+end

Gemfile.lock

@@ -1,63 +1,89 @@
-GIT
-  remote: git://github.com/cdchapman/HTML-Spellchecker.git
-  revision: 395d01c3bf7442947c3f897cea3b5d47baada8f7
-  specs:
-    html_spellchecker (0.1.6)
-      hunspell-ffi (~> 0.1.3.alpha2)
-      nokogiri (~> 1.4)
-
-GIT
-  remote: git://github.com/cdchapman/hunspell-ffi.git
-  revision: 2b86d8acba101670266f5bdb69754d0b325aacbd
-  specs:
-    hunspell-ffi (0.1.3.alpha3)
-      ffi (~> 1.0.7)
-
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     adsf (1.1.1)
       rack (>= 1.0.0)
-    builder (3.1.4)
-    chunky_png (1.2.6)
-    coderay (1.0.8)
+    allison (2.0.3)
+    atomic (1.1.14)
+    builder (3.2.2)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.2.8)
+    coderay (1.1.0)
     colored (1.2)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    cri (2.3.0)
+    cri (2.4.0)
       colored (>= 1.2)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    echoe (4.6.3)
+      allison (>= 2.0.3)
+      gemcutter (>= 0.7.0)
+      rake (>= 0.9.2)
+      rdoc (>= 3.6.1)
+      rubyforge (>= 2.0.4)
+    execjs (2.0.2)
     ffi (1.0.11)
-    fssm (0.2.9)
-    haml (3.1.7)
-    htmlbeautifier (0.0.7)
-    httparty (0.9.0)
-      multi_json (~> 1.0)
-      multi_xml
-    i18n (0.6.1)
-    json (1.7.5)
-    kramdown (0.14.0)
-    multi_json (1.3.6)
-    multi_xml (0.5.1)
-    nanoc (3.4.0)
-      cri (~> 2.2)
-    nokogiri (1.5.5)
-    rack (1.4.1)
+    fssm (0.2.10)
+    gemcutter (0.7.1)
+    haml (4.0.3)
+      tilt
+    html_spellchecker (0.1.7)
+      hunspell-ffi (= 0.1.3)
+      nokogiri (~> 1.4)
+    htmlbeautifier (0.0.8)
+    httparty (0.12.0)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    hunspell-ffi (0.1.3)
+      ffi (~> 1.0.7)
+    i18n (0.6.5)
+    json (1.8.0)
+    json_pure (1.8.0)
+    kramdown (1.2.0)
+    listen (2.1.1)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    nanoc (3.6.5)
+      cri (~> 2.3)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    rack (1.5.2)
     rainpress (1.0)
+      echoe
+    rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.2)
+      ffi (>= 0.5.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
     rqrcode (0.4.2)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
     rubypants-unicode (0.2.3)
-    sass (3.2.1)
+    sass (3.2.12)
     shortly (0.3.3)
       httparty
       json
     systemu (2.5.2)
-    uglifier (1.3.0)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    timers (1.1.0)
+    tzinfo (0.3.38)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     vpim (0.695)
@@ -73,12 +99,12 @@ DEPENDENCIES
   coderay
   compass
   haml
-  html_spellchecker!
+  html_spellchecker
   htmlbeautifier
-  hunspell-ffi!
   json
   kramdown
-  nanoc (= 3.4.0)
+  listen
+  nanoc (= 3.6.5)
   nokogiri
   rainpress
   rqrcode

build_prod.sh

@@ -1,7 +1,12 @@
 #!/bin/bash
 
+# First check to make sure bundler is installed
+if [ `gem list bundler -i` = "false" ]; then
+  gem install bundler
+fi
+
 # Ready, set...
-bundle install
+bundle install --without development
 
 # Let's make this a fresh build
 rm -rf {output,tmp}

lib/filters/ext/rqrcode.rb

@@ -1,4 +1,3 @@
-require "rqrcode"
 require "chunky_png"
 
 module RQRCode

config.yaml → nanoc.yaml

@@ -1,5 +1,5 @@
 # Site version
-version: 1.6.30
+version: 1.7.3
 
 # A list of file extensions that nanoc will consider to be textual rather than
 # binary. If an item with an extension not in this list is found,  the file