Update to sinatra 1.0a

This commit is contained in:
tdreyno 2010-01-29 22:48:34 -08:00
parent 854bd73b46
commit ce6deb4c9f
657 changed files with 2940 additions and 6172 deletions

View file

@ -6,12 +6,12 @@ bin_path "lib/middleman/vendor/bin"
gem "shotgun" gem "shotgun"
gem "templater" gem "templater"
gem "sprockets" gem "sprockets"
gem "sinatra" gem "sinatra", "1.0.a"
gem "sinatra-content-for" gem "sinatra-content-for"
gem "rack-test" gem "rack-test"
gem "yui-compressor" gem "yui-compressor"
gem "haml" gem "haml"
gem "compass", "0.10.0.pre4" gem "compass", "0.10.0.pre5"
gem "compass-colors" gem "compass-colors"
gem "fancy-buttons" gem "fancy-buttons"
gem "json_pure" gem "json_pure"

View file

@ -54,7 +54,7 @@ module Middleman
def template_exists?(path, renderer=nil) def template_exists?(path, renderer=nil)
template_path = path.dup template_path = path.dup
template_path << ".#{renderer}" if renderer template_path << ".#{renderer}" if renderer
File.readable? File.join(options.views, template_path) File.readable? File.join(settings.views, template_path)
end end
# Base case renderer (do nothing), Should be over-ridden # Base case renderer (do nothing), Should be over-ridden
@ -97,16 +97,20 @@ module Middleman
self.respond_to?(name) && self.send(name) self.respond_to?(name) && self.send(name)
end end
def enabled?(name)
self.class.enabled?(name)
end
private private
def process_request(layout = :layout) def process_request(layout = :layout)
# Normalize the path and add index if we're looking at a directory # Normalize the path and add index if we're looking at a directory
path = request.path path = request.path
path << options.index_file if path.match(%r{/$}) path << settings.index_file if path.match(%r{/$})
path.gsub!(%r{^/}, '') path.gsub!(%r{^/}, '')
# If the enabled renderers succeed, return the content, mime-type and an HTTP 200 # If the enabled renderers succeed, return the content, mime-type and an HTTP 200
if content = render_path(path, layout) if content = render_path(path, layout)
content_type media_type(File.extname(path)), :charset => 'utf-8' content_type mime_type(File.extname(path)), :charset => 'utf-8'
status 200 status 200
content content
else else

View file

@ -4,16 +4,16 @@ class Middleman::Base
alias_method :pre_automatic_image_tag, :image_tag alias_method :pre_automatic_image_tag, :image_tag
helpers do helpers do
def image_tag(path, params={}) def image_tag(path, params={})
if !options.enabled?(:automatic_image_sizes) if !self.enabled?(:automatic_image_sizes)
return pre_automatic_image_tag(path, params) return pre_automatic_image_tag(path, params)
end end
if (!params[:width] || !params[:height]) && !path.include?("://") if (!params[:width] || !params[:height]) && !path.include?("://")
params[:alt] ||= "" params[:alt] ||= ""
http_prefix = options.http_images_path rescue options.images_dir http_prefix = settings.http_images_path rescue settings.images_dir
begin begin
real_path = File.join(options.public, options.images_dir, path) real_path = File.join(settings.public, settings.images_dir, path)
if File.exists? real_path if File.exists? real_path
dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true) dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true)
params[:width] ||= dimensions[0] params[:width] ||= dimensions[0]

View file

@ -27,7 +27,7 @@ module Middleman
def page_classes def page_classes
path = request.path_info.dup path = request.path_info.dup
path << options.index_file if path.match(%r{/$}) path << settings.index_file if path.match(%r{/$})
path = path.gsub(%r{^/}, '') path = path.gsub(%r{^/}, '')
classes = [] classes = []
@ -49,21 +49,21 @@ module Middleman
def image_tag(path, params={}) def image_tag(path, params={})
params[:alt] ||= "" params[:alt] ||= ""
prefix = options.http_images_path rescue options.images_dir prefix = settings.http_images_path rescue settings.images_dir
params = params.merge(:src => asset_url(path, prefix)) params = params.merge(:src => asset_url(path, prefix))
params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ') params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
"<img #{params} />" "<img #{params} />"
end end
def javascript_include_tag(path, params={}) def javascript_include_tag(path, params={})
params = params.merge(:src => asset_url(path, options.js_dir), :type => "text/javascript") params = params.merge(:src => asset_url(path, settings.js_dir), :type => "text/javascript")
params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ') params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
"<script #{params}></script>" "<script #{params}></script>"
end end
def stylesheet_link_tag(path, params={}) def stylesheet_link_tag(path, params={})
params[:rel] ||= "stylesheet" params[:rel] ||= "stylesheet"
params = params.merge(:href => asset_url(path, options.css_dir), :type => "text/css") params = params.merge(:href => asset_url(path, settings.css_dir), :type => "text/css")
params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ') params = params.map { |k,v| %Q{#{k}="#{v}"}}.join(' ')
"<link #{params} />" "<link #{params} />"
end end

