From 45b4e1316c4a62e05c9abd679b8d4e3dd9f9ad57 Mon Sep 17 00:00:00 2001 From: "Davis W. Frank" Date: Sun, 27 Feb 2011 10:36:13 -0800 Subject: [PATCH] updating for new pages --- .gitmodules | 3 +++ Gemfile | 1 + Gemfile.lock | 19 +++++++++++++++++++ Rakefile | 2 +- pages | 1 + 5 files changed, 25 insertions(+), 1 deletion(-) create mode 160000 pages diff --git a/.gitmodules b/.gitmodules index e69de29..69a8095 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "pages"] + path = pages + url = git://github.com/pivotal/jasmine.git diff --git a/Gemfile b/Gemfile index a43e2d1..04eeea9 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source :rubygems gem "json_pure", "~>1.4.3" +gem "frank" gem "ragaskar-jsdoc_helper" gem "rake", "0.8.7" diff --git a/Gemfile.lock b/Gemfile.lock index 8045bf5..837abb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,33 @@ GEM remote: http://rubygems.org/ specs: + daemons (1.0.10) + frank (1.0.8) + haml (>= 3.0) + mongrel (>= 1.2.0.pre2) + net-scp (>= 1.0) + net-ssh (>= 2.0) + rack (>= 1.0) + tilt (= 0.9) + gem_plugin (0.2.3) + haml (3.0.25) json_pure (1.4.6) + mongrel (1.2.0.pre2) + daemons (~> 1.0.10) + gem_plugin (~> 0.2.3) + net-scp (1.0.4) + net-ssh (>= 1.99.1) + net-ssh (2.1.0) + rack (1.2.1) ragaskar-jsdoc_helper (0.0.2.1) rake (0.8.7) + tilt (0.9) PLATFORMS ruby DEPENDENCIES + frank json_pure (~> 1.4.3) ragaskar-jsdoc_helper rake (= 0.8.7) diff --git a/Rakefile b/Rakefile index 3f600de..18d4f03 100644 --- a/Rakefile +++ b/Rakefile @@ -91,7 +91,7 @@ jasmine.version_= { FileUtils.cp("src/html/jasmine.css", "lib/jasmine.css") end - downloads_file = 'pages/download.html.md' + downloads_file = 'pages/download.html' task :need_pages_submodule do unless File.exist?(downloads_file) raise "Jasmine pages submodule isn't present. Run git submodule update --init" diff --git a/pages b/pages new file mode 160000 index 0000000..ae5da67 --- /dev/null +++ b/pages @@ -0,0 +1 @@ +Subproject commit ae5da671e3b47e3846ced7371722e9b5c6204e75