github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nanoc so we can use the new watcher.

Browse Source
This commit is contained in:
Chris Eppstein 2010-11-12 21:45:24 -08:00
parent 955cfa75cf
commit 20d3e705e3
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc-src/Gemfile
View File

@ -1,7 +1,6 @@
source :gemcutter source :gemcutter
# We can switch nanoc to a normal gem when 3.1.3 is released. gem 'nanoc3', :git => "git://github.com/chriseppstein/nanoc.git"
gem 'nanoc3', :require => false, :git => "git://github.com/chriseppstein/nanoc.git", :branch => "3.1.x"
gem 'rdiscount' gem 'rdiscount'
gem 'thor' gem 'thor'
gem 'rack' gem 'rack'
@ -11,7 +10,7 @@ gem 'serve', "1.0.0"
gem 'mongrel' gem 'mongrel'
gem 'nokogiri' gem 'nokogiri'
gem 'coderay' gem 'coderay'
gem 'haml', ">=3.0.6", :require => 'sass' gem 'haml', ">=3.0.23", :require => 'sass'
gem 'rake' gem 'rake'
gem 'compass', :path => ".." gem 'compass', :path => ".."
gem 'compass-susy-plugin', ">=0.7.0.pre8" gem 'compass-susy-plugin', ">=0.7.0.pre8"

9
doc-src/Gemfile.lock
View File

@ -1,9 +1,8 @@
GIT GIT
remote: git://github.com/chriseppstein/nanoc.git remote: git://github.com/chriseppstein/nanoc.git
revision: 3982942 revision: 4ecb400489c83fd2068659de0c651733b8dad28f
branch: 3.1.x
specs: specs:
nanoc3 (3.1.2) nanoc3 (3.2.0a3)
cri (>= 1.0.0) cri (>= 1.0.0)
PATH PATH
@ -24,7 +23,7 @@ GEM
compass (>= 0.10.0.rc3) compass (>= 0.10.0.rc3)
fssm (0.1.4) fssm (0.1.4)
gem_plugin (0.2.3) gem_plugin (0.2.3)
haml (3.0.16) haml (3.0.23)
i18n (0.4.2) i18n (0.4.2)
json (1.4.5) json (1.4.5)
mime-types (1.16) mime-types (1.16)
@ -51,7 +50,7 @@ DEPENDENCIES
compass-susy-plugin (>= 0.7.0.pre8) compass-susy-plugin (>= 0.7.0.pre8)
css-slideshow (= 0.2.0) css-slideshow (= 0.2.0)
fssm fssm
haml (>= 3.0.6) haml (>= 3.0.23)
json json
mime-types mime-types
mongrel mongrel

10
doc-src/lib/data_sources/nanoc_monkey_patches.rb
View File

@ -1,12 +1,12 @@
class Nanoc3::Site class Nanoc3::Site
def cached(key) def cached(key)
if cache.has_key?(key) if cached_stuff.has_key?(key)
cache[key] cached_stuff[key]
else else
cache[key]= yield cached_stuff[key]= yield
end end
end end
def cache def cached_stuff
@cache ||= {} @cached_stuff ||= {}
end end
end end

4
doc-src/lib/stylesheets/sass_extensions.rb
View File

@ -61,8 +61,12 @@ module Sass
attr_accessor :imported_filename unless method_defined? :imported_filename attr_accessor :imported_filename unless method_defined? :imported_filename
end end
class CommentNode < Node class CommentNode < Node
unless defined?(PRE_COMMENT)
PRE_COMMENT = %r{(^ */*\**(\s*\|)?( |$))} PRE_COMMENT = %r{(^ */*\**(\s*\|)?( |$))}
end
unless defined?(POST_COMMENT)
POST_COMMENT = %r{ *\*/$} POST_COMMENT = %r{ *\*/$}
end
def self.clean(docstring) def self.clean(docstring)
docstring.gsub(/@doc off(.*?)@doc on/m, '') docstring.gsub(/@doc off(.*?)@doc on/m, '')
end end