View file

@ -17,17 +17,17 @@ module Middleman::Sass
def render_path(path, layout) def render_path(path, layout)
if template_exists?(path, :sass) if template_exists?(path, :sass)
begin begin
static_version = options.public + request.path_info static_version = settings.public + request.path_info
send_file(static_version) if File.exists? static_version send_file(static_version) if File.exists? static_version
location_of_sass_file = options.environment == "build" ? location_of_sass_file = settings.environment == "build" ?
File.join(Dir.pwd, options.build_dir) : File.join(Dir.pwd, settings.build_dir) :
options.public settings.public
css_filename = File.join(location_of_sass_file, request.path_info) css_filename = File.join(location_of_sass_file, request.path_info)
result = sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename })) result = sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename }))
if options.enabled?(:minify_css?) if enabled?(:minify_css)
::YUI::CssCompressor.new.compress(result) ::YUI::CssCompressor.new.compress(result)
else else
result result

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/compass-0.10.0.pre4/bin/compass")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/compass-0.10.0.pre5/bin/compass"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/haml-2.2.17/bin/css2sass")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/haml-2.2.17/bin/css2sass"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/json_pure-1.2.0/bin/edit_json.rb")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/json-1.2.0/bin/edit_json.rb"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/haml-2.2.17/bin/haml")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/haml-2.2.17/bin/haml"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/haml-2.2.17/bin/html2haml")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/haml-2.2.17/bin/html2haml"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/diff-lcs-1.1.2/bin/htmldiff")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/htmldiff"))

View file

@ -1,3 +0,0 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/launchy-0.3.5/bin/launchy"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/diff-lcs-1.1.2/bin/ldiff")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/ldiff"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/json_pure-1.2.0/bin/prettify_json.rb")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/json-1.2.0/bin/prettify_json.rb"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/rack-1.1.0/bin/rackup")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/rack-1.1.0/bin/rackup"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/rake-0.8.7/bin/rake")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/rake-0.8.7/bin/rake"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/haml-2.2.17/bin/sass")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/haml-2.2.17/bin/sass"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/shotgun-0.5/bin/shotgun")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/shotgun-0.6/bin/shotgun"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/smusher-0.4.2/bin/smusher")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/smusher-0.4.2/bin/smusher"))

View file

