Updated docs

Rakefile

@@ -23,17 +23,27 @@ end
 
 def build
   system "middleman build"
+
+  Dir.chdir "build" do
+    system "cp ../config.ru ."
+    system "cp ../Procfile ."
+  end
 end
 
 def generate_marionette_docs
   # output_path = 'api.yml'
   repo_path = marionette_path
   site_path = current_path
   current_tag = ""
+  select_box = "<select id=\"version\" class=\"form-control\">"
   tags = Array.new
   print "Generating docs data from #{repo_path}... "
 
   Dir.chdir(repo_path) do
+    system("git checkout master")
+    describe = `git describe --tags --always`.strip
+    current_tag = describe.gsub("\n", "")
+
     # get list of tags in marionette repo
     describe = `git tag`.strip
     tags = describe.split("\n")
@@ -53,11 +63,17 @@ def generate_marionette_docs
         newfilename = File.basename(filename, ".*" )
         FileUtils.cp(filename, "#{site_path}/source/docs/#{tag}/#{newfilename}.md")
       end
+
+      if tag == current_tag
+        select_box += "<option value=\"#{tag}\">#{tag} (current)</option>"
+      else
+        select_box += "<option value=\"#{tag}\">#{tag}</option>"
+      end
     end
 
-    # checkout last tag
-    describe = `git describe --tags --always`.strip
-    current_tag = describe.gsub("\n", "")
+    select_box += "</select>"
+
+    # checkout latest tag
     system("git checkout tags/#{current_tag}")
     FileUtils.mkdir_p("#{site_path}/source/docs/current")
     filenames = Dir.glob('docs/*.md')
@@ -76,6 +92,8 @@ def generate_marionette_docs
 
         system("node ../../doc-assets/build.js");
         system("rm *.md");
+        text = File.read('sidebar_.html')
+        File.write('sidebar_.html', text.gsub('{select_box}', select_box))
 
       end
     end
@@ -85,15 +103,18 @@ def generate_marionette_docs
 
     system("node ../../doc-assets/build.js");
     system("rm *.md");
+    text = File.read('sidebar_.html')
+    File.write('sidebar_.html', text.gsub('{select_box}', select_box))
 
   end
 
-  print "Generating annotated src data from #{repo_path}... "
-  FileUtils.mkdir_p("#{site_path}/backbone.marionette/#{current_tag}")
-  system("curl https://raw.githubusercontent.com/marionettejs/backbone.marionette/#{current_tag}/lib/backbone.marionette.js > backbone.marionette/#{current_tag}/backbone.marionette.js")
-  system("./node_modules/.bin/docco backbone.marionette/#{current_tag}/backbone.marionette.js -o source/annotated-src/")
-  system("rm -rdf backbone.marionette");
-  puts "Built #{repo_path}"
+  # print "Generating annotated src data from #{repo_path}... "
+  # FileUtils.mkdir_p("#{site_path}/backbone.marionette/#{current_tag}")
+  # system("curl https://raw.githubusercontent.com/marionettejs/backbone.marionette/#{current_tag}/lib/backbone.marionette.js > backbone.marionette/#{current_tag}/backbone.marionette.js")
+  # system("./node_modules/.bin/docco backbone.marionette/#{current_tag}/backbone.marionette.js -o source/annotated-src/#{current_tag}/")
+  # system("./node_modules/.bin/docco backbone.marionette/#{current_tag}/backbone.marionette.js -o source/annotated-src/")
+  # system("rm -rdf backbone.marionette");
+  # puts "Built #{repo_path}"
 end
 
 def get_anotated_source
@@ -132,6 +153,10 @@ task :backfill_anotated_source do
   get_anotated_source
 end
 
+task :build do
+  build
+end
+
 desc "Build and deploy the website to github pages"
 task :deploy do
   require "highline/import"
@@ -146,11 +171,9 @@ task :deploy do
   build
 
   Dir.chdir "build" do
-    system "cp ../config.ru ."
-    system "cp ../Procfile ."
     system "git add -A"
     system "git commit -m '#{message.gsub("'", "\\'")}'"
     system "git push --force heroku master"
   end
 
-end
+end

config.ru

@@ -5,6 +5,7 @@ require 'rack/rewrite'
 use Rack::Rewrite do
   r301 '/docs/backbone.marionette.html', '/annotated-src/backbone.marionette'
   rewrite %r{/docs/marionette.(\w+).html}, '/docs/current/marionette.$1.html'
+  rewrite %r{/docs/index.html}, '/docs/current/index.html'
   rewrite %r{/docs/sidebar_.html}, '/docs/current/sidebar_.html'
   rewrite %r{/docs/assets_/(.*)}, '/docs/current/assets_/$1'
 end

package.json

@@ -1,7 +1,7 @@
 {
   "name": "marionette-www",
   "dependencies": {
-    "mdoc": "~0.3.4",
+    "mdoc": "git://github.com/ahumphreys87/mdoc.git#v0.4.0",
     "docco": "~0.6.3"
   }
 }

readme.md

@@ -15,9 +15,11 @@ Update the site
 
 Make your changes to the site in the source/ folder.
 
-    middleman server
+    rake build
+    cd build
+    rackup config.ru -p 2000
 
-Preview your changes in browser by pointing to http://localhost:4567
+Preview your changes in browser by pointing to http://localhost:2000
 
 
 Populate a new version of Marionette.js builds
@@ -32,4 +34,4 @@ Push your changes to Heroku
 -----
 
     Login to heroku CLI Tools
-    `git push heroku {branchName}:master`
+    `rake deploy`

source/doc-assets/build.js

@@ -16,6 +16,8 @@ mdoc.run({
 
     templatePath : __dirname + '/custom_template',
 
+    indexContent: '<h1>Backbone.Marionette Documentation.</h1><p>Please use the links in the sidebar or below to find what you are looking for.</p>',
+
     //by default it will look at an `assets_` folder inside the `templatePath`
     assetsPath : __dirname + '/custom_assets',