@ -1,3 +1,3 @@
#!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p376/bin/ruby #!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/environment")) require File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/environment"))
load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.9.1/gems/sprockets-1.0.2/bin/sprocketize")) load File.expand_path(File.join(File.dirname(__FILE__), "../gems/ruby/1.8/gems/sprockets-1.0.2/bin/sprocketize"))

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -6,8 +6,6 @@ module Bundler
ENV["PATH"] = "#{dir}/../../../bin:#{ENV["PATH"]}" ENV["PATH"] = "#{dir}/../../../bin:#{ENV["PATH"]}"
ENV["RUBYOPT"] = "-r#{file} #{ENV["RUBYOPT"]}" ENV["RUBYOPT"] = "-r#{file} #{ENV["RUBYOPT"]}"
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/configuration-1.1.0/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json_pure-1.2.0/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/bin")
@ -20,48 +18,44 @@ module Bundler
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.1.0/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.1.0/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.1.0/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-1.1.0/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.6/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.6/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/rack-test-0.5.3/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.17/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.17/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.17/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.17/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-1.0.a/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-1.0.a/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sprockets-1.0.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.5/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/launchy-0.3.5/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.5/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.5/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/diff-lcs-1.1.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/highline-1.5.1/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/templater-1.0.0/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/rake-0.8.7/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/httpclient-2.1.5.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre4/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre4/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre5/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre5/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-colors-0.3.1/lib")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.7/bin") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.9/bin")
$LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.7/lib") $LOAD_PATH.unshift File.expand_path("#{dir}/gems/fancy-buttons-0.3.9/lib")
@gemfile = "#{dir}/../../../../../../Gemfile" @gemfile = "#{dir}/../../../../../../Gemfile"
require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded
@bundled_specs = {} @bundled_specs = {}
@bundled_specs["configuration"] = eval(File.read("#{dir}/specifications/configuration-1.1.0.gemspec"))
@bundled_specs["configuration"].loaded_from = "#{dir}/specifications/configuration-1.1.0.gemspec"
@bundled_specs["json_pure"] = eval(File.read("#{dir}/specifications/json_pure-1.2.0.gemspec")) @bundled_specs["json_pure"] = eval(File.read("#{dir}/specifications/json_pure-1.2.0.gemspec"))
@bundled_specs["json_pure"].loaded_from = "#{dir}/specifications/json_pure-1.2.0.gemspec" @bundled_specs["json_pure"].loaded_from = "#{dir}/specifications/json_pure-1.2.0.gemspec"
@bundled_specs["extlib"] = eval(File.read("#{dir}/specifications/extlib-0.9.14.gemspec")) @bundled_specs["extlib"] = eval(File.read("#{dir}/specifications/extlib-0.9.14.gemspec"))
@ -72,40 +66,38 @@ module Bundler
@bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec" @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec"
@bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.1.0.gemspec")) @bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.1.0.gemspec"))
@bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.1.0.gemspec" @bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.1.0.gemspec"
@bundled_specs["shotgun"] = eval(File.read("#{dir}/specifications/shotgun-0.6.gemspec"))
@bundled_specs["shotgun"].loaded_from = "#{dir}/specifications/shotgun-0.6.gemspec"
@bundled_specs["rack-test"] = eval(File.read("#{dir}/specifications/rack-test-0.5.3.gemspec")) @bundled_specs["rack-test"] = eval(File.read("#{dir}/specifications/rack-test-0.5.3.gemspec"))
@bundled_specs["rack-test"].loaded_from = "#{dir}/specifications/rack-test-0.5.3.gemspec" @bundled_specs["rack-test"].loaded_from = "#{dir}/specifications/rack-test-0.5.3.gemspec"
@bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-0.9.4.gemspec"))
@bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-0.9.4.gemspec"
@bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.17.gemspec")) @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.17.gemspec"))
@bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.17.gemspec" @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.17.gemspec"
@bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-1.0.a.gemspec"))
@bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-1.0.a.gemspec"
@bundled_specs["sprockets"] = eval(File.read("#{dir}/specifications/sprockets-1.0.2.gemspec")) @bundled_specs["sprockets"] = eval(File.read("#{dir}/specifications/sprockets-1.0.2.gemspec"))
@bundled_specs["sprockets"].loaded_from = "#{dir}/specifications/sprockets-1.0.2.gemspec" @bundled_specs["sprockets"].loaded_from = "#{dir}/specifications/sprockets-1.0.2.gemspec"
@bundled_specs["rake"] = eval(File.read("#{dir}/specifications/rake-0.8.7.gemspec"))
@bundled_specs["rake"].loaded_from = "#{dir}/specifications/rake-0.8.7.gemspec"
@bundled_specs["launchy"] = eval(File.read("#{dir}/specifications/launchy-0.3.5.gemspec"))
@bundled_specs["launchy"].loaded_from = "#{dir}/specifications/launchy-0.3.5.gemspec"
@bundled_specs["shotgun"] = eval(File.read("#{dir}/specifications/shotgun-0.5.gemspec"))
@bundled_specs["shotgun"].loaded_from = "#{dir}/specifications/shotgun-0.5.gemspec"
@bundled_specs["diff-lcs"] = eval(File.read("#{dir}/specifications/diff-lcs-1.1.2.gemspec")) @bundled_specs["diff-lcs"] = eval(File.read("#{dir}/specifications/diff-lcs-1.1.2.gemspec"))
@bundled_specs["diff-lcs"].loaded_from = "#{dir}/specifications/diff-lcs-1.1.2.gemspec" @bundled_specs["diff-lcs"].loaded_from = "#{dir}/specifications/diff-lcs-1.1.2.gemspec"
@bundled_specs["highline"] = eval(File.read("#{dir}/specifications/highline-1.5.1.gemspec")) @bundled_specs["highline"] = eval(File.read("#{dir}/specifications/highline-1.5.1.gemspec"))
@bundled_specs["highline"].loaded_from = "#{dir}/specifications/highline-1.5.1.gemspec" @bundled_specs["highline"].loaded_from = "#{dir}/specifications/highline-1.5.1.gemspec"
@bundled_specs["templater"] = eval(File.read("#{dir}/specifications/templater-1.0.0.gemspec")) @bundled_specs["templater"] = eval(File.read("#{dir}/specifications/templater-1.0.0.gemspec"))
@bundled_specs["templater"].loaded_from = "#{dir}/specifications/templater-1.0.0.gemspec" @bundled_specs["templater"].loaded_from = "#{dir}/specifications/templater-1.0.0.gemspec"
@bundled_specs["rake"] = eval(File.read("#{dir}/specifications/rake-0.8.7.gemspec"))
@bundled_specs["rake"].loaded_from = "#{dir}/specifications/rake-0.8.7.gemspec"
@bundled_specs["httpclient"] = eval(File.read("#{dir}/specifications/httpclient-2.1.5.2.gemspec")) @bundled_specs["httpclient"] = eval(File.read("#{dir}/specifications/httpclient-2.1.5.2.gemspec"))
@bundled_specs["httpclient"].loaded_from = "#{dir}/specifications/httpclient-2.1.5.2.gemspec" @bundled_specs["httpclient"].loaded_from = "#{dir}/specifications/httpclient-2.1.5.2.gemspec"
@bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.10.0.pre4.gemspec")) @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
@bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.10.0.pre4.gemspec" @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
@bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.10.0.pre5.gemspec"))
@bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.10.0.pre5.gemspec"
@bundled_specs["compass-slickmap"] = eval(File.read("#{dir}/specifications/compass-slickmap-0.2.3.gemspec")) @bundled_specs["compass-slickmap"] = eval(File.read("#{dir}/specifications/compass-slickmap-0.2.3.gemspec"))
@bundled_specs["compass-slickmap"].loaded_from = "#{dir}/specifications/compass-slickmap-0.2.3.gemspec" @bundled_specs["compass-slickmap"].loaded_from = "#{dir}/specifications/compass-slickmap-0.2.3.gemspec"
@bundled_specs["smusher"] = eval(File.read("#{dir}/specifications/smusher-0.4.2.gemspec")) @bundled_specs["smusher"] = eval(File.read("#{dir}/specifications/smusher-0.4.2.gemspec"))
@bundled_specs["smusher"].loaded_from = "#{dir}/specifications/smusher-0.4.2.gemspec" @bundled_specs["smusher"].loaded_from = "#{dir}/specifications/smusher-0.4.2.gemspec"
@bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
@bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
@bundled_specs["compass-colors"] = eval(File.read("#{dir}/specifications/compass-colors-0.3.1.gemspec")) @bundled_specs["compass-colors"] = eval(File.read("#{dir}/specifications/compass-colors-0.3.1.gemspec"))
@bundled_specs["compass-colors"].loaded_from = "#{dir}/specifications/compass-colors-0.3.1.gemspec" @bundled_specs["compass-colors"].loaded_from = "#{dir}/specifications/compass-colors-0.3.1.gemspec"
@bundled_specs["fancy-buttons"] = eval(File.read("#{dir}/specifications/fancy-buttons-0.3.7.gemspec")) @bundled_specs["fancy-buttons"] = eval(File.read("#{dir}/specifications/fancy-buttons-0.3.9.gemspec"))
@bundled_specs["fancy-buttons"].loaded_from = "#{dir}/specifications/fancy-buttons-0.3.7.gemspec" @bundled_specs["fancy-buttons"].loaded_from = "#{dir}/specifications/fancy-buttons-0.3.9.gemspec"
def self.add_specs_to_loaded_specs def self.add_specs_to_loaded_specs
Gem.loaded_specs.merge! @bundled_specs Gem.loaded_specs.merge! @bundled_specs

View file

@ -1 +0,0 @@
08894dc6ab17c4d79297868e177cbed3d338b93b

View file

@ -1 +0,0 @@
git://github.com/nex3/haml.git master

View file

@ -1,21 +0,0 @@
!!! Transition
/ Feel free to delete this, it's just here to act as an example
%html(xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en")
%head
%title Welcome to Compass &amp; Blueprint
%link(rel="stylesheet" href="<%= http_stylesheets_path %>/screen.css" type="text/css" media="screen, projection")
%link(href="<%= http_stylesheets_path %>/print.css" media="print" rel="stylesheet" type="text/css")
/[if lt IE 8]
%link(href="<%= http_stylesheets_path %>/ie.css" media="screen, projection" rel="stylesheet" type="text/css")
%style(type="text/css")
:sass
@import blueprint.sass
body#welcome
#container
+container
h1
+column(24)
%body#welcome.bp
#container
%h1 Welcome to Compass!
%p This is <%= "ERB" %>

View file

@ -1,25 +0,0 @@
class FSSM::Monitor
def initialize(options={})
@options = options
@backend = FSSM::Backends::Default.new
end
def path(*args, &block)
path = FSSM::Path.new(*args)
if block_given?
if block.arity == 1
block.call(path)
else
path.instance_eval(&block)
end
end
@backend.add_path(path)
path
end
def run
@backend.run
end
end

View file

@ -1,54 +0,0 @@
require 'yaml'
class FSSM::State
def initialize(path)
@path = path
@cache = FSSM::Tree::Cache.new
end
def refresh(base=nil, skip_callbacks=false)
previous, current = recache(base || @path.to_pathname)
unless skip_callbacks
deleted(previous, current)
created(previous, current)
modified(previous, current)
end
end
private
def created(previous, current)
(current.keys - previous.keys).each {|created| @path.create(created)}
end
def deleted(previous, current)
(previous.keys - current.keys).each {|deleted| @path.delete(deleted)}
end
def modified(previous, current)
(current.keys & previous.keys).each do |file|
@path.update(file) if (current[file] <=> previous[file]) != 0
end
end
def recache(base)
base = FSSM::Pathname.for(base)
previous = @cache.files
snapshot(base)
current = @cache.files
[previous, current]
end
def snapshot(base)
base = FSSM::Pathname.for(base)
@cache.unset(base)
@path.glob.each {|glob| add_glob(base, glob)}
end
def add_glob(base, glob)
FSSM::Pathname.glob(base.join(glob).to_s).each do |fn|
@cache.set(fn)
end
end
end

View file

@ -1,6 +1,22 @@
COMPASS CHANGELOG COMPASS CHANGELOG
================= =================
0.10.0.pre5 (January 18, 2010)
------------------------------
* Fixed a bug in the grid builder in ruby 1.8.6 (Credit: [Richard Wöber][der-rich])
* Better sudo handling for the rails installer via environment variables or prompt. (Credit: Ryan Shaw, Evan Sharp)
* Removed support for the rip package manager.
* Support for scss files in the compass watcher.
* Cache buster timestamps were not working in some cases.
* Make ANSI color output work on windows.
* Command line switch (--boring) to turn off colorized output.
* Strip trailing slash from directory and path configuration variables.
* Added a --poll option to the compass watch subcommand to force polling.
* Fixed a test failure in ruby 1.9 due to faulty test code.
* Move the frameworks directory back to the top level. There's not actually a good reason for it to be buried in the ruby source.
* Upgrade FSSM. (Hopfully) Fixes a watcher issue that caused the watcher to not trigger for some users.
* Silence a deprecation warning in Rails 3.
0.10.0.pre4 (January 04, 2010) 0.10.0.pre4 (January 04, 2010)
------------------------------ ------------------------------
* Fixed an FSSM loading issue that broke the compass watcher. * Fixed an FSSM loading issue that broke the compass watcher.

View file

@ -0,0 +1 @@
9503512782eba7e387ba0dec14e5cfe1f3c0f22b

View file

@ -63,6 +63,7 @@ begin
gemspec.files -= Dir.glob("examples/**/*.css") gemspec.files -= Dir.glob("examples/**/*.css")
gemspec.files -= Dir.glob("examples/**/*.html") gemspec.files -= Dir.glob("examples/**/*.html")
gemspec.files -= Dir.glob("examples/*/extensions/**") gemspec.files -= Dir.glob("examples/*/extensions/**")
gemspec.files += Dir.glob("frameworks/**/*")
gemspec.files += Dir.glob("lib/**/*") gemspec.files += Dir.glob("lib/**/*")
gemspec.files += Dir.glob("test/**/*.*") gemspec.files += Dir.glob("test/**/*.*")
gemspec.files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*") gemspec.files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*")

View file

@ -2,4 +2,4 @@
:patch: 0 :patch: 0
:major: 0 :major: 0
:minor: 10 :minor: 10
:build: pre4 :build: pre5

Some files were not shown because too many files have changed in this diff Show more