diff --git a/Gemfile b/Gemfile index ff504868..b1f3bf60 100644 --- a/Gemfile +++ b/Gemfile @@ -6,12 +6,12 @@ bin_path "lib/middleman/vendor/bin" gem "shotgun" gem "templater" gem "sprockets" -gem "sinatra" +gem "sinatra", "1.0.a" gem "sinatra-content-for" gem "rack-test" gem "yui-compressor" gem "haml" -gem "compass", "0.10.0.pre4" +gem "compass", "0.10.0.pre5" gem "compass-colors" gem "fancy-buttons" gem "json_pure" diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb index cee904fe..2569285c 100644 --- a/lib/middleman/base.rb +++ b/lib/middleman/base.rb @@ -54,7 +54,7 @@ module Middleman def template_exists?(path, renderer=nil) template_path = path.dup template_path << ".#{renderer}" if renderer - File.readable? File.join(options.views, template_path) + File.readable? File.join(settings.views, template_path) end # Base case renderer (do nothing), Should be over-ridden @@ -96,17 +96,21 @@ module Middleman name = (name.to_s << "?").to_sym self.respond_to?(name) && self.send(name) end + + def enabled?(name) + self.class.enabled?(name) + end private def process_request(layout = :layout) # Normalize the path and add index if we're looking at a directory path = request.path - path << options.index_file if path.match(%r{/$}) + path << settings.index_file if path.match(%r{/$}) path.gsub!(%r{^/}, '') # If the enabled renderers succeed, return the content, mime-type and an HTTP 200 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 content else diff --git a/lib/middleman/features/automatic_image_sizes.rb b/lib/middleman/features/automatic_image_sizes.rb index 4fd4d06a..bc3e4c3b 100755 --- a/lib/middleman/features/automatic_image_sizes.rb +++ b/lib/middleman/features/automatic_image_sizes.rb @@ -4,16 +4,16 @@ class Middleman::Base alias_method :pre_automatic_image_tag, :image_tag helpers do def image_tag(path, params={}) - if !options.enabled?(:automatic_image_sizes) + if !self.enabled?(:automatic_image_sizes) return pre_automatic_image_tag(path, params) end if (!params[:width] || !params[:height]) && !path.include?("://") params[:alt] ||= "" - http_prefix = options.http_images_path rescue options.images_dir + http_prefix = settings.http_images_path rescue settings.images_dir 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 dimensions = Middleman::FastImage.size(real_path, :raise_on_failure => true) params[:width] ||= dimensions[0] diff --git a/lib/middleman/helpers.rb b/lib/middleman/helpers.rb index d672dd9f..05598ab7 100755 --- a/lib/middleman/helpers.rb +++ b/lib/middleman/helpers.rb @@ -27,7 +27,7 @@ module Middleman def page_classes 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{^/}, '') classes = [] @@ -49,21 +49,21 @@ module Middleman def image_tag(path, params={}) 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.map { |k,v| %Q{#{k}="#{v}"}}.join(' ') "" end 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(' ') "" end def stylesheet_link_tag(path, params={}) 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(' ') "" end diff --git a/lib/middleman/sass.rb b/lib/middleman/sass.rb index 27ae1ac3..3c51bcb8 100644 --- a/lib/middleman/sass.rb +++ b/lib/middleman/sass.rb @@ -17,17 +17,17 @@ module Middleman::Sass def render_path(path, layout) if template_exists?(path, :sass) begin - static_version = options.public + request.path_info + static_version = settings.public + request.path_info send_file(static_version) if File.exists? static_version - location_of_sass_file = options.environment == "build" ? - File.join(Dir.pwd, options.build_dir) : - options.public + location_of_sass_file = settings.environment == "build" ? + File.join(Dir.pwd, settings.build_dir) : + settings.public 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 })) - if options.enabled?(:minify_css?) + if enabled?(:minify_css) ::YUI::CssCompressor.new.compress(result) else result diff --git a/lib/middleman/vendor/bin/compass b/lib/middleman/vendor/bin/compass index c156a517..13024947 100755 --- a/lib/middleman/vendor/bin/compass +++ b/lib/middleman/vendor/bin/compass @@ -1,3 +1,3 @@ -#!/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/compass-0.10.0.pre4/bin/compass")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/compass-0.10.0.pre5/bin/compass")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/css2sass b/lib/middleman/vendor/bin/css2sass index 3aaec878..fe955763 100755 --- a/lib/middleman/vendor/bin/css2sass +++ b/lib/middleman/vendor/bin/css2sass @@ -1,3 +1,3 @@ -#!/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/haml-2.2.17/bin/css2sass")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/haml-2.2.17/bin/css2sass")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/edit_json.rb b/lib/middleman/vendor/bin/edit_json.rb index 000c2bb1..a9fa9ec8 100755 --- a/lib/middleman/vendor/bin/edit_json.rb +++ b/lib/middleman/vendor/bin/edit_json.rb @@ -1,3 +1,3 @@ -#!/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/json_pure-1.2.0/bin/edit_json.rb")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/json-1.2.0/bin/edit_json.rb")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/haml b/lib/middleman/vendor/bin/haml index 8654771c..f58c3090 100755 --- a/lib/middleman/vendor/bin/haml +++ b/lib/middleman/vendor/bin/haml @@ -1,3 +1,3 @@ -#!/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/haml-2.2.17/bin/haml")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/haml-2.2.17/bin/haml")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/html2haml b/lib/middleman/vendor/bin/html2haml index 0938ed1d..7134ea5a 100755 --- a/lib/middleman/vendor/bin/html2haml +++ b/lib/middleman/vendor/bin/html2haml @@ -1,3 +1,3 @@ -#!/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/haml-2.2.17/bin/html2haml")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/haml-2.2.17/bin/html2haml")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/htmldiff b/lib/middleman/vendor/bin/htmldiff index 0e97621a..8967c07e 100755 --- a/lib/middleman/vendor/bin/htmldiff +++ b/lib/middleman/vendor/bin/htmldiff @@ -1,3 +1,3 @@ -#!/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/diff-lcs-1.1.2/bin/htmldiff")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/diff-lcs-1.1.2/bin/htmldiff")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/launchy b/lib/middleman/vendor/bin/launchy deleted file mode 100755 index 9ab12de5..00000000 --- a/lib/middleman/vendor/bin/launchy +++ /dev/null @@ -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")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/ldiff b/lib/middleman/vendor/bin/ldiff index b3fb32c1..6da03082 100755 --- a/lib/middleman/vendor/bin/ldiff +++ b/lib/middleman/vendor/bin/ldiff @@ -1,3 +1,3 @@ -#!/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/diff-lcs-1.1.2/bin/ldiff")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/diff-lcs-1.1.2/bin/ldiff")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/prettify_json.rb b/lib/middleman/vendor/bin/prettify_json.rb index 61b6e2da..f7642269 100755 --- a/lib/middleman/vendor/bin/prettify_json.rb +++ b/lib/middleman/vendor/bin/prettify_json.rb @@ -1,3 +1,3 @@ -#!/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/json_pure-1.2.0/bin/prettify_json.rb")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/json-1.2.0/bin/prettify_json.rb")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/rackup b/lib/middleman/vendor/bin/rackup index 24284441..e9c6c1f1 100755 --- a/lib/middleman/vendor/bin/rackup +++ b/lib/middleman/vendor/bin/rackup @@ -1,3 +1,3 @@ -#!/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/rack-1.1.0/bin/rackup")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/rack-1.1.0/bin/rackup")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/rake b/lib/middleman/vendor/bin/rake index 3ccdbbeb..29b9f65a 100755 --- a/lib/middleman/vendor/bin/rake +++ b/lib/middleman/vendor/bin/rake @@ -1,3 +1,3 @@ -#!/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/rake-0.8.7/bin/rake")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/rake-0.8.7/bin/rake")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/sass b/lib/middleman/vendor/bin/sass index 3baff881..3675e7b4 100755 --- a/lib/middleman/vendor/bin/sass +++ b/lib/middleman/vendor/bin/sass @@ -1,3 +1,3 @@ -#!/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/haml-2.2.17/bin/sass")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/haml-2.2.17/bin/sass")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/shotgun b/lib/middleman/vendor/bin/shotgun index d77fcd05..52a02d61 100755 --- a/lib/middleman/vendor/bin/shotgun +++ b/lib/middleman/vendor/bin/shotgun @@ -1,3 +1,3 @@ -#!/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/shotgun-0.5/bin/shotgun")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/shotgun-0.6/bin/shotgun")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/smusher b/lib/middleman/vendor/bin/smusher index 721afb5d..aede0aed 100755 --- a/lib/middleman/vendor/bin/smusher +++ b/lib/middleman/vendor/bin/smusher @@ -1,3 +1,3 @@ -#!/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/smusher-0.4.2/bin/smusher")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/smusher-0.4.2/bin/smusher")) \ No newline at end of file diff --git a/lib/middleman/vendor/bin/sprocketize b/lib/middleman/vendor/bin/sprocketize index 0c1834ac..79f96805 100755 --- a/lib/middleman/vendor/bin/sprocketize +++ b/lib/middleman/vendor/bin/sprocketize @@ -1,3 +1,3 @@ -#!/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/sprockets-1.0.2/bin/sprocketize")) \ No newline at end of file +#!/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +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.8/gems/sprockets-1.0.2/bin/sprocketize")) \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre4.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre4.gem deleted file mode 100644 index b71ae1cc..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre4.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre5.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre5.gem new file mode 100644 index 00000000..5a102743 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre5.gem differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/configuration-1.1.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/configuration-1.1.0.gem deleted file mode 100644 index 25cc4965..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/configuration-1.1.0.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.7.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.7.gem deleted file mode 100644 index 9d34b591..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.7.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.9.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.9.gem new file mode 100644 index 00000000..7cca9b25 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.9.gem differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/launchy-0.3.5.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/launchy-0.3.5.gem deleted file mode 100644 index 1c4752d7..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/launchy-0.3.5.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.5.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.5.gem deleted file mode 100644 index fc6ffd61..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.5.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.6.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.6.gem new file mode 100644 index 00000000..4bac5017 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.6.gem differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-0.9.4.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-0.9.4.gem deleted file mode 100644 index c30a6f78..00000000 Binary files a/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-0.9.4.gem and /dev/null differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-1.0.a.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-1.0.a.gem new file mode 100644 index 00000000..64c026ae Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-1.0.a.gem differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/environment.rb b/lib/middleman/vendor/gems/ruby/1.8/environment.rb index dbe0b106..62e01eec 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/environment.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/environment.rb @@ -6,8 +6,6 @@ module Bundler ENV["PATH"] = "#{dir}/../../../bin:#{ENV["PATH"]}" 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/lib") $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/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/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/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/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/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/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/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/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/lib") - $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre4/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/bin") + $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/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/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/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.7/lib") + $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.9/lib") @gemfile = "#{dir}/../../../../../../Gemfile" require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded @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"].loaded_from = "#{dir}/specifications/json_pure-1.2.0.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["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["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"].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"].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"].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"].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"].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"].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"].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["compass"].loaded_from = "#{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["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"].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"].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"].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"].loaded_from = "#{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.9.gemspec" def self.add_specs_to_loaded_specs Gem.loaded_specs.merge! @bundled_specs diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/REVISION b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/REVISION deleted file mode 100644 index 5862c00c..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/REVISION +++ /dev/null @@ -1 +0,0 @@ -08894dc6ab17c4d79297868e177cbed3d338b93b \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/deps.rip b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/deps.rip deleted file mode 100644 index 71d1e8c1..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/deps.rip +++ /dev/null @@ -1 +0,0 @@ -git://github.com/nex3/haml.git master diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml deleted file mode 100644 index 89aec1c4..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml +++ /dev/null @@ -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 & 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" %> diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/monitor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/monitor.rb deleted file mode 100644 index b7cd0f99..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/monitor.rb +++ /dev/null @@ -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 diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb deleted file mode 100644 index e22ef878..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb +++ /dev/null @@ -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 diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/CHANGELOG.markdown similarity index 97% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/CHANGELOG.markdown index 6746cef3..119d2d06 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/CHANGELOG.markdown @@ -1,6 +1,22 @@ 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) ------------------------------ * Fixed an FSSM loading issue that broke the compass watcher. diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/LICENSE.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/LICENSE.markdown similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/LICENSE.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/LICENSE.markdown diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/README.markdown diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/REVISION b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/REVISION new file mode 100644 index 00000000..ce685447 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/REVISION @@ -0,0 +1 @@ +9503512782eba7e387ba0dec14e5cfe1f3c0f22b \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/Rakefile similarity index 99% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/Rakefile index 70de0032..3fc95592 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/Rakefile +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/Rakefile @@ -63,6 +63,7 @@ begin gemspec.files -= Dir.glob("examples/**/*.css") gemspec.files -= Dir.glob("examples/**/*.html") gemspec.files -= Dir.glob("examples/*/extensions/**") + gemspec.files += Dir.glob("frameworks/**/*") gemspec.files += Dir.glob("lib/**/*") gemspec.files += Dir.glob("test/**/*.*") gemspec.files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*") diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/VERSION.yml similarity index 73% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/VERSION.yml index 6c31e8a1..d0ed1358 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/VERSION.yml @@ -2,4 +2,4 @@ :patch: 0 :major: 0 :minor: 10 -:build: pre4 +:build: pre5 diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/bin/compass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/bin/compass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/bin/compass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/bin/compass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/README.markdown diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/index.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/elements.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/elements.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/elements.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/elements.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/forms.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/forms.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/forms.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/forms.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/grid.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/grid.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/grid.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/grid.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/test-small.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/test.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/valid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/parts/valid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_default/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/cross.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/cross.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/cross.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/cross.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/key.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/key.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/key.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/key.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/tick.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/tick.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/tick.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/buttons/tick.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/doc.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/doc.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/doc.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/doc.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/email.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/email.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/email.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/email.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/external.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/external.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/external.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/external.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/feed.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/feed.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/feed.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/feed.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/im.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/im.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/im.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/im.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/pdf.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/pdf.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/pdf.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/pdf.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/visited.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/visited.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/visited.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/visited.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/xls.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/xls.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/xls.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/link_icons/xls.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/test-small.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/test.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/valid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/images/valid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/index.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/buttons.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/buttons.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/buttons.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/buttons.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/fancy_type.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/fancy_type.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/fancy_type.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/fancy_type.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/link_icons.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/link_icons.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/link_icons.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/link_icons.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/rtl.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/rtl.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/rtl.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/plugins/rtl.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/buttons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/link_icons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/rtl_screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/rtl_screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/rtl_screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/rtl_screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_plugins/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_scoped_form/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/index.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/fancy_type.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/fancy_type.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/fancy_type.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/fancy_type.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/liquid.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/liquid.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/liquid.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/liquid.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/test-small.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/test.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/valid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/parts/valid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/liquid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/blueprint_semantic/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/bootstrap.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/compass.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/compass.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/compass.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/compass.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/_yui.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/_yui.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/_yui.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/_yui.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/extensions/yui/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/images/blue_arrow.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/images/blue_arrow.gif similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/images/blue_arrow.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/images/blue_arrow.gif diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/compass.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/compass.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/compass.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/compass.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/images/blue_arrow.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/images/blue_arrow.gif similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/images/blue_arrow.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/images/blue_arrow.gif diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/sticky_footer.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/sticky_footer.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/sticky_footer.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/sticky_footer.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/src/utilities.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/sticky_footer.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/sticky_footer.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/sticky_footer.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/sticky_footer.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/utilities.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/utilities.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/utilities.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/compass/utilities.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/images/fresh-peas.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/images/fresh-peas.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/images/fresh-peas.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/images/fresh-peas.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/index.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/fancy-fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/fancy-fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/fancy-fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/fancy-fonts.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/gradient.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/gradient.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/main.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/main.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/main.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/src/main.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/Vtks Revolt.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/stylesheets/fonts/Vtks Revolt.ttf similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/Vtks Revolt.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/stylesheets/fonts/Vtks Revolt.ttf diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/angelina.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/stylesheets/fonts/angelina.ttf similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/angelina.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/css3/stylesheets/fonts/angelina.ttf diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/downloader.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/downloader.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/downloader.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/downloader.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/logo.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/logo.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/logo.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/logo.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/logo/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/bootstrap.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/README.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/README.mkdn similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/README.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/README.mkdn diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/text.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/extensions/ninesixty/templates/project/text.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/src/grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/src/grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/src/text.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/ninesixty/src/text.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/bootstrap.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/LICENSE.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/LICENSE.txt similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/LICENSE.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/LICENSE.txt diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/README.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/README.mkdn similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/README.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/README.mkdn diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/compass-susy-plugin.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/compass-susy-plugin.gemspec similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/compass-susy-plugin.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/compass-susy-plugin.gemspec diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/build.sh b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/build.sh similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/build.sh rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/build.sh diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/index.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/index.mkdn similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/index.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/docs/tutorial/index.mkdn diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/compass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy/compass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/compass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy/compass_plugin.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/sass_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy/sass_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/sass_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/lib/susy/sass_extensions.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_susy.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_susy.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_susy.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_susy.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_text.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_utils.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_utils.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_utils.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/sass/susy/_utils.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/extensions/susy/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/susy/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/bootstrap.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/divisions.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/divisions.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/divisions.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/divisions.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/_yui.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/_yui.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/_yui.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/_yui.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/extensions/yui/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/index.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/src/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/sub_divisions.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/sub_divisions.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/sub_divisions.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/sub_divisions.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/templates.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/templates.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/templates.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/templates.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/test.jpg diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/typography.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/typography.html.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/typography.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/examples/yui/typography.html.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/command_line.feature b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/command_line.feature similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/command_line.feature rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/command_line.feature diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/extensions.feature b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/extensions.feature similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/extensions.feature rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/extensions.feature diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/command_line_steps.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/step_definitions/command_line_steps.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/command_line_steps.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/step_definitions/command_line_steps.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/extension_steps.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/step_definitions/extension_steps.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/extension_steps.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/features/step_definitions/extension_steps.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/_blueprint.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/_blueprint.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_buttons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_colors.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_debug.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_debug.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_form.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_form.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_interaction.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_interaction.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_liquid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_rtl.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_rtl.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_typography.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_typography.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/_utilities.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/index.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/index.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/index.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/index.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/cross.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/cross.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/key.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/key.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/tick.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/buttons/tick.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/buttons/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/doc.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/doc.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/email.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/email.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/external.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/external.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/feed.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/feed.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/im.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/im.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/pdf.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/pdf.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/visited.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/visited.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/xls.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/link_icons/xls.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/link_icons/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/manifest.rb similarity index 95% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/manifest.rb index e637d521..3c101942 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/manifest.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/manifest.rb @@ -7,8 +7,6 @@ stylesheet 'ie.sass', :media => 'screen, projection', :condition => "lt IE 8 image 'grid.png' -html 'welcome.html.haml', :erb => true - help %Q{ Please see the blueprint website for documentation on how blueprint works: diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/partials/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/partials/_base.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/blueprint/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/_compass.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/_compass.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/_compass.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/_compass.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_css3.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_css3.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_layout.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_layout.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_misc.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_misc.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/_utilities.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_clip.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_clip.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_origin.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_origin.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_size.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_background_size.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_border_radius.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_border_radius.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_columns.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_columns.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_font_face.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_font_face.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_gradient.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_inline_block.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_inline_block.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_opacity.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_opacity.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_transform.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_transform.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_transition.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/css3/_transition.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_general.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_general.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_links.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_links.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_lists.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_lists.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_sprites.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_sprites.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_tables.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_tables.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/_text.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_float.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_float.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_min.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_min.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_min.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_min.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/ellipsis.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/ellipsis.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/xml/ellipsis.xml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/ellipsis/xml/ellipsis.xml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/stylesheets/main.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/stylesheets/main.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/extension/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/USAGE.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/USAGE.markdown similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/USAGE.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/USAGE.markdown diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/frameworks/compass/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/actions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/actions.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/actions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/actions.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/merb.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/merb.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb/runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/merb/runtime.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb/runtime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/merb/runtime.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/action_controller.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/action_controller.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/action_controller.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/action_controller.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/configuration_defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/configuration_defaults.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/configuration_defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/configuration_defaults.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/installer.rb similarity index 95% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/installer.rb index c6529d3b..a81e2469 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/installer.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/installer.rb @@ -62,7 +62,7 @@ module Compass print %Q{Compass recommends that you keep your stylesheets in #{recommended_location} instead of the Sass default location of #{default_location}. Is this OK? (Y/n) } - answer = gets.downcase[0] + answer = $stdin.gets.downcase[0] answer == ?n ? default_location : recommended_location end @@ -74,7 +74,8 @@ module Compass instead the Sass default of #{default_location}/. However, if you're exclusively using Sass, then #{default_location}/ is recommended. Emit compiled stylesheets to #{recommended_location}/? (Y/n) } - answer = gets.downcase[0] + answer = $stdin.gets + answer = answer.downcase[0] answer == ?n ? default_location : recommended_location end @@ -92,7 +93,7 @@ module Compass %Q{require 'compass' # If you have any compass plugins, require them here. Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.rb")) - Compass.configuration.environment = RAILS_ENV.to_sym + Compass.configuration.environment = (defined?(Rails) ? Rails.env : RAILS_ENV).to_sym Compass.configure_sass_plugin! } end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/runtime.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/runtime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/runtime.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/sass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/sass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/sass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/sass_plugin.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/templates/compass-install-rails.rb similarity index 81% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/templates/compass-install-rails.rb index dd7d2301..cbd2d6ca 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/templates/compass-install-rails.rb @@ -28,6 +28,15 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # OTHER DEALINGS IN THE SOFTWARE. # ================================================================= + +# Determine if we use sudo, defaults to true unless we are +# on win32, cygwin, or mingw32 or they ask us not to +def sudo_is_an_option? + return false if RUBY_PLATFORM =~ /(win|w)32$/ # true if win32, cygwin or mingw32 + return false if ENV['NO_SUDO'] =~ /true/i + return true +end + puts "===================================================" puts "Welcome to the Compass Installer for Ruby on Rails!" puts "===================================================" @@ -45,29 +54,25 @@ sass_dir = "app/stylesheets" if sass_dir.blank? css_dir = ask("Where would you like Compass to store your compiled css files? (default: 'public/stylesheets/compiled')") css_dir = "public/stylesheets/compiled" if css_dir.blank? +# use sudo for gem commands? +use_sudo = sudo_is_an_option? +if sudo_is_an_option? # dont give them the option if they are on a system that can't use sudo (aka windows) + use_sudo = yes?("Use sudo for the gem commands? (the default for your system is #{sudo_is_an_option? ? 'yes' : 'no'})") +end + # define dependencies gem "haml", :version => ">=2.2.16" gem "compass", :version => ">= 0.8.17" # install and unpack -unless RUBY_PLATFORM =~ /(win|w)32$/ # true if win32, cygwin or mingw32 - rake "gems:install GEM=haml", :sudo => true - rake "gems:install GEM=compass", :sudo => true -else - rake "gems:install GEM=haml" - rake "gems:install GEM=compass" -end +rake "gems:install GEM=haml", :sudo => use_sudo +rake "gems:install GEM=compass", :sudo => use_sudo rake "gems:unpack GEM=compass" # load any compass framework plugins if css_framework =~ /960/ gem "compass-960-plugin", :lib => "ninesixty" - unless RUBY_PLATFORM =~ /(win|w)32$/ - rake "gems:install GEM=compass-960-plugin", :sudo => true - else - rake "gems:install GEM=compass-960-plugin" - end - rake "gems:unpack GEM=compass-960-plugin" + rake "gems:install GEM=compass-960-plugin", :sudo => use_sudo css_framework = "960" # rename for command plugin_require = "-r ninesixty" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/urls.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/urls.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/urls.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/rails/urls.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/configuration_defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone/configuration_defaults.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/configuration_defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone/configuration_defaults.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone/installer.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/app_integration/stand_alone/installer.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/base.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/base.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/create_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/create_project.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/create_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/create_project.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/generate_grid_background.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/generate_grid_background.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/generate_grid_background.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/generate_grid_background.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/help.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/help.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/help.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/help.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/installer_command.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/installer_command.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/installer_command.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/installer_command.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/interactive.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/interactive.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/interactive.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/interactive.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/list_frameworks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/list_frameworks.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/list_frameworks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/list_frameworks.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/print_version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/print_version.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/print_version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/print_version.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/project_base.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/project_base.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_stats.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/project_stats.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_stats.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/project_stats.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/registry.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/registry.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/registry.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/registry.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/stamp_pattern.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/stamp_pattern.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/stamp_pattern.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/stamp_pattern.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/update_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/update_project.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/update_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/update_project.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/validate_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/validate_project.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/validate_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/validate_project.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/watch_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/watch_project.rb similarity index 53% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/watch_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/watch_project.rb index 96b291bb..5158e7b4 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/watch_project.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/watch_project.rb @@ -5,6 +5,25 @@ require 'compass/commands/update_project' module Compass module Commands + module WatchProjectOptionsParser + def set_options(opts) + super + + opts.banner = %Q{ + Usage: compass watch [path/to/project] [path/to/project/src/file.sass ...] [options] + + Description: + watch the project for changes and recompile when they occur. + + Options: + }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n") + + opts.on("--poll", :NONE, "Check periodically if there's been changes.") do + self.options[:poll] = 1 # check every 1 second. + end + + end + end class WatchProject < UpdateProject register :watch @@ -19,19 +38,29 @@ module Compass recompile - puts ">>> Compass is watching for changes. Press Ctrl-C to Stop." - begin require 'fssm' rescue LoadError - $: << File.join(Compass.lib_directory, 'vendor') + $: << File.join(Compass.lib_directory, 'vendor', 'fssm') retry end + if options[:poll] + require "fssm/backends/polling" + # have to silence the ruby warning about chaning a constant. + stderr, $stderr = $stderr, StringIO.new + FSSM::Backends.const_set("Default", FSSM::Backends::Polling) + $stderr = stderr + end + + action = FSSM::Backends::Default.to_s == "FSSM::Backends::Polling" ? "polling" : "watching" + + puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop." + FSSM.monitor do |monitor| Compass.configuration.sass_load_paths.each do |load_path| monitor.path load_path do |path| - path.glob '**/*.sass' + path.glob '**/*.s[ac]ss' path.update &method(:recompile) path.delete {|base, relative| remove_obsolete_css(base,relative); recompile(base, relative)} @@ -66,6 +95,15 @@ module Compass end end + class << self + def option_parser(arguments) + parser = Compass::Exec::CommandOptionParser.new(arguments) + parser.extend(Compass::Exec::GlobalOptionsParser) + parser.extend(Compass::Exec::ProjectOptionsParser) + parser.extend(CompileProjectOptionsParser) + parser.extend(WatchProjectOptionsParser) + end + end end end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/write_configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/write_configuration.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/write_configuration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/commands/write_configuration.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/compiler.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/compiler.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/compiler.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/compiler.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration.rb similarity index 96% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration.rb index ac4aaf7f..c6ca3e6a 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration.rb @@ -41,6 +41,6 @@ module Compass end end -['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'data'].each do |lib| +['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'paths', 'data'].each do |lib| require "compass/configuration/#{lib}" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/adapters.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/adapters.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/adapters.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/adapters.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/comments.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/comments.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/comments.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/comments.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/data.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/data.rb similarity index 97% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/data.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/data.rb index 6b0db638..abdb82ff 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/data.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/data.rb @@ -22,10 +22,13 @@ module Compass include Compass::Configuration::Inheritance include Compass::Configuration::Serialization include Compass::Configuration::Adapters + extend Compass::Configuration::Paths inherited_accessor *ATTRIBUTES inherited_accessor :required_libraries #XXX we should make this array add up cumulatively. + strip_trailing_separator *ATTRIBUTES.select{|a| a.to_s =~ /dir|path/} + def initialize(name, attr_hash = nil) raise "I need a name!" unless name @name = name diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/defaults.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/defaults.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/helpers.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/inheritance.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/inheritance.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/inheritance.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/inheritance.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/paths.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/paths.rb new file mode 100644 index 00000000..01d9cd92 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/paths.rb @@ -0,0 +1,19 @@ +module Compass::Configuration::Paths + + TRAILING_SEPARATOR = %r{.(/|#{Regexp.escape(File::SEPARATOR)})$} + + def strip_trailing_separator(*attributes) + attributes.each do |attr| + alias_method "#{attr}_with_trailing_separator".to_sym, attr + class_eval %Q{ + def #{attr} # def css_dir + path = #{attr}_with_trailing_separator # path = css_dir_with_trailing_separator + if path =~ TRAILING_SEPARATOR # if path =~ TRAILING_SEPARATOR + path = path[0..-($1.length+1)] # path = path[0..-($1.length+1)] + end # end + path # path + end # end + } + end + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/serialization.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/serialization.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/serialization.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/configuration/serialization.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/core_ext.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/core_ext.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/core_ext.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/core_ext.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/dependencies.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/dependencies.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/dependencies.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/dependencies.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/errors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/errors.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/errors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/errors.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec.rb similarity index 80% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec.rb index 2547d376..664db9d4 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec.rb @@ -5,6 +5,8 @@ require 'compass/errors' require 'compass/actions' require 'compass/installers' require 'compass/commands' +require 'rbconfig' +require 'win32console' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ module Compass::Exec end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/command_option_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/command_option_parser.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/command_option_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/command_option_parser.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/global_options_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/global_options_parser.rb similarity index 89% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/global_options_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/global_options_parser.rb index 955ee8e0..c3ad7f1a 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/global_options_parser.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/global_options_parser.rb @@ -27,6 +27,10 @@ module Compass::Exec::GlobalOptionsParser self.options[:dry_run] = true end + opts.on('--boring', :NONE, 'Turn off colorized output.') do + self.options[:color_output] = false + end + opts.on_tail("-?", "-h", "--help", "Show this message") do puts opts exit diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/helpers.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/project_options_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/project_options_parser.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/project_options_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/project_options_parser.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/sub_command_ui.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/sub_command_ui.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/sub_command_ui.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/sub_command_ui.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/switch_ui.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/switch_ui.rb similarity index 97% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/switch_ui.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/switch_ui.rb index 384092cd..818946d5 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/switch_ui.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/exec/switch_ui.rb @@ -154,6 +154,10 @@ END self.options[:command] = :print_version end + opts.on('--boring', :NONE, 'Turn off colorized output.') do + self.options[:color_output] = false + end + end def do_command(command) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/frameworks.rb similarity index 97% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/frameworks.rb index b818b715..bfe821f8 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/frameworks.rb @@ -3,7 +3,7 @@ module Compass extend self ALL = [] - DEFAULT_FRAMEWORKS_PATH = File.join(Compass.lib_directory, 'compass', 'frameworks') + DEFAULT_FRAMEWORKS_PATH = File.join(Compass.base_directory, 'frameworks') class Framework attr_accessor :name diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/grid_builder.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/grid_builder.rb similarity index 89% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/grid_builder.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/grid_builder.rb index 981769fe..7adc3df1 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/grid_builder.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/grid_builder.rb @@ -15,7 +15,7 @@ module Compass class << self def crc(chunkdata='') - chunkdata.bytes.to_a.inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte) & 0xff] ^ (crc >> 8) } ^ 0xffffffff + chunkdata.unpack('C*').inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte) & 0xff] ^ (crc >> 8) } ^ 0xffffffff end def chunk(type, data="") @@ -64,14 +64,17 @@ module Compass # * :height -- Height (in pixels) of a row # * :filename -- Output path of grid.png file def initialize(options={}) - @column_width = options[:column_width] - gutter_width = options[:gutter_width] + @column_width = options[:column_width] || 0 + gutter_width = options[:gutter_width] || 0 height = options[:height] || 20 + width = @column_width + gutter_width + width = 10 if width == 0 + @filename = options[:filename] @options = options - super(@column_width + gutter_width, height, [0xe9,0xe9,0xe9]) + super(width, height, [0xe9,0xe9,0xe9]) end def working_path diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/bare_installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/bare_installer.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/bare_installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/bare_installer.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/base.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/base.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/manifest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest_installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/manifest_installer.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest_installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/manifest_installer.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/template_context.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/template_context.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/template_context.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/installers/template_context.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/logger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/logger.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/logger.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/logger.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/color_stop.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/color_stop.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/color_stop.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/color_stop.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/display.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/display.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/display.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/display.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/enumerate.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/enumerate.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/enumerate.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/enumerate.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/font_files.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/font_files.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/font_files.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/font_files.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/inline_image.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/inline_image.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/inline_image.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/inline_image.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/selectors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/selectors.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/selectors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/selectors.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/urls.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/urls.rb similarity index 98% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/urls.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/urls.rb index 4b15c56b..00ec2c16 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/urls.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/functions/urls.rb @@ -116,7 +116,7 @@ module Compass::SassExtensions::Functions::Urls def default_cache_buster(path, real_path) if File.readable?(real_path) - File.mtime(real_path).strftime("%s") + File.mtime(real_path).to_i.to_s else $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/traversal.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches/traversal.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/traversal.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/sass_extensions/monkey_patches/traversal.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/stats.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/stats.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/stats.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/stats.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/test_case.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/test_case.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/test_case.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/test_case.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/validator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/validator.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/validator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/validator.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/version.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/compass/version.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm.rb similarity index 72% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm.rb index e2709279..058cbf3c 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm.rb @@ -12,15 +12,7 @@ module FSSM def monitor(*args, &block) monitor = FSSM::Monitor.new - context = args.empty? ? monitor : monitor.path(*args) - - if block_given? - if block.arity == 1 - block.call(context) - else - context.instance_eval(&block) - end - end + FSSM::Support.use_block(args.empty? ? monitor : monitor.path(*args), block) monitor.run end @@ -33,7 +25,8 @@ require 'fssm/pathname' require 'fssm/support' require 'fssm/tree' require 'fssm/path' -require 'fssm/state' +require 'fssm/state/directory' +require 'fssm/state/file' require 'fssm/monitor' require "fssm/backends/#{FSSM::Support.backend.downcase}" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/fsevents.rb similarity index 67% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/fsevents.rb index bb33c598..800cebd1 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/fsevents.rb @@ -7,18 +7,17 @@ module FSSM::Backends @fsevents = [] end - def add_path(path, preload=true) - handler = FSSM::State.new(path) - @handlers["#{path}"] = handler + def add_handler(handler, preload=true) + @handlers[handler.path.to_s] = handler - fsevent = Rucola::FSEvents.new("#{path}", {:latency => 0.5}) do |events| + fsevent = Rucola::FSEvents.new(handler.path.to_s, {:latency => 0.5}) do |events| events.each do |event| handler.refresh(event.path) end end fsevent.create_stream - handler.refresh(path.to_pathname, true) if preload + handler.refresh(nil, true) if preload fsevent.start @fsevents << fsevent end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/inotify.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/inotify.rb similarity index 58% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/inotify.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/inotify.rb index 5a9736f0..dc9079cf 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/inotify.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/inotify.rb @@ -4,14 +4,12 @@ module FSSM::Backends @notifier = INotify::Notifier.new end - def add_path(path, preload=true) - handler = FSSM::State.new(path) - - @notifier.watch(path.to_s, :all_events) do |event| + def add_handler(handler, preload=true) + @notifier.watch(handler.path.to_s, :all_events) do |event| handler.refresh(event.name) end - handler.refresh(path.to_pathname, true) if preload + handler.refresh(nil, true) if preload end def run diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/polling.rb similarity index 77% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/polling.rb index f80dc168..083cf07b 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/polling.rb @@ -5,9 +5,8 @@ module FSSM::Backends @latency = options[:latency] || 1.5 end - def add_path(path, preload=true) - handler = FSSM::State.new(path) - handler.refresh(path.to_pathname, true) if preload + def add_handler(handler, preload=true) + handler.refresh(nil, true) if preload @handlers << handler end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/rubycocoa/fsevents.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/rubycocoa/fsevents.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/rubycocoa/fsevents.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/backends/rubycocoa/fsevents.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/monitor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/monitor.rb new file mode 100644 index 00000000..d7f7468d --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/monitor.rb @@ -0,0 +1,26 @@ +class FSSM::Monitor + def initialize(options={}) + @options = options + @backend = FSSM::Backends::Default.new + end + + def path(*args, &block) + path = FSSM::Path.new(*args) + FSSM::Support.use_block(path, block) + + @backend.add_handler(FSSM::State::Directory.new(path)) + path + end + + def file(*args, &block) + path = FSSM::Path.new(*args) + FSSM::Support.use_block(path, block) + + @backend.add_handler(FSSM::State::File.new(path)) + path + end + + def run + @backend.run + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/path.rb similarity index 95% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/path.rb index 1264809c..101dd103 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/path.rb @@ -81,7 +81,7 @@ class FSSM::Path def set_path(path) path = FSSM::Pathname.for(path) - raise FSSM::FileNotFoundError, "#{path}" unless path.exist? + raise FSSM::FileNotFoundError, "No such file or directory - #{path}" unless path.exist? @path = path.expand_path end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/pathname.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/pathname.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/pathname.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/pathname.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/directory.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/directory.rb new file mode 100644 index 00000000..de701e6a --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/directory.rb @@ -0,0 +1,57 @@ +module FSSM::State + class Directory + attr_reader :path + + 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 +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/file.rb new file mode 100644 index 00000000..ec601f81 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/state/file.rb @@ -0,0 +1,24 @@ +module FSSM::State + class File + attr_reader :path + + def initialize(path) + @path = path + end + + def refresh(base=nil, skip_callbacks=false) + base ||= @path.to_pathname + used_to_exist, @exists = @exists, base.exists? + # this handles bad symlinks without failing. why handle bad symlinks at + # all? well, we could still be interested in their creation and deletion. + old_mtime, @mtime = @mtime, base.symlink? ? Time.at(0) : base.mtime if @exists + + unless skip_callbacks + @path.delete(@path.to_s) if used_to_exist && !@exists + @path.create(@path.to_s) if !used_to_exist && @exists + @path.update(@path.to_s) if used_to_exist && @exists && old_mtime != @mtime + end + end + + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/support.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/support.rb similarity index 69% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/support.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/support.rb index 8e2b8850..4aa7b486 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/support.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/support.rb @@ -37,15 +37,23 @@ module FSSM::Support end def rb_inotify? - begin - require 'rubygems' - gem 'rb-inotify', '>= 0.3.0' + found = begin require 'rb-inotify' - true - rescue LoadError, Gem::LoadError - STDERR.puts("Warning: Unable to load rb-inotify >= 0.3.0. Inotify will be unavailable.") + INotify::Notifier.ancestors.include?(IO) + rescue LoadError false end + STDERR.puts("Warning: Unable to load rb-inotify >= 0.3.0. Inotify will be unavailable.") unless found + found + end + + def use_block(context, block) + return if block.nil? + if block.arity == 1 + block.call(context) + else + context.instance_eval(&block) + end end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/tree.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/tree.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/tree.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/lib/vendor/fssm/fssm/tree.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_helper.rb similarity index 86% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_helper.rb index a3363aa4..b6b47825 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_helper.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_helper.rb @@ -7,7 +7,7 @@ module Compass::CommandLineHelper if block_given? responder = Responder.new yield responder - IO.popen("-", "w+") do |io| + IO.popen("-", "r+") do |io| if io #parent process output = "" @@ -26,6 +26,7 @@ module Compass::CommandLineHelper prompt = output.split("\n").last.strip if response = responder.response_for(prompt) io.puts response + io.flush end end end @@ -60,7 +61,14 @@ module Compass::CommandLineHelper @responses << Response.new(prompt, options[:with], options[:required]) end def response_for(prompt) - response = @responses.detect{|r| r.prompt == prompt} + response = @responses.detect do |r| + case r.prompt + when Regexp + prompt =~ r.prompt + when String + r.prompt == prompt + end + end if response response.responded = true response.text @@ -84,7 +92,7 @@ module Compass::CommandLineHelper end message = "Action #{action.inspect} was not performed on: #{path}." message += "The following actions were performed: #{actions_found.map{|a|a.inspect}.join(", ")}" if actions_found.any? - puts @last_result + # puts @last_result fail message end @@ -100,6 +108,8 @@ module Compass::CommandLineHelper def execute(*arguments) command_line_class = Compass::Exec::Helpers.select_appropriate_command_line_ui(arguments) - command_line_class.new(arguments).run! + exit_code = command_line_class.new(arguments).run! + # fail "Command Failed with exit code: #{exit_code}" unless exit_code == 0 + exit_code end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_test.rb similarity index 81% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_test.rb index d99f7378..456e635f 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/command_line_test.rb @@ -25,7 +25,7 @@ class CommandLineTest < Test::Unit::TestCase def test_basic_install within_tmp_directory do - compass "basic" + compass "--boring", "basic" assert File.exists?("basic/src/screen.sass") assert File.exists?("basic/stylesheets/screen.css") assert_action_performed :directory, "basic/" @@ -35,11 +35,11 @@ class CommandLineTest < Test::Unit::TestCase end end - def test_framework_installs - Compass::Frameworks::ALL.each do |framework| + Compass::Frameworks::ALL.each do |framework| + define_method "test_#{framework.name}_installation" do within_tmp_directory do - compass *%W(--framework #{framework.name} #{framework.name}_project) - assert File.exists?("#{framework.name}_project/src/screen.sass") + compass *%W(--boring --framework #{framework.name} #{framework.name}_project) + assert File.exists?("#{framework.name}_project/src/screen.sass"), "src/screen.sass is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}" assert File.exists?("#{framework.name}_project/stylesheets/screen.css") assert_action_performed :directory, "#{framework.name}_project/" assert_action_performed :create, "#{framework.name}_project/src/screen.sass" @@ -51,13 +51,13 @@ class CommandLineTest < Test::Unit::TestCase def test_basic_update within_tmp_directory do - compass "basic" + compass "--boring", "basic" Dir.chdir "basic" do # basic update with timestamp caching - compass + compass "--boring" assert_action_performed :unchanged, "src/screen.sass" # basic update with force option set - compass "--force" + compass "--force", "--boring" assert_action_performed :compile, "src/screen.sass" assert_action_performed :identical, "stylesheets/screen.css" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_png_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/compass_png_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_png_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/compass_png_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/compass_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/compass_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/configuration_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/configuration_test.rb similarity index 83% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/configuration_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/configuration_test.rb index c53a625b..d13c528e 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/configuration_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/configuration_test.rb @@ -120,4 +120,29 @@ EXPECTED assert_equal expected_serialization, Compass.configuration.serialize end + def test_strip_trailing_directory_separators + contents = StringIO.new(<<-CONFIG) + css_dir = "css/" + sass_dir = "sass/" + images_dir = "images/" + javascripts_dir = "js/" + fonts_dir = "fonts/" + extensions_dir = "extensions/" + css_path = "css/" + sass_path = "sass/" + images_path = "images/" + javascripts_path = "js/" + fonts_path = "fonts/" + extensions_path = "extensions/" + CONFIG + + Compass.add_configuration(contents, "test_strip_trailing_directory_separators") + + assert_equal "css", Compass.configuration.css_dir + assert_equal "sass", Compass.configuration.sass_dir + assert_equal "images", Compass.configuration.images_dir + assert_equal "js", Compass.configuration.javascripts_dir + assert_equal "fonts", Compass.configuration.fonts_dir + assert_equal "extensions", Compass.configuration.extensions_dir + end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/css/typography.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/css/typography.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/css/typography.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/css/typography.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/typography.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/blueprint/sass/typography.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/layout.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/layout.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/layout.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/layout.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/print.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/print.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/print.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/print.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/reset.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/reset.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/reset.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/reset.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/utilities.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/utilities.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/utilities.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/css/utilities.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/layout.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/layout.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/layout.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/layout.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/reset.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/reset.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/compass/sass/utilities.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/css/screen.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/css/screen.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/css/screen.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/css/screen.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/images/grid.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/image_urls/sass/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/assets/images/testing.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/assets/images/testing.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/assets/images/testing.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/assets/images/testing.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/config.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/config.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/ie.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/ie.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/ie.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/ie.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/print.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/print.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/print.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/print.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/screen.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/screen.css similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/screen.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/css/screen.css diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/ie.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/print.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/fixtures/stylesheets/relative/sass/screen.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/io_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/io_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/io_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/io_helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/rails_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/rails_helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_integration_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/rails_integration_test.rb similarity index 68% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_integration_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/rails_integration_test.rb index a46fd2f1..4cde55eb 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_integration_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/rails_integration_test.rb @@ -15,18 +15,22 @@ class RailsIntegrationTest < Test::Unit::TestCase end def test_rails_install - within_tmp_directory do + # within_tmp_directory do + begin generate_rails_app_directories("compass_rails") Dir.chdir "compass_rails" do - compass("--rails", '--trace', ".") do |responder| - responder.respond_to "Is this OK? (Y/n)", :with => "Y", :required => true - responder.respond_to "Emit compiled stylesheets to public/stylesheets/compiled/? (Y/n)", :with => "Y", :required => true + compass(*%w(--rails --trace --boring .)) do |responder| + responder.respond_to %r{^\s*Is this OK\? \(Y/n\)\s*$}, :with => "Y", :required => true + responder.respond_to %r{^\s*Emit compiled stylesheets to public/stylesheets/compiled/\? \(Y/n\)\s*$}, :with => "Y", :required => true end # puts ">>>#{@last_result}<<<" assert_action_performed :create, "./app/stylesheets/screen.sass" assert_action_performed :create, "./config/initializers/compass.rb" end + ensure + FileUtils.rm_rf "compass_rails" end + #end rescue LoadError puts "Skipping rails test. Couldn't Load rails" end @@ -35,7 +39,7 @@ class RailsIntegrationTest < Test::Unit::TestCase within_tmp_directory do generate_rails_app_directories("compass_rails") Dir.chdir "compass_rails" do - compass(*%w(--rails --trace --sass-dir app/stylesheets --css-dir public/stylesheets/compiled .)) + compass(*%w(--rails --trace --boring --sass-dir app/stylesheets --css-dir public/stylesheets/compiled .)) assert_action_performed :create, "./app/stylesheets/screen.sass" assert_action_performed :create, "./config/initializers/compass.rb" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/sass_extensions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/sass_extensions_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/sass_extensions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/sass_extensions_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_case_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_case_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_case_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_case_helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_rails_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_rails_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_rails_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre5/test/test_rails_helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README deleted file mode 100644 index fd142ea7..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README +++ /dev/null @@ -1,197 +0,0 @@ -NAME - configuration.rb - -SYNOPSIS - pure ruby scoped configuration files - -DESCRIPTION - configuration.rb provides a mechanism for configuring ruby programs with - ruby configuration files. a configuration.rb file, for example - 'config/app.rb', can be written simply as - - Configuration.for('app'){ - key 'value' - foo 'bar' - port 42 - } - - and loaded via the normal ruby require/load mechanism - - Kernel.load 'config/app.rb' - - or with a slightly augmented loading mechnanism which simply searches an - extra set of paths in *addition* to the standard ones - - Configuration.path = %w( config configuration ) - - Configuration.load 'app' - - configurations are completely open - - Configuration.for('app'){ - object_id 'very open' - } - - support arbitrarily nested values - - Configuration.for('app'){ - a { b { c { d 42 } } } - } - - c = Configuration.for 'app' - - p c.a.b.c.d #=> 42 - - allow POLS scoped lookup of vars - - Configuration.for('config'){ - outer 'bar' - - inner { - value 42 - } - } - - c = Configuration.for 'config' - - p c.outer #=> 'bar' - p c.inner.value #=> 42 - p c.inner.outer #=> 'bar' - - - and not a whole lot else - configuration.rb is s very small library - consisting of one file and < 150 loc - -SAMPLES - - <========< samples/a.rb >========> - - ~ > cat samples/a.rb - - # - # basic usage is quite, simple, load the config and use it's values. the - # config syntax is fairly obvious, i think, but note that it *is* ruby and any - # ruby can be included. also note that each config is named, allowing - # multiple configs to be places in one file - # - require 'configuration' - - c = Configuration.load 'a' - - p c.a + c.b - c.c - - ~ > ruby samples/a.rb - - 42 - - - <========< samples/b.rb >========> - - ~ > cat samples/b.rb - - # - # configuration.rb supports a very natural nesting syntax. note how values - # are scoped in a POLS fashion - # - require 'configuration' - - c = Configuration.for 'b' - - p c.www.url - p c.db.url - p c.mail.url - - ~ > ruby samples/b.rb - - "http://codeforpeople.com:80" - "db://codeforpeople.com:5342" - "mail://gmail.com:25" - - - <========< samples/c.rb >========> - - ~ > cat samples/c.rb - - # - # configuration.rb let's you keep code very dry. - # - - require 'configuration' - - Configuration.load 'c' - - p Configuration.for('development').db - p Configuration.for('production').db - p Configuration.for('testing').db - - ~ > ruby samples/c.rb - - "db/development" - "db/production" - "db/testing" - - - <========< samples/d.rb >========> - - ~ > cat samples/d.rb - - # - # configuration.rb makes use of an external blank slate dsl, this means that - # you Configuration objects do, in fact, have all built-in ruby methods such - # as #inspect, etc, *unless* you configure over the top of them. the effect - # is a configuration object that behaves like a nice ruby object, but which - # allows *any* key to be configured - # - require 'configuration' - - c = Configuration.for 'd' - - p c.object_id - p c.inspect - p c.p - - ~ > ruby samples/d.rb - - config/d.rb:2:in `object_id': wrong number of arguments (1 for 0) (ArgumentError) - from config/d.rb:2 - from ./lib/configuration.rb:159:in `instance_eval' - from ./lib/configuration.rb:159:in `call' - from ./lib/configuration.rb:159:in `method_missing' - from ./lib/configuration.rb:105:in `evaluate' - from ./lib/configuration.rb:68:in `initialize' - from ./lib/configuration.rb:29:in `new' - from ./lib/configuration.rb:29:in `for' - from config/d.rb:1 - from ./lib/configuration.rb:53:in `load' - from ./lib/configuration.rb:53:in `load' - from ./lib/configuration.rb:31:in `for' - from samples/d.rb:10 - - - <========< samples/e.rb >========> - - ~ > cat samples/e.rb - - # - # configuration.rb uses a totally clean slate dsl for the block. if you need - # to access base Object methods you can do this - # - - require 'configuration' - - c = Configuration.for 'e' - - p c.foo - p c.bar - p c.foobar - - ~ > ruby samples/e.rb - - 42 - "forty-two" - 42.0 - - - -AUTHOR - ara.t.howard@gmail.com diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README.erb deleted file mode 100644 index 28159dae..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README.erb +++ /dev/null @@ -1,69 +0,0 @@ -NAME - configuration.rb - -SYNOPSIS - pure ruby scoped configuration files - -DESCRIPTION - configuration.rb provides a mechanism for configuring ruby programs with - ruby configuration files. a configuration.rb file, for example - 'config/app.rb', can be written simply as - - Configuration.for('app'){ - key 'value' - foo 'bar' - port 42 - } - - and loaded via the normal ruby require/load mechanism - - Kernel.load 'config/app.rb' - - or with a slightly augmented loading mechnanism which simply searches an - extra set of paths in *addition* to the standard ones - - Configuration.path = %w( config configuration ) - - Configuration.load 'app' - - configurations are completely open - - Configuration.for('app'){ - object_id 'very open' - } - - support arbitrarily nested values - - Configuration.for('app'){ - a { b { c { d 42 } } } - } - - c = Configuration.for 'app' - - p c.a.b.c.d #=> 42 - - allow POLS scoped lookup of vars - - Configuration.for('config'){ - outer 'bar' - - inner { - value 42 - } - } - - c = Configuration.for 'config' - - p c.outer #=> 'bar' - p c.inner.value #=> 42 - p c.inner.outer #=> 'bar' - - - and not a whole lot else - configuration.rb is s very small library - consisting of one file and < 150 loc - -SAMPLES -<%= samples %> - -AUTHOR - ara.t.howard@gmail.com diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/Rakefile deleted file mode 100644 index a155f9c2..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/Rakefile +++ /dev/null @@ -1,241 +0,0 @@ -This.author = "Ara T. Howard" -This.email = "ara.t.howard@gmail.com" -This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master" -This.rubyforge_project = 'codeforpeople' - -task :default do - puts(Rake::Task.tasks.map{|task| task.name} - ['default']) -end - -task :spec do - require 'spec/rake/spectask' - Spec::Rake::SpecTask.new do |t| - t.spec_files = FileList['spec/*_spec.rb'] - end -end - -task :gemspec do - ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem' - ignore_directories = 'pkg' - ignore_files = 'test/log' - - shiteless = - lambda do |list| - list.delete_if do |entry| - next unless test(?e, entry) - extension = File.basename(entry).split(%r/[.]/).last - ignore_extensions.any?{|ext| ext === extension} - end - list.delete_if do |entry| - next unless test(?d, entry) - dirname = File.expand_path(entry) - ignore_directories.any?{|dir| File.expand_path(dir) == dirname} - end - list.delete_if do |entry| - next unless test(?f, entry) - filename = File.expand_path(entry) - ignore_files.any?{|file| File.expand_path(file) == filename} - end - end - - lib = This.lib - version = This.version - files = shiteless[Dir::glob("**/**")] - executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)} - has_rdoc = true #File.exist?('doc') - test_files = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb") - - extensions = This.extensions - if extensions.nil? - %w( Makefile configure extconf.rb ).each do |ext| - extensions << ext if File.exists?(ext) - end - end - extensions = [extensions].flatten.compact - - template = - if test(?e, 'gemspec.erb') - Template{ IO.read('gemspec.erb') } - else - Template { - <<-__ - ## #{ lib }.gemspec - # - - Gem::Specification::new do |spec| - spec.name = #{ lib.inspect } - spec.version = #{ version.inspect } - spec.platform = Gem::Platform::RUBY - spec.summary = #{ lib.inspect } - - spec.files = #{ files.inspect } - spec.executables = #{ executables.inspect } - - <% if test(?d, 'lib') %> - spec.require_path = "lib" - <% end %> - - spec.has_rdoc = #{ has_rdoc.inspect } - spec.test_files = #{ test_files.inspect } - #spec.add_dependency 'lib', '>= version' - #spec.add_dependency 'fattr' - - spec.extensions.push(*#{ extensions.inspect }) - - spec.rubyforge_project = #{ This.rubyforge_project.inspect } - spec.author = #{ This.author.inspect } - spec.email = #{ This.email.inspect } - spec.homepage = #{ This.homepage.inspect } - end - __ - } - end - - open("#{ lib }.gemspec", "w"){|fd| fd.puts template} - This.gemspec = "#{ lib }.gemspec" -end - -task :gem => [:clean, :gemspec] do - Fu.mkdir_p This.pkgdir - before = Dir['*.gem'] - cmd = "gem build #{ This.gemspec }" - `#{ cmd }` - after = Dir['*.gem'] - gem = ((after - before).first || after.first) or abort('no gem!') - Fu.mv gem, This.pkgdir - This.gem = File.basename(gem) -end - -task :readme do - samples = '' - prompt = '~ > ' - lib = This.lib - version = This.version - - Dir['sample*/*'].sort.each do |sample| - samples << "\n" << " <========< #{ sample } >========>" << "\n\n" - - cmd = "cat #{ sample }" - samples << Util.indent(prompt + cmd, 2) << "\n\n" - samples << Util.indent(`#{ cmd }`, 4) << "\n" - - cmd = "ruby #{ sample }" - samples << Util.indent(prompt + cmd, 2) << "\n\n" - - cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -Ilib -Iconfig #{ sample })'" - samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n" - end - - template = - if test(?e, 'readme.erb') - Template{ IO.read('readme.erb') } - else - Template { - <<-__ - NAME - #{ lib } - - DESCRIPTION - - INSTALL - gem install #{ lib } - - SAMPLES - #{ samples } - __ - } - end - - open("README", "w"){|fd| fd.puts template} -end - - -task :clean do - Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)} -end - - -task :release => [:clean, :gemspec, :gem] do - gems = Dir[File.join(This.pkgdir, '*.gem')].flatten - raise "which one? : #{ gems.inspect }" if gems.size > 1 - raise "no gems?" if gems.size < 1 - cmd = "rubyforge login && rubyforge add_release #{ This.rubyforge_project } #{ This.lib } #{ This.version } #{ This.pkgdir }/#{ This.gem }" - puts cmd - system cmd -end - - - - - -BEGIN { - $VERBOSE = nil - - require 'ostruct' - require 'erb' - require 'fileutils' - - Fu = FileUtils - - This = OpenStruct.new - - This.file = File.expand_path(__FILE__) - This.dir = File.dirname(This.file) - This.pkgdir = File.join(This.dir, 'pkg') - - lib = ENV['LIB'] - unless lib - lib = File.basename(Dir.pwd) - end - This.lib = lib - - version = ENV['VERSION'] - unless version - name = lib.capitalize - library = "./lib/#{ lib }.rb" - program = "./bin/#{ lib }" - if test(?e, library) - require library - version = eval(name).send(:version) - elsif test(?e, program) - version = `#{ program } --version`.strip - end - abort('no version') if(version.nil? or version.empty?) - end - This.version = version - - abort('no lib') unless This.lib - abort('no version') unless This.version - - module Util - def indent(s, n = 2) - s = unindent(s) - ws = ' ' * n - s.gsub(%r/^/, ws) - end - - def unindent(s) - indent = nil - s.each do |line| - next if line =~ %r/^\s*$/ - indent = line[%r/^\s*/] and break - end - indent ? s.gsub(%r/^#{ indent }/, "") : s - end - extend self - end - - class Template - def initialize(&block) - @block = block - @template = block.call.to_s - end - def expand(b=nil) - ERB.new(Util.unindent(@template)).result(b||@block) - end - alias_method 'to_s', 'expand' - end - def Template(*args, &block) Template.new(*args, &block) end - - Dir.chdir(This.dir) -} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/a.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/a.rb deleted file mode 100644 index fdcdac6f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/a.rb +++ /dev/null @@ -1,5 +0,0 @@ -Configuration.for('a'){ - a 40 - b 4 - c 2 -} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/b.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/b.rb deleted file mode 100644 index 7c41f195..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/b.rb +++ /dev/null @@ -1,19 +0,0 @@ -Configuration.for('b'){ - host "codeforpeople.com" - - www { - port 80 - url "http://#{ host }:#{ port }" - } - - db { - port 5342 - url "db://#{ host }:#{ port }" - } - - mail { - host "gmail.com" - port 25 - url "mail://#{ host }:#{ port }" - } -} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/c.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/c.rb deleted file mode 100644 index 63a769ae..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/c.rb +++ /dev/null @@ -1,8 +0,0 @@ -%w( development production testing ).each do |environment| - - Configuration.for(environment){ - adapter "sqlite3" - db "db/#{ environment }" - } - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/d.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/d.rb deleted file mode 100644 index 9cda1011..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/d.rb +++ /dev/null @@ -1,5 +0,0 @@ -Configuration.for('d'){ - object_id 42 - inspect 'forty-two' - p 42.0 -} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/e.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/e.rb deleted file mode 100644 index f458940e..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/e.rb +++ /dev/null @@ -1,13 +0,0 @@ -Configuration.for('e'){ - foo 42 - - if Send('respond_to?', 'foo') - bar 'forty-two' - end - - respond_to = Method('bar') - - if respond_to.call() - foobar 42.0 - end -} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/configuration.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/configuration.gemspec deleted file mode 100644 index e64f2247..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/configuration.gemspec +++ /dev/null @@ -1,28 +0,0 @@ -## configuration.gemspec -# - -Gem::Specification::new do |spec| - spec.name = "configuration" - spec.version = "1.1.0" - spec.platform = Gem::Platform::RUBY - spec.summary = "configuration" - - spec.files = ["config", "config/a.rb", "config/b.rb", "config/c.rb", "config/d.rb", "config/e.rb", "configuration.gemspec", "lib", "lib/configuration.rb", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb"] - spec.executables = [] - - - spec.require_path = "lib" - - - spec.has_rdoc = true - spec.test_files = nil - #spec.add_dependency 'lib', '>= version' - #spec.add_dependency 'fattr' - - spec.extensions.push(*[]) - - spec.rubyforge_project = "codeforpeople" - spec.author = "Ara T. Howard" - spec.email = "ara.t.howard@gmail.com" - spec.homepage = "http://github.com/ahoward/configuration/tree/master" -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/lib/configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/lib/configuration.rb deleted file mode 100644 index 1e5308f6..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/lib/configuration.rb +++ /dev/null @@ -1,199 +0,0 @@ -class Configuration - Configuration::Version = '1.1.0' - def Configuration.version() Configuration::Version end - - Path = [ - if defined? CONFIGURATION_PATH - CONFIGURATION_PATH - else - ENV['CONFIGURATION_PATH'] - end - ].compact.flatten.join(File::PATH_SEPARATOR).split(File::PATH_SEPARATOR) - - Table = Hash.new - Error = Class.new StandardError - Import = Class.new Error - - module ClassMethods - def for name, options = nil, &block - name = name.to_s - if Table.has_key?(name) - if options or block - configuration = Table[name] - Table[name] = DSL.evaluate(configuration, options || {}, &block) - else - Table[name] - end - else - if options or block - Table[name] = new name, options || {}, &block - else - load name - end - end - end - - def path *value - return self.path = value.first unless value.empty? - Path - end - - def path= value - Path.clear - Path.replace [value].compact.flatten.join(File::PATH_SEPARATOR).split(File::PATH_SEPARATOR) - end - - def load name - name = name.to_s - name = name + '.rb' unless name[%r/\.rb$/] - key = name.sub %r/\.rb$/, '' - load_path = $LOAD_PATH.dup - begin - $LOAD_PATH.replace(path + load_path) - ::Kernel.load name - ensure - $LOAD_PATH.replace load_path - end - Table[key] - end - end - send :extend, ClassMethods - - module InstanceMethods - attr 'name' - - def initialize *argv, &block - options = Hash === argv.last ? argv.pop : Hash.new - @name = argv.shift - DSL.evaluate(self, options, &block) - end - - def method_missing m, *a, &b - return(Pure[@__parent].send m, *a, &b) rescue super if @__parent - super - end - end - send :include, InstanceMethods - - class DSL - Protected = %r/^__|^object_id$/ - - instance_methods.each do |m| - undef_method m unless m[Protected] - end - - Kernel.methods.each do |m| - next if m[Protected] - module_eval <<-code - def #{ m }(*a, &b) - method_missing '#{ m }', *a, &b - end - code - end - - def Send(m, *a, &b) - Method(m).call(*a, &b) - end - - def Method m - @__configuration.method(m) - end - - def self.evaluate configuration, options = {}, &block - dsl = new configuration - Pure[dsl].instance_eval(&block) if block - options.each{|key, value| Pure[dsl].send key, value} - Pure[dsl].instance_eval{ @__configuration } - end - - def initialize configuration, &block - @__configuration = configuration - @__singleton_class = - class << @__configuration - self - end - end - - def __configuration__ - @__configuration - end - - undef_method(:method_missing) rescue nil - def method_missing(m, *a, &b) - if(a.empty? and b.nil?) - return Pure[@__configuration].send(m, *a, &b) - end - if b - raise ArgumentError unless a.empty? - parent = @__configuration - name = m.to_s - configuration = - if @__configuration.respond_to?(name) and Configuration === @__configuration.send(name) - @__configuration.send name - else - Configuration.new name - end - Pure[configuration].instance_eval{ @__parent = parent } - DSL.evaluate configuration, &b - value = configuration - end - unless a.empty? - value = a.size == 1 ? a.first : a - end - @__singleton_class.module_eval do - define_method(m){ value } - end - end - - verbose = $VERBOSE - begin - $VERBOSE = nil - def object_id(*args) - unless args.empty? - verbose = $VERBOSE - begin - $VERBOSE = nil - define_method(:object_id){ args.first } - ensure - $VERBOSE = verbose - end - else - return Pure[@__configuration].object_id - end - end - ensure - $VERBOSE = verbose - end - end - - class Pure - Instance_Methods = Hash.new - Protected = %r/^__|^object_id$/ - - ::Object.instance_methods.each do |m| - Instance_Methods[m.to_s] = ::Object.instance_method m - undef_method m unless m[Protected] - end - - def method_missing m, *a, &b - Instance_Methods[m.to_s].bind(@object).call(*a, &b) - end - - def initialize object - @object = object - end - - def Pure.[] object - new object - end - end -end - -def Configuration(*a, &b) - if a.empty? and b.nil? - const_get :Configuration - else - Configuration.new(*a, &b) - end -end - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/a.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/a.rb deleted file mode 100644 index 0bd2d017..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/a.rb +++ /dev/null @@ -1,11 +0,0 @@ -# -# basic usage is quite, simple, load the config and use it's values. the -# config syntax is fairly obvious, i think, but note that it *is* ruby and any -# ruby can be included. also note that each config is named, allowing -# multiple configs to be places in one file -# - require 'configuration' - - c = Configuration.load 'a' - - p c.a + c.b - c.c diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/b.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/b.rb deleted file mode 100644 index ca407130..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/b.rb +++ /dev/null @@ -1,11 +0,0 @@ -# -# configuration.rb supports a very natural nesting syntax. note how values -# are scoped in a POLS fashion -# - require 'configuration' - - c = Configuration.for 'b' - - p c.www.url - p c.db.url - p c.mail.url diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/c.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/c.rb deleted file mode 100644 index 419de628..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/c.rb +++ /dev/null @@ -1,11 +0,0 @@ -# -# configuration.rb let's you keep code very dry. -# - - require 'configuration' - - Configuration.load 'c' - - p Configuration.for('development').db - p Configuration.for('production').db - p Configuration.for('testing').db diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/d.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/d.rb deleted file mode 100644 index 54099926..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/d.rb +++ /dev/null @@ -1,14 +0,0 @@ -# -# configuration.rb makes use of an external blank slate dsl, this means that -# you Configuration objects do, in fact, have all built-in ruby methods such -# as #inspect, etc, *unless* you configure over the top of them. the effect -# is a configuration object that behaves like a nice ruby object, but which -# allows *any* key to be configured -# - require 'configuration' - - c = Configuration.for 'd' - - p c.object_id - p c.inspect - p c.p diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/e.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/e.rb deleted file mode 100644 index 854f7cea..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/e.rb +++ /dev/null @@ -1,12 +0,0 @@ -# -# configuration.rb uses a totally clean slate dsl for the block. if you need -# to access base Object methods you can do this -# - - require 'configuration' - - c = Configuration.for 'e' - - p c.foo - p c.bar - p c.foobar diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/README.markdown similarity index 88% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/README.markdown index f572a44f..e72b6fdc 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/README.markdown +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/README.markdown @@ -12,12 +12,12 @@ Without CSS gradient support: Install the plugin: sudo gem install compass --pre + sudo gem install compass-colors sudo gem install fancy-buttons - To create a new project based on fancy-buttons: - compass -r compass-colors -r fancy-buttons -f fancy-buttons project_directory + compass install -r fancy-buttons -r compass-colors fancy-buttons To add fancy-buttons to an existing compass project: @@ -26,7 +26,7 @@ To add fancy-buttons to an existing compass project: require 'fancy-buttons' # Then run the following command: - compass -r fancy-buttons -f fancy-buttons project_directory + compass install -r fancy-buttons fancy-buttons # Project Goals: diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/Rakefile similarity index 77% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/Rakefile index 6745c913..812bf4c7 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/Rakefile +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/Rakefile @@ -3,7 +3,7 @@ begin Jeweler::Tasks.new do |gemspec| gemspec.name = "fancy-buttons" gemspec.summary = "Make fancy buttons with the Compass stylesheet authoring framework." - gemspec.description = "Make fancy buttons with the Compass stylesheet authoring framework." + gemspec.description = "Easily style buttons with beautiful CSS3 features like gradients, rounded corners, etc. Don't worry the buttons also degrade nicely for browsers with no support. This requires the Compass stylesheet authoring framework." gemspec.email = "brandon@imathis.com" gemspec.homepage = "http://github.com/imathis/fancy-buttons" gemspec.author = "Brandon Mathis" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/fancy-buttons.gemspec similarity index 84% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/fancy-buttons.gemspec index c78d7bfd..db472098 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/fancy-buttons.gemspec @@ -5,12 +5,12 @@ Gem::Specification.new do |s| s.name = %q{fancy-buttons} - s.version = "0.3.7" + s.version = "0.3.9" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Brandon Mathis"] - s.date = %q{2009-12-15} - s.description = %q{Make fancy buttons with the Compass stylesheet authoring framework.} + s.date = %q{2010-01-24} + s.description = %q{Easily style buttons with beautiful CSS3 features like gradients, rounded corners, etc. Don't worry the buttons also degrade nicely for browsers with no support. This requires the Compass stylesheet authoring framework.} s.email = %q{brandon@imathis.com} s.extra_rdoc_files = [ "README.markdown" @@ -24,6 +24,7 @@ Gem::Specification.new do |s| "lib/sass/_fancy_gradient.sass", "lib/templates/project/button_bg.png", "lib/templates/project/buttons.sass", + "lib/templates/project/ie6.sass", "lib/templates/project/index.html", "lib/templates/project/manifest.rb" ] diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/fancy-buttons.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/fancy-buttons.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/sass/_fancy_buttons.sass similarity index 98% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/sass/_fancy_buttons.sass index b21629bb..c45f0062 100755 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/sass/_fancy_buttons.sass @@ -11,6 +11,7 @@ !fb_light_text ||= #fff !fb_dark_text ||= #222 !fb_gradient ||= 1 +!fb_image_path ||= image_url("button_bg.png") // Make a fancy button. =fancy-button(!color= !fb_color, !font_size= !fb_font_size, !radius= !fb_radius, !border_width= !fb_border_width) @@ -149,7 +150,7 @@ // Reset the button's important properties to make sure they behave correctly =fb-reset(!font_weight = !fb_font_weight) font-family: "Lucida Grande", Lucida, Arial, sans_serif - background: #{image_url("button_bg.png")} repeat-x bottom left + background: #{!fb_image_path} repeat-x bottom left margin: 0 width: auto overflow: visible diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/sass/_fancy_gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/sass/_fancy_gradient.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/button_bg.png b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/button_bg.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/button_bg.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/button_bg.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/buttons.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/ie6.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/ie6.sass new file mode 100644 index 00000000..0cb49b68 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/ie6.sass @@ -0,0 +1,4 @@ +a.button, form button + background-image: none !important + &:hover, &:active, &:focus + background-image: none !important \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/index.html b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/index.html similarity index 91% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/index.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/index.html index 0ba7523c..7aa28480 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/index.html +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/index.html @@ -4,6 +4,9 @@ Fancy Buttons - Demo +

Fancy Buttons

diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/manifest.rb similarity index 74% rename from lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/manifest.rb index 599b6a21..973aa4be 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.9/lib/templates/project/manifest.rb @@ -1,3 +1,4 @@ stylesheet 'buttons.sass' +stylesheet 'ie6.sass' image 'button_bg.png' file 'index.html' \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/HISTORY b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/HISTORY deleted file mode 100644 index d1a0b125..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/HISTORY +++ /dev/null @@ -1,62 +0,0 @@ -= Launchy Changlog - -== Version 0.3.5 - 2009-12-17 - -* clarify that launchy is under ISC license -* fix missing data file in released gem needed for running specs - -== Version 0.3.3 - 2009-02-19 - -* pass command line as discrete items to system() to avoid string - interpretation by the system shell. (Suraj N. Kurapati) -* rework project layout and tasks - -== Version 0.3.2 - 2008-05-21 - -* detect aix and mingw as known operating systems. - -== Version 0.3.1 - 2007-09-08 - -* finalize the command line wrapper around the launchy library. -* added more tests - -== Version 0.3.0 - 2007-08-30 - -* reorganize the code structure, removing Spawnable namespace -* removed 'do_magic' method, changed it to 'open' -* added override environment variable LAUNCHY_HOST_OS for testing -* fix broken cygwin support [Bug #13472] - -== Version 0.2.1 - 2007-08-18 - -* fix inability to find windows executables [Bug #13132] - -== Version 0.2.0 - 2007-08-11 - -* rework browser finding -* manual override with LAUNCHY_BROWSER environment variable -* on *nix use desktop application launcher with fallback to list of browsers -* On windows, switch to 'start' command and remove dependency on win32-process -* removed win32 gem -* Add debug output by setting LAUNCHY_DEBUG environment variable to 'true' - -== Version 0.1.2 - 2007-08-11 - -* forked child exits without calling at_exit handlers - -== Version 0.1.1 - -* fixed rubyforge task to release mswin32 gem also - -== Version 0.1.0 - -* Initial public release -* switched to using fork to spawn process and require 'win32/process' if on windows - -== Version 0.0.2 - -* First attempt at using systemu to spawn processes - -== Version 0.0.1 - -* Initially working release diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/LICENSE deleted file mode 100644 index 6d5b33d0..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/LICENSE +++ /dev/null @@ -1,16 +0,0 @@ -ISC LICENSE - http://opensource.org/licenses/isc-license.txt - -Copyright (c) 2007-2009 Jeremy Hinegardner - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/README b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/README deleted file mode 100644 index 97697531..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/README +++ /dev/null @@ -1,53 +0,0 @@ -== launchy - -* Homepage[http://copiousfreetime.rubyforge.org/launchy/] -* {Rubyforge Project}[http://rubyforge.org/projects/copiousfreetime] -* email jeremy at hinegardner dot org - -== DESCRIPTION - -Launchy is helper class for launching cross-platform applications in a -fire and forget manner. - -There are application concepts (browser, email client, etc) that are -common across all platforms, and they may be launched differently on -each platform. Launchy is here to make a common approach to launching -external application from within ruby programs. - -== FEATURES - -Currently only launching a browser is supported. - -== SYNOPSIS - -From within your ruby code you can trust launchy to do the right thing: - - Launchy.open("http://www.ruby-lang.org/") - -Or, if you want to launch the application yourself: - - Launchy::Browser.run("http://www.ruby-lang.org/") - -OR - - Launchy::Browser.new.visit("http://www.ruby-lang.org/") - -== ISC LICENSE - -http://opensource.org/licenses/isc-license.txt - -Copyright (c) 2007-2009 Jeremy Hinegardner - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice -and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/Rakefile deleted file mode 100644 index 80c3b3e7..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/Rakefile +++ /dev/null @@ -1,62 +0,0 @@ -#-- -# Copyright (c) 2007 Jeremy Hinegardner -# All rights reserved. See LICENSE and/or COPYING for details. -#++ - -#------------------------------------------------------------------------------- -# make sure our project's top level directory and the lib directory are added to -# the ruby search path. -#------------------------------------------------------------------------------- -$: << File.expand_path(File.join(File.dirname(__FILE__),"lib")) -$: << File.expand_path(File.dirname(__FILE__)) - - -#------------------------------------------------------------------------------- -# load the global project configuration and add in the top level clean and -# clobber tasks so that other tasks can utilize those constants if necessary -# This loads up the defaults for the whole project configuration -#------------------------------------------------------------------------------- -require 'rubygems' -require 'tasks/config.rb' -require 'rake/clean' - -#------------------------------------------------------------------------------- -# Main configuration for the project, these overwrite the items that are in -# tasks/config.rb -#------------------------------------------------------------------------------- -require 'launchy/version' -require 'launchy/paths' - -Configuration.for("project") { - name "launchy" - version Launchy::VERSION - author "Jeremy Hinegardner" - email "jeremy@copiousfreetime.org" - homepage "http://copiousfreetime.rubyforge.org/launchy/" -} - -#------------------------------------------------------------------------------- -# load up all the project tasks and setup the default task to be the -# test:default task. -#------------------------------------------------------------------------------- -Configuration.for("packaging").files.tasks.each do |tasklib| - import tasklib -end -task :default => 'test:default' - -#------------------------------------------------------------------------------- -# Finalize the loading of all pending imports and update the top level clobber -# task to depend on all possible sub-level tasks that have a name like -# ':clobber' in other namespaces. This allows us to say: -# -# rake clobber -# -# and it will get everything. -#------------------------------------------------------------------------------- -Rake.application.load_imports -Rake.application.tasks.each do |t| - if t.name =~ /:clobber/ then - task :clobber => [t.name] - end -end - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/bin/launchy b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/bin/launchy deleted file mode 100755 index 7a6bd091..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/bin/launchy +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env ruby - -begin - require 'launchy' -rescue LoadError - path = File.expand_path(File.join(File.dirname(__FILE__),"..","lib")) - raise if $:.include? path - $: << path - retry -end - -Launchy.command_line.run(ARGV) \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/gemspec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/gemspec.rb deleted file mode 100644 index 823821e0..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/gemspec.rb +++ /dev/null @@ -1,41 +0,0 @@ -require 'rubygems' -require 'launchy/version' -require 'tasks/config' - -Launchy::GEM_SPEC = Gem::Specification.new do |spec| - proj = Configuration.for('project') - spec.name = proj.name - spec.version = Launchy::VERSION - - spec.author = proj.author - spec.email = proj.email - spec.homepage = proj.homepage - spec.summary = proj.summary - spec.description = proj.description - spec.platform = Gem::Platform::RUBY - - - pkg = Configuration.for('packaging') - spec.files = pkg.files.all - spec.executables = pkg.files.bin.collect { |b| File.basename(b) } - - # add dependencies here - spec.add_dependency("rake", ">= 0.8.1") - spec.add_dependency("configuration", ">= 0.0.5") - - if rdoc = Configuration.for_if_exist?('rdoc') then - spec.has_rdoc = true - spec.extra_rdoc_files = pkg.files.rdoc - spec.rdoc_options = rdoc.options + [ "--main" , rdoc.main_page ] - else - spec.has_rdoc = false - end - - if test = Configuration.for_if_exist?('testing') then - spec.test_files = test.files - end - - if rf = Configuration.for_if_exist?('rubyforge') then - spec.rubyforge_project = rf.project - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy.rb deleted file mode 100644 index 0fcb19c5..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy.rb +++ /dev/null @@ -1,53 +0,0 @@ -module Launchy - # - # Utility method to require all files ending in .rb in the directory - # with the same name as this file minus .rb - # - def self.require_all_libs_relative_to(fname) - prepend = File.basename(fname,".rb") - search_me = File.join(File.dirname(fname),prepend) - - Dir.entries(search_me).each do |rb| - if File.extname(rb) == ".rb" then - require "#{prepend}/#{File.basename(rb,".rb")}" - end - end - end - - class << self - # - # Convenience method to launch an item - # - def open(*params) - begin - klass = Launchy::Application.find_application_class_for(*params) - if klass then - klass.run(*params) - else - msg = "Unable to launch #{params.join(' ')}" - Launchy.log "#{self.name} : #{msg}" - $stderr.puts msg - end - rescue Exception => e - msg = "Failure in opening #{params.join(' ')} : #{e}" - Launchy.log "#{self.name} : #{msg}" - $stderr.puts msg - end - end - - # Setting the LAUNCHY_DEBUG environment variable to 'true' will spew - # debug information to $stderr - def log(msg) - if ENV['LAUNCHY_DEBUG'] == 'true' then - $stderr.puts "LAUNCHY_DEBUG: #{msg}" - end - end - - # Create an instance of the commandline application of launchy - def command_line - Launchy::CommandLine.new - end - end -end - -Launchy.require_all_libs_relative_to(__FILE__) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/application.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/application.rb deleted file mode 100644 index 33bc7471..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/application.rb +++ /dev/null @@ -1,174 +0,0 @@ -require 'rbconfig' - -module Launchy - class Application - class << self - def known_os_families - @known_os_families ||= [ :windows, :darwin, :nix, :cygwin ] - end - - def inherited(sub_class) - application_classes << sub_class - end - def application_classes - @application_classes ||= [] - end - - def find_application_class_for(*args) - Launchy.log "#{self.name} : finding application classes for [#{args.join(' ')}]" - application_classes.find do |klass| - Launchy.log "#{self.name} : Trying #{klass.name}" - if klass.handle?(*args) then - true - else - false - end - end - end - - # find an executable in the available paths - # mkrf did such a good job on this I had to borrow it. - def find_executable(bin,*paths) - paths = ENV['PATH'].split(File::PATH_SEPARATOR) if paths.empty? - paths.each do |path| - file = File.join(path,bin) - if File.executable?(file) then - Launchy.log "#{self.name} : found executable #{file}" - return file - end - end - Launchy.log "#{self.name} : Unable to find `#{bin}' in #{paths.join(', ')}" - return nil - end - - # return the current 'host_os' string from ruby's configuration - def my_os - if ENV['LAUNCHY_HOST_OS'] then - Launchy.log "#{self.name} : Using LAUNCHY_HOST_OS override of '#{ENV['LAUNCHY_HOST_OS']}'" - return ENV['LAUNCHY_HOST_OS'] - else - ::Config::CONFIG['host_os'] - end - end - - # detect what the current os is and return :windows, :darwin or :nix - def my_os_family(test_os = my_os) - case test_os - when /mingw/i - family = :windows - when /mswin/i - family = :windows - when /windows/i - family = :windows - when /darwin/i - family = :darwin - when /mac os/i - family = :darwin - when /solaris/i - family = :nix - when /bsd/i - family = :nix - when /linux/i - family = :nix - when /aix/i - family = :nix - when /cygwin/i - family = :cygwin - else - $stderr.puts "Unknown OS familiy for '#{test_os}'. Please report this bug to " - family = :unknown - end - end - end - - - # Determine the appropriate desktop environment for *nix machine. Currently this is - # linux centric. The detection is based upon the detection used by xdg-open from - # http://portland.freedesktop.org/wiki/XdgUtils - def nix_desktop_environment - if not defined? @nix_desktop_environment then - @nix_desktop_environment = :generic - if ENV["KDE_FULL_SESSION"] || ENV["KDE_SESSION_UID"] then - @nix_desktop_environment = :kde - elsif ENV["GNOME_DESKTOP_SESSION_ID"] then - @nix_desktop_environment = :gnome - elsif find_executable("xprop") then - if %x[ xprop -root _DT_SAVE_MODE | grep ' = \"xfce\"$' ].strip.size > 0 then - @nix_desktop_environment = :xfce - end - end - Launchy.log "#{self.class.name} : nix_desktop_environment => '#{@nix_desktop_environment}'" - end - return @nix_desktop_environment - end - - # find an executable in the available paths - def find_executable(bin,*paths) - Application.find_executable(bin,*paths) - end - - # return the current 'host_os' string from ruby's configuration - def my_os - Application.my_os - end - - # detect what the current os is and return :windows, :darwin, :nix, or :cygwin - def my_os_family(test_os = my_os) - Application.my_os_family(test_os) - end - - # returns the list of command line application names for the current os. The list - # returned should only contain appliations or commands that actually exist on the - # system. The list members should have their full path to the executable. - def app_list - @app_list ||= self.send("#{my_os_family}_app_list") - end - - # On darwin a good general default is the 'open' executable. - def darwin_app_list - Launchy.log "#{self.class.name} : Using 'open' application on darwin." - [ find_executable('open') ] - end - - # On windows a good general default is the 'start' Command Shell command - def windows_app_list - Launchy.log "#{self.class.name} : Using 'start' command on windows." - %w[ start ] - end - - # Cygwin uses the windows start but through an explicit execution of the cmd shell - def cygwin_app_list - Launchy.log "#{self.class.name} : Using 'cmd /C start' on windows." - [ "cmd /C start" ] - end - - # run the command - def run(cmd,*args) - Launchy.log "#{self.class.name} : Spawning on #{my_os_family} : #{cmd} #{args.inspect}" - - if my_os_family == :windows then - # NOTE: the command is purposely omitted here because - # running the filename via "cmd /c" is the same as - # running "start filename" at the command-prompt - # - # furthermore, when "cmd /c start filename" is - # run, the shell interprets it as two commands: - # (1) "start" opens a new terminal, and (2) - # "filename" causes the file to be launched. - system 'cmd', '/c', *args - else - # fork, and the child process should NOT run any exit handlers - child_pid = fork do - # NOTE: we pass a dummy argument *before* - # the actual command to prevent sh - # from silently consuming our actual - # command and assigning it to $0! - dummy = '' - system 'sh', '-c', '"$@" >/dev/null 2>&1', dummy, cmd, *args - exit! - end - Process.detach(child_pid) - end - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/browser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/browser.rb deleted file mode 100644 index 371c76f4..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/browser.rb +++ /dev/null @@ -1,98 +0,0 @@ -require 'launchy/application' -require 'uri' - -module Launchy - class Browser < Application - - - class << self - def desktop_environment_browser_launchers - @desktop_environment_browser_launchers ||= { - :kde => "kfmclient", - :gnome => "gnome-open", - :xfce => "exo-open", - :generic => "htmlview" - } - end - def fallback_browsers - @fallback_browsers ||= %w[ firefox seamonkey opera mozilla netscape galeon ] - end - def run(*args) - Browser.new.visit(args[0]) - end - - # return true if this class can handle the given parameter(s) - def handle?(*args) - begin - Launchy.log "#{self.name} : testing if [#{args[0]}] (#{args[0].class}) is a url." - uri = URI.parse(args[0]) - result = [URI::HTTP, URI::HTTPS, URI::FTP].include?(uri.class) - rescue Exception => e - # hmm... why does rcov not see that this is executed ? - Launchy.log "#{self.name} : not a url, #{e}" - return false - end - end - end - - def initialize - @browser = nil - @nix_app_list = [] - raise "Unable to find browser to launch for os family '#{my_os_family}'." unless browser - end - - def desktop_environment_browser_launchers - self.class.desktop_environment_browser_launchers - end - - def fallback_browsers - self.class.fallback_browsers - end - - # Find a list of potential browser applications to run on *nix machines. - # The order is: - # 1) What is in ENV['LAUNCHY_BROWSER'] or ENV['BROWSER'] - # 2) xdg-open - # 3) desktop environment launcher program - # 4) a list of fallback browsers - def nix_app_list - if @nix_app_list.empty? - browser_cmds = ['xdg-open'] - browser_cmds << desktop_environment_browser_launchers[nix_desktop_environment] - browser_cmds << fallback_browsers - browser_cmds.flatten! - browser_cmds.delete_if { |b| b.nil? || (b.strip.size == 0) } - Launchy.log "#{self.class.name} : Initial *Nix Browser List: #{browser_cmds.join(', ')}" - @nix_app_list = browser_cmds.collect { |bin| find_executable(bin) }.find_all { |x| not x.nil? } - Launchy.log "#{self.class.name} : Filtered *Nix Browser List: #{@nix_app_list.join(', ')}" - end - @nix_app_list - end - - # return the full command line path to the browser or nil - def browser - if not @browser then - if ENV['LAUNCHY_BROWSER'] and File.exists?(ENV['LAUNCHY_BROWSER']) then - Launchy.log "#{self.class.name} : Using LAUNCHY_BROWSER environment variable : #{ENV['LAUNCHY_BROWSER']}" - @browser = ENV['LAUNCHY_BROWSER'] - elsif ENV['BROWSER'] and File.exists?(ENV['BROWSER']) then - Launchy.log "#{self.class.name} : Using BROWSER environment variable : #{ENV['BROWSER']}" - @browser = ENV['BROWSER'] - elsif app_list.size > 0 then - @browser = app_list.first - Launchy.log "#{self.class.name} : Using application list : #{@browser}" - else - msg = "Unable to launch. No Browser application found." - Launchy.log "#{self.class.name} : #{msg}" - $stderr.puts msg - end - end - return @browser - end - - # launch the browser at the appointed url - def visit(url) - run(browser,url) - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/command_line.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/command_line.rb deleted file mode 100644 index 98aed3d9..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/command_line.rb +++ /dev/null @@ -1,48 +0,0 @@ -require 'optparse' - -module Launchy - class CommandLine - - def parser - @parser ||= OptionParser.new do |op| - op.banner = "Usage: launchy [options] url" - op.separator "" - op.on("-d", "--debug", "Force debug, output lots of information.", - "This sets the LAUNCHY_DEBUG environment variable to 'true'.") do |d| - ENV["LAUNCHY_DEBUG"] = 'true' - end - - op.on("-h", "--help", "Print this message") do |h| - puts op.to_s - exit 0 - end - - op.on("-v", "--version", "Output the version of Launchy") do |v| - puts "Launchy version #{Launchy::VERSION}" - exit 0 - end - - op.on("-o", "--host-os HOST_OS","Force the behavior of a particular host os.", - "This sets the LAUNCHY_HOST_OS environment variable.") do |os| - ENV["LAUNCHY_HOST_OS"] = os - end - - op.on("-b", "--browser BROWSER", "Force launchy to use a particular browser.", - "This sets the LAUNCHY_BROWSER environment variable.") do |browser| - ENV["LAUNCHY_BROWSER"] = browser - end - end - end - - def run(argv = ARGV) - begin - parser.parse!(argv) - Launchy.open(*argv) - rescue ::OptionParser::ParseError => pe - $stderr.puts "#{parser.programn_name}: #{pe}" - $stderr.puts "Try `#{parser.program_name} --help' for more information." - exit 1 - end - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/paths.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/paths.rb deleted file mode 100644 index 8cefd3dc..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/paths.rb +++ /dev/null @@ -1,53 +0,0 @@ -#-- -# Copyright (c) 2007 Jeremy Hinegardner -# All rights reserved. See LICENSE and/or COPYING for details. -#++ -# -module Launchy - # - # Access to various paths inside the project programatically - # - module Paths - # - # :call-seq: - # Launchy::Paths.root_dir -> String - # - # Returns The full expanded path of the parent directory of +lib+ - # going up the path from the current file. A trailing File::SEPARATOR⋅ - # is guaranteed - # - def self.root_dir - @root_dir ||=( - path_parts = ::File.expand_path( __FILE__ ).split( ::File::SEPARATOR ) - lib_index = path_parts.rindex( "lib" ) - @root_dir = path_parts[0...lib_index].join( ::File::SEPARATOR ) + ::File::SEPARATOR - ) - end - - # - # :call-seq: - # Launchy::Paths.lib_path( *args ) -> String - # - # Returns The full expanded path of the +lib+ directory below - # _root_dir_. All parameters passed in are joined onto the⋅ - # result. A trailing File::SEPARATOR is guaranteed if⋅ - # _args_ are *not* present. - # - def self.lib_path( *args ) - self.sub_path( "lib", *args ) - end - - # - # :call-seq: - # Launchy::Paths.sub_path( sub, *args ) -> String - # - # Returns the full expanded path of the +sub+ directory below _root_dir. All - # _arg_ parameters passed in are joined onto the result. A trailing - # File::SEPARATOR is guaranteed if _args_ are *not* present. - # - def self.sub_path( sub, *args ) - sp = ::File.join( root_dir, sub ) + File::SEPARATOR - sp = ::File.join( sp, *args ) if args - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/version.rb deleted file mode 100644 index 630b9cbd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/version.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Launchy - module Version - MAJOR = 0 - MINOR = 3 - BUILD = 5 - - def self.to_a - [MAJOR, MINOR, BUILD] - end - - def self.to_s - to_a.join(".") - end - STRING = Version.to_s.freeze - end - VERSION = Version.to_s.freeze -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/application_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/application_spec.rb deleted file mode 100644 index 2266a4b0..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/application_spec.rb +++ /dev/null @@ -1,62 +0,0 @@ -require File.join(File.dirname(__FILE__),"spec_helper.rb") -require 'yaml' - -describe Launchy::Application do - before(:each) do - yml = YAML::load(IO.read(File.join(File.dirname(__FILE__),"tattle-host-os.yml"))) - @host_os = yml['host_os'] - @app = Launchy::Application.new - end - - YAML::load(IO.read(File.join(File.dirname(__FILE__), "tattle-host-os.yml")))['host_os'].keys.sort.each do |os| - it "#{os} should be a found os" do - Launchy::Application::known_os_families.should include(@app.my_os_family(os)) - end - end - - it "should not find os of 'dos'" do - @app.my_os_family('dos').should eql(:unknown) - end - - it "my os should have a value" do - @app.my_os.should_not eql('') - @app.my_os.should_not eql(nil) - end - - it "should find open or curl" do - r = "found open or curl" - found = %w[ open curl ].collect do |app| - @app.find_executable(app).nil? - end - found.should be_include( false ) - end - - it "should not find app xyzzy" do - @app.find_executable('xyzzy').should eql(nil) - end - - it "should find the correct class to launch an ftp url" do - Launchy::Application.find_application_class_for("ftp://ftp.ruby-lang.org/pub/ruby/").should == Launchy::Browser - end - - it "knows when it cannot find an application class" do - Launchy::Application.find_application_class_for("xyzzy:stuff,things").should == nil - end - - it "allows for environmental override of host_os" do - ENV["LAUNCHY_HOST_OS"] = "hal-9000" - Launchy::Application.my_os.should eql("hal-9000") - ENV["LAUNCHY_HOST_OS"] = nil - end - - { "KDE_FULL_SESSION" => :kde, - "KDE_SESSION_UID" => :kde, - "GNOME_DESKTOP_SESSION_ID" => :gnome }.each_pair do |k,v| - it "can detect the desktop environment of a *nix machine using #{k}" do - @app.nix_desktop_environment.should eql(:generic) - ENV[k] = "launchy-test" - Launchy::Application.new.nix_desktop_environment.should eql(v) - ENV[k] = nil - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/browser_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/browser_spec.rb deleted file mode 100644 index 4f1a9efc..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/browser_spec.rb +++ /dev/null @@ -1,58 +0,0 @@ -require File.join(File.dirname(__FILE__),"spec_helper.rb") -require 'stringio' -describe Launchy::Browser do - it "should find a path to a executable" do - begin - File.executable?(Launchy::Browser.new.browser).should == true - rescue => e - e.message.should == "Unable to find browser to launch for os family 'nix'." - end - end - - it "should handle an http url" do - Launchy::Browser.handle?("http://www.example.com").should == true - end - - it "should handle an https url" do - Launchy::Browser.handle?("https://www.example.com").should == true - end - - it "should handle an ftp url" do - Launchy::Browser.handle?("ftp://download.example.com").should == true - end - - it "should not handle a mailto url" do - Launchy::Browser.handle?("mailto:jeremy@example.com").should == false - end - - it "creates a default unix application list" do - begin - Launchy::Browser.new.nix_app_list.class.should == Array - rescue => e - e.message.should == "Unable to find browser to launch for os family 'nix'." - end - end - - { "BROWSER" => "/bin/sh", - "LAUNCHY_BROWSER" => "/bin/sh"}.each_pair do |e,v| - it "can use environmental variable overrides of #{e} for the browser" do - ENV[e] = v - Launchy::Browser.new.browser.should eql(v) - ENV[e] = nil - end - end - - it "reports when it cannot find an browser" do - old_error = $stderr - $stderr = StringIO.new - ENV["LAUNCHY_HOST_OS"] = "linux" - begin - browser = Launchy::Browser.new - rescue => e - e.message.should =~ /Unable to find browser to launch for os family/m - end - ENV["LAUNCHY_HOST_OS"] = nil - $stderr.string.should =~ /Unable to launch. No Browser application found./m - $stderr = old_error - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/launchy_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/launchy_spec.rb deleted file mode 100644 index 71dae0bc..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/launchy_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require File.join(File.dirname(__FILE__),"spec_helper.rb") -require 'stringio' - -describe Launchy do - it "instantiates an instance of Launchy::CommandLine for commandline" do - Launchy.command_line.class.should eql(Launchy::CommandLine) - end - - it "logs to stderr when LAUNCHY_DEBUG environment variable is set" do - ENV["LAUNCHY_DEBUG"] = 'true' - old_stderr = $stderr - $stderr = StringIO.new - Launchy.log "This is a test log message" - $stderr.string.strip.should eql("LAUNCHY_DEBUG: This is a test log message") - $stderr = old_stderr - ENV["LAUNCHY_DEBUG"] = nil - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/paths_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/paths_spec.rb deleted file mode 100644 index 4e0f2bc1..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/paths_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require File.expand_path( File.join( File.dirname( __FILE__ ), "spec_helper.rb" ) ) - -require 'launchy/paths' - -describe Launchy::Paths do - it "can access the root dir of the project" do - Launchy::Paths.root_dir.should == File.expand_path( File.join( File.dirname( __FILE__ ), ".." ) ) + ::File::SEPARATOR - end - - %w[ lib ].each do |sub| - it "can access the #{sub} path of the project" do - Launchy::Paths.send("#{sub}_path" ).should == File.expand_path( File.join( File.dirname( __FILE__ ), "..", sub ) ) + ::File::SEPARATOR - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/spec_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/spec_helper.rb deleted file mode 100644 index c2e7cbbb..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/spec_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rubygems' -require 'spec' - -$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib")) -require 'launchy' diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/tattle-host-os.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/tattle-host-os.yml deleted file mode 100644 index 500acebd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/tattle-host-os.yml +++ /dev/null @@ -1,427 +0,0 @@ -# SOURCE: http://tattle.rubygarden.org ---- -ruby_version: - 1.8.4: 506 - 1.8.5: 842 - 1.8.6: 270 - 1.9.0: 1 - 1.8.1: 9 - 1.8.2: 36 -host_vendor: - "": 1 - mandrake: 1 - sun: 18 - apple: 619 - mandriva: 1 - slackware: 1 - portbld: 27 - pc: 858 - ibm: 1 - suse: 5 - Apple Computer, Inc.: 13 - Sun Microsystems Inc.: 6 - unknown: 45 - redhat: 70 -ruby_install_name: - jruby.bat: 2 - ruby185: 1 - jruby: 17 - ruby18: 175 - ruby1.8: 222 - ruby1.8.4: 1 - ruby: 1248 -build: - sparc-sun-solaris2.9: 8 - i686-apple-darwin8.6.1: 81 - i686-apple-darwin8.5.2: 11 - java1.5: 3 - i386-unknown-freebsd4.11: 1 - powerpc-apple-darwin8.2.0: 3 - i386-pc-solaris2.8: 2 - x86_64-suse-linux-gnu: 2 - x86_64-pc-linux-gnu: 89 - i686-apple-darwin8.7.1: 31 - i686-apple-darwin8.6.2: 15 - java1.6: 6 - i686-apple-darwin8.5.3: 4 - i686-pc-mswin32: 375 - i386-pc-linux-gnu: 2 - i386-pc-linux: 3 - powerpc-apple-darwin8.3.0: 3 - i686-apple-darwin8.8.1: 140 - i686-redhat-linux-gnu: 30 - i686-apple-darwin8.7.2: 2 - powerpc-apple-darwin8.4.0: 6 - amd64-portbld-freebsd6: 2 - i686-apple-darwin8.8.2: 53 - i686-apple-darwin8.9.1: 27 - i686-apple-darwin8.7.3: 3 - x86_64-unknown-linux-gnu: 29 - i686-suse-linux-gnu: 2 - powerpc-apple-darwin8.10.0: 2 - i686-apple-darwin8.8.3: 15 - powerpc-apple-darwin7.9.0: 12 - powerpc-apple-darwin8.5.0: 8 - i386-mingw32: 1 - i686-apple-darwin8.9.3: 1 - i686-apple-darwin8.8.4: 5 - x86_64-redhat-linux-gnu: 7 - powerpc-apple-darwin8.6.0: 25 - sparc-sun-solaris2.10: 7 - i686-apple-darwin8.9.4: 3 - i686-apple-darwin8.8.5: 3 - powerpc-apple-darwin8.7.0: 39 - powerpc-apple-darwin8.11.0: 1 - powerpc-ibm-aix5.3.0.0: 1 - powerpc-apple-darwin8.8.0: 53 - i386-unknown-netbsdelf3.1.: 1 - powerpc-unknown-linux-gnu: 3 - powerpc-apple-darwin8.8.1: 1 - i486-slackware-linux: 1 - i386-pc-solaris2.10: 7 - powerpc-apple-darwin8.9.0: 8 - i686-pc-cygwin: 14 - x86_64-unknown-openbsd4.0: 4 - i686-pc-linux-gnu: 343 - java: 8 - i586-mandrake-linux-gnu: 1 - i386-redhat-linux-gnu: 33 - i686-apple-darwin9.0: 29 - i586-mandriva-linux-gnu: 1 - i386-portbld-freebsd5: 3 - powerpc-apple-darwin8.0: 10 - i386-unknown-freebsd6.0: 2 - i486-pc-linux-gnu: 22 - i686-suse-linux: 1 - i686-apple-darwin: 1 - i386-portbld-freebsd6: 20 - powerpc-apple-darwin9.0: 5 - i386-unknown-freebsd6.1: 1 - x86_64-unknown-openbsd3.9: 1 - i686-apple-darwin8.10.1: 13 - i386-portbld-freebsd7: 2 - i686-apple-darwin9.1.0: 1 - i686-apple-darwin8.4.1: 1 - i686-apple-darwin8.11.1: 2 - powerpc64-unknown-linux-gnu: 2 - i686-apple-darwin8.5.1: 1 - i686-apple-darwin8.10.3: 1 - java1.4: 2 - sparc-sun-solaris2.8: 3 - i386-unknown-openbsd4.0: 2 -arch: - x86-java1.5: 1 - i686-darwin8.8.1: 140 - i686-darwin8.7.2: 2 - i386-mswin32: 375 - i686-darwin8.8.2: 53 - i686-darwin8.9.1: 27 - i686-darwin8.7.3: 3 - x86-java1.6: 1 - i686-darwin8.8.3: 15 - i686-darwin8.9.3: 1 - i686-darwin8.8.4: 5 - amd64-freebsd6: 2 - sparc-solaris2.8: 3 - x86_64-openbsd4.0: 4 - powerpc-aix5.3.0.0: 1 - powerpc-darwin8.2.0: 3 - sparc-solaris2.9: 8 - i386-netbsdelf: 1 - i386-mingw32: 1 - powerpc-darwin8.3.0: 3 - i686-darwin8.9.4: 3 - i686-darwin8.8.5: 3 - i386-linux-gnu: 8 - powerpc-darwin8.10.0: 2 - i586-linux-gnu: 2 - powerpc-darwin8.4.0: 6 - powerpc-darwin8.11.0: 1 - powerpc-darwin8.5.0: 8 - i386-freebsd5: 3 - powerpc-darwin8.6.0: 25 - i386-linux: 71 - i386-freebsd6: 20 - powerpc-darwin8.7.0: 39 - i486-linux: 188 - x86_64-linux: 127 - i386-freebsd7: 2 - powerpc-darwin8.8.0: 53 - i586-linux: 3 - java: 8 - i386-freebsd4.11: 1 - powerpc-darwin8.9.0: 8 - powerpc-darwin8.8.1: 1 - x86_64-openbsd3.9: 1 - i686-darwin: 1 - powerpc-darwin8.0: 7 - sparc-solaris2.10: 7 - universal-darwin8.0: 5 - powerpc-linux: 3 - i386-freebsd6.0: 2 - powerpc64-linux: 2 - universal-darwin9.0: 34 - i386-cygwin: 14 - powerpc-darwin7.9.0: 12 - i386-freebsd6.1: 1 - i386-solaris2.10: 7 - i386-java1.5: 2 - i386-openbsd4.0: 2 - i686-darwin8.4.1: 1 - i686-darwin8.10.1: 11 - i386-solaris2.8: 2 - i686-darwin9.1.0: 1 - i686-darwin8.5.1: 1 - i686-darwin8.11.1: 2 - i386-java1.6: 7 - i686-darwin8.6.1: 81 - i686-darwin8.5.2: 11 - i686-darwin8.10.3: 1 - i686-linux: 167 - i686-darwin8.7.1: 31 - i686-darwin8.6.2: 15 - i686-darwin8.5.3: 4 -target_cpu: - x86: 2 - powerpc64: 2 - i686: 610 - powerpc: 180 - amd64: 2 - x86_64: 132 - i386: 527 - i486: 188 - i586: 5 - sparc: 18 -host_os: - freebsd6.1: 1 - darwin8.11.1: 2 - darwin8.5.3: 4 - solaris2.9: 8 - darwin7.9.0: 12 - darwin8.6.2: 15 - darwin8.7.1: 31 - darwin8.8.0: 53 - darwin8.10.3: 1 - freebsd4.11: 1 - darwin9.1.0: 1 - darwin8.7.2: 2 - darwin8.9.0: 8 - darwin8.0: 10 - darwin8.8.1: 141 - darwin8.7.3: 3 - linux: 9 - darwin8.9.1: 27 - darwin9.0: 34 - darwin8.8.2: 53 - openbsd3.9: 1 - Windows XP: 2 - cygwin: 14 - darwin8.8.3: 15 - darwin8.9.3: 1 - darwin8.2.0: 3 - darwin8.8.4: 5 - darwin8.8.5: 3 - darwin8.9.4: 3 - darwin8.3.0: 3 - openbsd4.0: 6 - Mac OS X: 13 - aix5.3.0.0: 1 - darwin: 1 - freebsd5: 3 - darwin8.4.0: 6 - darwin8.4.1: 1 - darwin8.10.0: 2 - darwin8.5.0: 8 - freebsd6: 22 - netbsdelf: 1 - darwin8.5.1: 1 - darwin8.11.0: 1 - freebsd7: 2 - darwin8.10.1: 13 - darwin8.6.0: 25 - freebsd6.0: 2 - solaris2.8: 5 - darwin8.5.2: 11 - solaris2.10: 14 - darwin8.7.0: 39 - darwin8.6.1: 81 - mswin32: 376 - linux-gnu: 566 -rubygems_version: - 1.1.0: 11 - 0.9.3: 11 - 0.9.0.8: 16 - 1.0.1: 71 - 0.8.5: 2 - 0.8.10: 12 - 1.1.1: 16 - 0.9.0.9: 21 - 0.9.4: 95 - 0.9.5: 6 - 0.8.11: 235 - 0.9.4.7: 1 - 0.8.8: 1 - 0.9.0.10: 5 - 0.9.0: 912 - 0.9.1: 78 - 0.9.0.6: 5 - 0.9.2: 162 - 0.9.0.7: 2 - 1.0.0: 2 -SHELL: - /bin/bash: 75 - /bin/sh: 1212 - $(COMSPEC): 375 - cmd.exe: 2 - /usr/local/bin/bash: 2 -host_cpu: - powerpc64: 2 - x86: 2 - i686: 1208 - powerpc: 180 - amd64: 2 - x86_64: 132 - i386: 97 - i486: 23 - i586: 2 - sparc: 18 -LIBRUBY: - libruby.so.1.8.6: 9 - libruby1.8.4.1.8.4.dylib: 1 - libruby18.so.1.8.4: 3 - libruby185-static.a: 1 - libruby1.8.so.1.8.2: 7 - libruby18.so.1.8.5: 127 - libruby18.so.1.8.6: 17 - libruby.1.8.5.dylib: 166 - jruby: 8 - libruby.1.8.6.dylib: 41 - libruby.so.1.9.0: 1 - libruby.so.1.8.1: 8 - libruby1.8.so.1.8.4: 125 - libruby.so.1.8.2: 1 - libruby18.so.18.5: 1 - libruby.so.1.84: 2 - jruby.jar: 11 - libruby1.8.so.1.8.5: 62 - libmsvcrt-ruby18.dll.a: 1 - libruby.so.1.85: 1 - libruby1.8-static.a: 1 - libruby.so.1: 4 - libruby.1.8.2.dylib: 5 - libruby1.8.so.1.8.6: 26 - libruby.dll.a: 14 - libruby.so.1.8.4: 15 - libruby.1.dylib: 43 - libruby-static.a: 454 - libruby.1.8.4.dylib: 50 - libruby.so.1.8.5: 59 - msvcrt-ruby18.lib: 375 - libruby18.so.18: 27 -LIBRUBY_SO: - libruby.so.1.8.6: 47 - libruby1.8.4.1.8.4.dylib: 1 - libruby18.so.1.8.4: 3 - libruby1.8.so.1.8.2: 7 - libruby18.so.1.8.5: 127 - libruby18.so.1.8.6: 17 - libruby.1.8.5.dylib: 166 - jruby: 8 - libruby.1.8.6.dylib: 41 - libruby.so.1.9.0: 1 - libruby.so.1.8.1: 9 - libruby1.8.so.1.8.4: 125 - libruby18.so.18.5: 1 - libruby.so.1.84: 2 - libruby.so.1.8.2: 3 - jruby.jar: 11 - libruby1.8.so.1.8.5: 63 - libruby.so.1.85: 1 - libruby.so.1: 4 - libruby.1.8.2.dylib: 5 - libruby1.8.so.1.8.6: 26 - libruby185.so.1.8.5: 1 - cygruby18.dll: 14 - libruby.1.dylib: 43 - libruby.so.1.8.4: 253 - msvcrt-ruby18.dll: 376 - libruby.1.8.4.dylib: 50 - libruby.so.1.8.5: 234 - libruby18.so.18: 27 -target: - sparc-sun-solaris2.9: 8 - i686-apple-darwin8.6.1: 81 - i686-apple-darwin8.5.2: 11 - i386--netbsdelf: 1 - powerpc-apple-darwin8.2.0: 3 - i386-unknown-freebsd4.11: 1 - i386-pc-solaris2.8: 2 - x86_64-pc-linux-gnu: 105 - i686-apple-darwin8.7.1: 31 - i686-apple-darwin8.6.2: 15 - i686-apple-darwin8.5.3: 4 - x86_64-suse-linux: 2 - i386-pc-linux-gnu: 2 - i386-pc-linux: 15 - powerpc-apple-darwin8.3.0: 3 - i686-apple-darwin8.8.1: 140 - i686-apple-darwin8.7.2: 2 - powerpc-apple-darwin8.4.0: 6 - amd64-portbld-freebsd6: 2 - i686-apple-darwin8.8.2: 53 - i686-apple-darwin8.9.1: 27 - i686-apple-darwin8.7.3: 3 - x86_64-unknown-linux-gnu: 13 - powerpc-apple-darwin8.10.0: 2 - i686-apple-darwin8.8.3: 15 - powerpc-apple-darwin7.9.0: 12 - powerpc-apple-darwin8.5.0: 8 - i386-mingw32: 1 - i686-apple-darwin8.9.3: 1 - i586-suse-linux: 3 - i686-apple-darwin8.8.4: 5 - x86_64-redhat-linux-gnu: 7 - powerpc-apple-darwin8.6.0: 25 - powerpc-apple-darwin8.11.0: 1 - sparc-sun-solaris2.10: 7 - i686-apple-darwin8.9.4: 3 - i686-apple-darwin8.8.5: 3 - powerpc-apple-darwin8.7.0: 39 - powerpc-ibm-aix5.3.0.0: 1 - i386-redhat-linux: 1 - powerpc-apple-darwin8.8.0: 53 - powerpc-unknown-linux-gnu: 3 - i486-slackware-linux: 1 - i386-pc-solaris2.10: 7 - powerpc-apple-darwin8.9.0: 8 - powerpc-apple-darwin8.8.1: 1 - i686-pc-cygwin: 14 - x86_64-unknown-openbsd4.0: 4 - i686-pc-linux-gnu: 166 - java: 8 - i586-mandrake-linux-gnu: 1 - i386-redhat-linux-gnu: 61 - i586-mandriva-linux-gnu: 1 - i686-apple-darwin9.0: 29 - i386-portbld-freebsd5: 3 - powerpc-apple-darwin8.0: 10 - i386-unknown-freebsd6.0: 2 - i486-pc-linux-gnu: 187 - i686-apple-darwin: 1 - i386-portbld-freebsd6: 20 - powerpc-apple-darwin9.0: 5 - i386-unknown-freebsd6.1: 1 - x86_64-unknown-openbsd3.9: 1 - i686-redhat-linux: 1 - i686-apple-darwin8.10.1: 13 - i386-portbld-freebsd7: 2 - i686-apple-darwin9.1.0: 1 - i686-apple-darwin8.4.1: 1 - i686-apple-darwin8.11.1: 2 - powerpc64-unknown-linux-gnu: 2 - i386-pc-mswin32: 375 - i686-apple-darwin8.5.1: 1 - java1.4: 11 - sparc-sun-solaris2.8: 3 - i386-unknown-openbsd4.0: 2 - i686-apple-darwin8.10.3: 1 diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/version_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/version_spec.rb deleted file mode 100644 index 538bd7fe..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/version_spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require File.join(File.dirname(__FILE__),"spec_helper.rb") -require 'yaml' - -describe "Launchy::VERSION" do - it "should have a #.#.# format" do - Launchy::VERSION.should =~ /\d+\.\d+\.\d+/ - Launchy::Version.to_a.each do |n| - n.to_i.should >= 0 - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/announce.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/announce.rake deleted file mode 100644 index 18d39141..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/announce.rake +++ /dev/null @@ -1,39 +0,0 @@ -require 'tasks/config' -#------------------------------------------------------------------------------- -# announcement methods -#------------------------------------------------------------------------------- - -proj_config = Configuration.for('project') -namespace :announce do - desc "create email for ruby-talk" - task :email do - info = Utils.announcement - - File.open("email.txt", "w") do |mail| - mail.puts "From: #{proj_config.author} <#{proj_config.email}>" - mail.puts "To: ruby-talk@ruby-lang.org" - mail.puts "Date: #{Time.now.rfc2822}" - mail.puts "Subject: [ANN] #{info[:subject]}" - mail.puts - mail.puts info[:title] - mail.puts - mail.puts " gem install #{Launchy::GEM_SPEC.name}" - mail.puts - mail.puts info[:urls] - mail.puts - mail.puts info[:description] - mail.puts - mail.puts "{{ Release notes for Version #{Launchy::VERSION} }}" - mail.puts - mail.puts info[:release_notes] - mail.puts - end - puts "Created the following as email.txt:" - puts "-" * 72 - puts File.read("email.txt") - puts "-" * 72 - end - - CLOBBER << "email.txt" -end - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/config.rb deleted file mode 100644 index fa09fd2e..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/config.rb +++ /dev/null @@ -1,107 +0,0 @@ -require 'configuration' - -require 'rake' -require 'tasks/utils' - -#----------------------------------------------------------------------- -# General project configuration -#----------------------------------------------------------------------- -Configuration.for('project') { - name "launchy" - version Launchy::Version.to_s - author "Jeremy Hinegardner" - email "jeremy at copiousfreetime dot org" - homepage "http://copiousfreetime.rubyforge.org/launchy/" - description Utils.section_of("README", "description") - summary description.split(".").first - history "HISTORY" - license FileList["LICENSE"] - readme "README" -} - -#----------------------------------------------------------------------- -# Packaging -#----------------------------------------------------------------------- -Configuration.for('packaging') { - # files in the project - proj_conf = Configuration.for('project') - files { - bin FileList["bin/*"] - ext FileList["ext/*.{c,h,rb}"] - examples FileList["examples/*.rb"] - lib FileList["lib/**/*.rb"] - test FileList["spec/**/*.rb", "test/**/*.rb"] - data FileList["data/**/*", "spec/**/*.yml"] - tasks FileList["tasks/**/*.r{ake,b}"] - rdoc FileList[proj_conf.readme, proj_conf.history, - proj_conf.license] + lib + FileList["ext/*.c"] - all bin + examples + ext + lib + test + data + rdoc + tasks + FileList["Rakefile"] - } - - # ways to package the results - formats { - tgz true - zip true - rubygem Configuration::Table.has_key?('gem') - } -} - -#----------------------------------------------------------------------- -# Gem packaging -#----------------------------------------------------------------------- -Configuration.for("gem") { - spec "gemspec.rb" - Configuration.for('packaging').files.all << spec -} - -#----------------------------------------------------------------------- -# Testing -# - change mode to 'testunit' to use unit testing -#----------------------------------------------------------------------- -Configuration.for('test') { - mode "spec" - files Configuration.for("packaging").files.test - options %w[ --format specdoc --color ] - ruby_opts %w[ -w ] -} - -#----------------------------------------------------------------------- -# Rcov -#----------------------------------------------------------------------- -Configuration.for('rcov') { - output_dir "coverage" - libs %w[ lib ] - rcov_opts %w[ --html ] - ruby_opts %w[ -w ] - test_files Configuration.for('packaging').files.test -} - -#----------------------------------------------------------------------- -# Rdoc -#----------------------------------------------------------------------- -Configuration.for('rdoc') { - files Configuration.for('packaging').files.rdoc - main_page files.first - title Configuration.for('project').name - options %w[ --line-numbers --inline-source ]#-f darkfish ] - output_dir "doc" -} - -#----------------------------------------------------------------------- -# Extension -#----------------------------------------------------------------------- -Configuration.for('extension') { - configs Configuration.for('packaging').files.ext.find_all { |x| %w[ mkrf_conf.rb extconf.rb ].include?(File.basename(x)) } -} - -#----------------------------------------------------------------------- -# Rubyforge -#----------------------------------------------------------------------- -Configuration.for('rubyforge') { - project "copiousfreetime" - user "jjh" - host "rubyforge.org" - rdoc_location "#{user}@#{host}:/var/www/gforge-projects/#{project}/launchy" -} - - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/distribution.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/distribution.rake deleted file mode 100644 index 9319903d..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/distribution.rake +++ /dev/null @@ -1,46 +0,0 @@ -require 'tasks/config' - -#------------------------------------------------------------------------------- -# Distribution and Packaging -#------------------------------------------------------------------------------- -if pkg_config = Configuration.for_if_exist?("packaging") then - - require 'gemspec' - require 'rake/gempackagetask' - require 'rake/contrib/sshpublisher' - - namespace :dist do - - Rake::GemPackageTask.new(Launchy::GEM_SPEC) do |pkg| - pkg.need_tar = pkg_config.formats.tgz - pkg.need_zip = pkg_config.formats.zip - end - - desc "Install as a gem" - task :install => [:clobber, :package] do - sh "sudo gem install pkg/#{Launchy::GEM_SPEC.full_name}.gem" - end - - desc "Uninstall gem" - task :uninstall do - sh "sudo gem uninstall -x #{Launchy::GEM_SPEC.name}" - end - - desc "dump gemspec" - task :gemspec do - puts Launchy::GEM_SPEC.to_ruby - end - - desc "reinstall gem" - task :reinstall => [:uninstall, :repackage, :install] - - desc "distribute copiously" - task :copious => :package do - gems = Launchy::SPECS.collect { |s| "#{s.full_name}.gem" } - Rake::SshFilePublisher.new('jeremy@copiousfreetime.org', - '/var/www/vhosts/www.copiousfreetime.org/htdocs/gems/gems', - 'pkg', *gems).upload - sh "ssh jeremy@copiousfreetime.org rake -f /var/www/vhosts/www.copiousfreetime.org/htdocs/gems/Rakefile" - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/documentation.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/documentation.rake deleted file mode 100644 index da66fbee..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/documentation.rake +++ /dev/null @@ -1,32 +0,0 @@ -require 'tasks/config' - -#----------------------------------------------------------------------- -# Documentation -#----------------------------------------------------------------------- - -if rdoc_config = Configuration.for_if_exist?('rdoc') then - - namespace :doc do - - require 'rdoc' - require 'rake/rdoctask' - - # generating documentation locally - Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = rdoc_config.output_dir - rdoc.options = rdoc_config.options - rdoc.rdoc_files = rdoc_config.files.sort - rdoc.title = rdoc_config.title - rdoc.main = rdoc_config.main_page - end - - if rubyforge_config = Configuration.for_if_exist?('rubyforge') then - desc "Deploy the RDoc documentation to #{rubyforge_config.rdoc_location}" - task :deploy => :rerdoc do - sh "rsync -zav --delete #{rdoc_config.output_dir}/ #{rubyforge_config.rdoc_location}" - end - end - - end -end - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rspec.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rspec.rake deleted file mode 100644 index 7e764e81..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rspec.rake +++ /dev/null @@ -1,29 +0,0 @@ - -require 'tasks/config' - -#-------------------------------------------------------------------------------- -# configuration for running rspec. This shows up as the test:default task -#-------------------------------------------------------------------------------- -if spec_config = Configuration.for_if_exist?("test") then - if spec_config.mode == "spec" then - namespace :test do - - task :default => :spec - - require 'spec/rake/spectask' - Spec::Rake::SpecTask.new do |r| - r.ruby_opts = spec_config.ruby_opts - r.libs = [ Launchy::Paths.lib_path, - Launchy::Paths.root_dir ] - r.spec_files = spec_config.files - r.spec_opts = spec_config.options - - if rcov_config = Configuration.for_if_exist?('rcov') then - r.rcov = true - r.rcov_dir = rcov_config.output_dir - r.rcov_opts = rcov_config.rcov_opts - end - end - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rubyforge.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rubyforge.rake deleted file mode 100644 index a67b9097..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rubyforge.rake +++ /dev/null @@ -1,52 +0,0 @@ -require 'tasks/config' - -#----------------------------------------------------------------------- -# Rubyforge additions to the task library -#----------------------------------------------------------------------- -if rf_conf = Configuration.for_if_exist?("rubyforge") then - - abort("rubyforge gem not installed 'gem install rubyforge'") unless Utils.try_require('rubyforge') - - proj_conf = Configuration.for('project') - - namespace :dist do - desc "Release files to rubyforge" - task :rubyforge => [:clean, :package ] do - - rubyforge = RubyForge.new - - config = {} - config["release_notes"] = proj_conf.description - config["release_changes"] = Utils.release_notes_from(proj_conf.history)[Launchy::VERSION] - config["Prefomatted"] = true - - - rubyforge.configure config - - # make sure this release doesn't already exist - releases = rubyforge.autoconfig['release_ids'] - if releases.has_key?(Launchy::GEM_SPEC.name) and releases[Launchy::GEM_SPEC.name][Launchy::VERSION] then - abort("Release #{Launchy::VERSION} already exists! Unable to release.") - end - - puts "Uploading to rubyforge..." - files = FileList[File.join("pkg","#{Launchy::GEM_SPEC.name}-#{Launchy::VERSION}*.*")].to_a - rubyforge.login - rubyforge.add_release(Launchy::GEM_SPEC.rubyforge_project, Launchy::GEM_SPEC.name, Launchy::VERSION, *files) - puts "done." - end - end - - namespace :announce do - desc "Post news of #{proj_conf.name} to #{rf_conf.project} on rubyforge" - task :rubyforge do - info = Utils.announcement - rubyforge = RubyForge.new - rubyforge.configure - rubyforge.login - rubyforge.post_news(rf_conf.project, info[:subject], "#{info[:title]}\n\n#{info[:urls]}\n\n#{info[:release_notes]}") - puts "Posted to rubyforge" - end - - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/utils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/utils.rb deleted file mode 100644 index 42fd591f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/utils.rb +++ /dev/null @@ -1,80 +0,0 @@ -require 'launchy/version' - -#------------------------------------------------------------------------------- -# Additions to the Configuration class that are useful -#------------------------------------------------------------------------------- -class Configuration - class << self - def exist?( name ) - Configuration::Table.has_key?( name ) - end - - def for_if_exist?( name ) - if self.exist?( name ) then - self.for( name ) - end - end - end -end - -#------------------------------------------------------------------------------- -# some useful utilitiy methods for the tasks -#------------------------------------------------------------------------------- -module Utils - class << self - - # Try to load the given _library_ using the built-in require, but do not - # raise a LoadError if unsuccessful. Returns +true+ if the _library_ was - # successfully loaded; returns +false+ otherwise. - # - def try_require( lib ) - require lib - true - rescue LoadError - false - end - - # partition an rdoc file into sections, and return the text of the section - # given. - def section_of(file, section_name) - File.read(file).split(/^(?==)/).each do |section| - lines = section.split("\n") - return lines[1..-1].join("\n").strip if lines.first =~ /#{section_name}/i - end - nil - end - - # Get an array of all the changes in the application for a particular - # release. This is done by looking in the history file and grabbing the - # information for the most recent release. The history file is assumed to - # be in RDoc format and version release are 2nd tier sections separated by - # '== Version X.Y.Z' - # - # returns:: A hash of notes keyed by version number - # - def release_notes_from(history_file) - releases = {} - File.read(history_file).split(/^(?=== Version)/).each do |section| - lines = section.split("\n") - md = %r{Version ((\w+\.)+\w+)}.match(lines.first) - next unless md - releases[md[1]] = lines[1..-1].join("\n").strip - end - return releases - end - - # return a hash of useful information for the latest release - # urls, subject, title, description and latest release notes - # - def announcement - cfg = Configuration.for("project") - { - :subject => "#{cfg.name} #{Launchy::VERSION} Released", - :title => "#{cfg.name} version #{Launchy::VERSION} has been released.", - :urls => "#{cfg.homepage}", - :description => "#{cfg.description.rstrip}", - :release_notes => Utils.release_notes_from(cfg.history)[Launchy::VERSION].rstrip - } - end - end -end # << self diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile deleted file mode 100644 index 1221147f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile +++ /dev/null @@ -1,42 +0,0 @@ -require 'rake/clean' -require 'rake/testtask' - -task :default => [:test] -task :spec => :test - -Rake::TestTask.new(:test) do |t| - t.test_files = FileList['test/spec_*.rb'] - t.ruby_opts = ['-rubygems'] if defined? Gem -end - -require 'rubygems' -$spec = eval(File.read('shotgun.gemspec')) - -def package(ext='') - "pkg/#{$spec.name}-#{$spec.version}" + ext -end - -desc 'Build packages' -task :package => %w[.gem .tar.gz].map { |e| package(e) } - -desc 'Build and install as local gem' -task :install => package('.gem') do - sh "gem install #{package('.gem')}" -end - -directory 'pkg/' -CLOBBER.include('pkg') - -file package('.gem') => %W[pkg/ #{$spec.name}.gemspec] + $spec.files do |f| - sh "gem build #{$spec.name}.gemspec" - mv File.basename(f.name), f.name -end - -file package('.tar.gz') => %w[pkg/] + $spec.files do |f| - sh <<-SH - git archive \ - --prefix=#{$spec.name}-#{$spec.version}/ \ - --format=tar \ - HEAD | gzip > #{f.name} - SH -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/COPYING b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/COPYING similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/COPYING rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/COPYING diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/README b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/README similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/README diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/Rakefile new file mode 100644 index 00000000..28f6b4f3 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/Rakefile @@ -0,0 +1,43 @@ +require 'rake/clean' +require 'rake/testtask' + +task :default => [:test] +task :spec => :test + +Rake::TestTask.new(:test) do |t| + t.test_files = FileList['test/*_test.rb'] + t.ruby_opts = ['-rubygems'] if defined? Gem +end + +if defined? Gem + $spec = eval(File.read('shotgun.gemspec')) + + def package(ext='') + "pkg/#{$spec.name}-#{$spec.version}#{ext}" + end + + desc 'Build packages' + task :package => %w[.gem .tar.gz].map { |ext| package(ext) } + + desc 'Build and install as local gem' + task :install => package('.gem') do + sh "gem install #{package('.gem')}" + end + + directory 'pkg/' + CLOBBER.include('pkg') + + file package('.gem') => %w[pkg/ shotgun.gemspec] + $spec.files do |f| + sh "gem build shotgun.gemspec" + mv File.basename(f.name), f.name + end + + file package('.tar.gz') => %w[pkg/] + $spec.files do |f| + sh <<-SH + git archive \ + --prefix=shotgun-#{$spec.version}/ \ + --format=tar \ + HEAD | gzip > #{f.name} + SH + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/bin/shotgun similarity index 83% rename from lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/bin/shotgun index d618d297..e068dafc 100755 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/bin/shotgun @@ -130,14 +130,25 @@ app_wrapper = ENV['RACK_ENV'] = env +# use the BROWSER environment variable or fall back to a more or less standard +# set of commands +ENV['BROWSER'] ||= + %w[open xdg-open x-www-browser firefox opera mozilla netscape].find do |comm| + next if comm == 'open' && `uname` !~ /Darwin/ + ENV['PATH'].split(':').any? { |dir| File.executable?("#{dir}/#{comm}") } + end + require 'shotgun' app = Shotgun.new(config, app_wrapper) +base_url = "http://#{options[:Host]}:#{options[:Port]}" +puts "== Shotgun starting #{server.to_s} at #{base_url}" server.run app, options do |inst| - puts "== Shotgun starting #{server.to_s} on http://#{options[:Host]}:#{options[:Port]}" - if browse - require 'launchy' - Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}") + if ENV['BROWSER'] + system "#{ENV['BROWSER']} '#{base_url}#{options[:Path]}'" + else + abort "BROWSER environment variable not set and no browser detected" + end end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/lib/shotgun.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/lib/shotgun.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/lib/shotgun.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/lib/shotgun.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/shotgun.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/shotgun.gemspec similarity index 81% rename from lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/shotgun.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/shotgun.gemspec index cfc6400c..9c35f83a 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/shotgun.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/shotgun.gemspec @@ -3,8 +3,8 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.name = 'shotgun' - s.version = '0.5' - s.date = '2010-01-16' + s.version = '0.6' + s.date = '2010-01-28' s.description = "Because reloading sucks." s.summary = s.description @@ -19,13 +19,14 @@ Gem::Specification.new do |s| shotgun.gemspec lib/shotgun.rb bin/shotgun + test/shotgun_test.rb + test/test.ru ] s.executables = ['shotgun'] - s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/} + s.test_files = ['test/shotgun_test.rb'] s.extra_rdoc_files = %w[README] s.add_dependency 'rack', '>= 0.9.1' - s.add_dependency 'launchy', '>= 0.3.3', '< 1.0' s.homepage = "http://github.com/rtomayko/shotgun/" s.require_paths = %w[lib] diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/shotgun_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/shotgun_test.rb new file mode 100644 index 00000000..b3a05693 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/shotgun_test.rb @@ -0,0 +1,22 @@ +require 'test/unit' +require 'rack/mock' +require 'shotgun' + +class ShotgunTest < Test::Unit::TestCase + def setup + @rackup_file = "#{File.dirname(__FILE__)}/test.ru" + @shotgun = Shotgun.new(@rackup_file) + end + + def test_knows_the_rackup_file + assert_equal @rackup_file, @shotgun.rackup_file + end + + def test_processes_requests + request = Rack::MockRequest.new(@shotgun) + res = request.get("/") + assert_equal 200, res.status + assert_equal "BANG!", res.body + assert_equal "text/plain", res.headers['Content-Type'] + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/test.ru b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/test.ru new file mode 100644 index 00000000..271870be --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.6/test/test.ru @@ -0,0 +1,7 @@ +require 'rack' + +app = lambda { |env| + [200, {'Content-Type'=>'text/plain'}, ['BANG!']] } + +use Rack::ContentLength +run app diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/Rakefile deleted file mode 100644 index c541c340..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/Rakefile +++ /dev/null @@ -1,138 +0,0 @@ -require 'rake/clean' -require 'rake/testtask' -require 'fileutils' - -task :default => [:test, :compat] -task :spec => :test - -# SPECS =============================================================== - -task(:test) { puts "==> Running main test suite" } - -Rake::TestTask.new(:test) do |t| - t.test_files = FileList['test/*_test.rb'] - t.ruby_opts = ['-rubygems'] if defined? Gem -end - -desc "Run < 0.9.x compatibility specs" -task :compat do - begin - require 'mocha' - require 'test/spec' - at_exit { exit 0 } # disable test-spec at_exit runner - - puts "==> Running compat test suite" - Rake::TestTask.new(:compat) do |t| - t.test_files = FileList['compat/*_test.rb'] - t.ruby_opts = ['-rubygems'] if defined? Gem - end - rescue LoadError - warn 'Skipping compat tests. mocha and/or test-spec gems not installed.' - end -end - -# PACKAGING ============================================================ - -# Load the gemspec using the same limitations as github -def spec - @spec ||= - begin - require 'rubygems/specification' - data = File.read('sinatra.gemspec') - spec = nil - Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join - spec - end -end - -def package(ext='') - "pkg/sinatra-#{spec.version}" + ext -end - -desc 'Build packages' -task :package => %w[.gem .tar.gz].map {|e| package(e)} - -desc 'Build and install as local gem' -task :install => package('.gem') do - sh "gem install #{package('.gem')}" -end - -directory 'pkg/' -CLOBBER.include('pkg') - -file package('.gem') => %w[pkg/ sinatra.gemspec] + spec.files do |f| - sh "gem build sinatra.gemspec" - mv File.basename(f.name), f.name -end - -file package('.tar.gz') => %w[pkg/] + spec.files do |f| - sh <<-SH - git archive \ - --prefix=sinatra-#{source_version}/ \ - --format=tar \ - HEAD | gzip > #{f.name} - SH -end - -# Rubyforge Release / Publish Tasks ================================== - -desc 'Publish gem and tarball to rubyforge' -task 'release' => [package('.gem'), package('.tar.gz')] do |t| - sh <<-end - rubyforge add_release sinatra sinatra #{spec.version} #{package('.gem')} && - rubyforge add_file sinatra sinatra #{spec.version} #{package('.tar.gz')} - end -end - -# Website ============================================================ -# Building docs requires HAML and the hanna gem: -# gem install mislav-hanna --source=http://gems.github.com - -task 'doc' => ['doc:api'] - -desc 'Generate Hanna RDoc under doc/api' -task 'doc:api' => ['doc/api/index.html'] - -file 'doc/api/index.html' => FileList['lib/**/*.rb','README.rdoc'] do |f| - rb_files = f.prerequisites - sh((<<-end).gsub(/\s+/, ' ')) - hanna --charset utf8 \ - --fmt html \ - --inline-source \ - --line-numbers \ - --main README.rdoc \ - --op doc/api \ - --title 'Sinatra API Documentation' \ - #{rb_files.join(' ')} - end -end -CLEAN.include 'doc/api' - -# Gemspec Helpers ==================================================== - -def source_version - line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/] - line.match(/.*VERSION = '(.*)'/)[1] -end - -task 'sinatra.gemspec' => FileList['{lib,test,compat}/**','Rakefile','CHANGES','*.rdoc'] do |f| - # read spec file and split out manifest section - spec = File.read(f.name) - head, manifest, tail = spec.split(" # = MANIFEST =\n") - # replace version and date - head.sub!(/\.version = '.*'/, ".version = '#{source_version}'") - head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'") - # determine file list from git ls-files - files = `git ls-files`. - split("\n"). - sort. - reject{ |file| file =~ /^\./ }. - reject { |file| file =~ /^doc/ }. - map{ |file| " #{file}" }. - join("\n") - # piece file back together and write... - manifest = " s.files = %w[\n#{files}\n ]\n" - spec = [head,manifest,tail].join(" # = MANIFEST =\n") - File.open(f.name, 'w') { |io| io.write(spec) } - puts "updated #{f.name}" -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/app_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/app_test.rb deleted file mode 100644 index 1a17eb63..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/app_test.rb +++ /dev/null @@ -1,282 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Sinatra" do - - setup do - Sinatra.application = nil - end - - specify "should put all DSL methods on (main)" do - object = Object.new - methods = %w[get put post head delete configure template helpers set] - methods.each do |method| - object.private_methods.map { |m| m.to_sym }.should.include(method.to_sym) - end - end - - specify "should handle result of nil" do - get '/' do - nil - end - - get_it '/' - should.be.ok - body.should == '' - end - - specify "handles events" do - get '/:name' do - 'Hello ' + params["name"] - end - - get_it '/Blake' - - should.be.ok - body.should.equal 'Hello Blake' - end - - - specify "handles splats" do - get '/hi/*' do - params["splat"].kind_of?(Array).should.equal true - params["splat"].first - end - - get_it '/hi/Blake' - - should.be.ok - body.should.equal 'Blake' - end - - specify "handles multiple splats" do - get '/say/*/to/*' do - params["splat"].join(' ') - end - - get_it '/say/hello/to/world' - - should.be.ok - body.should.equal 'hello world' - end - - specify "allow empty splats" do - get '/say/*/to*/*' do - params["splat"].join(' ') - end - - get_it '/say/hello/to/world' - - should.be.ok - body.should.equal 'hello world' # second splat is empty - - get_it '/say/hello/tomy/world' - - should.be.ok - body.should.equal 'hello my world' - end - - specify "gives access to underlying response header Hash" do - get '/' do - header['X-Test'] = 'Is this thing on?' - headers 'X-Test2' => 'Foo', 'X-Test3' => 'Bar' - '' - end - - get_it '/' - should.be.ok - headers.should.include 'X-Test' - headers['X-Test'].should.equal 'Is this thing on?' - headers.should.include 'X-Test3' - headers['X-Test3'].should.equal 'Bar' - end - - specify "follows redirects" do - get '/' do - redirect '/blake' - end - - get '/blake' do - 'Mizerany' - end - - get_it '/' - should.be.redirection - body.should.equal '' - - follow! - should.be.ok - body.should.equal 'Mizerany' - end - - specify "renders a body with a redirect" do - helpers do - def foo ; 'blah' ; end - end - get "/" do - redirect 'foo', :foo - end - get_it '/' - should.be.redirection - headers['Location'].should.equal 'foo' - body.should.equal 'blah' - end - - specify "redirects permanently with 301 status code" do - get "/" do - redirect 'foo', 301 - end - get_it '/' - should.be.redirection - headers['Location'].should.equal 'foo' - status.should.equal 301 - body.should.be.empty - end - - specify "stop sets content and ends event" do - get '/set_body' do - stop 'Hello!' - stop 'World!' - fail 'stop should have halted' - end - - get_it '/set_body' - - should.be.ok - body.should.equal 'Hello!' - - end - - specify "should easily set response Content-Type" do - get '/foo.html' do - content_type 'text/html', :charset => 'utf-8' - "

Hello, World

" - end - - get_it '/foo.html' - should.be.ok - headers['Content-Type'].should.equal 'text/html;charset=utf-8' - body.should.equal '

Hello, World

' - - get '/foo_test.xml' do - content_type :xml - "" - end - - get_it '/foo_test.xml' - should.be.ok - headers['Content-Type'].should.equal 'application/xml' - body.should.equal '' - end - - specify "supports conditional GETs with last_modified" do - modified_at = Time.now - get '/maybe' do - last_modified modified_at - 'response body, maybe' - end - - get_it '/maybe' - should.be.ok - body.should.equal 'response body, maybe' - - get_it '/maybe', :env => { 'HTTP_IF_MODIFIED_SINCE' => modified_at.httpdate } - status.should.equal 304 - body.should.equal '' - end - - specify "supports conditional GETs with entity_tag" do - get '/strong' do - entity_tag 'FOO' - 'foo response' - end - - get_it '/strong' - should.be.ok - body.should.equal 'foo response' - - get_it '/strong', {}, - 'HTTP_IF_NONE_MATCH' => '"BAR"' - should.be.ok - body.should.equal 'foo response' - - get_it '/strong', {}, - 'HTTP_IF_NONE_MATCH' => '"FOO"' - status.should.equal 304 - body.should.equal '' - - get_it '/strong', {}, - 'HTTP_IF_NONE_MATCH' => '"BAR", *' - status.should.equal 304 - body.should.equal '' - end - - specify "delegates HEAD requests to GET handlers" do - get '/invisible' do - "I am invisible to the world" - end - - head_it '/invisible' - should.be.ok - body.should.not.equal "I am invisible to the world" - body.should.equal '' - end - - - specify "supports PUT" do - put '/' do - 'puted' - end - put_it '/' - assert_equal 'puted', body - end - - specify "rewrites POSTs with _method param to PUT" do - put '/' do - 'puted' - end - post_it '/', :_method => 'PUT' - assert_equal 'puted', body - end - - specify "rewrites POSTs with lowercase _method param to PUT" do - put '/' do - 'puted' - end - post_it '/', :_method => 'put' - body.should.equal 'puted' - end - - specify "does not rewrite GETs with _method param to PUT" do - get '/' do - 'getted' - end - get_it '/', :_method => 'put' - should.be.ok - body.should.equal 'getted' - end - - specify "ignores _method query string parameter on non-POST requests" do - post '/' do - 'posted' - end - put '/' do - 'booo' - end - post_it "/?_method=PUT" - should.be.ok - body.should.equal 'posted' - end - - specify "does not read body if content type is not url encoded" do - post '/foo.xml' do - request.env['CONTENT_TYPE'].should.be == 'application/xml' - request.content_type.should.be == 'application/xml' - request.body.read - end - - post_it '/foo.xml', '', :content_type => 'application/xml' - @response.should.be.ok - @response.body.should.be == '' - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/application_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/application_test.rb deleted file mode 100644 index af8d33b2..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/application_test.rb +++ /dev/null @@ -1,262 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -require 'uri' - -class TesterWithEach - def each - yield 'foo' - yield 'bar' - yield 'baz' - end -end - -context "An app returns" do - - setup do - Sinatra.application = nil - end - - specify "404 if no events found" do - request = Rack::MockRequest.new(@app) - get_it '/' - should.be.not_found - body.should.equal '

Not Found

' - end - - specify "200 if success" do - get '/' do - 'Hello World' - end - get_it '/' - should.be.ok - body.should.equal 'Hello World' - end - - specify "an objects result from each if it has it" do - - get '/' do - TesterWithEach.new - end - - get_it '/' - should.be.ok - body.should.equal 'foobarbaz' - - end - - specify "404 if NotFound is raised" do - - get '/' do - raise Sinatra::NotFound - end - - get_it '/' - should.be.not_found - - end - -end - -context "Application#configure blocks" do - - setup do - Sinatra.application = nil - end - - specify "run when no environment specified" do - ref = false - configure { ref = true } - ref.should.equal true - end - - specify "run when matching environment specified" do - ref = false - configure(:test) { ref = true } - ref.should.equal true - end - - specify "do not run when no matching environment specified" do - configure(:foo) { flunk "block should not have been executed" } - configure(:development, :production, :foo) { flunk "block should not have been executed" } - end - - specify "accept multiple environments" do - ref = false - configure(:foo, :test, :bar) { ref = true } - ref.should.equal true - end - -end - -context "Events in an app" do - - setup do - Sinatra.application = nil - end - - specify "evaluate in a clean context" do - helpers do - def foo - 'foo' - end - end - - get '/foo' do - foo - end - - get_it '/foo' - should.be.ok - body.should.equal 'foo' - end - - specify "get access to request, response, and params" do - get '/:foo' do - params["foo"] + params["bar"] - end - - get_it '/foo?bar=baz' - should.be.ok - body.should.equal 'foobaz' - end - - specify "can filters by agent" do - - get '/', :agent => /Windows/ do - request.env['HTTP_USER_AGENT'] - end - - get_it '/', :env => { :agent => 'Windows' } - should.be.ok - body.should.equal 'Windows' - - get_it '/', :env => { :agent => 'Mac' } - should.not.be.ok - - end - - specify "can use regex to get parts of user-agent" do - - get '/', :agent => /Windows (NT)/ do - params[:agent].first - end - - get_it '/', :env => { :agent => 'Windows NT' } - - body.should.equal 'NT' - - end - - specify "can deal with spaces in paths" do - - path = '/path with spaces' - - get path do - "Look ma, a path with spaces!" - end - - get_it URI.encode(path) - - body.should.equal "Look ma, a path with spaces!" - end - - specify "route based on host" do - - get '/' do - 'asdf' - end - - get_it '/' - assert ok? - assert_equal('asdf', body) - - get '/foo', :host => 'foo.sinatrarb.com' do - 'in foo!' - end - - get '/foo', :host => 'bar.sinatrarb.com' do - 'in bar!' - end - - get_it '/foo', {}, 'HTTP_HOST' => 'foo.sinatrarb.com' - assert ok? - assert_equal 'in foo!', body - - get_it '/foo', {}, 'HTTP_HOST' => 'bar.sinatrarb.com' - assert ok? - assert_equal 'in bar!', body - - get_it '/foo' - assert not_found? - - end - -end - - -context "Options in an app" do - - setup do - Sinatra.application = nil - @app = Sinatra::application - end - - specify "can be set singly on app" do - @app.set :foo, 1234 - @app.options.foo.should.equal 1234 - end - - specify "can be set singly from top-level" do - set_option :foo, 1234 - @app.options.foo.should.equal 1234 - end - - specify "can be set multiply on app" do - @app.options.foo.should.be.nil - @app.set :foo => 1234, - :bar => 'hello, world' - @app.options.foo.should.equal 1234 - @app.options.bar.should.equal 'hello, world' - end - - specify "can be set multiply from top-level" do - @app.options.foo.should.be.nil - set_options :foo => 1234, - :bar => 'hello, world' - @app.options.foo.should.equal 1234 - @app.options.bar.should.equal 'hello, world' - end - - specify "can be enabled on app" do - @app.options.foo.should.be.nil - @app.enable :sessions, :foo, :bar - @app.options.sessions.should.equal true - @app.options.foo.should.equal true - @app.options.bar.should.equal true - end - - specify "can be enabled from top-level" do - @app.options.foo.should.be.nil - enable :sessions, :foo, :bar - @app.options.sessions.should.equal true - @app.options.foo.should.equal true - @app.options.bar.should.equal true - end - - specify "can be disabled on app" do - @app.options.foo.should.be.nil - @app.disable :sessions, :foo, :bar - @app.options.sessions.should.equal false - @app.options.foo.should.equal false - @app.options.bar.should.equal false - end - - specify "can be enabled from top-level" do - @app.options.foo.should.be.nil - disable :sessions, :foo, :bar - @app.options.sessions.should.equal false - @app.options.foo.should.equal false - @app.options.bar.should.equal false - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/builder_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/builder_test.rb deleted file mode 100644 index 5abc83bd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/builder_test.rb +++ /dev/null @@ -1,101 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Builder" do - - setup do - Sinatra.application = nil - end - - context "without layouts" do - - setup do - Sinatra.application = nil - end - - specify "should render" do - - get '/no_layout' do - builder 'xml.instruct!' - end - - get_it '/no_layout' - should.be.ok - body.should == %(\n) - - end - - specify "should render inline block" do - - get '/no_layout_and_inlined' do - @name = "Frank & Mary" - builder do |xml| - xml.couple @name - end - end - - get_it '/no_layout_and_inlined' - should.be.ok - body.should == %(Frank & Mary\n) - - end - - end - - - - context "Templates (in general)" do - - setup do - Sinatra.application = nil - end - - specify "are read from files if Symbols" do - - get '/from_file' do - @name = 'Blue' - builder :foo, :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/from_file' - should.be.ok - body.should.equal %(You rock Blue!\n) - - end - - specify "use layout.ext by default if available" do - - get '/' do - builder :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/' - should.be.ok - body.should.equal "\nis foo!\n\n" - - end - - specify "renders without layout" do - - get '/' do - builder :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout" - end - - get_it '/' - should.be.ok - body.should.equal "No Layout!\n" - - end - - specify "raises error if template not found" do - - get '/' do - builder :not_found - end - - lambda { get_it '/' }.should.raise(Errno::ENOENT) - - end - - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/compat_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/compat_test.rb deleted file mode 100644 index 00978197..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/compat_test.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Compat" do - setup do - Sinatra.application = nil - @app = Sinatra.application - end - - specify "makes EventContext available" do - assert_same Sinatra::Default, Sinatra::EventContext - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/custom_error_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/custom_error_test.rb deleted file mode 100644 index e4fdb759..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/custom_error_test.rb +++ /dev/null @@ -1,62 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Custom Errors" do - - setup do - Sinatra.application = nil - end - - specify "override the default 404" do - - get_it '/' - should.be.not_found - body.should.equal '

Not Found

' - - error Sinatra::NotFound do - 'Custom 404' - end - - get_it '/' - should.be.not_found - body.should.equal 'Custom 404' - - end - - specify "override the default 500" do - Sinatra.application.options.raise_errors = false - - get '/' do - raise 'asdf' - end - - get_it '/' - status.should.equal 500 - body.should.equal '

Internal Server Error

' - - - error do - 'Custom 500 for ' + request.env['sinatra.error'].message - end - - get_it '/' - - get_it '/' - status.should.equal 500 - body.should.equal 'Custom 500 for asdf' - - Sinatra.application.options.raise_errors = true - end - - class UnmappedError < RuntimeError; end - - specify "should bring unmapped error back to the top" do - get '/' do - raise UnmappedError, 'test' - end - - assert_raises(UnmappedError) do - get_it '/' - end - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/erb_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/erb_test.rb deleted file mode 100644 index 51a79593..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/erb_test.rb +++ /dev/null @@ -1,136 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Erb" do - - setup do - Sinatra.application = nil - end - - context "without layouts" do - - setup do - Sinatra.application = nil - end - - specify "should render" do - - get '/no_layout' do - erb '<%= 1 + 1 %>' - end - - get_it '/no_layout' - should.be.ok - body.should == '2' - - end - - specify "should take an options hash with :locals set with a string" do - get '/locals' do - erb '<%= foo %>', :locals => {:foo => "Bar"} - end - - get_it '/locals' - should.be.ok - body.should == 'Bar' - end - - specify "should take an options hash with :locals set with a complex object" do - get '/locals-complex' do - erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]} - end - - get_it '/locals-complex' - should.be.ok - body.should == 'foo' - end - end - - context "with layouts" do - - setup do - Sinatra.application = nil - end - - specify "can be inline" do - - layout do - %Q{This is <%= yield %>!} - end - - get '/lay' do - erb 'Blake' - end - - get_it '/lay' - should.be.ok - body.should.equal 'This is Blake!' - - end - - specify "can use named layouts" do - - layout :pretty do - %Q{

<%= yield %>

} - end - - get '/pretty' do - erb 'Foo', :layout => :pretty - end - - get '/not_pretty' do - erb 'Bar' - end - - get_it '/pretty' - body.should.equal '

Foo

' - - get_it '/not_pretty' - body.should.equal 'Bar' - - end - - specify "can be read from a file if they're not inlined" do - - get '/foo' do - @title = 'Welcome to the Hello Program' - erb 'Blake', :layout => :foo_layout, - :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/foo' - body.should.equal "Welcome to the Hello Program\nHi Blake\n" - - end - - end - - context "Templates (in general)" do - - specify "are read from files if Symbols" do - - get '/from_file' do - @name = 'Alena' - erb :foo, :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/from_file' - - body.should.equal 'You rock Alena!' - - end - - specify "use layout.ext by default if available" do - - get '/layout_from_file' do - erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/layout_from_file' - should.be.ok - body.should.equal "x This is foo! x \n" - - end - - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/events_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/events_test.rb deleted file mode 100644 index 42cdb95c..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/events_test.rb +++ /dev/null @@ -1,78 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Simple Events" do - def simple_request_hash(method, path) - Rack::Request.new({ - 'REQUEST_METHOD' => method.to_s.upcase, - 'PATH_INFO' => path - }) - end - - class MockResult < Struct.new(:block, :params) - end - - def invoke_simple(path, request_path, &b) - params = nil - get path do - params = self.params - b.call if b - end - get_it request_path - MockResult.new(b, params) - end - - setup { Sinatra.application = nil } - - specify "return last value" do - block = Proc.new { 'Simple' } - result = invoke_simple('/', '/', &block) - result.should.not.be.nil - result.block.should.be block - result.params.should.equal Hash.new - end - - specify "takes params in path" do - result = invoke_simple('/:foo/:bar', '/a/b') - result.should.not.be.nil - result.params.should.equal "foo" => 'a', "bar" => 'b' - - # unscapes - Sinatra.application = nil - result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany') - result.should.not.be.nil - result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany' - end - - specify "takes optional params in path" do - result = invoke_simple('/?:foo?/?:bar?', '/a/b') - result.should.not.be.nil - result.params.should.equal "foo" => 'a', "bar" => 'b' - - Sinatra.application = nil - result = invoke_simple('/?:foo?/?:bar?', '/a/') - result.should.not.be.nil - result.params.should.equal "foo" => 'a', "bar" => nil - - Sinatra.application = nil - result = invoke_simple('/?:foo?/?:bar?', '/a') - result.should.not.be.nil - result.params.should.equal "foo" => 'a', "bar" => nil - - Sinatra.application = nil - result = invoke_simple('/:foo?/?:bar?', '/') - result.should.not.be.nil - result.params.should.equal "foo" => nil, "bar" => nil - end - - specify "ignores to many /'s" do - result = invoke_simple('/x/y', '/x//y') - result.should.not.be.nil - end - - specify "understands splat" do - invoke_simple('/foo/*', '/foo/bar').should.not.be.nil - invoke_simple('/foo/*', '/foo/bar/baz').should.not.be.nil - invoke_simple('/foo/*', '/foo/baz').should.not.be.nil - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/filter_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/filter_test.rb deleted file mode 100644 index 0a52ec6f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/filter_test.rb +++ /dev/null @@ -1,30 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "before filters" do - - setup do - Sinatra.application = nil - @app = Sinatra.application - end - - specify "should be executed in the order defined" do - invoked = 0x0 - @app.before { invoked = 0x01 } - @app.before { invoked |= 0x02 } - @app.get('/') { 'Hello World' } - get_it '/' - should.be.ok - body.should.be == 'Hello World' - invoked.should.be == 0x03 - end - - specify "should be capable of modifying the request" do - @app.get('/foo') { 'foo' } - @app.get('/bar') { 'bar' } - @app.before { request.path_info = '/bar' } - get_it '/foo' - should.be.ok - body.should.be == 'bar' - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/haml_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/haml_test.rb deleted file mode 100644 index 532414cd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/haml_test.rb +++ /dev/null @@ -1,236 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Haml" do - - setup do - Sinatra.application = nil - end - - context "without layouts" do - - setup do - Sinatra.application = nil - end - - specify "should render" do - - get '/no_layout' do - haml '== #{1+1}' - end - - get_it '/no_layout' - should.be.ok - body.should == "2\n" - - end - end - - context "with layouts" do - - setup do - Sinatra.application = nil - end - - specify "can be inline" do - - layout do - '== This is #{yield}!' - end - - get '/lay' do - haml 'Blake' - end - - get_it '/lay' - should.be.ok - body.should.equal "This is Blake\n!\n" - - end - - specify "can use named layouts" do - - layout :pretty do - '%h1== #{yield}' - end - - get '/pretty' do - haml 'Foo', :layout => :pretty - end - - get '/not_pretty' do - haml 'Bar' - end - - get_it '/pretty' - body.should.equal "

Foo

\n" - - get_it '/not_pretty' - body.should.equal "Bar\n" - - end - - specify "can be read from a file if they're not inlined" do - - get '/foo' do - @title = 'Welcome to the Hello Program' - haml 'Blake', :layout => :foo_layout, - :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/foo' - body.should.equal "Welcome to the Hello Program\nHi Blake\n" - - end - - specify "can be read from file and layout from text" do - get '/foo' do - haml 'Test', :layout => '== Foo #{yield}' - end - - get_it '/foo' - - body.should.equal "Foo Test\n" - end - - end - - context "Templates (in general)" do - - setup do - Sinatra.application = nil - end - - specify "are read from files if Symbols" do - - get '/from_file' do - @name = 'Alena' - haml :foo, :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/from_file' - - body.should.equal "You rock Alena!\n" - - end - - specify "use layout.ext by default if available" do - - get '/' do - haml :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/' - should.be.ok - body.should.equal "x This is foo!\n x\n" - - end - - specify "renders without layout" do - - get '/' do - haml :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout" - end - - get_it '/' - should.be.ok - body.should.equal "

No Layout!

\n" - - end - - specify "can render with no layout" do - layout do - "X\n= yield\nX" - end - - get '/' do - haml 'blake', :layout => false - end - - get_it '/' - - body.should.equal "blake\n" - end - - specify "raises error if template not found" do - get '/' do - haml :not_found - end - - lambda { get_it '/' }.should.raise(Errno::ENOENT) - end - - specify "use layout.ext by default if available" do - - template :foo do - 'asdf' - end - - get '/' do - haml :foo, :layout => false, - :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/' - should.be.ok - body.should.equal "asdf\n" - - end - - end - - describe 'Options passed to the HAML interpreter' do - setup do - Sinatra.application = nil - end - - specify 'default to filename and line of caller' do - - get '/' do - haml 'foo' - end - - Haml::Engine.expects(:new).with('foo', {:filename => __FILE__, - :line => (__LINE__-4)}).returns(stub(:render => 'foo')) - - get_it '/' - should.be.ok - - end - - specify 'can be configured by passing :options to haml' do - - get '/' do - haml 'foo', :options => {:format => :html4} - end - - Haml::Engine.expects(:new).with('foo', {:filename => __FILE__, - :line => (__LINE__-4), :format => :html4}).returns(stub(:render => 'foo')) - - get_it '/' - should.be.ok - - end - - specify 'can be configured using set_option :haml' do - - configure do - set_option :haml, :format => :html4, - :escape_html => true - end - - get '/' do - haml 'foo' - end - - Haml::Engine.expects(:new).with('foo', {:filename => __FILE__, - :line => (__LINE__-4), :format => :html4, - :escape_html => true}).returns(stub(:render => 'foo')) - - get_it '/' - should.be.ok - - end - - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/helper.rb deleted file mode 100644 index 696fe96e..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/helper.rb +++ /dev/null @@ -1,33 +0,0 @@ -require 'rubygems' -require 'mocha' - -# disable warnings in compat specs. -$VERBOSE = nil - -$:.unshift File.dirname(File.dirname(__FILE__)) + "/lib" - -ENV['RACK_ENV'] ||= 'test' - -require 'sinatra' -require 'sinatra/test' -require 'sinatra/test/unit' -require 'sinatra/test/spec' - -module Sinatra::Test - # we need to remove the new test helper methods since they conflict with - # the top-level methods of the same name. - %w(get head post put delete).each do |verb| - remove_method verb - end - include Sinatra::Delegator -end - -class Test::Unit::TestCase - include Sinatra::Test - - PASSTHROUGH_EXCEPTIONS = [] unless const_defined?(:PASSTHROUGH_EXCEPTIONS) - - def setup - @app = lambda { |env| Sinatra::Application.call(env) } - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/mapped_error_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/mapped_error_test.rb deleted file mode 100644 index e6256b47..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/mapped_error_test.rb +++ /dev/null @@ -1,72 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -class FooError < RuntimeError; end - -context "Mapped errors" do - - setup do - Sinatra.application = nil - Sinatra.application.options.raise_errors = false - end - - specify "are rescued and run in context" do - - error FooError do - 'MAPPED ERROR!' - end - - get '/' do - raise FooError - end - - get_it '/' - - should.be.server_error - body.should.equal 'MAPPED ERROR!' - - end - - specify "renders empty if no each method on result" do - - error FooError do - nil - end - - get '/' do - raise FooError - end - - get_it '/' - - should.be.server_error - body.should.be.empty - - end - - specify "doesn't override status if set" do - - error FooError do - status(200) - end - - get '/' do - raise FooError - end - - get_it '/' - - should.be.ok - - end - - specify "raises errors when the raise_errors option is set" do - Sinatra.application.options.raise_errors = true - error FooError do - end - get '/' do - raise FooError - end - assert_raises(FooError) { get_it('/') } - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/pipeline_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/pipeline_test.rb deleted file mode 100644 index a9eb360a..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/pipeline_test.rb +++ /dev/null @@ -1,45 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -class UpcaseMiddleware - def initialize(app, *args, &block) - @app = app - @args = args - @block = block - end - def call(env) - env['PATH_INFO'] = env['PATH_INFO'].to_s.upcase - @app.call(env) - end -end - -context "Middleware Pipelines" do - - setup do - Sinatra.application = nil - @app = Sinatra.application - end - - teardown do - Sinatra.application = nil - end - - specify "should add middleware with use" do - block = Proc.new { |env| } - @app.use UpcaseMiddleware - @app.use UpcaseMiddleware, "foo", "bar" - @app.use UpcaseMiddleware, "foo", "bar", &block - @app.send(:middleware).should.include([UpcaseMiddleware, [], nil]) - @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], nil]) - @app.send(:middleware).should.include([UpcaseMiddleware, ["foo", "bar"], block]) - end - - specify "should run middleware added with use" do - get('/foo') { "FAIL!" } - get('/FOO') { "PASS!" } - use UpcaseMiddleware - get_it '/foo' - should.be.ok - body.should.equal "PASS!" - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/public/foo.xml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/public/foo.xml deleted file mode 100644 index 74d9a6d3..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/public/foo.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sass_test.rb deleted file mode 100644 index 1b9745cc..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sass_test.rb +++ /dev/null @@ -1,67 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Sass" do - - setup do - Sinatra.application = nil - end - - context "Templates (in general)" do - - setup do - Sinatra.application = nil - end - - specify "are read from files if Symbols" do - - get '/from_file' do - sass :foo, :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/from_file' - should.be.ok - body.should.equal "#sass {\n background_color: #FFF; }\n" - - end - - specify "raise an error if template not found" do - get '/' do - sass :not_found - end - - lambda { get_it '/' }.should.raise(Errno::ENOENT) - end - - specify "ignore default layout file with .sass extension" do - get '/' do - sass :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/' - should.be.ok - body.should.equal "#sass {\n background_color: #FFF; }\n" - end - - specify "ignore explicitly specified layout file" do - get '/' do - sass :foo, :layout => :layout, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/' - should.be.ok - body.should.equal "#sass {\n background_color: #FFF; }\n" - end - - it "passes :sass option to the Sass engine" do - get '/' do - sass "#sass\n :background-color #FFF\n :color #000\n", :sass => {:style => :compact} - end - - get_it '/' - should.be.ok - body.should.equal "#sass { background-color: #FFF; color: #000; }\n" - end - - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sessions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sessions_test.rb deleted file mode 100644 index 9d9622db..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sessions_test.rb +++ /dev/null @@ -1,42 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Sessions" do - - setup { Sinatra.application = nil } - - specify "should be off by default" do - get '/asdf' do - session[:test] = true - "asdf" - end - - get '/test' do - session[:test] == true ? "true" : "false" - end - - get_it '/asdf', {}, 'HTTP_HOST' => 'foo.sinatrarb.com' - assert ok? - assert !include?('Set-Cookie') - end - - specify "should be able to store data accross requests" do - set_option :sessions, true - set_option :environment, :not_test # necessary because sessions are disabled - - get '/foo' do - session[:test] = true - "asdf" - end - - get '/bar' do - session[:test] == true ? "true" : "false" - end - - get_it '/foo', :env => { :host => 'foo.sinatrarb.com' } - assert ok? - assert include?('Set-Cookie') - - set_option :environment, :test - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/streaming_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/streaming_test.rb deleted file mode 100644 index cf3727be..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/streaming_test.rb +++ /dev/null @@ -1,133 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Static files (by default)" do - - setup do - Sinatra.application = nil - Sinatra.application.options.public = File.dirname(__FILE__) + '/public' - end - - specify "are served from root/public" do - get_it '/foo.xml' - should.be.ok - headers['Content-Length'].should.equal '12' - headers['Content-Type'].should.equal 'application/xml' - body.should.equal "\n" - end - - specify "are not served when verb is not GET or HEAD" do - post_it '/foo.xml' - # these should actually be giving back a 405 Method Not Allowed but that - # complicates the routing logic quite a bit. - should.be.not_found - status.should.equal 404 - end - - specify "are served when verb is HEAD but missing a body" do - head_it '/foo.xml' - should.be.ok - headers['Content-Length'].should.equal '12' - headers['Content-Type'].should.equal 'application/xml' - body.should.equal "" - end - - # static files override dynamic/internal events and ... - specify "are served when conflicting events exists" do - get '/foo.xml' do - 'this is not foo.xml!' - end - get_it '/foo.xml' - should.be.ok - body.should.equal "\n" - end - - specify "are irrelevant when request_method is not GET/HEAD" do - put '/foo.xml' do - 'putted!' - end - put_it '/foo.xml' - should.be.ok - body.should.equal 'putted!' - - get_it '/foo.xml' - should.be.ok - body.should.equal "\n" - end - - specify "include a Last-Modified header" do - last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml') - get_it('/foo.xml') - should.be.ok - body.should.not.be.empty - headers['Last-Modified'].should.equal last_modified.httpdate - end - - # Deprecated. Use: ConditionalGet middleware. - specify "are not served when If-Modified-Since matches" do - last_modified = File.mtime(Sinatra.application.options.public + '/foo.xml') - @request = Rack::MockRequest.new(Sinatra.application) - @response = @request.get('/foo.xml', 'HTTP_IF_MODIFIED_SINCE' => last_modified.httpdate) - status.should.equal 304 - body.should.be.empty - end - - specify "should omit Content-Disposition headers" do - get_it('/foo.xml') - should.be.ok - headers['Content-Disposition'].should.be.nil - headers['Content-Transfer-Encoding'].should.be.nil - end - - specify "should be served even if their path is url escaped" do - get_it('/fo%6f.xml') - should.be.ok - body.should.equal "\n" - end - -end - -context "SendData" do - - setup do - Sinatra.application = nil - end - - # Deprecated. send_data is going away. - specify "should send the data with options" do - get '/' do - send_data 'asdf', :status => 500 - end - - get_it '/' - - should.be.server_error - body.should.equal 'asdf' - end - - # Deprecated. The Content-Disposition is no longer handled by sendfile. - specify "should include a Content-Disposition header" do - get '/' do - send_file File.dirname(__FILE__) + '/public/foo.xml', - :disposition => 'attachment' - end - - get_it '/' - - should.be.ok - headers['Content-Disposition'].should.not.be.nil - headers['Content-Disposition'].should.equal 'attachment; filename="foo.xml"' - end - - specify "should include a Content-Disposition header when :disposition set to attachment" do - get '/' do - send_file File.dirname(__FILE__) + '/public/foo.xml', - :disposition => 'attachment' - end - - get_it '/' - - should.be.ok - headers['Content-Disposition'].should.not.be.nil - headers['Content-Disposition'].should.equal 'attachment; filename="foo.xml"' - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sym_params_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sym_params_test.rb deleted file mode 100644 index 2172be0c..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sym_params_test.rb +++ /dev/null @@ -1,19 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Symbol Params" do - - setup do - Sinatra.application = nil - end - - specify "should be accessable as Strings or Symbols" do - get '/' do - params[:foo] + params['foo'] - end - - get_it '/', :foo => "X" - assert_equal('XX', body) - end - -end - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/template_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/template_test.rb deleted file mode 100644 index 1e27578f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/template_test.rb +++ /dev/null @@ -1,30 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Templates" do - - specify "are read from files if Symbols" do - - get '/from_file' do - @name = 'Alena' - erb :foo, :views_directory => File.dirname(__FILE__) + "/views" - end - - get_it '/from_file' - - body.should.equal 'You rock Alena!' - - end - - specify "use layout.ext by default if available" do - - get '/layout_from_file' do - erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test" - end - - get_it '/layout_from_file' - should.be.ok - body.should.equal "x This is foo! x \n" - - end - -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/use_in_file_templates_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/use_in_file_templates_test.rb deleted file mode 100644 index 265f07de..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/use_in_file_templates_test.rb +++ /dev/null @@ -1,47 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -context "Rendering in file templates" do - - setup do - Sinatra.application = nil - use_in_file_templates! - end - - specify "should set template" do - assert Sinatra.application.templates[:foo] - end - - specify "should set layout" do - assert Sinatra.application.templates[:layout] - end - - specify "should render without layout if specified" do - get '/' do - haml :foo, :layout => false - end - - get_it '/' - assert_equal "this is foo\n", body - end - - specify "should render with layout if specified" do - get '/' do - haml :foo - end - - get_it '/' - assert_equal "X\nthis is foo\nX\n", body - end - -end - -__END__ - -@@ foo -this is foo - -@@ layout -X -= yield -X - diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.builder deleted file mode 100644 index dfa91a64..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.builder +++ /dev/null @@ -1 +0,0 @@ -xml.exclaim "You rock #{@name}!" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.erb deleted file mode 100644 index fac96378..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.erb +++ /dev/null @@ -1 +0,0 @@ -You rock <%= @name %>! \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.haml deleted file mode 100644 index 0fcc4f40..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.haml +++ /dev/null @@ -1 +0,0 @@ -== You rock #{@name}! \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.sass deleted file mode 100644 index 12340f70..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.sass +++ /dev/null @@ -1,2 +0,0 @@ -#sass - :background_color #FFF \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.erb deleted file mode 100644 index 6e39e8c7..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.erb +++ /dev/null @@ -1,2 +0,0 @@ -<%= @title %> -Hi <%= yield %> diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.haml deleted file mode 100644 index 5c041fb0..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.haml +++ /dev/null @@ -1,2 +0,0 @@ -== #{@title} -== Hi #{yield} diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.builder deleted file mode 100644 index 910eb1de..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.builder +++ /dev/null @@ -1 +0,0 @@ -xml.this "is foo!" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.erb deleted file mode 100644 index 10872edd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.erb +++ /dev/null @@ -1 +0,0 @@ -This is foo! \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.haml deleted file mode 100644 index 10872edd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.haml +++ /dev/null @@ -1 +0,0 @@ -This is foo! \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.sass deleted file mode 100644 index 12340f70..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.sass +++ /dev/null @@ -1,2 +0,0 @@ -#sass - :background_color #FFF \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.builder deleted file mode 100644 index 9491f574..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.builder +++ /dev/null @@ -1,3 +0,0 @@ -xml.layout do - xml << yield -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.erb deleted file mode 100644 index 7fec122a..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.erb +++ /dev/null @@ -1 +0,0 @@ -x <%= yield %> x diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.haml deleted file mode 100644 index 75efae53..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.haml +++ /dev/null @@ -1 +0,0 @@ -== x #{yield} x diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.sass deleted file mode 100644 index b2ee9d07..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.sass +++ /dev/null @@ -1,2 +0,0 @@ -b0rked! -= yield \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.builder deleted file mode 100644 index cbf4be6d..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.builder +++ /dev/null @@ -1 +0,0 @@ -xml.foo "No Layout!" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.haml deleted file mode 100644 index 0e6bd342..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.haml +++ /dev/null @@ -1 +0,0 @@ -%h1 No Layout! \ No newline at end of file diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/compat.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/compat.rb deleted file mode 100644 index b0ebd38f..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/compat.rb +++ /dev/null @@ -1,266 +0,0 @@ -# Sinatra 0.3.x compatibility module. -# -# The following code makes Sinatra 0.9.x compatible with Sinatra 0.3.x to -# ease the transition to the final 1.0 release. Everything defined in this -# file will be removed for the 1.0 release. - -require 'ostruct' -require 'sinatra/base' -require 'sinatra/main' - -# Like Kernel#warn but outputs the location that triggered the warning. -def sinatra_warn(*message) #:nodoc: - line = caller. - detect { |line| line !~ /(?:lib\/sinatra\/|__DELEGATE__)/ }. - sub(/:in .*/, '') - warn "#{line}: warning: #{message.join(' ')}" -end - -# Rack now supports evented and swiftiplied mongrels through separate -# handler. -if ENV['SWIFT'] - sinatra_warn 'the SWIFT environment variable is deprecated;', - 'use Rack::Handler::SwiftipliedMongrel instead.' - require 'swiftcore/swiftiplied_mongrel' - puts "Using Swiftiplied Mongrel" -elsif ENV['EVENT'] - sinatra_warn 'the EVENT environment variable is deprecated;', - 'use Rack::Handler::EventedMongrel instead.' - require 'swiftcore/evented_mongrel' - puts "Using Evented Mongrel" -end - -# Make Rack 0.9.0 backward compatibile with 0.4.0 mime types. This isn't -# technically a Sinatra issue but many Sinatra apps access the old -# MIME_TYPES constants due to Sinatra example code. -require 'rack/file' -module Rack #:nodoc: - class File #:nodoc: - def self.const_missing(const_name) - if const_name == :MIME_TYPES - hash = Hash.new { |hash,key| Rack::Mime::MIME_TYPES[".#{key}"] } - const_set :MIME_TYPES, hash - sinatra_warn 'Rack::File::MIME_TYPES is deprecated; use Rack::Mime instead.' - hash - else - super - end - end - end -end - -module Sinatra - module Compat #:nodoc: - end - - # Make Sinatra::EventContext an alias for Sinatra::Default to unbreak plugins. - def self.const_missing(const_name) #:nodoc: - if const_name == :EventContext - const_set :EventContext, Sinatra::Default - sinatra_warn 'Sinatra::EventContext is deprecated; use Sinatra::Default instead.' - Sinatra::Default - else - super - end - end - - # The ServerError exception is deprecated. Any exception is considered an - # internal server error. - class ServerError < RuntimeError - def initialize(*args, &block) - sinatra_warn 'Sinatra::ServerError is deprecated;', - 'use another exception, error, or Kernel#fail instead.' - end - def code ; 500 ; end - end - - class Default < Base - def self.const_missing(const_name) #:nodoc: - if const_name == :FORWARD_METHODS - sinatra_warn 'Sinatra::Application::FORWARD_METHODS is deprecated;', - 'use Sinatra::Delegator::METHODS instead.' - const_set :FORWARD_METHODS, Sinatra::Delegator::METHODS - Sinatra::Delegator::METHODS - else - super - end - end - - # Deprecated. Use: response['Header-Name'] - def header(header=nil) - sinatra_warn "The 'header' method is deprecated; use 'headers' instead." - headers(header) - end - - # Deprecated. Use: halt - def stop(*args, &block) - sinatra_warn "The 'stop' method is deprecated; use 'halt' instead." - halt(*args, &block) - end - - # Deprecated. Use: etag - def entity_tag(*args, &block) - sinatra_warn "The 'entity_tag' method is deprecated; use 'etag' instead." - etag(*args, &block) - end - - # Deprecated. Use the #attachment helper and return the data as a String or - # Array. - def send_data(data, options={}) - sinatra_warn "The 'send_data' method is deprecated. use attachment, status, content_type, etc. helpers instead." - - status options[:status] if options[:status] - attachment options[:filename] if options[:disposition] == 'attachment' - content_type options[:type] if options[:type] - halt data - end - - # The :views_directory, :options, :haml, and :sass options are deprecated. - def render(engine, template, options={}, locals={}, &bk) - if options.key?(:views_directory) - sinatra_warn "The :views_directory option is deprecated; use :views instead." - options[:views] = options.delete(:views_directory) - end - [:options, engine.to_sym].each do |key| - if options.key?(key) - sinatra_warn "Passing :#{key} => {} to #{engine} is deprecated; " + - "merge options directly into hash instead." - options.merge! options.delete(key) - end - end - super(engine, template, options, locals, &bk) - end - - # Throwing halt with a Symbol and the to_result convention are - # deprecated. Override the invoke method to detect those types of return - # values. - def invoke(&block) #:nodoc: - res = super - case - when res.kind_of?(Symbol) - sinatra_warn "Invoking the :#{res} helper by returning a Symbol is deprecated;", - "call the helper directly instead." - @response.body = __send__(res) - when res.respond_to?(:to_result) - sinatra_warn "The to_result convention is deprecated." - @response.body = res.to_result(self) - end - res - end - - def options #:nodoc: - Options.new(self.class) - end - - class Options < Struct.new(:target) #:nodoc: - def method_missing(name, *args, &block) - if target.respond_to?(name) - target.__send__(name, *args, &block) - elsif args.empty? && name.to_s !~ /=$/ - sinatra_warn 'accessing undefined options will raise a NameError in Sinatra 1.0' - nil - else - super - end - end - end - - class << self - # Deprecated. Options are stored directly on the class object. - def options - sinatra_warn "The 'options' class method is deprecated; use 'self' instead." - Options.new(self) - end - - # Deprecated. Use: configure - def configures(*args, &block) - sinatra_warn "The 'configures' method is deprecated; use 'configure' instead." - configure(*args, &block) - end - - # Deprecated. Use: set - def default_options - sinatra_warn "Sinatra::Application.default_options is deprecated; use 'set' instead." - fake = lambda { |options| set(options) } - def fake.merge!(options) ; call(options) ; end - fake - end - - # Deprecated. Use: set - def set_option(*args, &block) - sinatra_warn "The 'set_option' method is deprecated; use 'set' instead." - set(*args, &block) - end - - def set_options(*args, &block) - sinatra_warn "The 'set_options' method is deprecated; use 'set' instead." - set(*args, &block) - end - - # Deprecated. Use: set :environment, ENV - def env=(value) - sinatra_warn "The :env option is deprecated; use :environment instead." - set :environment, value - end - - # Deprecated. Use: options.environment - def env - sinatra_warn "The :env option is deprecated; use :environment instead." - environment - end - end - - # Deprecated. Missing messages are no longer delegated to @response. - def method_missing(name, *args, &b) #:nodoc: - if @response.respond_to?(name) - sinatra_warn "The '#{name}' method is deprecated; use 'response.#{name}' instead." - @response.send(name, *args, &b) - else - super - end - end - end - - class << self - # Deprecated. Use: Sinatra::Application - def application - sinatra_warn "Sinatra.application is deprecated; use Sinatra::Application instead." - Sinatra::Application - end - - # Deprecated. Use: Sinatra::Application.reset! - def application=(value) - raise ArgumentError unless value.nil? - sinatra_warn "Setting Sinatra.application to nil is deprecated; create a new instance instead." - Sinatra.class_eval do - remove_const :Application - const_set :Application, Class.new(Sinatra::Default) - end - end - - def build_application - sinatra_warn "Sinatra.build_application is deprecated; use Sinatra::Application instead." - Sinatra::Application - end - - def options - sinatra_warn "Sinatra.options is deprecated; use Sinatra::Application.option_name instead." - Sinatra::Application.options - end - - def port - sinatra_warn "Sinatra.port is deprecated; use Sinatra::Application.port instead." - options.port - end - - def host - sinatra_warn "Sinatra.host is deprecated; use Sinatra::Application.host instead." - options.host - end - - def env - sinatra_warn "Sinatra.env is deprecated; use Sinatra::Application.environment instead." - options.environment - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test.rb deleted file mode 100644 index 6954eb59..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test.rb +++ /dev/null @@ -1,128 +0,0 @@ -require 'sinatra/base' - -warn 'Sinatra::Test is deprecated; use Rack::Test instead.' - -module Sinatra - module Test - include Rack::Utils - - def self.included(base) - Sinatra::Default.set(:environment, :test) - end - - attr_reader :app, :request, :response - - def self.deprecate(framework) - warn <<-EOF -Warning: support for the #{framework} testing framework is deprecated and -will be dropped in Sinatra 1.0. See -for more information. - EOF - end - - def make_request(verb, path, body=nil, options={}) - @app = Sinatra::Application if @app.nil? && defined?(Sinatra::Application) - fail "@app not set - cannot make request" if @app.nil? - - @request = Rack::MockRequest.new(@app) - options = { :lint => true }.merge(options || {}) - - case - when body.respond_to?(:to_hash) - options.merge! body.delete(:env) if body.key?(:env) - options[:input] = param_string(body) - when body.respond_to?(:to_str) - options[:input] = body - when body.nil? - options[:input] = '' - else - raise ArgumentError, "body must be a Hash, String, or nil" - end - - yield @request if block_given? - @response = @request.request(verb, path, rack_options(options)) - end - - def get(path, *args, &b) ; make_request('GET', path, *args, &b) ; end - def head(path, *args, &b) ; make_request('HEAD', path, *args, &b) ; end - def post(path, *args, &b) ; make_request('POST', path, *args, &b) ; end - def put(path, *args, &b) ; make_request('PUT', path, *args, &b) ; end - def delete(path, *args, &b) ; make_request('DELETE', path, *args, &b) ; end - - def follow! - make_request 'GET', @response.location - end - - def body ; @response.body ; end - def status ; @response.status ; end - - # Delegate other missing methods to @response. - def method_missing(name, *args, &block) - if @response && @response.respond_to?(name) - @response.send(name, *args, &block) - else - super - end - end - - # Also check @response since we delegate there. - def respond_to?(symbol, include_private=false) - super || (@response && @response.respond_to?(symbol, include_private)) - end - - private - - RACK_OPTIONS = { - :accept => 'HTTP_ACCEPT', - :agent => 'HTTP_USER_AGENT', - :host => 'HTTP_HOST', - :session => 'rack.session', - :cookies => 'HTTP_COOKIE', - :content_type => 'CONTENT_TYPE' - } - - def rack_options(opts) - opts.merge(:lint => true).inject({}) do |hash,(key,val)| - key = RACK_OPTIONS[key] || key - hash[key] = val - hash - end - end - - def param_string(value, prefix = nil) - case value - when Array - value.map { |v| - param_string(v, "#{prefix}[]") - } * "&" - when Hash - value.map { |k, v| - param_string(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k)) - } * "&" - else - "#{prefix}=#{escape(value)}" - end - end - - if defined? Sinatra::Compat - # Deprecated. Use: "get" instead of "get_it". - %w(get head post put delete).each do |verb| - eval <<-RUBY, binding, __FILE__, __LINE__ - def #{verb}_it(*args, &block) - sinatra_warn "The #{verb}_it method is deprecated; use #{verb} instead." - make_request('#{verb.upcase}', *args, &block) - end - RUBY - end - end - end - - class TestHarness - include Test - - def initialize(app=nil) - @app = app || Sinatra::Application - @app.set(:environment, :test) - end - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/bacon.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/bacon.rb deleted file mode 100644 index 66c0b135..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/bacon.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'bacon' -require 'sinatra/test' - -Sinatra::Test.deprecate('Bacon') - -Sinatra::Default.set( - :environment => :test, - :run => false, - :raise_errors => true, - :logging => false -) - -module Sinatra::Test - def should - @response.should - end -end - -Bacon::Context.send(:include, Sinatra::Test) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/rspec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/rspec.rb deleted file mode 100644 index 971b96f6..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/rspec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'sinatra/test' -require 'sinatra/test/unit' -require 'spec' -require 'spec/interop/test' - -Sinatra::Test.deprecate('RSpec') - -Sinatra::Default.set( - :environment => :test, - :run => false, - :raise_errors => true, - :logging => false -) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/spec.rb deleted file mode 100644 index daffe32c..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/spec.rb +++ /dev/null @@ -1,11 +0,0 @@ -require 'test/spec' -require 'sinatra/test' -require 'sinatra/test/unit' - -Sinatra::Test.deprecate('test/spec') - -module Sinatra::Test - def should - @response.should - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/unit.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/unit.rb deleted file mode 100644 index a7e60b3a..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/unit.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'sinatra/test' -require 'test/unit' - -Sinatra::Test.deprecate('test/unit') - -Test::Unit::TestCase.send :include, Sinatra::Test - -Sinatra::Default.set( - :environment => :test, - :run => false, - :raise_errors => true, - :logging => false -) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/data/reload_app_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/data/reload_app_file.rb deleted file mode 100644 index 673ab7cd..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/data/reload_app_file.rb +++ /dev/null @@ -1,3 +0,0 @@ -$reload_count += 1 - -$reload_app.get('/') { 'Hello from reload file' } diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/filter_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/filter_test.rb deleted file mode 100644 index 38f0495b..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/filter_test.rb +++ /dev/null @@ -1,99 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -class FilterTest < Test::Unit::TestCase - it "executes filters in the order defined" do - count = 0 - mock_app do - get('/') { 'Hello World' } - before { - assert_equal 0, count - count = 1 - } - before { - assert_equal 1, count - count = 2 - } - end - - get '/' - assert ok? - assert_equal 2, count - assert_equal 'Hello World', body - end - - it "allows filters to modify the request" do - mock_app { - get('/foo') { 'foo' } - get('/bar') { 'bar' } - before { request.path_info = '/bar' } - } - - get '/foo' - assert ok? - assert_equal 'bar', body - end - - it "can modify instance variables available to routes" do - mock_app { - before { @foo = 'bar' } - get('/foo') { @foo } - } - - get '/foo' - assert ok? - assert_equal 'bar', body - end - - it "allows redirects in filters" do - mock_app { - before { redirect '/bar' } - get('/foo') do - fail 'before block should have halted processing' - 'ORLY?!' - end - } - - get '/foo' - assert redirect? - assert_equal '/bar', response['Location'] - assert_equal '', body - end - - it "does not modify the response with its return value" do - mock_app { - before { 'Hello World!' } - get '/foo' do - assert_equal [], response.body - 'cool' - end - } - - get '/foo' - assert ok? - assert_equal 'cool', body - end - - it "does modify the response with halt" do - mock_app { - before { halt 302, 'Hi' } - get '/foo' do - "should not happen" - end - } - - get '/foo' - assert_equal 302, response.status - assert_equal 'Hi', body - end - - it "gives you access to params" do - mock_app { - before { @foo = params['foo'] } - get('/foo') { @foo } - } - - get '/foo?foo=cool' - assert ok? - assert_equal 'cool', body - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/render_backtrace_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/render_backtrace_test.rb deleted file mode 100644 index 350beba4..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/render_backtrace_test.rb +++ /dev/null @@ -1,145 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -require 'sass/error' - -class RenderBacktraceTest < Test::Unit::TestCase - VIEWS = File.dirname(__FILE__) + '/views' - - def assert_raise_at(filename, line, exception = RuntimeError) - f, l = nil - assert_raise(exception) do - begin - get('/') - rescue => e - f, l = e.backtrace.first.split(':') - raise - end - end - assert_equal(filename, f, "expected #{exception.name} in #{filename}, was #{f}") - assert_equal(line, l.to_i, "expected #{exception.name} in #{filename} at line #{line}, was at line #{l}") - end - - def backtrace_app(&block) - mock_app { - use_in_file_templates! - set :views, RenderBacktraceTest::VIEWS - template :builder_template do - 'raise "error"' - end - template :erb_template do - '<% raise "error" %>' - end - template :haml_template do - '%h1= raise "error"' - end - template :sass_template do - '+syntax-error' - end - get '/', &block - } - end - - it "provides backtrace for Builder template" do - backtrace_app { builder :error } - assert_raise_at(File.join(VIEWS,'error.builder'), 2) - end - - it "provides backtrace for ERB template" do - backtrace_app { erb :error } - assert_raise_at(File.join(VIEWS,'error.erb'), 2) - end - - it "provides backtrace for HAML template" do - backtrace_app { haml :error } - assert_raise_at(File.join(VIEWS,'error.haml'), 2) - end - - it "provides backtrace for Sass template" do - backtrace_app { sass :error } - assert_raise_at(File.join(VIEWS,'error.sass'), 2, Sass::SyntaxError) - end - - it "provides backtrace for ERB template with locals" do - backtrace_app { erb :error, {}, :french => true } - assert_raise_at(File.join(VIEWS,'error.erb'), 3) - end - - it "provides backtrace for HAML template with locals" do - backtrace_app { haml :error, {}, :french => true } - assert_raise_at(File.join(VIEWS,'error.haml'), 3) - end - - it "provides backtrace for inline Builder string" do - backtrace_app { builder "raise 'Ack! Thbbbt!'"} - assert_raise_at(__FILE__, (__LINE__-1)) - end - - it "provides backtrace for inline ERB string" do - backtrace_app { erb "<% raise 'bidi-bidi-bidi' %>" } - assert_raise_at(__FILE__, (__LINE__-1)) - end - - it "provides backtrace for inline HAML string" do - backtrace_app { haml "%h1= raise 'Lions and tigers and bears! Oh, my!'" } - assert_raise_at(__FILE__, (__LINE__-1)) - end - - # it "provides backtrace for inline Sass string" do - # backtrace_app { sass '+buh-bye' } - # assert_raise_at(__FILE__, (__LINE__-1), Sass::SyntaxError) - # end - - it "provides backtrace for named Builder template" do - backtrace_app { builder :builder_template } - assert_raise_at(__FILE__, (__LINE__-68)) - end - - it "provides backtrace for named ERB template" do - backtrace_app { erb :erb_template } - assert_raise_at(__FILE__, (__LINE__-70)) - end - - it "provides backtrace for named HAML template" do - backtrace_app { haml :haml_template } - assert_raise_at(__FILE__, (__LINE__-72)) - end - - # it "provides backtrace for named Sass template" do - # backtrace_app { sass :sass_template } - # assert_raise_at(__FILE__, (__LINE__-74), Sass::SyntaxError) - # end - - it "provides backtrace for in file Builder template" do - backtrace_app { builder :builder_in_file } - assert_raise_at(__FILE__, (__LINE__+22)) - end - - it "provides backtrace for in file ERB template" do - backtrace_app { erb :erb_in_file } - assert_raise_at(__FILE__, (__LINE__+20)) - end - - it "provides backtrace for in file HAML template" do - backtrace_app { haml :haml_in_file } - assert_raise_at(__FILE__, (__LINE__+18)) - end - - # it "provides backtrace for in file Sass template" do - # backtrace_app { sass :sass_in_file } - # assert_raise_at(__FILE__, (__LINE__+16), Sass::SyntaxError) - # end -end - -__END__ - -@@ builder_in_file -raise "bif" - -@@ erb_in_file -<% raise "bam" %> - -@@ haml_in_file -%h1= raise "pow" - -@@ sass_in_file -+blam diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/test_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/test_test.rb deleted file mode 100644 index 23527e40..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/test_test.rb +++ /dev/null @@ -1,152 +0,0 @@ -require File.dirname(__FILE__) + '/helper' - -require 'yaml' - -# silence deprecation warning when requiring sinatra/test -$VERBOSE, v = nil, $VERBOSE -require 'sinatra/test' -$VERBOSE = v - -class TestTest < Test::Unit::TestCase - include Sinatra::Test - - def request - YAML.load(body) - end - - def request_body - request['test.body'] - end - - def request_params - YAML.load(request['test.params']) - end - - setup do - mock_app { - %w[get head post put delete].each { |verb| - send(verb, '/') do - redirect '/redirected' if params[:redirect] - env.update('test.body' => request.body.read) - env.update('test.params' => params.to_yaml) - env.to_yaml - end - } - - get '/redirected' do - "you've been redirected" - end - } - end - - it 'allows GET/HEAD/POST/PUT/DELETE' do - get '/' - assert_equal('GET', request['REQUEST_METHOD']) - - post '/' - assert_equal('POST', request['REQUEST_METHOD']) - - put '/' - assert_equal('PUT', request['REQUEST_METHOD']) - - delete '/' - assert_equal('DELETE', request['REQUEST_METHOD']) - - head '/' - assert response.headers['Content-Length'].to_i > 0 - assert_equal('', body) - end - - it 'allows to specify a body' do - post '/', '42' - assert_equal '42', request_body - end - - it 'allows to specify params' do - get '/', :foo => 'bar' - assert_equal 'bar', request_params['foo'] - end - - it 'supports nested params' do - get '/', :foo => { :x => 'y', :chunky => 'bacon' } - assert_equal "y", request_params['foo']['x'] - assert_equal "bacon", request_params['foo']['chunky'] - end - - it 'provides easy access to response status and body' do - get '/' - assert_equal 200, status - assert body =~ /^---/ - end - - it 'delegates methods to @response' do - get '/' - assert ok? - end - - it 'follows redirect' do - get '/', :redirect => true - follow! - assert_equal "you've been redirected", body - end - - it 'provides sugar for common HTTP headers' do - get '/', :env => { :accept => 'text/plain' } - assert_equal 'text/plain', request['HTTP_ACCEPT'] - - get '/', :env => { :agent => 'TATFT' } - assert_equal 'TATFT', request['HTTP_USER_AGENT'] - - get '/', :env => { :host => '1.2.3.4' } - assert_equal '1.2.3.4', request['HTTP_HOST'] - - get '/', :env => { :session => {'foo' => 'bar'} } - assert_equal({'foo' => 'bar'}, request['rack.session']) - - get '/', :env => { :cookies => 'foo' } - assert_equal 'foo', request['HTTP_COOKIE'] - - get '/', :env => { :content_type => 'text/plain' } - assert_equal 'text/plain', request['CONTENT_TYPE'] - end - - it 'allow to test session easily' do - app = mock_app(Sinatra::Default) { - get '/' do - session['foo'] = 'bar' - 200 - end - - post '/' do - assert_equal 'bar', session['foo'] - session['foo'] || "blah" - end - } - - browser = Sinatra::TestHarness.new(app) - browser.get '/' - browser.post '/', {}, :session => { 'foo' => 'bar' } - assert_equal 'bar', browser.response.body - end - - it 'yields the request object to the block before invoking the application' do - called = false - get '/' do |req| - called = true - assert req.kind_of?(Rack::MockRequest) - end - assert called - end - - it 'sets the environment to :test on include' do - Sinatra::Default.set(:environment, :production) - Class.new { include Sinatra::Test } - assert_equal :test, Sinatra::Default.environment - end - - def test_TestHarness - session = Sinatra::TestHarness.new(@app) - response = session.get('/') - assert_equal 200, response.status - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/AUTHORS b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/AUTHORS similarity index 95% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/AUTHORS rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/AUTHORS index 372390f2..028ea276 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/AUTHORS +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/AUTHORS @@ -10,6 +10,8 @@ Sinatra would not be possible: * Ryan Tomayko (rtomayko) for constantly fixing whitespace errors 60d5006 * Ezra Zygmuntowicz (ezmobius) for initial help and letting Blake steal some of merbs internal code. +* Ari Lerner (http://xnot.org/) for his evangelism, spirit, and gumption + that got Sinatra recognized from Day 1. * Christopher Schneid (cschneid) for The Book, the blog (gittr.com), irclogger.com, and a bunch of useful patches. * Markus Prinz (cypher) for patches over the years, caring about diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/CHANGES b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/CHANGES similarity index 77% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/CHANGES rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/CHANGES index 64fd2dbf..14348449 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/CHANGES +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/CHANGES @@ -1,19 +1,104 @@ -= 0.9.4 / 2009-07-26 += 1.0 / unreleased - * The app_file and run options should be properly detected - on Debian when installed from apt package. + * It's now possible to register blocks to run after each request using + after filters. After filters run at the end of each request, after + routes and error handlers. - * The :show_exceptions option now defaults to false in all - cases for subclasses of Sinatra::Base. + * Sinatra now uses Tilt for rendering + templates. This adds support for template caching, consistent + template backtraces, and support for new template engines, like + mustache and liquid. - * Fix webrick server handler not found errors when starting - from the command line without mongrel or thin [#231]. + * New boolean 'reload_templates' setting controls whether template files + are reread from disk and recompiled on each request. Template read/compile + is cached by default in all environments except development. - * Fix locals not being passed to layouts. + * New 'settings' method gives access to options in both class and request + scopes. This replaces the 'options' method. + * New 'erubis' helper method for rendering Erubis templates. - * Fix 'Illegal Seek' errors running under Apache/CGI. + * New 'cache_control' helper method provides a convenient way of + setting the Cache-Control response header. Takes a variable number + of boolean directives followed by a hash of value directives, like + this: + cache_control :public, :must_revalidate, :max_age => 60 -= 0.9.3 / unreleased + * New 'expires' helper method is like cache_control but takes an + integer number of seconds or Time object: + expires 300, :public, :must_revalidate + + * Sinatra apps can now be run with a `-h ` argument to specify + the address to bind to. + + * Rack::Session::Cookie is now added to the middleware pipeline when + running in test environments if the :sessions option is set. + + * Route handlers, before filters, templates, error mappings, and + middleware are now resolved dynamically up the inheritance hierarchy + when needed instead of duplicating the superclass's version when + a new Sinatra::Base subclass is created. This should fix a variety + of issues with extensions that need to add any of these things + to the base class. + +The following Sinatra features have been obsoleted in the 1.0 release: + + * The `sinatra/test` library is obsolete. This includes the + `Sinatra::Test` module, the `Sinatra::TestHarness` class, + and the `get_it`, `post_it`, `put_it`, `delete_it`, and `head_it` + helper methods. The + [`Rack::Test` library](http://gitrdoc.com/brynary/rack-test) should + be used instead. + + * Test framework specific libraries (`sinatra/test/spec`, + `sinatra/test/bacon`,`sinatra/test/rspec`, etc.) are obsolete. + See http://www.sinatrarb.com/testing.html for instructions on + setting up a testing environment under each of these frameworks. + + * Auto-requiring template libraries in the `erb`, `builder`, `haml`, + and `sass` methods is obsolete due to thread-safety issues. You must + require the template libraries explicitly in your app. + + * The `:views_directory` option to rendering methods is obsolete; use + `:views` instead. + + * The `:haml` and `:sass` options to rendering methods are obsolete. + Template engine options should be passed in the second Hash argument + instead. + + * The 'media_type' helper method is obsolete. Use 'mime_type' instead. + + * The request-level `send_data` method is no longer supported. + + * The `Sinatra::Event` and `Sinatra::EventContext` classes are no longer + supported. This may effect extensions written for versions prior to 0.9.2. + See [Writing Sinatra Extensions](http://www.sinatrarb.com/extensions.html) + for the officially supported extensions API. + + * The `set_option` and `set_options` methods are obsolete; use `set` + instead. + + * The `:env` setting (`settings.env`) is obsolete; use `:environment` + instead. + + * The request level `stop` method is obsolete; use `halt` instead. + + * The request level `entity_tag` method is obsolete; use `etag` + instead. + + * The request level `headers` method (HTTP response headers) is obsolete; + use `response['Header-Name']` instead. + + * `Sinatra.application` is obsolete; use `Sinatra::Application` instead. + + * Using `Sinatra.application = nil` to reset an application is obsolete. + This should no longer be necessary. + + * Using `Sinatra.default_options` to set base configuration items is + obsolete; use `Sinatra::Base.set(key, value)` instead. + + * The `Sinatra::ServerError` exception is obsolete. All exceptions raised + within a request are now treated as internal server errors and result in + a 500 response status. = 0.9.2 / 2009-05-18 diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/LICENSE similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/LICENSE diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.jp.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.jp.rdoc new file mode 100644 index 00000000..6f829879 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.jp.rdoc @@ -0,0 +1,552 @@ += Sinatra + +SinatraはRubyで下記のような最小労力で手早くウェブアプリケーションを作成するためのDSLです。 + + # myapp.rb + require 'rubygems' + require 'sinatra' + get '/' do + 'Hello world!' + end + +gemをインストールして動かしてみる。 + + sudo gem install sinatra + ruby myapp.rb + +http://localhost:4567 を見る。 + +== ルート + +Sinatraでは、ルートはHTTPメソッドとURLマッチングパターンがペアになっています。 +ルートはブロックに結び付けられています。 + + get '/' do + .. 何か見せる .. + end + + post '/' do + .. 何か生成する .. + end + + put '/' do + .. 何か更新する .. + end + + delete '/' do + .. 何か削除する .. + end + +ルートは定義された順番にマッチします。 リクエストに最初にマッチしたルートが呼び出されます。 + +ルートのパターンは名前付きパラメータを含むことができ、 +paramsハッシュで取得できます。 + + get '/hello/:name' do + # matches "GET /hello/foo" and "GET /hello/bar" + # params[:name] is 'foo' or 'bar' + "Hello #{params[:name]}!" + end + +また、ブロックパラメータで名前付きパラメータにアクセスすることもできます。 + + get '/hello/:name' do |n| + "Hello #{n}!" + end + +ルートパターンはsplat(またはワイルドカード)を含むこともでき、 +params[:splat] で取得できます。 + + get '/say/*/to/*' do + # matches /say/hello/to/world + params[:splat] # => ["hello", "world"] + end + + get '/download/*.*' do + # matches /download/path/to/file.xml + params[:splat] # => ["path/to/file", "xml"] + end + +正規表現を使ったルート: + + get %r{/hello/([\w]+)} do + "Hello, #{params[:captures].first}!" + end + +ブロックパラーメータを使用した場合: + + get %r{/hello/([\w]+)} do |c| + "Hello, #{c}!" + end + +ルートにはユーザエージェントのようなさまざまな条件を含めることができます。 + + get '/foo', :agent => /Songbird (\d\.\d)[\d\/]*?/ do + "You're using Songbird version #{params[:agent][0]}" + end + + get '/foo' do + # Matches non-songbird browsers + end + +== 静的ファイル + +静的ファイルは./publicディレクトリから配信されます。 +:publicオプションを指定することで別の場所を指定することができます。 + + set :public, File.dirname(__FILE__) + '/static' + +注意: この静的ファイル用のディレクトリ名はURL中に含まれません。 +例えば、./public/css/style.csshttp://example.com/css/style.cssでアクセスできます。 + +== ビュー / テンプレート + +テンプレートは./viewsディレクトリ下に配置されています。 +他のディレクトリを使用する場合の例: + + set :views, File.dirname(__FILE__) + '/templates' + +テンプレートはシンボルを使用して参照させることを覚えておいて下さい。 +サブデレクトリでもこの場合は:'subdir/template'のようにします。 +レンダリングメソッドは文字列が渡されると、そのまま文字列を出力します。 + +=== Haml テンプレート + +hamlを使うにはhamlライブラリが必要です: + + ## hamlを読み込みます + require 'haml' + + get '/' do + haml :index + end + +./views/index.hamlを表示します。 + +{Haml's options}[http://haml.hamptoncatlin.com/docs/rdoc/classes/Haml.html] +はSinatraの設定でグローバルに設定することができます。 +{Options and Configurations}[http://www.sinatrarb.com/configuration.html], +を参照してそれぞれ設定を上書きして下さい。 + + set :haml, {:format => :html5 } # デフォルトのフォーマットは:xhtml + + get '/' do + haml :index, :haml_options => {:format => :html4 } # 上書き + end + + +=== Erb テンプレート + + ## erbを読み込みます + require 'erb' + + get '/' do + erb :index + end + +./views/index.erbを表示します。 + +=== Builder テンプレート + +builderを使うにはbuilderライブラリが必要です: + + ## builderを読み込みます + require 'builder' + + get '/' do + content_type 'application/xml', :charset => 'utf-8' + builder :index + end + +./views/index.builderを表示します。 + +=== Sass テンプレート + +Sassテンプレートを使うにはsassライブラリが必要です: + + ## hamlかsassを読み込みます + require 'sass' + + get '/stylesheet.css' do + content_type 'text/css', :charset => 'utf-8' + sass :stylesheet + end + +./views/stylesheet.sassを表示します。 + +{Sass' options}[http://haml.hamptoncatlin.com/docs/rdoc/classes/Sass.html] +はSinatraの設定でグローバルに設定することができます。 +see {Options and Configurations}[http://www.sinatrarb.com/configuration.html], +を参照してそれぞれ設定を上書きして下さい。 + + set :sass, {:style => :compact } # デフォルトのSass styleは :nested + + get '/stylesheet.css' do + content_type 'text/css', :charset => 'utf-8' + sass :stylesheet, :sass_options => {:style => :expanded } # 上書き + end + + +=== インラインテンプレート + + get '/' do + haml '%div.title Hello World' + end + +文字列をテンプレートとして表示します。 + +=== テンプレート内で変数にアクセスする + +テンプレートはルートハンドラと同じコンテキストの中で評価されます。. ルートハンドラでセットされたインスタンス変数は +テンプレート内で直接使うことができます。 + + get '/:id' do + @foo = Foo.find(params[:id]) + haml '%h1= @foo.name' + end + +ローカル変数を明示的に定義することもできます。 + + get '/:id' do + foo = Foo.find(params[:id]) + haml '%h1= foo.name', :locals => { :foo => foo } + end + +このやり方は他のテンプレート内で部分テンプレートとして表示する時に典型的に使用されます。 + +=== ファイル内テンプレート + +テンプレートはソースファイルの最後で定義することもできます。 + + require 'rubygems' + require 'sinatra' + + get '/' do + haml :index + end + + __END__ + + @@ layout + %html + = yield + + @@ index + %div.title Hello world!!!!! + +注意: sinatraをrequireするファイル内で定義されたファイル内テンプレートは自動的に読み込まれます。 +他のファイルで定義されているテンプレートを使うには use_in_file_templates!メソッドで指定します。 + +=== 名前付きテンプレート + +テンプレートはトップレベルのtemplateメソッドで定義することができます。 + + template :layout do + "%html\n =yield\n" + end + + template :index do + '%div.title Hello World!' + end + + get '/' do + haml :index + end + +「layout」というテンプレートが存在する場合、そのテンプレートファイルは他のテンプレートが +表示される度に使用されます。:layout => false.することでlayoutsを無効にできます。 + + get '/' do + haml :index, :layout => !request.xhr? + end + +== ヘルパー + +トップレベルのhelpersを使用してルートハンドラやテンプレートで使うヘルパメソッドを +定義できます。 + + helpers do + def bar(name) + "#{name}bar" + end + end + + get '/:name' do + bar(params[:name]) + end + +== フィルタ + +beforeフィルタはリクエストされたコンテキストを実行する前に評価され、 +リクエストとレスポンスを変更することができます。フィルタ内でセットされた +インスタンス変数はルーティングとテンプレートで使用できます。 + + before do + @note = 'Hi!' + request.path_info = '/foo/bar/baz' + end + + get '/foo/*' do + @note #=> 'Hi!' + params[:splat] #=> 'bar/baz' + end + +== 強制終了 + +ルートかbeforeフィルタ内で直ちに実行を終了する方法: + + halt + +body部を指定することもできます ... + + halt 'ここにbodyを書く' + +ステータスとbody部を指定する ... + + halt 401, '立ち去れ!' + +== パッシング(Passing) + +ルートはpassを使って次のルートに飛ばすことができます: + + get '/guess/:who' do + pass unless params[:who] == 'Frank' + "見つかっちゃった!" + end + + get '/guess/*' do + "はずれです!" + end + +ルートブロックからすぐに抜け出し、次にマッチするルートを実行します。 +マッチするルートが見当たらない場合は404が返されます。 + +== 設定 + +どの環境でも起動時に1回だけ実行されます。 + + configure do + ... + end + +環境変数:production(RACK_ENV環境変数) がセットされている時だけ実行する方法: + + configure :production do + ... + end + +環境変数:production:testの場合に設定する方法: + + configure :production, :test do + ... + end + +== エラーハンドリング + +エラーハンドラーはルートコンテキストとbeforeフィルタ内で実行します。 +hamlerbhaltなどを使うこともできます。 + +=== Not Found + +Sinatra::NotFoundが起きた時か レスポンスのステータスコードが +404の時にnot_foundハンドラーが発動します。 + + not_found do + 'ファイルが存在しません' + end + +=== エラー + ++error+ ハンドラーはルートブロックかbeforeフィルタ内で例外が発生した時はいつでも発動します。 +block or before filter. 例外オブジェクトはRack変数sinatra.errorから取得されます。 + + error do + 'エラーが発生しました。 - ' + env['sinatra.error'].name + end + +エラーをカスタマイズする場合は、 + + error MyCustomError do + 'エラーメッセージ...' + request.env['sinatra.error'].message + end + +と書いておいて,下記のように呼び出します。 + + get '/' do + raise MyCustomError, '何かがまずかったようです' + end + +そうするとこうなります: + + エラーメッセージ... 何かがまずかったようです + +開発環境として実行している場合、Sinatraは特別なnot_founderrorハンドラーを +インストールしています。 + +== MIMEタイプ + +send_fileか静的ファイルを使う時、Sinatraが理解でいないMIMEタイプがある場合があります。 +その時は +mime_type+ を使ってファイル拡張子毎に登録して下さい。 + + mime_type :foo, 'text/foo' + +== Rackミドルウェア + +SinatraはRack[http://rack.rubyforge.org/]というRubyのWEBフレームワーク用の +最小限の標準インターフェース 上で動作しています。Rack中でもアプリケーションデベロッパー +向けに一番興味深い機能はミドルウェア(サーバとアプリケーション間に介在し、モニタリング、HTTPリクエストとレスポンス +の手動操作ができるなど、一般的な機能のいろいろなことを提供するもの)をサポートすることです。 + +Sinatraではトップレベルの+user+ メソッドを使ってRackにパイプラインを構築します。 + + require 'sinatra' + require 'my_custom_middleware' + + use Rack::Lint + use MyCustomMiddleware + + get '/hello' do + 'Hello World' + end + +use の意味は{Rack::Builder}[http://rack.rubyforge.org/doc/classes/Rack/Builder.html] DSLで定義されていることと全て一致します。 +例えば +use+ メソッドはブロック構文のように複数の引数を受け取ることができます。 + + use Rack::Auth::Basic do |username, password| + username == 'admin' && password == 'secret' + end + +Rackはログ、デバッギング、URLルーティング、認証、セッションなどいろいろな機能を備えた標準的ミドルウェアです。 +Sinatraはその多くのコンポーネントを自動で使うよう基本設定されているため、+use+で明示的に指定する必要はありません。 + +== テスト + +SinatraでのテストはRack-basedのテストライブラリかフレームワークを使って書くことができます。 +{Rack::Test}[http://gitrdoc.com/brynary/rack-test] をおすすめします。やり方: + + require 'my_sinatra_app' + require 'rack/test' + + class MyAppTest < Test::Unit::TestCase + include Rack::Test::Methods + + def app + Sinatra::Application + end + + def test_my_default + get '/' + assert_equal 'Hello World!', last_response.body + end + + def test_with_params + get '/meet', :name => 'Frank' + assert_equal 'Hello Frank!', last_response.body + end + + def test_with_rack_env + get '/', {}, 'HTTP_USER_AGENT' => 'Songbird' + assert_equal "あなたはSongbirdを使ってますね!", last_response.body + end + end + +注意: ビルトインのSinatra::TestモジュールとSinatra::TestHarnessクラスは +0.9.2リリース以降、廃止予定になっています。 + +== Sinatra::Base - ミドルウェア、ライブラリ、 モジュラーアプリ + +トップレベル(グローバル領域)上でいろいろ定義していくのは軽量アプリならうまくいきますが、 +RackミドルウェアやRails metal、サーバのコンポーネントを含んだシンプルな +ライブラリやSinatraの拡張プログラムを考慮するような場合はそうとは限りません。 +トップレベルのDSLがネームスペースを汚染したり、設定を変えてしまうこと(例:./publicや./view)がありえます。 +そこでSinatra::Baseの出番です。 + + require 'sinatra/base' + + class MyApp < Sinatra::Base + set :sessions, true + set :foo, 'bar' + + get '/' do + 'Hello world!' + end + end + +このMyAppは独立したRackコンポーネントで、RackミドルウェアやRackアプリケーション +Rails metalとして使用することができます。config.ruファイル内で +use+ か、または ++run+ でこのクラスを指定するか、ライブラリとしてサーバコンポーネントをコントロールします。 + + MyApp.run! :host => 'localhost', :port => 9090 + +Sinatra::Baseのサブクラスで使えるメソッドはトップレベルのDSLを経由して確実に使うことができます。 +ほとんどのトップレベルで記述されたアプリは、以下の2点を修正することでSinatra::Baseコンポーネントに変えることができます。 + +* +sinatra+の代わりにsinatra/baseを読み込む +(そうしない場合、SinatraのDSLメソッドの全てがメインネームスペースにインポートされます) +* ルート、エラーハンドラー、フィルター、オプションをSinatra::Baseのサブクラスに書く + +Sinatra::Base はまっさらです。ビルトインサーバを含む、ほとんどのオプションがデフォルト +で無効になっています。オプション詳細については{Options and Configuration}[http://sinatra.github.com/configuration.html] +をご覧下さい。 + +補足: SinatraのトップレベルDSLはシンプルな委譲(delgation)システムで実装されています。 +Sinatra::Applicationクラス(Sinatra::Baseの特別なサブクラス)は、トップレベルに送られる +:get、 :put、 :post、:delete、 :before、:error、:not_found、 :configure、:set messagesのこれら +全てを受け取ります。 詳細を閲覧されたい方はこちら(英語): +{Sinatra::Delegator mixin}[http://github.com/sinatra/sinatra/blob/master/lib/sinatra/base.rb#L1064] +{included into the main namespace}[http://github.com/sinatra/sinatra/blob/master/lib/sinatra/main.rb#L25]. + +== コマンドライン + +Sinatraアプリケーションは直接実行できます。 + + ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-s HANDLER] + +オプション: + + -h # ヘルプ + -p # ポート指定(デフォルトは4567) + -e # 環境を指定 (デフォルトはdevelopment) + -s # rackserver/handlerを指定 (デフォルトはthin) + -x # mutex lockを付ける (デフォルトはoff) + +== 最新開発版について + +Sinatraの開発版を使いたい場合は、ローカルに開発版を落として、 +LOAD_PATHsinatra/libディレクトリを指定して実行して下さい。 + + cd myapp + git clone git://github.com/sinatra/sinatra.git + ruby -Isinatra/lib myapp.rb + +sinatra/libディレクトリをto theLOAD_PATHに追加する方法もあります。 + + $LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib' + require 'rubygems' + require 'sinatra' + + get '/about' do + "今使ってるバージョンは" + Sinatra::VERSION + end + +Sinatraのソースを更新する方法: + + cd myproject/sinatra + git pull + +== その他 + +日本語サイト + +* {Greenbear Laboratory Rack日本語マニュアル}[http://mono.kmc.gr.jp/~yhara/w/?RackReferenceJa] - Rackの日本語マニュアル + +英語サイト + +* {プロジェクトサイト}[http://sinatra.github.com/] - ドキュメント、 + ニュース、他のリソースへのリンクがあります。 +* {プロジェクトに参加(貢献)する}[http://sinatra.github.com/contributing.html] - バグレポート + パッチの送信、サポートなど +* {Lighthouse}[http://sinatra.lighthouseapp.com] - チケット管理とリリース計画 +* {Twitter}[http://twitter.com/sinatra] +* {メーリングリスト}[http://groups.google.com/group/sinatrarb] +* {IRC: #sinatra}[irc://chat.freenode.net/#sinatra] on http://freenode.net diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.rdoc similarity index 89% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.rdoc index 11f0d8b8..1c4f273f 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/README.rdoc +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/README.rdoc @@ -1,6 +1,6 @@ = Sinatra -Sinatra is a DSL for quickly creating web-applications in Ruby with minimal +Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort: # myapp.rb @@ -150,6 +150,19 @@ and overridden on an individual basis. Renders ./views/index.erb +=== Erubis + +The erubis gem/library is required to render builder templates: + + ## You'll need to require erubis in your app + require 'erubis' + + get '/' do + erubis :index + end + +Renders ./views/index.erubis + === Builder Templates The builder gem/library is required to render builder templates: @@ -187,10 +200,9 @@ and overridden on an individual basis. get '/stylesheet.css' do content_type 'text/css', :charset => 'utf-8' - sass :stylesheet, :sass_options => {:style => :expanded } # overridden + sass :stylesheet, :style => :expanded # overridden end - === Inline Templates get '/' do @@ -219,7 +231,7 @@ Or, specify an explicit Hash of local variables: This is typically used when rendering templates as partials from within other templates. -=== In-file Templates +=== Inline Templates Templates may be defined at the end of the source file: @@ -239,9 +251,9 @@ Templates may be defined at the end of the source file: @@ index %div.title Hello world!!!!! -NOTE: In-file templates defined in the source file that requires sinatra -are automatically loaded. Call the use_in_file_templates! -method explicitly if you have in-file templates in other source files. +NOTE: Inline templates defined in the source file that requires sinatra +are automatically loaded. Call `enable :inline_templates` explicitly if you +have inline templates in other source files. === Named Templates @@ -297,31 +309,47 @@ filters are accessible by routes and templates: params[:splat] #=> 'bar/baz' end +After filter are evaluated after each request within the context of the +request and can also modify the request and response. Instance variables +set in before filters and routes are accessible by after filters: + + after do + puts response.status + end + == Halting -To immediately stop a request during a before filter or route use: +To immediately stop a request within a filter or route use: halt -You can also specify a body when halting ... +You can also specify the status when halting ... + + halt 410 + +Or the body ... halt 'this will be the body' -Or set the status and body ... +Or both ... halt 401, 'go away!' +With headers ... + + halt 402, {'Content-Type' => 'text/plain'}, 'revenge' + == Passing A route can punt processing to the next matching route using pass: get '/guess/:who' do pass unless params[:who] == 'Frank' - "You got me!" + 'You got me!' end get '/guess/*' do - "You missed!" + 'You missed!' end The route block is immediately exited and control continues with the next @@ -367,7 +395,7 @@ code is 404, the not_found handler is invoked: === Error The +error+ handler is invoked any time an exception is raised from a route -block or before filter. The exception object can be obtained from the +block or a filter. The exception object can be obtained from the sinatra.error Rack variable: error do @@ -390,15 +418,35 @@ You get this: So what happened was... something bad +Alternatively, you can install error handler for a status code: + + error 403 do + 'Access forbidden' + end + + get '/secret' do + 403 + end + +Or a range: + + error 400..510 do + 'Boom' + end + Sinatra installs special not_found and error handlers when running under the development environment. == Mime types When using send_file or static files you may have mime types Sinatra -doesn't understand. Use +mime+ to register them by file extension: +doesn't understand. Use +mime_type+ to register them by file extension: - mime :foo, 'text/foo' + mime_type :foo, 'text/foo' + +You can also use it with the +content_type+ helper: + + content_type :foo == Rack Middleware @@ -524,12 +572,13 @@ being {included into the main namespace}[http://github.com/sinatra/sinatra/blob/ Sinatra applications can be run directly: - ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-s HANDLER] + ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-h HOST] [-s HANDLER] Options are: -h # help -p # set the port (default is 4567) + -h # set the host (default is 0.0.0.0) -e # set the environment (default is development) -s # specify rack server/handler (default is thin) -x # turn on the mutex lock (default is off) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/Rakefile new file mode 100644 index 00000000..54875e60 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/Rakefile @@ -0,0 +1,113 @@ +require 'rake/clean' +require 'rake/testtask' +require 'fileutils' + +task :default => :test +task :spec => :test + +def source_version + line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/] + line.match(/.*VERSION = '(.*)'/)[1] +end + +# SPECS =============================================================== + +Rake::TestTask.new(:test) do |t| + t.test_files = FileList['test/*_test.rb'] + t.ruby_opts = ['-rubygems -I.'] if defined? Gem +end + +# Rcov ================================================================ +namespace :test do + desc 'Mesures test coverage' + task :coverage do + rm_f "coverage" + rcov = "rcov --text-summary --test-unit-only -Ilib" + system("#{rcov} --no-html --no-color test/*_test.rb") + end +end + +# Website ============================================================= +# Building docs requires HAML and the hanna gem: +# gem install mislav-hanna --source=http://gems.github.com + +desc 'Generate RDoc under doc/api' +task 'doc' => ['doc:api'] + +task 'doc:api' => ['doc/api/index.html'] + +file 'doc/api/index.html' => FileList['lib/**/*.rb','README.rdoc'] do |f| + rb_files = f.prerequisites + sh((<<-end).gsub(/\s+/, ' ')) + hanna --charset utf8 \ + --fmt html \ + --inline-source \ + --line-numbers \ + --main README.rdoc \ + --op doc/api \ + --title 'Sinatra API Documentation' \ + #{rb_files.join(' ')} + end +end +CLEAN.include 'doc/api' + +# PACKAGING ============================================================ + +if defined?(Gem) + # Load the gemspec using the same limitations as github + def spec + require 'rubygems' unless defined? Gem::Specification + @spec ||= eval(File.read('sinatra.gemspec')) + end + + def package(ext='') + "pkg/sinatra-#{spec.version}" + ext + end + + desc 'Build packages' + task :package => %w[.gem .tar.gz].map {|e| package(e)} + + desc 'Build and install as local gem' + task :install => package('.gem') do + sh "gem install #{package('.gem')}" + end + + directory 'pkg/' + CLOBBER.include('pkg') + + file package('.gem') => %w[pkg/ sinatra.gemspec] + spec.files do |f| + sh "gem build sinatra.gemspec" + mv File.basename(f.name), f.name + end + + file package('.tar.gz') => %w[pkg/] + spec.files do |f| + sh <<-SH + git archive \ + --prefix=sinatra-#{source_version}/ \ + --format=tar \ + HEAD | gzip > #{f.name} + SH + end + + task 'sinatra.gemspec' => FileList['{lib,test,compat}/**','Rakefile','CHANGES','*.rdoc'] do |f| + # read spec file and split out manifest section + spec = File.read(f.name) + head, manifest, tail = spec.split(" # = MANIFEST =\n") + # replace version and date + head.sub!(/\.version = '.*'/, ".version = '#{source_version}'") + head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'") + # determine file list from git ls-files + files = `git ls-files`. + split("\n"). + sort. + reject{ |file| file =~ /^\./ }. + reject { |file| file =~ /^doc/ }. + map{ |file| " #{file}" }. + join("\n") + # piece file back together and write... + manifest = " s.files = %w[\n#{files}\n ]\n" + spec = [head,manifest,tail].join(" # = MANIFEST =\n") + File.open(f.name, 'w') { |io| io.write(spec) } + puts "updated #{f.name}" + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra.rb similarity index 74% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra.rb index 8ba17244..71b122d1 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra.rb @@ -3,6 +3,5 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) require 'sinatra/base' require 'sinatra/main' -require 'sinatra/compat' -use_in_file_templates! +enable :inline_templates diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/base.rb similarity index 71% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/base.rb index aee52fcb..3970312b 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/base.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/base.rb @@ -5,26 +5,41 @@ require 'rack' require 'rack/builder' require 'sinatra/showexceptions' +# require tilt if available; fall back on bundled version. +begin + require 'tilt' +rescue LoadError + require 'sinatra/tilt' +end + module Sinatra - VERSION = '0.9.4' + VERSION = '1.0.a' # The request object. See Rack::Request for more info: # http://rack.rubyforge.org/doc/classes/Rack/Request.html class Request < Rack::Request - def user_agent - @env['HTTP_USER_AGENT'] - end - # Returns an array of acceptable media types for the response def accept @env['HTTP_ACCEPT'].to_s.split(',').map { |a| a.strip } end - # Override Rack 0.9.x's #params implementation (see #72 in lighthouse) - def params - self.GET.update(self.POST) - rescue EOFError, Errno::ESPIPE - self.GET + def secure? + (@env['HTTP_X_FORWARDED_PROTO'] || @env['rack.url_scheme']) == 'https' + end + + # Override Rack < 1.1's Request#params implementation (see lh #72 for + # more info) and add a Request#user_agent method. + # XXX remove when we require rack > 1.1 + if Rack.release < '1.1' + def params + self.GET.update(self.POST) + rescue EOFError, Errno::ESPIPE + self.GET + end + + def user_agent + @env['HTTP_USER_AGENT'] + end end end @@ -43,7 +58,7 @@ module Sinatra body = [body] if body.respond_to? :to_str if body.respond_to?(:to_ary) header["Content-Length"] = body.to_ary. - inject(0) { |len, part| len + part.bytesize }.to_s + inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s end [status.to_i, header.to_hash, body] end @@ -54,7 +69,7 @@ module Sinatra def code ; 404 ; end end - # Methods available to routes, before filters, and views. + # Methods available to routes, before/after filters, and views. module Helpers # Set or retrieve the response status code. def status(value=nil) @@ -104,20 +119,20 @@ module Sinatra end # Look up a media type by file extension in Rack's mime registry. - def media_type(type) - Base.media_type(type) + def mime_type(type) + Base.mime_type(type) end # Set the Content-Type of the response body given a media type or file # extension. def content_type(type, params={}) - media_type = self.media_type(type) - fail "Unknown media type: %p" % type if media_type.nil? + mime_type = self.mime_type(type) + fail "Unknown media type: %p" % type if mime_type.nil? if params.any? params = params.collect { |kv| "%s=%s" % kv }.join(', ') - response['Content-Type'] = [media_type, params].join(";") + response['Content-Type'] = [mime_type, params].join(";") else - response['Content-Type'] = media_type + response['Content-Type'] = mime_type end end @@ -136,8 +151,8 @@ module Sinatra stat = File.stat(path) last_modified stat.mtime - content_type media_type(opts[:type]) || - media_type(File.extname(path)) || + content_type mime_type(opts[:type]) || + mime_type(File.extname(path)) || response['Content-Type'] || 'application/octet-stream' @@ -166,6 +181,57 @@ module Sinatra end end + # Specify response freshness policy for HTTP caches (Cache-Control header). + # Any number of non-value directives (:public, :private, :no_cache, + # :no_store, :must_revalidate, :proxy_revalidate) may be passed along with + # a Hash of value directives (:max_age, :min_stale, :s_max_age). + # + # cache_control :public, :must_revalidate, :max_age => 60 + # => Cache-Control: public, must-revalidate, max-age=60 + # + # See RFC 2616 / 14.9 for more on standard cache control directives: + # http://tools.ietf.org/html/rfc2616#section-14.9.1 + def cache_control(*values) + if values.last.kind_of?(Hash) + hash = values.pop + hash.reject! { |k,v| v == false } + hash.reject! { |k,v| values << k if v == true } + else + hash = {} + end + + values = values.map { |value| value.to_s.tr('_','-') } + hash.each { |k,v| values << [k.to_s.tr('_', '-'), v].join('=') } + + response['Cache-Control'] = values.join(', ') if values.any? + end + + # Set the Expires header and Cache-Control/max-age directive. Amount + # can be an integer number of seconds in the future or a Time object + # indicating when the response should be considered "stale". The remaining + # "values" arguments are passed to the #cache_control helper: + # + # expires 500, :public, :must_revalidate + # => Cache-Control: public, must-revalidate, max-age=60 + # => Expires: Mon, 08 Jun 2009 08:50:17 GMT + # + def expires(amount, *values) + values << {} unless values.last.kind_of?(Hash) + + if amount.respond_to?(:to_time) + max_age = amount.to_time - Time.now + time = amount.to_time + else + max_age = amount + time = Time.now + amount + end + + values.last.merge!(:max_age => max_age) + cache_control(*values) + + response['Expires'] = time.httpdate + end + # Set the last modified time of the resource (HTTP 'Last-Modified' header) # and halt if conditional GET matches. The +time+ argument is a Time, # DateTime, or other object that responds to +to_time+. @@ -183,7 +249,7 @@ module Sinatra # Set the response entity tag (HTTP 'ETag' header) and halt if conditional # GET matches. The +value+ argument is an identifier that uniquely - # identifies the current version of the resource. The +strength+ argument + # identifies the current version of the resource. The +kind+ argument # indicates whether the etag should be used as a :strong (default) or :weak # cache validator. # @@ -208,7 +274,7 @@ module Sinatra end - # Template rendering methods. Each method takes a the name of a template + # Template rendering methods. Each method takes the name of a template # to render as a Symbol and returns a String with the rendered output, # as well as an optional hash with additional options. # @@ -223,127 +289,76 @@ module Sinatra # in the template module Templates def erb(template, options={}, locals={}) - require_warn('ERB') unless defined?(::ERB) - render :erb, template, options, locals end - def haml(template, options={}, locals={}) - require_warn('Haml') unless defined?(::Haml::Engine) + def erubis(template, options={}, locals={}) + render :erubis, template, options, locals + end + def haml(template, options={}, locals={}) render :haml, template, options, locals end def sass(template, options={}, locals={}) - require_warn('Sass') unless defined?(::Sass::Engine) - options[:layout] = false render :sass, template, options, locals end def builder(template=nil, options={}, locals={}, &block) - require_warn('Builder') unless defined?(::Builder) - options, template = template, nil if template.is_a?(Hash) - template = lambda { block } if template.nil? + template = Proc.new { block } if template.nil? render :builder, template, options, locals end private - def render(engine, template, options={}, locals={}) + def render(engine, data, options={}, locals={}, &block) # merge app-level options - options = self.class.send(engine).merge(options) if self.class.respond_to?(engine) + options = settings.send(engine).merge(options) if settings.respond_to?(engine) # extract generic options + locals = options.delete(:locals) || locals || {} + views = options.delete(:views) || settings.views || "./views" layout = options.delete(:layout) layout = :layout if layout.nil? || layout == true - views = options.delete(:views) || self.class.views || "./views" - locals = options.delete(:locals) || locals || {} - # render template - data, options[:filename], options[:line] = lookup_template(engine, template, views) - output = __send__("render_#{engine}", template, data, options, locals) + # compile and render template + template = compile_template(engine, data, options, views) + output = template.render(self, locals, &block) # render layout if layout - data, options[:filename], options[:line] = lookup_layout(engine, layout, views) - if data - output = __send__("render_#{engine}", layout, data, options, locals) { output } + begin + options = options.merge(:views => views, :layout => false) + output = render(engine, layout, options, locals) { output } + rescue Errno::ENOENT end end output end - def lookup_template(engine, template, views_dir, filename = nil, line = nil) - case template - when Symbol - if cached = self.class.templates[template] - lookup_template(engine, cached[:template], views_dir, cached[:filename], cached[:line]) + def compile_template(engine, data, options, views) + @template_cache.fetch engine, data, options do + case + when data.is_a?(Symbol) + body, path, line = self.class.templates[data] + if body + body = body.call if body.respond_to?(:call) + Tilt[engine].new(path, line.to_i, options) { body } + else + path = ::File.join(views, "#{data}.#{engine}") + Tilt[engine].new(path, 1, options) + end + when data.is_a?(Proc) || data.is_a?(String) + body = data.is_a?(String) ? Proc.new { data } : data + path, line = self.class.caller_locations.first + Tilt[engine].new(path, line.to_i, options, &body) else - path = ::File.join(views_dir, "#{template}.#{engine}") - [ ::File.read(path), path, 1 ] + raise ArgumentError end - when Proc - filename, line = self.class.caller_locations.first if filename.nil? - [ template.call, filename, line.to_i ] - when String - filename, line = self.class.caller_locations.first if filename.nil? - [ template, filename, line.to_i ] - else - raise ArgumentError end end - - def lookup_layout(engine, template, views_dir) - lookup_template(engine, template, views_dir) - rescue Errno::ENOENT - nil - end - - def render_erb(template, data, options, locals, &block) - original_out_buf = defined?(@_out_buf) && @_out_buf - data = data.call if data.kind_of? Proc - - instance = ::ERB.new(data, nil, nil, '@_out_buf') - locals_assigns = locals.to_a.collect { |k,v| "#{k} = locals[:#{k}]" } - - filename = options.delete(:filename) || '(__ERB__)' - line = options.delete(:line) || 1 - line -= 1 if instance.src =~ /^#coding:/ - - render_binding = binding - eval locals_assigns.join("\n"), render_binding - eval instance.src, render_binding, filename, line - @_out_buf, result = original_out_buf, @_out_buf - result - end - - def render_haml(template, data, options, locals, &block) - ::Haml::Engine.new(data, options).render(self, locals, &block) - end - - def render_sass(template, data, options, locals, &block) - ::Sass::Engine.new(data, options).render - end - - def render_builder(template, data, options, locals, &block) - options = { :indent => 2 }.merge(options) - filename = options.delete(:filename) || '' - line = options.delete(:line) || 1 - xml = ::Builder::XmlMarkup.new(options) - if data.respond_to?(:to_str) - eval data.to_str, binding, filename, line - elsif data.kind_of?(Proc) - data.call(xml) - end - xml.target! - end - - def require_warn(engine) - warn "Auto-require of #{engine} is deprecated; add require '#{engine}' to your app." - require engine.downcase - end end # Base class for all Sinatra applications and middleware. @@ -356,6 +371,7 @@ module Sinatra def initialize(app=nil) @app = app + @template_cache = Tilt::Cache.new yield self if block_given? end @@ -370,7 +386,8 @@ module Sinatra @env = env @request = Request.new(env) @response = Response.new - @params = nil + @params = indifferent_params(@request.params) + @template_cache.clear if settings.reload_templates invoke { dispatch! } invoke { error_block!(response.status) } @@ -388,10 +405,11 @@ module Sinatra [status, header, body] end - # Access options defined with Base.set. - def options + # Access settings defined with Base.set. + def settings self.class end + alias_method :options, :settings # Exit the current block, halts any further processing # of the request, and returns the specified response. @@ -403,8 +421,8 @@ module Sinatra # Pass control to the next matching route. # If there are no more matching routes, Sinatra will # return a 404 response. - def pass - throw :pass + def pass(&block) + throw :pass, block end # Forward the request to the downstream app -- middleware only. @@ -418,21 +436,21 @@ module Sinatra end private - # Run before filters and then locate and run a matching route. - def route! - # enable nested params in Rack < 1.0; allow indifferent access - @params = - if Rack::Utils.respond_to?(:parse_nested_query) - indifferent_params(@request.params) - else - nested_params(@request.params) - end + # Run before filters defined on the class and all superclasses. + def before_filter!(base=self.class) + before_filter!(base.superclass) if base.superclass.respond_to?(:before_filters) + base.before_filters.each { |block| instance_eval(&block) } + end - # before filters - self.class.filters.each { |block| instance_eval(&block) } + # Run after filters defined on the class and all superclasses. + def after_filter!(base=self.class) + after_filter!(base.superclass) if base.superclass.respond_to?(:after_filters) + base.after_filters.each { |block| instance_eval(&block) } + end - # routes - if routes = self.class.routes[@request.request_method] + # Run routes defined on the class and all superclasses. + def route!(base=self.class, pass_block=nil) + if routes = base.routes[@request.request_method] original_params = @params path = unescape(@request.path_info) @@ -457,15 +475,25 @@ module Sinatra @params = original_params.merge(params) @block_params = values - catch(:pass) do + pass_block = catch(:pass) do conditions.each { |cond| throw :pass if instance_eval(&cond) == false } route_eval(&block) end end end + + @params = original_params end + # Run routes defined in superclass. + if base.superclass.respond_to?(:routes) + route! base.superclass, pass_block + return + end + + route_eval(&pass_block) if pass_block + route_missing end @@ -487,6 +515,20 @@ module Sinatra end end + # Attempt to serve static files from public directory. Throws :halt when + # a matching file is found, returns nil otherwise. + def static! + return if (public_dir = settings.public).nil? + public_dir = File.expand_path(public_dir) + + path = File.expand_path(public_dir + unescape(request.path_info)) + return if path[0, public_dir.length] != public_dir + return unless File.file?(path) + + env['sinatra.static_file'] = path + send_file path, :disposition => nil + end + # Enable string or symbol key access to the nested params hash. def indifferent_params(params) params = indifferent_hash.merge(params) @@ -496,23 +538,6 @@ module Sinatra end end - # Recursively replace the params hash with a nested indifferent - # hash. Rack 1.0 has a built in implementation of this method - remove - # this once Rack 1.0 is required. - def nested_params(params) - return indifferent_hash.merge(params) if !params.keys.join.include?('[') - params.inject indifferent_hash do |res, (key,val)| - if key.include?('[') - head = key.split(/[\]\[]+/) - last = head.pop - head.inject(res){ |hash,k| hash[k] ||= indifferent_hash }[last] = val - else - res[key] = val - end - res - end - end - def indifferent_hash Hash.new {|hash,key| hash[key.to_s] if Symbol === key } end @@ -552,25 +577,30 @@ module Sinatra # Dispatch a request with error handling. def dispatch! + static! if settings.static? && (request.get? || request.head?) + before_filter! route! rescue NotFound => boom handle_not_found!(boom) rescue ::Exception => boom handle_exception!(boom) + ensure + after_filter! unless env['sinatra.static_file'] end def handle_not_found!(boom) - @env['sinatra.error'] = boom - @response.status = 404 - @response.body = ['

Not Found

'] + @env['sinatra.error'] = boom + @response.status = 404 + @response.headers['X-Cascade'] = 'pass' + @response.body = ['

Not Found

'] error_block! boom.class, NotFound end def handle_exception!(boom) @env['sinatra.error'] = boom - dump_errors!(boom) if options.dump_errors? - raise boom if options.raise_errors? || options.show_exceptions? + dump_errors!(boom) if settings.dump_errors? + raise boom if settings.raise_errors? || settings.show_exceptions? @response.status = 500 error_block! boom.class, Exception @@ -578,11 +608,16 @@ module Sinatra # Find an custom error block for the key(s) specified. def error_block!(*keys) - errmap = self.class.errors keys.each do |key| - if block = errmap[key] - res = instance_eval(&block) - return res + base = self.class + while base.respond_to?(:errors) + if block = base.errors[key] + # found a handler, eval and return result + res = instance_eval(&block) + return res + else + base = base.superclass + end end end nil @@ -592,11 +627,11 @@ module Sinatra backtrace = clean_backtrace(boom.backtrace) msg = ["#{boom.class} - #{boom.message}:", *backtrace].join("\n ") - @env['rack.errors'].write(msg) + @env['rack.errors'].puts(msg) end def clean_backtrace(trace) - return trace unless options.clean_trace? + return trace unless settings.clean_trace? trace.reject { |line| line =~ /lib\/sinatra.*\.rb/ || @@ -604,18 +639,43 @@ module Sinatra }.map! { |line| line.gsub(/^\.\//, '') } end - @routes = {} - @filters = [] - @conditions = [] - @templates = {} - @middleware = [] - @errors = {} - @prototype = nil - @extensions = [] - class << self - attr_accessor :routes, :filters, :conditions, :templates, - :middleware, :errors + attr_reader :routes, :before_filters, :after_filters, :templates, :errors + + def reset! + @conditions = [] + @routes = {} + @before_filters = [] + @after_filters = [] + @errors = {} + @middleware = [] + @prototype = nil + @extensions = [] + + if superclass.respond_to?(:templates) + @templates = Hash.new { |hash,key| superclass.templates[key] } + else + @templates = {} + end + end + + # Extension modules registered on this class and all superclasses. + def extensions + if superclass.respond_to?(:extensions) + (@extensions + superclass.extensions).uniq + else + @extensions + end + end + + # Middleware used in this class and all superclasses. + def middleware + if superclass.respond_to?(:middleware) + superclass.middleware + @middleware + else + @middleware + end + end # Sets an option to the given value. If the value is a proc, # the proc will be called every time the option is accessed. @@ -648,11 +708,7 @@ module Sinatra # class, or an HTTP status code to specify which errors should be # handled. def error(codes=Exception, &block) - if codes.respond_to? :each - codes.each { |err| error(err, &block) } - else - @errors[codes] = block - end + Array(codes).each { |code| @errors[code] = block } end # Sugar for `error(404) { ... }` @@ -663,7 +719,7 @@ module Sinatra # Define a named template. The block must return the template source. def template(name, &block) filename, line = caller_locations.first - templates[name] = { :filename => filename, :line => line, :template => block } + templates[name] = [block, filename, line.to_i] end # Define the layout template. The block must return the template source. @@ -673,20 +729,24 @@ module Sinatra # Load embeded templates from the file; uses the caller's __FILE__ # when no file is specified. - def use_in_file_templates!(file=nil) - file ||= caller_files.first - app, data = - ::IO.read(file).split(/^__END__$/, 2) rescue nil + def inline_templates=(file=nil) + file = (file.nil? || file == true) ? caller_files.first : file + + begin + app, data = + ::IO.read(file).gsub("\r\n", "\n").split(/^__END__$/, 2) + rescue Errno::ENOENT + app, data = nil + end if data - data.gsub!(/\r\n/, "\n") lines = app.count("\n") + 1 template = nil data.each_line do |line| lines += 1 if line =~ /^@@\s*(.*)/ template = '' - templates[$1.to_sym] = { :filename => file, :line => lines, :template => template } + templates[$1.to_sym] = [template, file, lines] elsif template template << line end @@ -694,18 +754,26 @@ module Sinatra end end - # Look up a media type by file extension in Rack's mime registry. - def media_type(type) + # Lookup or register a mime type in Rack's mime registry. + def mime_type(type, value=nil) return type if type.nil? || type.to_s.include?('/') type = ".#{type}" unless type.to_s[0] == ?. - Rack::Mime.mime_type(type, nil) + return Rack::Mime.mime_type(type, nil) unless value + Rack::Mime::MIME_TYPES[type] = value end - # Define a before filter. Filters are run before all requests - # within the same context as route handlers and may access/modify the - # request and response. + # Define a before filter; runs before all requests within the same + # context as route handlers and may access/modify the request and + # response. def before(&block) - @filters << block + @before_filters << block + end + + # Define an after filter; runs after all requests within the same + # context as route handlers and may access/modify the request and + # response. + def after(&block) + @after_filters << block end # Add a route condition. The route is considered non-matching when the @@ -733,7 +801,7 @@ module Sinatra def provides(*types) types = [types] unless types.kind_of? Array - types.map!{|t| media_type(t)} + types.map!{|t| mime_type(t)} condition { matching_types = (request.accept & types) @@ -776,14 +844,14 @@ module Sinatra unbound_method = instance_method("#{verb} #{path}") block = if block.arity != 0 - lambda { unbound_method.bind(self).call(*@block_params) } + proc { unbound_method.bind(self).call(*@block_params) } else - lambda { unbound_method.bind(self).call } + proc { unbound_method.bind(self).call } end invoke_hook(:route_added, verb, path, block) - (routes[verb] ||= []). + (@routes[verb] ||= []). push([pattern, keys, conditions, block]).last end @@ -826,10 +894,6 @@ module Sinatra include(*extensions) if extensions.any? end - def extensions - (@extensions + (superclass.extensions rescue [])).uniq - end - def register(*extensions, &block) extensions << Module.new(&block) if block_given? @extensions += extensions @@ -869,6 +933,7 @@ module Sinatra server.respond_to?(:stop!) ? server.stop! : server.stop puts "\n== Sinatra has ended his set (crowd applauds)" unless handler_name =~/cgi/i end + set :running, true end rescue Errno::EADDRINUSE => e puts "== Someone is already performing on port #{port}!" @@ -884,12 +949,12 @@ module Sinatra # an instance of the class new was called on. def new(*args, &bk) builder = Rack::Builder.new - builder.use Rack::Session::Cookie if sessions? && !test? + builder.use Rack::Session::Cookie if sessions? builder.use Rack::CommonLogger if logging? builder.use Rack::MethodOverride if methodoverride? builder.use ShowExceptions if show_exceptions? + middleware.each { |c,a,b| builder.use(c, *a, &b) } - @middleware.each { |c,a,b| builder.use(c, *a, &b) } builder.run super builder.to_app end @@ -898,25 +963,6 @@ module Sinatra synchronize { prototype.call(env) } end - def reset!(base=superclass) - @routes = base.dupe_routes - @templates = base.templates.dup - @conditions = [] - @filters = base.filters.dup - @errors = base.errors.dup - @middleware = base.middleware.dup - @prototype = nil - @extensions = [] - end - - protected - def dupe_routes - routes.inject({}) do |hash,(request_method,routes)| - hash[request_method] = routes.dup - hash - end - end - private def detect_rack_handler servers = Array(self.server) @@ -931,7 +977,7 @@ module Sinatra end def inherited(subclass) - subclass.reset! self + subclass.reset! super end @@ -951,11 +997,12 @@ module Sinatra public CALLERS_TO_IGNORE = [ - /\/sinatra(\/(base|main|showexceptions|compat))?\.rb$/, # all sinatra code + /\/sinatra(\/(base|main|showexceptions))?\.rb$/, # all sinatra code + /lib\/tilt.*\.rb$/, # all tilt code /\(.*\)/, # generated code /custom_require\.rb$/, # rubygems require hacks /active_support/, # active_support require hacks - ] unless self.const_defined?('CALLERS_TO_IGNORE') + ] # add rubinius (and hopefully other VM impls) ignore patterns ... CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS) @@ -974,17 +1021,19 @@ module Sinatra end end - set :raise_errors, true - set :dump_errors, false + reset! + + set :environment, (ENV['RACK_ENV'] || :development).to_sym + set :raise_errors, Proc.new { !development? } + set :dump_errors, Proc.new { development? } + set :show_exceptions, Proc.new { development? } set :clean_trace, true - set :show_exceptions, false set :sessions, false set :logging, false set :methodoverride, false - set :static, false - set :environment, (ENV['RACK_ENV'] || :development).to_sym - set :run, false + set :run, false # start server via at-exit hook? + set :running, false # is the built-in server running now? set :server, %w[thin mongrel webrick] set :host, '0.0.0.0' set :port, 4567 @@ -992,18 +1041,11 @@ module Sinatra set :app_file, nil set :root, Proc.new { app_file && File.expand_path(File.dirname(app_file)) } set :views, Proc.new { root && File.join(root, 'views') } - set :public, Proc.new { root && File.join(root, 'public') } + set :reload_templates, Proc.new { !development? } set :lock, false - # static files route - get(/.*[^\/]$/) do - pass unless options.static? && options.public? - public_dir = File.expand_path(options.public) - path = File.expand_path(public_dir + unescape(request.path_info)) - pass if path[0, public_dir.length] != public_dir - pass unless File.file?(path) - send_file path, :disposition => nil - end + set :public, Proc.new { root && File.join(root, 'public') } + set :static, Proc.new { self.public && File.exist?(self.public) } error ::Exception do response.status = 500 @@ -1045,16 +1087,21 @@ module Sinatra end end - # Base class for classic style (top-level) applications. - class Default < Base + # Execution context for classic style (top-level) applications. All + # DSL methods executed on main are delegated to this class. + # + # The Application class should not be subclassed, unless you want to + # inherit all settings, routes, handlers, and error pages from the + # top-level. Subclassing Sinatra::Base is heavily recommended for + # modular applications. + class Application < Base set :raise_errors, Proc.new { test? } - set :show_exceptions, Proc.new { development? } set :dump_errors, true set :sessions, false set :logging, Proc.new { ! test? } set :methodoverride, true - set :static, true set :run, Proc.new { ! test? } + set :static, true def self.register(*extensions, &block) #:nodoc: added_methods = extensions.map {|m| m.public_instance_methods }.flatten @@ -1063,11 +1110,6 @@ module Sinatra end end - # The top-level Application. All DSL methods executed on main are delegated - # to this class. - class Application < Default - end - # Sinatra delegation mixin. Mixing this module into an object causes all # methods to be delegated to the Sinatra::Application class. Used primarily # at the top-level. @@ -1083,10 +1125,10 @@ module Sinatra end end - delegate :get, :put, :post, :delete, :head, :template, :layout, :before, - :error, :not_found, :configures, :configure, :set, :set_option, - :set_options, :enable, :disable, :use, :development?, :test?, - :production?, :use_in_file_templates!, :helpers + delegate :get, :put, :post, :delete, :head, :template, :layout, + :before, :after, :error, :not_found, :configure, :set, :mime_type, + :enable, :disable, :use, :development?, :test?, :production?, + :helpers, :settings end # Create a new Sinatra application. The block is evaluated in the new app's @@ -1099,21 +1141,11 @@ module Sinatra # Extend the top-level DSL with the modules provided. def self.register(*extensions, &block) - Default.register(*extensions, &block) + Application.register(*extensions, &block) end # Include the helper modules provided in Sinatra's request context. def self.helpers(*extensions, &block) - Default.helpers(*extensions, &block) + Application.helpers(*extensions, &block) end end - -class String #:nodoc: - # Define String#each under 1.9 for Rack compatibility. This should be - # removed once Rack is fully 1.9 compatible. - alias_method :each, :each_line unless ''.respond_to? :each - - # Define String#bytesize as an alias to String#length for Ruby 1.8.6 and - # earlier. - alias_method :bytesize, :length unless ''.respond_to? :bytesize -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/404.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/images/404.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/404.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/images/404.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/500.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/images/500.png similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/500.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/images/500.png diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/main.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/main.rb similarity index 75% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/main.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/main.rb index ee7f5b81..d0afbfe3 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/main.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/main.rb @@ -1,7 +1,7 @@ require 'sinatra/base' module Sinatra - class Default < Base + class Application < Base # we assume that the first file that requires 'sinatra' is the # app_file. all other path related options are calculated based @@ -17,19 +17,12 @@ module Sinatra op.on('-e env') { |val| set :environment, val.to_sym } op.on('-s server') { |val| set :server, val } op.on('-p port') { |val| set :port, val.to_i } + op.on('-h addr') { |val| set :host, val } }.parse!(ARGV.dup) end end + + at_exit { Application.run! if $!.nil? && Application.run? } end include Sinatra::Delegator - -def mime(ext, type) - ext = ".#{ext}" unless ext.to_s[0] == ?. - Rack::Mime::MIME_TYPES[ext.to_s] = type -end - -at_exit do - raise $! if $! - Sinatra::Application.run! if Sinatra::Application.run? -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/showexceptions.rb similarity index 93% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/showexceptions.rb index 9f787686..86738c97 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/showexceptions.rb @@ -73,14 +73,14 @@ TEMPLATE = <
-

You're seeing this error because you use you have -enabled the show_exceptions option.

+

You're seeing this error because you have +enabled the show_exceptions setting.

diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/tilt.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/tilt.rb new file mode 100644 index 00000000..a5bd72d5 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/lib/sinatra/tilt.rb @@ -0,0 +1,509 @@ +module Tilt + VERSION = '0.4' + + @template_mappings = {} + + # Hash of template path pattern => template implementation + # class mappings. + def self.mappings + @template_mappings + end + + # Register a template implementation by file extension. + def self.register(ext, template_class) + ext = ext.to_s.sub(/^\./, '') + mappings[ext.downcase] = template_class + end + + # Create a new template for the given file using the file's extension + # to determine the the template mapping. + def self.new(file, line=nil, options={}, &block) + if template_class = self[file] + template_class.new(file, line, options, &block) + else + fail "No template engine registered for #{File.basename(file)}" + end + end + + # Lookup a template class given for the given filename or file + # extension. Return nil when no implementation is found. + def self.[](file) + if @template_mappings.key?(pattern = file.to_s.downcase) + @template_mappings[pattern] + elsif @template_mappings.key?(pattern = File.basename(pattern)) + @template_mappings[pattern] + else + while !pattern.empty? + if @template_mappings.key?(pattern) + return @template_mappings[pattern] + else + pattern = pattern.sub(/^[^.]*\.?/, '') + end + end + nil + end + end + + + # Base class for template implementations. Subclasses must implement + # the #compile! method and one of the #evaluate or #template_source + # methods. + class Template + # Template source; loaded from a file or given directly. + attr_reader :data + + # The name of the file where the template data was loaded from. + attr_reader :file + + # The line number in #file where template data was loaded from. + attr_reader :line + + # A Hash of template engine specific options. This is passed directly + # to the underlying engine and is not used by the generic template + # interface. + attr_reader :options + + # Create a new template with the file, line, and options specified. By + # default, template data is read from the file specified. When a block + # is given, it should read template data and return as a String. When + # file is nil, a block is required. + # + # The #initialize_engine method is called if this is the very first + # time this template subclass has been initialized. + def initialize(file=nil, line=1, options={}, &block) + raise ArgumentError, "file or block required" if file.nil? && block.nil? + options, line = line, 1 if line.is_a?(Hash) + @file = file + @line = line || 1 + @options = options || {} + @reader = block || lambda { |t| File.read(file) } + + if !self.class.engine_initialized + initialize_engine + self.class.engine_initialized = true + end + end + + # Called once and only once for each template subclass the first time + # the template class is initialized. This should be used to require the + # underlying template library and perform any initial setup. + def initialize_engine + end + @engine_initialized = false + class << self ; attr_accessor :engine_initialized ; end + + + # Load template source and compile the template. The template is + # loaded and compiled the first time this method is called; subsequent + # calls are no-ops. + def compile + if @data.nil? + @data = @reader.call(self) + compile! + end + end + + # Render the template in the given scope with the locals specified. If a + # block is given, it is typically available within the template via + # +yield+. + def render(scope=Object.new, locals={}, &block) + compile + evaluate scope, locals || {}, &block + end + + # The basename of the template file. + def basename(suffix='') + File.basename(file, suffix) if file + end + + # The template file's basename with all extensions chomped off. + def name + basename.split('.', 2).first if basename + end + + # The filename used in backtraces to describe the template. + def eval_file + file || '(__TEMPLATE__)' + end + + protected + # Do whatever preparation is necessary to "compile" the template. + # Called immediately after template #data is loaded. Instance variables + # set in this method are available when #evaluate is called. + # + # Subclasses must provide an implementation of this method. + def compile! + raise NotImplementedError + end + + # Process the template and return the result. Subclasses should override + # this method unless they implement the #template_source. + def evaluate(scope, locals, &block) + source, offset = local_assignment_code(locals) + source = [source, template_source].join("\n") + scope.instance_eval source, eval_file, line - offset + end + + # Return a string containing the (Ruby) source code for the template. The + # default Template#evaluate implementation requires this method be + # defined. + def template_source + raise NotImplementedError + end + + private + def local_assignment_code(locals) + return ['', 1] if locals.empty? + source = locals.collect { |k,v| "#{k} = locals[:#{k}]" } + [source.join("\n"), source.length] + end + + def require_template_library(name) + if Thread.list.size > 1 + warn "WARN: tilt autoloading '#{name}' in a non thread-safe way; " + + "explicit require '#{name}' suggested." + end + require name + end + end + + # Extremely simple template cache implementation. Calling applications + # create a Tilt::Cache instance and use #fetch with any set of hashable + # arguments (such as those to Tilt.new): + # cache = Tilt::Cache.new + # cache.fetch(path, line, options) { Tilt.new(path, line, options) } + # + # Subsequent invocations return the already compiled template object. + class Cache + def initialize + @cache = {} + end + + def fetch(*key) + @cache[key] ||= yield + end + + def clear + @cache = {} + end + end + + + # Template Implementations ================================================ + + + # The template source is evaluated as a Ruby string. The #{} interpolation + # syntax can be used to generated dynamic output. + class StringTemplate < Template + def compile! + @code = "%Q{#{data}}" + end + + def template_source + @code + end + end + register 'str', StringTemplate + + + # ERB template implementation. See: + # http://www.ruby-doc.org/stdlib/libdoc/erb/rdoc/classes/ERB.html + class ERBTemplate < Template + def initialize_engine + require_template_library 'erb' unless defined? ::ERB + end + + def compile! + @engine = ::ERB.new(data, options[:safe], options[:trim], '@_out_buf') + end + + def template_source + @engine.src + end + + def evaluate(scope, locals, &block) + source, offset = local_assignment_code(locals) + source = [source, template_source].join("\n") + + original_out_buf = + scope.instance_variables.any? { |var| var.to_sym == :@_out_buf } && + scope.instance_variable_get(:@_out_buf) + + scope.instance_eval source, eval_file, line - offset + + output = scope.instance_variable_get(:@_out_buf) + scope.instance_variable_set(:@_out_buf, original_out_buf) + + output + end + + private + + # ERB generates a line to specify the character coding of the generated + # source in 1.9. Account for this in the line offset. + if RUBY_VERSION >= '1.9.0' + def local_assignment_code(locals) + source, offset = super + [source, offset + 1] + end + end + end + %w[erb rhtml].each { |ext| register ext, ERBTemplate } + + + # Erubis template implementation. See: + # http://www.kuwata-lab.com/erubis/ + class ErubisTemplate < ERBTemplate + def initialize_engine + require_template_library 'erubis' unless defined? ::Erubis + end + + def compile! + Erubis::Eruby.class_eval(%Q{def add_preamble(src) src << "@_out_buf = _buf = '';" end}) + @engine = ::Erubis::Eruby.new(data, options) + end + + private + + # Erubis doesn't have ERB's line-off-by-one under 1.9 problem. Override + # and adjust back. + if RUBY_VERSION >= '1.9.0' + def local_assignment_code(locals) + source, offset = super + [source, offset - 1] + end + end + end + register 'erubis', ErubisTemplate + + + # Haml template implementation. See: + # http://haml.hamptoncatlin.com/ + class HamlTemplate < Template + def initialize_engine + require_template_library 'haml' unless defined? ::Haml::Engine + end + + def compile! + @engine = ::Haml::Engine.new(data, haml_options) + end + + def evaluate(scope, locals, &block) + @engine.render(scope, locals, &block) + end + + private + def haml_options + options.merge(:filename => eval_file, :line => line) + end + end + register 'haml', HamlTemplate + + + # Sass template implementation. See: + # http://haml.hamptoncatlin.com/ + # + # Sass templates do not support object scopes, locals, or yield. + class SassTemplate < Template + def initialize_engine + require_template_library 'sass' unless defined? ::Sass::Engine + end + + def compile! + @engine = ::Sass::Engine.new(data, sass_options) + end + + def evaluate(scope, locals, &block) + @engine.render + end + + private + def sass_options + options.merge(:filename => eval_file, :line => line) + end + end + register 'sass', SassTemplate + + + # Builder template implementation. See: + # http://builder.rubyforge.org/ + class BuilderTemplate < Template + def initialize_engine + require_template_library 'builder' unless defined?(::Builder) + end + + def compile! + end + + def evaluate(scope, locals, &block) + xml = ::Builder::XmlMarkup.new(:indent => 2) + if data.respond_to?(:to_str) + locals[:xml] = xml + super(scope, locals, &block) + elsif data.kind_of?(Proc) + data.call(xml) + end + xml.target! + end + + def template_source + data.to_str + end + end + register 'builder', BuilderTemplate + + + # Liquid template implementation. See: + # http://liquid.rubyforge.org/ + # + # Liquid is designed to be a *safe* template system and threfore + # does not provide direct access to execuatable scopes. In order to + # support a +scope+, the +scope+ must be able to represent itself + # as a hash by responding to #to_h. If the +scope+ does not respond + # to #to_h it will be ignored. + # + # LiquidTemplate does not support yield blocks. + # + # It's suggested that your program require 'liquid' at load + # time when using this template engine. + class LiquidTemplate < Template + def initialize_engine + require_template_library 'liquid' unless defined? ::Liquid::Template + end + + def compile! + @engine = ::Liquid::Template.parse(data) + end + + def evaluate(scope, locals, &block) + locals = locals.inject({}){ |h,(k,v)| h[k.to_s] = v ; h } + if scope.respond_to?(:to_h) + scope = scope.to_h.inject({}){ |h,(k,v)| h[k.to_s] = v ; h } + locals = scope.merge(locals) + end + # TODO: Is it possible to lazy yield ? + locals['yield'] = block.nil? ? '' : yield + locals['content'] = block.nil? ? '' : yield + @engine.render(locals) + end + end + register 'liquid', LiquidTemplate + + + # Discount Markdown implementation. See: + # http://github.com/rtomayko/rdiscount + # + # RDiscount is a simple text filter. It does not support +scope+ or + # +locals+. The +:smart+ and +:filter_html+ options may be set true + # to enable those flags on the underlying RDiscount object. + class RDiscountTemplate < Template + def flags + [:smart, :filter_html].select { |flag| options[flag] } + end + + def initialize_engine + require_template_library 'rdiscount' unless defined? ::RDiscount + end + + def compile! + @engine = RDiscount.new(data, *flags) + end + + def evaluate(scope, locals, &block) + @engine.to_html + end + end + register 'markdown', RDiscountTemplate + register 'mkd', RDiscountTemplate + register 'md', RDiscountTemplate + + +# RedCloth implementation. See: +# http://redcloth.org/ +class RedClothTemplate < Template + def initialize_engine + require_template_library 'redcloth' unless defined? ::RedCloth + end + + def compile! + @engine = RedCloth.new(data) + end + + def evaluate(scope, locals, &block) + @engine.to_html + end +end +register 'textile', RedClothTemplate + + + # Mustache is written and maintained by Chris Wanstrath. See: + # http://github.com/defunkt/mustache + # + # When a scope argument is provided to MustacheTemplate#render, the + # instance variables are copied from the scope object to the Mustache + # view. + class MustacheTemplate < Template + attr_reader :engine + + def initialize_engine + require_template_library 'mustache' unless defined? ::Mustache + end + + def compile! + Mustache.view_namespace = options[:namespace] + @engine = options[:view] || Mustache.view_class(name) + options.each do |key, value| + next if %w[view namespace mustaches].include?(key.to_s) + @engine.send("#{key}=", value) if @engine.respond_to? "#{key}=" + end + end + + def evaluate(scope=nil, locals={}, &block) + instance = @engine.new + + # copy instance variables from scope to the view + scope.instance_variables.each do |name| + instance.instance_variable_set(name, scope.instance_variable_get(name)) + end + + # locals get added to the view's context + locals.each do |local, value| + instance[local] = value + end + + # if we're passed a block it's a subview. Sticking it in yield + # lets us use {{yield}} in layout.html to render the actual page. + instance[:yield] = block.call if block + + instance.template = data unless instance.compiled? + + instance.to_html + end + end + register 'mustache', MustacheTemplate + + # RDoc template. See: + # http://rdoc.rubyforge.org/ + # + # It's suggested that your program require 'rdoc/markup' and + # 'rdoc/markup/to_html' at load time when using this template + # engine. + class RDocTemplate < Template + def initialize_engine + unless defined?(::RDoc::Markup) + require_template_library 'rdoc/markup' + require_template_library 'rdoc/markup/to_html' + end + end + + def compile! + markup = RDoc::Markup::ToHtml.new + @engine = markup.convert(data) + end + + def evaluate(scope, locals, &block) + @engine.to_s + end + end + register 'rdoc', RDocTemplate +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/sinatra.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/sinatra.gemspec similarity index 56% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/sinatra.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/sinatra.gemspec index 7269c4cd..9804c57d 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/sinatra.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/sinatra.gemspec @@ -3,13 +3,13 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.name = 'sinatra' - s.version = '0.9.4' - s.date = '2009-07-26' + s.version = '1.0.a' + s.date = '2010-01-28' s.description = "Classy web-development dressed in a DSL" s.summary = "Classy web-development dressed in a DSL" - s.authors = ["Blake Mizerany"] + s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"] s.email = "sinatrarb@googlegroups.com" # = MANIFEST = @@ -17,61 +17,22 @@ Gem::Specification.new do |s| AUTHORS CHANGES LICENSE + README.jp.rdoc README.rdoc Rakefile - compat/app_test.rb - compat/application_test.rb - compat/builder_test.rb - compat/compat_test.rb - compat/custom_error_test.rb - compat/erb_test.rb - compat/events_test.rb - compat/filter_test.rb - compat/haml_test.rb - compat/helper.rb - compat/mapped_error_test.rb - compat/pipeline_test.rb - compat/public/foo.xml - compat/sass_test.rb - compat/sessions_test.rb - compat/streaming_test.rb - compat/sym_params_test.rb - compat/template_test.rb - compat/use_in_file_templates_test.rb - compat/views/foo.builder - compat/views/foo.erb - compat/views/foo.haml - compat/views/foo.sass - compat/views/foo_layout.erb - compat/views/foo_layout.haml - compat/views/layout_test/foo.builder - compat/views/layout_test/foo.erb - compat/views/layout_test/foo.haml - compat/views/layout_test/foo.sass - compat/views/layout_test/layout.builder - compat/views/layout_test/layout.erb - compat/views/layout_test/layout.haml - compat/views/layout_test/layout.sass - compat/views/no_layout/no_layout.builder - compat/views/no_layout/no_layout.haml lib/sinatra.rb lib/sinatra/base.rb - lib/sinatra/compat.rb lib/sinatra/images/404.png lib/sinatra/images/500.png lib/sinatra/main.rb lib/sinatra/showexceptions.rb - lib/sinatra/test.rb - lib/sinatra/test/bacon.rb - lib/sinatra/test/rspec.rb - lib/sinatra/test/spec.rb - lib/sinatra/test/unit.rb + lib/sinatra/tilt.rb sinatra.gemspec test/base_test.rb test/builder_test.rb test/contest.rb - test/data/reload_app_file.rb test/erb_test.rb + test/erubis_test.rb test/extensions_test.rb test/filter_test.rb test/haml_test.rb @@ -79,8 +40,7 @@ Gem::Specification.new do |s| test/helpers_test.rb test/mapped_error_test.rb test/middleware_test.rb - test/options_test.rb - test/render_backtrace_test.rb + test/public/favicon.ico test/request_test.rb test/response_test.rb test/result_test.rb @@ -88,22 +48,25 @@ Gem::Specification.new do |s| test/routing_test.rb test/sass_test.rb test/server_test.rb + test/settings_test.rb test/sinatra_test.rb test/static_test.rb test/templates_test.rb - test/test_test.rb test/views/error.builder test/views/error.erb + test/views/error.erubis test/views/error.haml test/views/error.sass test/views/foo/hello.test test/views/hello.builder test/views/hello.erb + test/views/hello.erubis test/views/hello.haml test/views/hello.sass test/views/hello.test test/views/layout2.builder test/views/layout2.erb + test/views/layout2.erubis test/views/layout2.haml test/views/layout2.test ] @@ -112,9 +75,12 @@ Gem::Specification.new do |s| s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/} s.extra_rdoc_files = %w[README.rdoc LICENSE] - s.add_dependency 'rack', '>= 0.9.1' - s.add_development_dependency 'shotgun', '>= 0.2', '< 1.0' + s.add_dependency 'rack', '>= 1.0' + s.add_development_dependency 'shotgun', '>= 0.6', '< 1.0' s.add_development_dependency 'rack-test', '>= 0.3.0' + s.add_development_dependency 'haml' + s.add_development_dependency 'builder' + s.add_development_dependency 'erubis' s.has_rdoc = true s.homepage = "http://sinatra.rubyforge.org" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/base_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/base_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/base_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/base_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/builder_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/builder_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/builder_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/builder_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/contest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/contest.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/contest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/contest.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/erb_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/erb_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/erb_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/erb_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/erubis_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/erubis_test.rb new file mode 100644 index 00000000..447f25fa --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/erubis_test.rb @@ -0,0 +1,82 @@ +require File.dirname(__FILE__) + '/helper' +require 'erubis' + +class ERubisTest < Test::Unit::TestCase + def erubis_app(&block) + mock_app { + set :views, File.dirname(__FILE__) + '/views' + get '/', &block + } + get '/' + end + + it 'renders inline ERubis strings' do + erubis_app { erubis '<%= 1 + 1 %>' } + assert ok? + assert_equal '2', body + end + + it 'renders .erubis files in views path' do + erubis_app { erubis :hello } + assert ok? + assert_equal "Hello World\n", body + end + + it 'takes a :locals option' do + erubis_app { + locals = {:foo => 'Bar'} + erubis '<%= foo %>', :locals => locals + } + assert ok? + assert_equal 'Bar', body + end + + it "renders with inline layouts" do + mock_app { + layout { 'THIS. IS. <%= yield.upcase %>!' } + get('/') { erubis 'Sparta' } + } + get '/' + assert ok? + assert_equal 'THIS. IS. SPARTA!', body + end + + it "renders with file layouts" do + erubis_app { + erubis 'Hello World', :layout => :layout2 + } + assert ok? + assert_equal "ERubis Layout!\nHello World\n", body + end + + it "renders erubis with blocks" do + mock_app { + def container + @_out_buf << "THIS." + yield + @_out_buf << "SPARTA!" + end + def is; "IS." end + get '/' do + erubis '<% container do %> <%= is %> <% end %>' + end + } + get '/' + assert ok? + assert_equal 'THIS. IS. SPARTA!', body + end + + it "can be used in a nested fashion for partials and whatnot" do + mock_app { + template(:inner) { "<%= 'hi' %>" } + template(:outer) { "<%= erubis :inner %>" } + get '/' do + erubis :outer + end + } + + get '/' + assert ok? + assert_equal 'hi', body + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/extensions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/extensions_test.rb similarity index 82% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/extensions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/extensions_test.rb index 7977c29a..8e4a5438 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/extensions_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/extensions_test.rb @@ -35,9 +35,9 @@ class ExtensionsTest < Test::Unit::TestCase Sinatra::Base.register FooExtensions assert Sinatra::Base.respond_to?(:foo) - Sinatra::Default.register BarExtensions - assert Sinatra::Default.respond_to?(:bar) - assert Sinatra::Default.respond_to?(:foo) + Sinatra::Application.register BarExtensions + assert Sinatra::Application.respond_to?(:bar) + assert Sinatra::Application.respond_to?(:foo) assert !Sinatra::Base.respond_to?(:bar) end @@ -48,8 +48,8 @@ class ExtensionsTest < Test::Unit::TestCase assert Sinatra::Base.respond_to?(:im_in_ur_anonymous_module) end - it 'will make sure any public methods added via Default#register are delegated to Sinatra::Delegator' do - Sinatra::Default.register FooExtensions + it 'will make sure any public methods added via Application#register are delegated to Sinatra::Delegator' do + Sinatra::Application.register FooExtensions assert Sinatra::Delegator.private_instance_methods. map { |m| m.to_sym }.include?(:foo) assert !Sinatra::Delegator.private_instance_methods. @@ -57,7 +57,7 @@ class ExtensionsTest < Test::Unit::TestCase end it 'will handle special method names' do - Sinatra::Default.register PainExtensions + Sinatra::Application.register PainExtensions assert Sinatra::Delegator.private_instance_methods. map { |m| m.to_sym }.include?(:foo=) assert Sinatra::Delegator.private_instance_methods. @@ -71,10 +71,10 @@ class ExtensionsTest < Test::Unit::TestCase assert !Sinatra::Delegator.private_instance_methods.include?("quux") end - it 'will extend the Sinatra::Default application by default' do + it 'will extend the Sinatra::Application application by default' do Sinatra.register BazExtensions assert !Sinatra::Base.respond_to?(:baz) - assert Sinatra::Default.respond_to?(:baz) + assert Sinatra::Application.respond_to?(:baz) end module BizzleExtension diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/filter_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/filter_test.rb new file mode 100644 index 00000000..b4bbda1a --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/filter_test.rb @@ -0,0 +1,221 @@ +require File.dirname(__FILE__) + '/helper' + +class BeforeFilterTest < Test::Unit::TestCase + it "executes filters in the order defined" do + count = 0 + mock_app do + get('/') { 'Hello World' } + before { + assert_equal 0, count + count = 1 + } + before { + assert_equal 1, count + count = 2 + } + end + + get '/' + assert ok? + assert_equal 2, count + assert_equal 'Hello World', body + end + + it "can modify the request" do + mock_app { + get('/foo') { 'foo' } + get('/bar') { 'bar' } + before { request.path_info = '/bar' } + } + + get '/foo' + assert ok? + assert_equal 'bar', body + end + + it "can modify instance variables available to routes" do + mock_app { + before { @foo = 'bar' } + get('/foo') { @foo } + } + + get '/foo' + assert ok? + assert_equal 'bar', body + end + + it "allows redirects" do + mock_app { + before { redirect '/bar' } + get('/foo') do + fail 'before block should have halted processing' + 'ORLY?!' + end + } + + get '/foo' + assert redirect? + assert_equal '/bar', response['Location'] + assert_equal '', body + end + + it "does not modify the response with its return value" do + mock_app { + before { 'Hello World!' } + get '/foo' do + assert_equal [], response.body + 'cool' + end + } + + get '/foo' + assert ok? + assert_equal 'cool', body + end + + it "does modify the response with halt" do + mock_app { + before { halt 302, 'Hi' } + get '/foo' do + "should not happen" + end + } + + get '/foo' + assert_equal 302, response.status + assert_equal 'Hi', body + end + + it "gives you access to params" do + mock_app { + before { @foo = params['foo'] } + get('/foo') { @foo } + } + + get '/foo?foo=cool' + assert ok? + assert_equal 'cool', body + end + + it "runs filters defined in superclasses" do + base = Class.new(Sinatra::Base) + base.before { @foo = 'hello from superclass' } + + mock_app(base) { + get('/foo') { @foo } + } + + get '/foo' + assert_equal 'hello from superclass', body + end + + it 'does not run before filter when serving static files' do + ran_filter = false + mock_app { + before { ran_filter = true } + set :static, true + set :public, File.dirname(__FILE__) + } + get "/#{File.basename(__FILE__)}" + assert ok? + assert_equal File.read(__FILE__), body + assert !ran_filter + end +end + +class AfterFilterTest < Test::Unit::TestCase + it "executes filters in the order defined" do + invoked = 0 + mock_app do + before { invoked = 2 } + get('/') { invoked += 2 } + after { invoked *= 2 } + end + + get '/' + assert ok? + + assert_equal 8, invoked + end + + it "executes filters in the order defined" do + count = 0 + mock_app do + get('/') { 'Hello World' } + after { + assert_equal 0, count + count = 1 + } + after { + assert_equal 1, count + count = 2 + } + end + + get '/' + assert ok? + assert_equal 2, count + assert_equal 'Hello World', body + end + + it "allows redirects" do + mock_app { + get('/foo') { 'ORLY' } + after { redirect '/bar' } + } + + get '/foo' + assert redirect? + assert_equal '/bar', response['Location'] + assert_equal '', body + end + + it "does not modify the response with its return value" do + mock_app { + get('/foo') { 'cool' } + after { 'Hello World!' } + } + + get '/foo' + assert ok? + assert_equal 'cool', body + end + + it "does modify the response with halt" do + mock_app { + get '/foo' do + "should not be returned" + end + after { halt 302, 'Hi' } + } + + get '/foo' + assert_equal 302, response.status + assert_equal 'Hi', body + end + + it "runs filters defined in superclasses" do + count = 2 + base = Class.new(Sinatra::Base) + base.after { count *= 2 } + mock_app(base) { + get('/foo') { count += 2 } + } + + get '/foo' + assert_equal 8, count + end + + it 'does not run after filter when serving static files' do + ran_filter = false + mock_app { + after { ran_filter = true } + set :static, true + set :public, File.dirname(__FILE__) + } + get "/#{File.basename(__FILE__)}" + assert ok? + assert_equal File.read(__FILE__), body + assert !ran_filter + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/haml_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/haml_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/haml_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/haml_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/helper.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/helper.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helpers_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/helpers_test.rb similarity index 85% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helpers_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/helpers_test.rb index 673aff1d..7c8c0920 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helpers_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/helpers_test.rb @@ -142,6 +142,19 @@ class HelpersTest < Test::Unit::TestCase assert_equal 404, status assert_equal '', body end + + it 'does not set a X-Cascade header' do + mock_app { + get '/' do + not_found + fail 'not_found should halt' + end + } + + get '/' + assert_equal 404, status + assert_equal nil, response.headers['X-Cascade'] + end end describe 'headers' do @@ -188,41 +201,61 @@ class HelpersTest < Test::Unit::TestCase it 'creates a new session when none provided' do mock_app { + enable :sessions + get '/' do assert session.empty? session[:foo] = 'bar' - 'Hi' + redirect '/hi' + end + + get '/hi' do + "hi #{session[:foo]}" end } get '/' - assert_equal 'Hi', body + follow_redirect! + assert_equal 'hi bar', body end end - describe 'media_type' do + describe 'mime_type' do include Sinatra::Helpers - it "looks up media types in Rack's MIME registry" do + it "looks up mime types in Rack's MIME registry" do Rack::Mime::MIME_TYPES['.foo'] = 'application/foo' - assert_equal 'application/foo', media_type('foo') - assert_equal 'application/foo', media_type('.foo') - assert_equal 'application/foo', media_type(:foo) + assert_equal 'application/foo', mime_type('foo') + assert_equal 'application/foo', mime_type('.foo') + assert_equal 'application/foo', mime_type(:foo) end it 'returns nil when given nil' do - assert media_type(nil).nil? + assert mime_type(nil).nil? end it 'returns nil when media type not registered' do - assert media_type(:bizzle).nil? + assert mime_type(:bizzle).nil? end it 'returns the argument when given a media type string' do - assert_equal 'text/plain', media_type('text/plain') + assert_equal 'text/plain', mime_type('text/plain') end end + test 'Base.mime_type registers mime type' do + mock_app { + mime_type :foo, 'application/foo' + + get '/' do + "foo is #{mime_type(:foo)}" + end + } + + get '/' + assert_equal 'foo is application/foo', body + end + describe 'content_type' do it 'sets the Content-Type header' do mock_app { @@ -352,6 +385,43 @@ class HelpersTest < Test::Unit::TestCase end end + describe 'cache_control' do + setup do + mock_app { + get '/' do + cache_control :public, :no_cache, :max_age => 60 + 'Hello World' + end + } + end + + it 'sets the Cache-Control header' do + get '/' + assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ') + end + end + + describe 'expires' do + setup do + mock_app { + get '/' do + expires 60, :public, :no_cache + 'Hello World' + end + } + end + + it 'sets the Cache-Control header' do + get '/' + assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ') + end + + it 'sets the Expires header' do + get '/' + assert_not_nil response['Expires'] + end + end + describe 'last_modified' do setup do now = Time.now diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/mapped_error_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/mapped_error_test.rb similarity index 84% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/mapped_error_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/mapped_error_test.rb index fa57d9a1..337de3f6 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/mapped_error_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/mapped_error_test.rb @@ -101,6 +101,37 @@ class MappedErrorTest < Test::Unit::TestCase assert_equal 404, status assert_equal "Lost, are we?", body end + + it 'inherits error mappings from base class' do + base = Class.new(Sinatra::Base) + base.error(FooError) { 'base class' } + + mock_app(base) { + set :raise_errors, false + get '/' do + raise FooError + end + } + + get '/' + assert_equal 'base class', body + end + + it 'overrides error mappings in base class' do + base = Class.new(Sinatra::Base) + base.error(FooError) { 'base class' } + + mock_app(base) { + set :raise_errors, false + error(FooError) { 'subclass' } + get '/' do + raise FooError + end + } + + get '/' + assert_equal 'subclass', body + end end describe 'Custom Error Pages' do diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/middleware_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/middleware_test.rb similarity index 97% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/middleware_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/middleware_test.rb index 2ebef29a..ee34f35d 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/middleware_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/middleware_test.rb @@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper' class MiddlewareTest < Test::Unit::TestCase setup do - @app = mock_app(Sinatra::Default) { + @app = mock_app(Sinatra::Application) { get '/*' do response.headers['X-Tests'] = env['test.ran']. map { |n| n.split('::').last }. diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/public/favicon.ico b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/public/favicon.ico new file mode 100644 index 00000000..e69de29b diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/request_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/request_test.rb similarity index 55% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/request_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/request_test.rb index 44dac6cb..f213646c 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/request_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/request_test.rb @@ -15,4 +15,19 @@ class RequestTest < Test::Unit::TestCase ) assert_equal 'bar', request.params['foo'] end + + it 'is secure when the url scheme is https' do + request = Sinatra::Request.new('rack.url_scheme' => 'https') + assert request.secure? + end + + it 'is not secure when the url scheme is http' do + request = Sinatra::Request.new('rack.url_scheme' => 'http') + assert !request.secure? + end + + it 'respects X-Forwarded-Proto header for proxied SSL' do + request = Sinatra::Request.new('HTTP_X_FORWARDED_PROTO' => 'https') + assert request.secure? + end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/response_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/response_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/response_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/response_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/result_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/result_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/result_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/result_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/route_added_hook_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/route_added_hook_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/route_added_hook_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/route_added_hook_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/routing_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/routing_test.rb similarity index 91% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/routing_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/routing_test.rb index a8591cae..9976b679 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/routing_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/routing_test.rb @@ -60,6 +60,15 @@ class RoutingTest < Test::Unit::TestCase assert_equal 404, status end + it "404s and sets X-Cascade header when no route satisfies the request" do + mock_app { + get('/foo') { } + } + get '/bar' + assert_equal 404, status + assert_equal 'pass', response.headers['X-Cascade'] + end + it "overrides the content-type in error handlers" do mock_app { before { content_type 'text/plain' } @@ -462,6 +471,38 @@ class RoutingTest < Test::Unit::TestCase assert not_found? end + it "transitions to 404 and sets X-Cascade header when passed and no subsequent route matches" do + mock_app { + get '/:foo' do + pass + 'Hello Foo' + end + + get '/bar' do + 'Hello Bar' + end + } + + get '/foo' + assert not_found? + assert_equal 'pass', response.headers['X-Cascade'] + end + + it "uses optional block passed to pass as route block if no other route is found" do + mock_app { + get "/" do + pass do + "this" + end + "not this" + end + } + + get "/" + assert ok? + assert "this", body + end + it "passes when matching condition returns false" do mock_app { condition { params[:foo] == 'bar' } @@ -781,4 +822,39 @@ class RoutingTest < Test::Unit::TestCase end end + + it "matches routes defined in superclasses" do + base = Class.new(Sinatra::Base) + base.get('/foo') { 'foo in baseclass' } + + mock_app(base) { + get('/bar') { 'bar in subclass' } + } + + get '/foo' + assert ok? + assert_equal 'foo in baseclass', body + + get '/bar' + assert ok? + assert_equal 'bar in subclass', body + end + + it "matches routes in subclasses before superclasses" do + base = Class.new(Sinatra::Base) + base.get('/foo') { 'foo in baseclass' } + base.get('/bar') { 'bar in baseclass' } + + mock_app(base) { + get('/foo') { 'foo in subclass' } + } + + get '/foo' + assert ok? + assert_equal 'foo in subclass', body + + get '/bar' + assert ok? + assert_equal 'bar in baseclass', body + end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/sass_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/sass_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/server_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/server_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/server_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/server_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/options_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/settings_test.rb similarity index 59% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/options_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/settings_test.rb index 19f5ea2d..156377f4 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/options_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/settings_test.rb @@ -1,26 +1,27 @@ require File.dirname(__FILE__) + '/helper' -class OptionsTest < Test::Unit::TestCase +class SettingsTest < Test::Unit::TestCase setup do - @base = Sinatra.new(Sinatra::Base) - @default = Sinatra.new(Sinatra::Default) - @base.set :environment, :development - @default.set :environment, :development + @base = Sinatra.new(Sinatra::Base) + @base.set :environment, :foo + + @application = Sinatra.new(Sinatra::Application) + @application.set :environment, :foo end - it 'sets options to literal values' do + it 'sets settings to literal values' do @base.set(:foo, 'bar') assert @base.respond_to?(:foo) assert_equal 'bar', @base.foo end - it 'sets options to Procs' do + it 'sets settings to Procs' do @base.set(:foo, Proc.new { 'baz' }) assert @base.respond_to?(:foo) assert_equal 'baz', @base.foo end - it "sets multiple options with a Hash" do + it "sets multiple settings with a Hash" do @base.set :foo => 1234, :bar => 'Hello World', :baz => Proc.new { 'bizzle' } @@ -29,7 +30,7 @@ class OptionsTest < Test::Unit::TestCase assert_equal 'bizzle', @base.baz end - it 'inherits option methods when subclassed' do + it 'inherits settings methods when subclassed' do @base.set :foo, 'bar' @base.set :biz, Proc.new { 'baz' } @@ -40,7 +41,7 @@ class OptionsTest < Test::Unit::TestCase assert_equal 'baz', sub.biz end - it 'overrides options in subclass' do + it 'overrides settings in subclass' do @base.set :foo, 'bar' @base.set :biz, Proc.new { 'baz' } sub = Class.new(@base) @@ -78,27 +79,42 @@ class OptionsTest < Test::Unit::TestCase assert_equal 'oops', @base.foo end - it "sets multiple options to true with #enable" do + it "sets multiple settings to true with #enable" do @base.enable :sessions, :foo, :bar assert @base.sessions assert @base.foo assert @base.bar end - it "sets multiple options to false with #disable" do + it "sets multiple settings to false with #disable" do @base.disable :sessions, :foo, :bar assert !@base.sessions assert !@base.foo assert !@base.bar end - it 'enables MethodOverride middleware when :methodoverride is enabled' do - @base.set :methodoverride, true - @base.put('/') { 'okay' } - @app = @base - post '/', {'_method'=>'PUT'}, {} - assert_equal 200, status - assert_equal 'okay', body + + it 'is accessible from instances via #settings' do + assert_equal :foo, @base.new.settings.environment + end + + describe 'methodoverride' do + it 'is disabled on Base' do + assert ! @base.methodoverride? + end + + it 'is enabled on Application' do + assert @application.methodoverride? + end + + it 'enables MethodOverride middleware' do + @base.set :methodoverride, true + @base.put('/') { 'okay' } + @app = @base + post '/', {'_method'=>'PUT'}, {} + assert_equal 200, status + assert_equal 'okay', body + end end describe 'clean_trace' do @@ -110,8 +126,8 @@ class OptionsTest < Test::Unit::TestCase assert @base.clean_trace? end - it 'is enabled on Default' do - assert @default.clean_trace? + it 'is enabled on Application' do + assert @application.clean_trace? end it 'does nothing when disabled' do @@ -152,58 +168,45 @@ class OptionsTest < Test::Unit::TestCase assert ! @base.run? end - it 'is enabled on Default when not in test environment' do - @default.set :environment, :development - assert @default.development? - assert @default.run? + it 'is enabled on Application except in test environment' do + assert @application.run? - @default.set :environment, :development - assert @default.run? + @application.set :environment, :test + assert ! @application.run? end - - # TODO: it 'is enabled when $0 == app_file' end describe 'raise_errors' do - it 'is enabled on Base' do + it 'is enabled on Base except under development' do assert @base.raise_errors? + @base.environment = :development + assert !@base.raise_errors? end - it 'is enabled on Default only in test' do - @default.set(:environment, :development) - assert @default.development? - assert ! @default.raise_errors? + it 'is enabled on Application only in test' do + assert ! @application.raise_errors? - @default.set(:environment, :production) - assert ! @default.raise_errors? - - @default.set(:environment, :test) - assert @default.raise_errors? + @application.set(:environment, :test) + assert @application.raise_errors? end end describe 'show_exceptions' do - %w[development test production none].each do |environment| - it "is disabled on Base in #{environment} environments" do - @base.set(:environment, environment) - assert ! @base.show_exceptions? - end + it 'is disabled on Base except under development' do + assert ! @base.show_exceptions? + @base.environment = :development + assert @base.show_exceptions? end - it 'is enabled on Default only in development' do - @base.set(:environment, :development) - assert @default.development? - assert @default.show_exceptions? + it 'is disabled on Application except in development' do + assert ! @application.show_exceptions? - @default.set(:environment, :test) - assert ! @default.show_exceptions? - - @base.set(:environment, :production) - assert ! @base.show_exceptions? + @application.set(:environment, :development) + assert @application.show_exceptions? end it 'returns a friendly 500' do - klass = Sinatra.new(Sinatra::Default) + klass = Sinatra.new(Sinatra::Application) mock_app(klass) { enable :show_exceptions @@ -215,21 +218,23 @@ class OptionsTest < Test::Unit::TestCase get '/' assert_equal 500, status assert body.include?("StandardError") - assert body.include?("show_exceptions option") + assert body.include?("show_exceptions setting") end end describe 'dump_errors' do - it 'is disabled on Base' do + it 'is disabled on Base except in development' do assert ! @base.dump_errors? + @base.environment = :development + assert @base.dump_errors? end - it 'is enabled on Default' do - assert @default.dump_errors? + it 'is enabled on Application' do + assert @application.dump_errors? end it 'dumps exception with backtrace to rack.errors' do - klass = Sinatra.new(Sinatra::Default) + klass = Sinatra.new(Sinatra::Application) mock_app(klass) { disable :raise_errors @@ -247,7 +252,7 @@ class OptionsTest < Test::Unit::TestCase } get '/' - assert body.include?("RuntimeError") && body.include?("options_test.rb") + assert body.include?("RuntimeError") && body.include?("settings_test.rb") end end @@ -256,11 +261,9 @@ class OptionsTest < Test::Unit::TestCase assert ! @base.sessions? end - it 'is disabled on Default' do - assert ! @default.sessions? + it 'is disabled on Application' do + assert ! @application.sessions? end - - # TODO: it 'uses Rack::Session::Cookie when enabled' do end describe 'logging' do @@ -268,105 +271,113 @@ class OptionsTest < Test::Unit::TestCase assert ! @base.logging? end - it 'is enabled on Default when not in test environment' do - assert @default.logging? + it 'is enabled on Application except in test environment' do + assert @application.logging? - @default.set :environment, :test - assert ! @default.logging + @application.set :environment, :test + assert ! @application.logging end - - # TODO: it 'uses Rack::CommonLogger when enabled' do end describe 'static' do - it 'is disabled on Base' do + it 'is disabled on Base by default' do assert ! @base.static? end - it 'is enabled on Default' do - assert @default.static? + it 'is enabled on Base when public is set and exists' do + @base.set :environment, :development + @base.set :public, File.dirname(__FILE__) + assert @base.static? end - # TODO: it setup static routes if public is enabled - # TODO: however, that's already tested in static_test so... + it 'is enabled on Base when root is set and root/public exists' do + @base.set :environment, :development + @base.set :root, File.dirname(__FILE__) + assert @base.static? + end + + it 'is enabled on Application' do + assert @application.static? + end end describe 'host' do it 'defaults to 0.0.0.0' do assert_equal '0.0.0.0', @base.host - assert_equal '0.0.0.0', @default.host + assert_equal '0.0.0.0', @application.host end end describe 'port' do it 'defaults to 4567' do assert_equal 4567, @base.port - assert_equal 4567, @default.port + assert_equal 4567, @application.port end end describe 'server' do it 'is one of thin, mongrel, webrick' do assert_equal %w[thin mongrel webrick], @base.server - assert_equal %w[thin mongrel webrick], @default.server + assert_equal %w[thin mongrel webrick], @application.server end end describe 'app_file' do it 'is nil' do - assert @base.app_file.nil? - assert @default.app_file.nil? + assert_nil @base.app_file + assert_nil @application.app_file end end describe 'root' do it 'is nil if app_file is not set' do assert @base.root.nil? - assert @default.root.nil? + assert @application.root.nil? end it 'is equal to the expanded basename of app_file' do @base.app_file = __FILE__ assert_equal File.expand_path(File.dirname(__FILE__)), @base.root - @default.app_file = __FILE__ - assert_equal File.expand_path(File.dirname(__FILE__)), @default.root + @application.app_file = __FILE__ + assert_equal File.expand_path(File.dirname(__FILE__)), @application.root end end describe 'views' do it 'is nil if root is not set' do assert @base.views.nil? - assert @default.views.nil? + assert @application.views.nil? end it 'is set to root joined with views/' do @base.root = File.dirname(__FILE__) assert_equal File.dirname(__FILE__) + "/views", @base.views - @default.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/views", @default.views + @application.root = File.dirname(__FILE__) + assert_equal File.dirname(__FILE__) + "/views", @application.views end end describe 'public' do it 'is nil if root is not set' do assert @base.public.nil? - assert @default.public.nil? + assert @application.public.nil? end it 'is set to root joined with public/' do @base.root = File.dirname(__FILE__) assert_equal File.dirname(__FILE__) + "/public", @base.public - @default.root = File.dirname(__FILE__) - assert_equal File.dirname(__FILE__) + "/public", @default.public + @application.root = File.dirname(__FILE__) + assert_equal File.dirname(__FILE__) + "/public", @application.public end end describe 'lock' do it 'is disabled by default' do assert ! @base.lock? + assert ! @application.lock? end end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sinatra_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/sinatra_test.rb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sinatra_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/sinatra_test.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/static_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/static_test.rb similarity index 83% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/static_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/static_test.rb index 896d46c1..ba6869b5 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/static_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/static_test.rb @@ -26,6 +26,12 @@ class StaticTest < Test::Unit::TestCase assert_equal File.read(__FILE__), buf1.join end + it 'sets the sinatra.static_file env variable if served' do + env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}") + status, headers, body = @app.call(env) + assert_equal File.expand_path(__FILE__), env['sinatra.static_file'] + end + it 'serves HEAD requests for files in the public directory' do head "/#{File.basename(__FILE__)}" assert ok? @@ -34,6 +40,13 @@ class StaticTest < Test::Unit::TestCase assert response.headers.include?('Last-Modified') end + %w[POST PUT DELETE].each do |verb| + it "does not serve #{verb} requests" do + send verb.downcase, "/#{File.basename(__FILE__)}" + assert_equal 404, status + end + end + it 'serves files in preference to custom routes' do @app.get("/#{File.basename(__FILE__)}") { 'Hello World' } get "/#{File.basename(__FILE__)}" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/templates_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/templates_test.rb similarity index 66% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/templates_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/templates_test.rb index d2febc91..98560705 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/templates_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/templates_test.rb @@ -1,12 +1,20 @@ require File.dirname(__FILE__) + '/helper' +class TestTemplate < Tilt::Template + def compile! + end + + def evaluate(scope, locals={}, &block) + inner = block ? block.call : '' + data + inner + end + + Tilt.register 'test', self +end + class TemplatesTest < Test::Unit::TestCase - def render_app(&block) - mock_app { - def render_test(template, data, options, locals, &block) - inner = block ? block.call : '' - data + inner - end + def render_app(base=Sinatra::Base, &block) + mock_app(base) { set :views, File.dirname(__FILE__) + '/views' get '/', &block template(:layout3) { "Layout 3!\n" } @@ -68,12 +76,12 @@ class TemplatesTest < Test::Unit::TestCase assert_equal "Layout 3!\nHello World!\n", body end - it 'loads templates from source file with use_in_file_templates!' do + it 'loads templates from source file with inline_templates enabled' do mock_app { - use_in_file_templates! + enable :inline_templates } - assert_equal "this is foo\n\n", @app.templates[:foo][:template] - assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template] + assert_equal "this is foo\n\n", @app.templates[:foo][0] + assert_equal "X\n= yield\nX\n", @app.templates[:layout][0] end it 'loads templates from specified views directory' do @@ -85,7 +93,7 @@ class TemplatesTest < Test::Unit::TestCase test 'use_in_file_templates simply ignores IO errors' do assert_nothing_raised { mock_app { - use_in_file_templates!('/foo/bar') + set :inline_templates, '/foo/bar' } } @@ -107,6 +115,31 @@ class TemplatesTest < Test::Unit::TestCase assert ok? assert_equal 'Hello Mike!

content

', body end + + it 'loads templates defined in subclasses' do + base = Class.new(Sinatra::Base) + base.template(:foo) { 'bar' } + render_app(base) { render :test, :foo } + assert ok? + assert_equal 'bar', body + end + + it 'uses templates in superclasses before subclasses' do + base = Class.new(Sinatra::Base) + base.template(:foo) { 'template in superclass' } + assert_equal 'template in superclass', base.templates[:foo].first.call + + mock_app(base) { + set :views, File.dirname(__FILE__) + '/views' + template(:foo) { 'template in subclass' } + get('/') { render :test, :foo } + } + assert_equal 'template in subclass', @app.templates[:foo].first.call + + get '/' + assert ok? + assert_equal 'template in subclass', body + end end # __END__ : this is not the real end of the script. diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.builder similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.builder diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.erb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.erb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.erubis b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.erubis new file mode 100644 index 00000000..b48d1f06 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.erubis @@ -0,0 +1,3 @@ +Hello <%= 'World' %> +<% raise 'Goodbye' unless defined?(french) && french %> +<% raise 'Au revoir' if defined?(french) && french %> diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/error.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/foo/hello.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/foo/hello.test similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/foo/hello.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/foo/hello.test diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.builder similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.builder diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.erb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.erb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.erubis b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.erubis new file mode 100644 index 00000000..bcbbc926 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.erubis @@ -0,0 +1 @@ +Hello <%= 'World' %> diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.sass similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.sass diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.test similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/hello.test diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.builder similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.builder diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.erb similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.erb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.erubis b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.erubis new file mode 100644 index 00000000..b61db6d0 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.erubis @@ -0,0 +1,2 @@ +ERubis Layout! +<%= yield %> diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.haml similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.haml diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.test similarity index 100% rename from lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-1.0.a/test/views/layout2.test diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre4.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre4.gemspec deleted file mode 100644 index 46000957..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre4.gemspec +++ /dev/null @@ -1,36 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{compass} - s.version = "0.10.0.pre4" - - s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= - s.authors = ["Chris Eppstein"] - s.date = %q{2010-01-04} - s.default_executable = %q{compass} - s.description = %q{Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.} - s.email = %q{chris@eppsteins.net} - s.executables = ["compass"] - s.extra_rdoc_files = ["LICENSE.markdown", "README.markdown"] - s.files = ["CHANGELOG.markdown", "LICENSE.markdown", "README.markdown", "REVISION", "Rakefile", "VERSION.yml", "bin/compass", "deps.rip", "examples/README.markdown", "examples/blueprint_default/config.rb", "examples/blueprint_default/images/grid.png", "examples/blueprint_default/index.html.haml", "examples/blueprint_default/parts/elements.html.haml", "examples/blueprint_default/parts/forms.html.haml", "examples/blueprint_default/parts/grid.html.haml", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/src/ie.sass", "examples/blueprint_default/src/images/grid.png", "examples/blueprint_default/src/print.sass", "examples/blueprint_default/src/screen.sass", "examples/blueprint_plugins/config.rb", "examples/blueprint_plugins/images/buttons/cross.png", "examples/blueprint_plugins/images/buttons/key.png", "examples/blueprint_plugins/images/buttons/tick.png", "examples/blueprint_plugins/images/grid.png", "examples/blueprint_plugins/images/link_icons/doc.png", "examples/blueprint_plugins/images/link_icons/email.png", "examples/blueprint_plugins/images/link_icons/external.png", "examples/blueprint_plugins/images/link_icons/feed.png", "examples/blueprint_plugins/images/link_icons/im.png", "examples/blueprint_plugins/images/link_icons/pdf.png", "examples/blueprint_plugins/images/link_icons/visited.png", "examples/blueprint_plugins/images/link_icons/xls.png", "examples/blueprint_plugins/images/test-small.jpg", "examples/blueprint_plugins/images/test.jpg", "examples/blueprint_plugins/images/valid.png", "examples/blueprint_plugins/index.html.haml", "examples/blueprint_plugins/plugins/buttons.html.haml", "examples/blueprint_plugins/plugins/fancy_type.html.haml", "examples/blueprint_plugins/plugins/link_icons.html.haml", "examples/blueprint_plugins/plugins/rtl.html.haml", "examples/blueprint_plugins/src/buttons.sass", "examples/blueprint_plugins/src/ie.sass", "examples/blueprint_plugins/src/images/grid.png", "examples/blueprint_plugins/src/link_icons.sass", "examples/blueprint_plugins/src/print.sass", "examples/blueprint_plugins/src/rtl_screen.sass", "examples/blueprint_plugins/src/screen.sass", "examples/blueprint_scoped/images/grid.png", "examples/blueprint_scoped/src/ie.sass", "examples/blueprint_scoped/src/print.sass", "examples/blueprint_scoped/src/screen.sass", "examples/blueprint_scoped_form/images/grid.png", "examples/blueprint_scoped_form/src/ie.sass", "examples/blueprint_scoped_form/src/print.sass", "examples/blueprint_scoped_form/src/screen.sass", "examples/blueprint_semantic/config.rb", "examples/blueprint_semantic/images/grid.png", "examples/blueprint_semantic/index.html.haml", "examples/blueprint_semantic/parts/fancy_type.html.haml", "examples/blueprint_semantic/parts/liquid.html.haml", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/src/ie.sass", "examples/blueprint_semantic/src/images/grid.png", "examples/blueprint_semantic/src/liquid.sass", "examples/blueprint_semantic/src/print.sass", "examples/blueprint_semantic/src/screen.sass", "examples/compass/bootstrap.rb", "examples/compass/compass.html.haml", "examples/compass/config.rb", "examples/compass/extensions/yui/stylesheets/_yui.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass", "examples/compass/extensions/yui/templates/project/manifest.rb", "examples/compass/extensions/yui/templates/project/screen.sass", "examples/compass/images/blue_arrow.gif", "examples/compass/src/compass.sass", "examples/compass/src/images/blue_arrow.gif", "examples/compass/src/sticky_footer.sass", "examples/compass/src/utilities.sass", "examples/compass/sticky_footer.html.haml", "examples/compass/utilities.html.haml", "examples/css3/config.rb", "examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf", "examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf", "examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass", "examples/css3/extensions/fancy-fonts/templates/project/manifest.rb", "examples/css3/images/fresh-peas.jpg", "examples/css3/index.html.haml", "examples/css3/src/_base.sass", "examples/css3/src/fancy-fonts.sass", "examples/css3/src/gradient.sass", "examples/css3/src/main.sass", "examples/css3/stylesheets/fonts/Vtks Revolt.ttf", "examples/css3/stylesheets/fonts/angelina.ttf", "examples/downloader.rb", "examples/logo/logo.html.haml", "examples/logo/src/ie.sass", "examples/logo/src/print.sass", "examples/logo/src/screen.sass", "examples/ninesixty/bootstrap.rb", "examples/ninesixty/config.rb", "examples/ninesixty/extensions/ninesixty/README.mkdn", "examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec", "examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb", "examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb", "examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass", "examples/ninesixty/extensions/ninesixty/sass/960/_text.sass", "examples/ninesixty/extensions/ninesixty/templates/project/grid.sass", "examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb", "examples/ninesixty/extensions/ninesixty/templates/project/text.sass", "examples/ninesixty/src/grid.sass", "examples/ninesixty/src/text.sass", "examples/susy/bootstrap.rb", "examples/susy/config.rb", "examples/susy/extensions/susy/LICENSE.txt", "examples/susy/extensions/susy/README.mkdn", "examples/susy/extensions/susy/compass-susy-plugin.gemspec", "examples/susy/extensions/susy/docs/tutorial/build.sh", "examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb", "examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png", "examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png", "examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass", "examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl", "examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png", "examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png", "examples/susy/extensions/susy/docs/tutorial/index.mkdn", "examples/susy/extensions/susy/lib/susy.rb", "examples/susy/extensions/susy/lib/susy/compass_plugin.rb", "examples/susy/extensions/susy/lib/susy/sass_extensions.rb", "examples/susy/extensions/susy/sass/susy/_grid.sass", "examples/susy/extensions/susy/sass/susy/_reset.sass", "examples/susy/extensions/susy/sass/susy/_susy.sass", "examples/susy/extensions/susy/sass/susy/_text.sass", "examples/susy/extensions/susy/sass/susy/_utils.sass", "examples/susy/extensions/susy/templates/project/_base.sass", "examples/susy/extensions/susy/templates/project/_defaults.sass", "examples/susy/extensions/susy/templates/project/ie.sass", "examples/susy/extensions/susy/templates/project/manifest.rb", "examples/susy/extensions/susy/templates/project/print.sass", "examples/susy/extensions/susy/templates/project/screen.sass", "examples/susy/src/_base.sass", "examples/susy/src/_defaults.sass", "examples/susy/src/screen.sass", "examples/yui/bootstrap.rb", "examples/yui/divisions.html.haml", "examples/yui/extensions/yui/stylesheets/_yui.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass", "examples/yui/extensions/yui/templates/project/manifest.rb", "examples/yui/extensions/yui/templates/project/screen.sass", "examples/yui/index.html.haml", "examples/yui/src/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "lib/compass.rb", "lib/compass/actions.rb", "lib/compass/app_integration.rb", "lib/compass/app_integration/merb.rb", "lib/compass/app_integration/merb/runtime.rb", "lib/compass/app_integration/rails.rb", "lib/compass/app_integration/rails/action_controller.rb", "lib/compass/app_integration/rails/configuration_defaults.rb", "lib/compass/app_integration/rails/installer.rb", "lib/compass/app_integration/rails/runtime.rb", "lib/compass/app_integration/rails/sass_plugin.rb", "lib/compass/app_integration/rails/templates/compass-install-rails.rb", "lib/compass/app_integration/rails/urls.rb", "lib/compass/app_integration/stand_alone.rb", "lib/compass/app_integration/stand_alone/configuration_defaults.rb", "lib/compass/app_integration/stand_alone/installer.rb", "lib/compass/commands.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/help.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/interactive.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/project_stats.rb", "lib/compass/commands/registry.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/configuration/adapters.rb", "lib/compass/configuration/comments.rb", "lib/compass/configuration/data.rb", "lib/compass/configuration/defaults.rb", "lib/compass/configuration/helpers.rb", "lib/compass/configuration/inheritance.rb", "lib/compass/configuration/serialization.rb", "lib/compass/core_ext.rb", "lib/compass/dependencies.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/exec/command_option_parser.rb", "lib/compass/exec/global_options_parser.rb", "lib/compass/exec/helpers.rb", "lib/compass/exec/project_options_parser.rb", "lib/compass/exec/sub_command_ui.rb", "lib/compass/exec/switch_ui.rb", "lib/compass/frameworks.rb", "lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/index.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "lib/compass/frameworks/blueprint/templates/buttons/buttons.sass", "lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png", "lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png", "lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png", "lib/compass/frameworks/blueprint/templates/buttons/manifest.rb", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png", "lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png", "lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb", "lib/compass/frameworks/blueprint/templates/project/grid.png", "lib/compass/frameworks/blueprint/templates/project/ie.sass", "lib/compass/frameworks/blueprint/templates/project/manifest.rb", "lib/compass/frameworks/blueprint/templates/project/partials/_base.sass", "lib/compass/frameworks/blueprint/templates/project/print.sass", "lib/compass/frameworks/blueprint/templates/project/screen.sass", "lib/compass/frameworks/blueprint/templates/project/welcome.html.haml", "lib/compass/frameworks/compass/stylesheets/_compass.sass", "lib/compass/frameworks/compass/stylesheets/compass/_css3.sass", "lib/compass/frameworks/compass/stylesheets/compass/_layout.sass", "lib/compass/frameworks/compass/stylesheets/compass/_misc.sass", "lib/compass/frameworks/compass/stylesheets/compass/_reset.sass", "lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass", "lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass", "lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_min.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass", "lib/compass/frameworks/compass/templates/ellipsis/manifest.rb", "lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml", "lib/compass/frameworks/compass/templates/extension/manifest.rb", "lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass", "lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb", "lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass", "lib/compass/frameworks/compass/templates/project/USAGE.markdown", "lib/compass/frameworks/compass/templates/project/ie.sass", "lib/compass/frameworks/compass/templates/project/manifest.rb", "lib/compass/frameworks/compass/templates/project/print.sass", "lib/compass/frameworks/compass/templates/project/screen.sass", "lib/compass/grid_builder.rb", "lib/compass/installers.rb", "lib/compass/installers/bare_installer.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/manifest_installer.rb", "lib/compass/installers/template_context.rb", "lib/compass/logger.rb", "lib/compass/sass_extensions.rb", "lib/compass/sass_extensions/functions.rb", "lib/compass/sass_extensions/functions/color_stop.rb", "lib/compass/sass_extensions/functions/display.rb", "lib/compass/sass_extensions/functions/enumerate.rb", "lib/compass/sass_extensions/functions/font_files.rb", "lib/compass/sass_extensions/functions/inline_image.rb", "lib/compass/sass_extensions/functions/selectors.rb", "lib/compass/sass_extensions/functions/urls.rb", "lib/compass/sass_extensions/monkey_patches.rb", "lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb", "lib/compass/sass_extensions/monkey_patches/traversal.rb", "lib/compass/stats.rb", "lib/compass/test_case.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/vendor/fssm.rb", "lib/vendor/fssm/backends/fsevents.rb", "lib/vendor/fssm/backends/inotify.rb", "lib/vendor/fssm/backends/polling.rb", "lib/vendor/fssm/backends/rubycocoa/fsevents.rb", "lib/vendor/fssm/monitor.rb", "lib/vendor/fssm/path.rb", "lib/vendor/fssm/pathname.rb", "lib/vendor/fssm/state.rb", "lib/vendor/fssm/support.rb", "lib/vendor/fssm/tree.rb", "test/command_line_helper.rb", "test/command_line_test.rb", "test/compass_png_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/config.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/images/grid.png", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/config.rb", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/image_urls/config.rb", "test/fixtures/stylesheets/image_urls/css/screen.css", "test/fixtures/stylesheets/image_urls/images/grid.png", "test/fixtures/stylesheets/image_urls/sass/screen.sass", "test/fixtures/stylesheets/relative/assets/images/testing.png", "test/fixtures/stylesheets/relative/config.rb", "test/fixtures/stylesheets/relative/css/ie.css", "test/fixtures/stylesheets/relative/css/print.css", "test/fixtures/stylesheets/relative/css/screen.css", "test/fixtures/stylesheets/relative/sass/ie.sass", "test/fixtures/stylesheets/relative/sass/print.sass", "test/fixtures/stylesheets/relative/sass/screen.sass", "test/io_helper.rb", "test/rails_helper.rb", "test/rails_integration_test.rb", "test/sass_extensions_test.rb", "test/test_case_helper.rb", "test/test_helper.rb", "test/test_rails_helper.rb", "features/command_line.feature", "features/extensions.feature", "features/step_definitions/command_line_steps.rb", "features/step_definitions/extension_steps.rb"] - s.homepage = %q{http://compass-style.org} - s.rdoc_options = ["--charset=UTF-8"] - s.require_paths = ["lib"] - s.rubyforge_project = %q{compass} - s.rubygems_version = %q{1.3.5} - s.summary = %q{A Real Stylesheet Framework} - s.test_files = ["test/command_line_helper.rb", "test/command_line_test.rb", "test/compass_png_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/config.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/images/grid.png", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/config.rb", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/image_urls/config.rb", "test/fixtures/stylesheets/image_urls/css/screen.css", "test/fixtures/stylesheets/image_urls/images/grid.png", "test/fixtures/stylesheets/image_urls/sass/screen.sass", "test/fixtures/stylesheets/relative/assets/images/testing.png", "test/fixtures/stylesheets/relative/config.rb", "test/fixtures/stylesheets/relative/css/ie.css", "test/fixtures/stylesheets/relative/css/print.css", "test/fixtures/stylesheets/relative/css/screen.css", "test/fixtures/stylesheets/relative/sass/ie.sass", "test/fixtures/stylesheets/relative/sass/print.sass", "test/fixtures/stylesheets/relative/sass/screen.sass", "test/io_helper.rb", "test/rails_helper.rb", "test/rails_integration_test.rb", "test/sass_extensions_test.rb", "test/test_case_helper.rb", "test/test_helper.rb", "test/test_rails_helper.rb", "features/command_line.feature", "features/extensions.feature", "features/step_definitions/command_line_steps.rb", "features/step_definitions/extension_steps.rb"] - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 2.2.14"]) - else - s.add_dependency(%q, [">= 2.2.14"]) - end - else - s.add_dependency(%q, [">= 2.2.14"]) - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre5.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre5.gemspec new file mode 100644 index 00000000..18de2f83 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre5.gemspec @@ -0,0 +1,36 @@ +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{compass} + s.version = "0.10.0.pre5" + + s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= + s.authors = ["Chris Eppstein"] + s.date = %q{2010-01-19} + s.default_executable = %q{compass} + s.description = %q{Compass is a Sass-based Stylesheet Framework that streamlines the creation and maintainance of CSS.} + s.email = %q{chris@eppsteins.net} + s.executables = ["compass"] + s.extra_rdoc_files = ["LICENSE.markdown", "README.markdown"] + s.files = ["CHANGELOG.markdown", "LICENSE.markdown", "README.markdown", "REVISION", "Rakefile", "VERSION.yml", "bin/compass", "examples/README.markdown", "examples/blueprint_default/config.rb", "examples/blueprint_default/images/grid.png", "examples/blueprint_default/index.html.haml", "examples/blueprint_default/parts/elements.html.haml", "examples/blueprint_default/parts/forms.html.haml", "examples/blueprint_default/parts/grid.html.haml", "examples/blueprint_default/parts/test-small.jpg", "examples/blueprint_default/parts/test.jpg", "examples/blueprint_default/parts/valid.png", "examples/blueprint_default/src/ie.sass", "examples/blueprint_default/src/images/grid.png", "examples/blueprint_default/src/print.sass", "examples/blueprint_default/src/screen.sass", "examples/blueprint_plugins/config.rb", "examples/blueprint_plugins/images/buttons/cross.png", "examples/blueprint_plugins/images/buttons/key.png", "examples/blueprint_plugins/images/buttons/tick.png", "examples/blueprint_plugins/images/grid.png", "examples/blueprint_plugins/images/link_icons/doc.png", "examples/blueprint_plugins/images/link_icons/email.png", "examples/blueprint_plugins/images/link_icons/external.png", "examples/blueprint_plugins/images/link_icons/feed.png", "examples/blueprint_plugins/images/link_icons/im.png", "examples/blueprint_plugins/images/link_icons/pdf.png", "examples/blueprint_plugins/images/link_icons/visited.png", "examples/blueprint_plugins/images/link_icons/xls.png", "examples/blueprint_plugins/images/test-small.jpg", "examples/blueprint_plugins/images/test.jpg", "examples/blueprint_plugins/images/valid.png", "examples/blueprint_plugins/index.html.haml", "examples/blueprint_plugins/plugins/buttons.html.haml", "examples/blueprint_plugins/plugins/fancy_type.html.haml", "examples/blueprint_plugins/plugins/link_icons.html.haml", "examples/blueprint_plugins/plugins/rtl.html.haml", "examples/blueprint_plugins/src/buttons.sass", "examples/blueprint_plugins/src/ie.sass", "examples/blueprint_plugins/src/images/grid.png", "examples/blueprint_plugins/src/link_icons.sass", "examples/blueprint_plugins/src/print.sass", "examples/blueprint_plugins/src/rtl_screen.sass", "examples/blueprint_plugins/src/screen.sass", "examples/blueprint_scoped/images/grid.png", "examples/blueprint_scoped/src/ie.sass", "examples/blueprint_scoped/src/print.sass", "examples/blueprint_scoped/src/screen.sass", "examples/blueprint_scoped_form/images/grid.png", "examples/blueprint_scoped_form/src/ie.sass", "examples/blueprint_scoped_form/src/print.sass", "examples/blueprint_scoped_form/src/screen.sass", "examples/blueprint_semantic/config.rb", "examples/blueprint_semantic/images/grid.png", "examples/blueprint_semantic/index.html.haml", "examples/blueprint_semantic/parts/fancy_type.html.haml", "examples/blueprint_semantic/parts/liquid.html.haml", "examples/blueprint_semantic/parts/test-small.jpg", "examples/blueprint_semantic/parts/test.jpg", "examples/blueprint_semantic/parts/valid.png", "examples/blueprint_semantic/src/ie.sass", "examples/blueprint_semantic/src/images/grid.png", "examples/blueprint_semantic/src/liquid.sass", "examples/blueprint_semantic/src/print.sass", "examples/blueprint_semantic/src/screen.sass", "examples/compass/bootstrap.rb", "examples/compass/compass.html.haml", "examples/compass/config.rb", "examples/compass/extensions/yui/stylesheets/_yui.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass", "examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass", "examples/compass/extensions/yui/templates/project/manifest.rb", "examples/compass/extensions/yui/templates/project/screen.sass", "examples/compass/images/blue_arrow.gif", "examples/compass/src/compass.sass", "examples/compass/src/images/blue_arrow.gif", "examples/compass/src/sticky_footer.sass", "examples/compass/src/utilities.sass", "examples/compass/sticky_footer.html.haml", "examples/compass/utilities.html.haml", "examples/css3/config.rb", "examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf", "examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf", "examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass", "examples/css3/extensions/fancy-fonts/templates/project/manifest.rb", "examples/css3/images/fresh-peas.jpg", "examples/css3/index.html.haml", "examples/css3/src/_base.sass", "examples/css3/src/fancy-fonts.sass", "examples/css3/src/gradient.sass", "examples/css3/src/main.sass", "examples/css3/stylesheets/fonts/Vtks Revolt.ttf", "examples/css3/stylesheets/fonts/angelina.ttf", "examples/downloader.rb", "examples/logo/logo.html.haml", "examples/logo/src/ie.sass", "examples/logo/src/print.sass", "examples/logo/src/screen.sass", "examples/ninesixty/bootstrap.rb", "examples/ninesixty/config.rb", "examples/ninesixty/extensions/ninesixty/README.mkdn", "examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec", "examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb", "examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb", "examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass", "examples/ninesixty/extensions/ninesixty/sass/960/_text.sass", "examples/ninesixty/extensions/ninesixty/templates/project/grid.sass", "examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb", "examples/ninesixty/extensions/ninesixty/templates/project/text.sass", "examples/ninesixty/src/grid.sass", "examples/ninesixty/src/text.sass", "examples/susy/bootstrap.rb", "examples/susy/config.rb", "examples/susy/extensions/susy/LICENSE.txt", "examples/susy/extensions/susy/README.mkdn", "examples/susy/extensions/susy/compass-susy-plugin.gemspec", "examples/susy/extensions/susy/docs/tutorial/build.sh", "examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb", "examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png", "examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png", "examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass", "examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl", "examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass", "examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass", "examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png", "examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png", "examples/susy/extensions/susy/docs/tutorial/index.mkdn", "examples/susy/extensions/susy/lib/susy.rb", "examples/susy/extensions/susy/lib/susy/compass_plugin.rb", "examples/susy/extensions/susy/lib/susy/sass_extensions.rb", "examples/susy/extensions/susy/sass/susy/_grid.sass", "examples/susy/extensions/susy/sass/susy/_reset.sass", "examples/susy/extensions/susy/sass/susy/_susy.sass", "examples/susy/extensions/susy/sass/susy/_text.sass", "examples/susy/extensions/susy/sass/susy/_utils.sass", "examples/susy/extensions/susy/templates/project/_base.sass", "examples/susy/extensions/susy/templates/project/_defaults.sass", "examples/susy/extensions/susy/templates/project/ie.sass", "examples/susy/extensions/susy/templates/project/manifest.rb", "examples/susy/extensions/susy/templates/project/print.sass", "examples/susy/extensions/susy/templates/project/screen.sass", "examples/susy/src/_base.sass", "examples/susy/src/_defaults.sass", "examples/susy/src/screen.sass", "examples/yui/bootstrap.rb", "examples/yui/divisions.html.haml", "examples/yui/extensions/yui/stylesheets/_yui.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass", "examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass", "examples/yui/extensions/yui/templates/project/manifest.rb", "examples/yui/extensions/yui/templates/project/screen.sass", "examples/yui/index.html.haml", "examples/yui/src/screen.sass", "examples/yui/sub_divisions.html.haml", "examples/yui/templates.html.haml", "examples/yui/test.jpg", "examples/yui/typography.html.haml", "frameworks/blueprint/stylesheets/_blueprint.sass", "frameworks/blueprint/stylesheets/blueprint/_buttons.sass", "frameworks/blueprint/stylesheets/blueprint/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/_form.sass", "frameworks/blueprint/stylesheets/blueprint/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/_ie.sass", "frameworks/blueprint/stylesheets/blueprint/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/_link_icons.sass", "frameworks/blueprint/stylesheets/blueprint/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/_print.sass", "frameworks/blueprint/stylesheets/blueprint/_reset.sass", "frameworks/blueprint/stylesheets/blueprint/_rtl.sass", "frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/_screen.sass", "frameworks/blueprint/stylesheets/blueprint/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/_utilities.sass", "frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/index.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html", "frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html", "frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_form.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass", "frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass", "frameworks/blueprint/templates/buttons/buttons.sass", "frameworks/blueprint/templates/buttons/buttons/cross.png", "frameworks/blueprint/templates/buttons/buttons/key.png", "frameworks/blueprint/templates/buttons/buttons/tick.png", "frameworks/blueprint/templates/buttons/manifest.rb", "frameworks/blueprint/templates/link_icons/link_icons.sass", "frameworks/blueprint/templates/link_icons/link_icons/doc.png", "frameworks/blueprint/templates/link_icons/link_icons/email.png", "frameworks/blueprint/templates/link_icons/link_icons/external.png", "frameworks/blueprint/templates/link_icons/link_icons/feed.png", "frameworks/blueprint/templates/link_icons/link_icons/im.png", "frameworks/blueprint/templates/link_icons/link_icons/pdf.png", "frameworks/blueprint/templates/link_icons/link_icons/visited.png", "frameworks/blueprint/templates/link_icons/link_icons/xls.png", "frameworks/blueprint/templates/link_icons/manifest.rb", "frameworks/blueprint/templates/project/grid.png", "frameworks/blueprint/templates/project/ie.sass", "frameworks/blueprint/templates/project/manifest.rb", "frameworks/blueprint/templates/project/partials/_base.sass", "frameworks/blueprint/templates/project/print.sass", "frameworks/blueprint/templates/project/screen.sass", "frameworks/compass/stylesheets/_compass.sass", "frameworks/compass/stylesheets/compass/_css3.sass", "frameworks/compass/stylesheets/compass/_layout.sass", "frameworks/compass/stylesheets/compass/_misc.sass", "frameworks/compass/stylesheets/compass/_reset.sass", "frameworks/compass/stylesheets/compass/_utilities.sass", "frameworks/compass/stylesheets/compass/css3/_background_clip.sass", "frameworks/compass/stylesheets/compass/css3/_background_origin.sass", "frameworks/compass/stylesheets/compass/css3/_background_size.sass", "frameworks/compass/stylesheets/compass/css3/_border_radius.sass", "frameworks/compass/stylesheets/compass/css3/_box_shadow.sass", "frameworks/compass/stylesheets/compass/css3/_box_sizing.sass", "frameworks/compass/stylesheets/compass/css3/_columns.sass", "frameworks/compass/stylesheets/compass/css3/_font_face.sass", "frameworks/compass/stylesheets/compass/css3/_gradient.sass", "frameworks/compass/stylesheets/compass/css3/_inline_block.sass", "frameworks/compass/stylesheets/compass/css3/_opacity.sass", "frameworks/compass/stylesheets/compass/css3/_text_shadow.sass", "frameworks/compass/stylesheets/compass/css3/_transform.sass", "frameworks/compass/stylesheets/compass/css3/_transition.sass", "frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass", "frameworks/compass/stylesheets/compass/utilities/_general.sass", "frameworks/compass/stylesheets/compass/utilities/_links.sass", "frameworks/compass/stylesheets/compass/utilities/_lists.sass", "frameworks/compass/stylesheets/compass/utilities/_print.sass", "frameworks/compass/stylesheets/compass/utilities/_sprites.sass", "frameworks/compass/stylesheets/compass/utilities/_tables.sass", "frameworks/compass/stylesheets/compass/utilities/_text.sass", "frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass", "frameworks/compass/stylesheets/compass/utilities/general/_float.sass", "frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass", "frameworks/compass/stylesheets/compass/utilities/general/_min.sass", "frameworks/compass/stylesheets/compass/utilities/general/_reset.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass", "frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass", "frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass", "frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass", "frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass", "frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass", "frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass", "frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass", "frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass", "frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass", "frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass", "frameworks/compass/templates/ellipsis/ellipsis.sass", "frameworks/compass/templates/ellipsis/manifest.rb", "frameworks/compass/templates/ellipsis/xml/ellipsis.xml", "frameworks/compass/templates/extension/manifest.rb", "frameworks/compass/templates/extension/stylesheets/main.sass", "frameworks/compass/templates/extension/templates/project/manifest.rb", "frameworks/compass/templates/extension/templates/project/screen.sass", "frameworks/compass/templates/project/USAGE.markdown", "frameworks/compass/templates/project/ie.sass", "frameworks/compass/templates/project/manifest.rb", "frameworks/compass/templates/project/print.sass", "frameworks/compass/templates/project/screen.sass", "lib/compass.rb", "lib/compass/actions.rb", "lib/compass/app_integration.rb", "lib/compass/app_integration/merb.rb", "lib/compass/app_integration/merb/runtime.rb", "lib/compass/app_integration/rails.rb", "lib/compass/app_integration/rails/action_controller.rb", "lib/compass/app_integration/rails/configuration_defaults.rb", "lib/compass/app_integration/rails/installer.rb", "lib/compass/app_integration/rails/runtime.rb", "lib/compass/app_integration/rails/sass_plugin.rb", "lib/compass/app_integration/rails/templates/compass-install-rails.rb", "lib/compass/app_integration/rails/urls.rb", "lib/compass/app_integration/stand_alone.rb", "lib/compass/app_integration/stand_alone/configuration_defaults.rb", "lib/compass/app_integration/stand_alone/installer.rb", "lib/compass/commands.rb", "lib/compass/commands/base.rb", "lib/compass/commands/create_project.rb", "lib/compass/commands/generate_grid_background.rb", "lib/compass/commands/help.rb", "lib/compass/commands/installer_command.rb", "lib/compass/commands/interactive.rb", "lib/compass/commands/list_frameworks.rb", "lib/compass/commands/print_version.rb", "lib/compass/commands/project_base.rb", "lib/compass/commands/project_stats.rb", "lib/compass/commands/registry.rb", "lib/compass/commands/stamp_pattern.rb", "lib/compass/commands/update_project.rb", "lib/compass/commands/validate_project.rb", "lib/compass/commands/watch_project.rb", "lib/compass/commands/write_configuration.rb", "lib/compass/compiler.rb", "lib/compass/configuration.rb", "lib/compass/configuration/adapters.rb", "lib/compass/configuration/comments.rb", "lib/compass/configuration/data.rb", "lib/compass/configuration/defaults.rb", "lib/compass/configuration/helpers.rb", "lib/compass/configuration/inheritance.rb", "lib/compass/configuration/paths.rb", "lib/compass/configuration/serialization.rb", "lib/compass/core_ext.rb", "lib/compass/dependencies.rb", "lib/compass/errors.rb", "lib/compass/exec.rb", "lib/compass/exec/command_option_parser.rb", "lib/compass/exec/global_options_parser.rb", "lib/compass/exec/helpers.rb", "lib/compass/exec/project_options_parser.rb", "lib/compass/exec/sub_command_ui.rb", "lib/compass/exec/switch_ui.rb", "lib/compass/frameworks.rb", "lib/compass/grid_builder.rb", "lib/compass/installers.rb", "lib/compass/installers/bare_installer.rb", "lib/compass/installers/base.rb", "lib/compass/installers/manifest.rb", "lib/compass/installers/manifest_installer.rb", "lib/compass/installers/template_context.rb", "lib/compass/logger.rb", "lib/compass/sass_extensions.rb", "lib/compass/sass_extensions/functions.rb", "lib/compass/sass_extensions/functions/color_stop.rb", "lib/compass/sass_extensions/functions/display.rb", "lib/compass/sass_extensions/functions/enumerate.rb", "lib/compass/sass_extensions/functions/font_files.rb", "lib/compass/sass_extensions/functions/inline_image.rb", "lib/compass/sass_extensions/functions/selectors.rb", "lib/compass/sass_extensions/functions/urls.rb", "lib/compass/sass_extensions/monkey_patches.rb", "lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb", "lib/compass/sass_extensions/monkey_patches/traversal.rb", "lib/compass/stats.rb", "lib/compass/test_case.rb", "lib/compass/validator.rb", "lib/compass/version.rb", "lib/vendor/fssm/fssm.rb", "lib/vendor/fssm/fssm/backends/fsevents.rb", "lib/vendor/fssm/fssm/backends/inotify.rb", "lib/vendor/fssm/fssm/backends/polling.rb", "lib/vendor/fssm/fssm/backends/rubycocoa/fsevents.rb", "lib/vendor/fssm/fssm/monitor.rb", "lib/vendor/fssm/fssm/path.rb", "lib/vendor/fssm/fssm/pathname.rb", "lib/vendor/fssm/fssm/state/directory.rb", "lib/vendor/fssm/fssm/state/file.rb", "lib/vendor/fssm/fssm/support.rb", "lib/vendor/fssm/fssm/tree.rb", "test/command_line_helper.rb", "test/command_line_test.rb", "test/compass_png_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/config.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/images/grid.png", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/config.rb", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/image_urls/config.rb", "test/fixtures/stylesheets/image_urls/css/screen.css", "test/fixtures/stylesheets/image_urls/images/grid.png", "test/fixtures/stylesheets/image_urls/sass/screen.sass", "test/fixtures/stylesheets/relative/assets/images/testing.png", "test/fixtures/stylesheets/relative/config.rb", "test/fixtures/stylesheets/relative/css/ie.css", "test/fixtures/stylesheets/relative/css/print.css", "test/fixtures/stylesheets/relative/css/screen.css", "test/fixtures/stylesheets/relative/sass/ie.sass", "test/fixtures/stylesheets/relative/sass/print.sass", "test/fixtures/stylesheets/relative/sass/screen.sass", "test/io_helper.rb", "test/rails_helper.rb", "test/rails_integration_test.rb", "test/sass_extensions_test.rb", "test/test_case_helper.rb", "test/test_helper.rb", "test/test_rails_helper.rb", "features/command_line.feature", "features/extensions.feature", "features/step_definitions/command_line_steps.rb", "features/step_definitions/extension_steps.rb"] + s.homepage = %q{http://compass-style.org} + s.rdoc_options = ["--charset=UTF-8"] + s.require_paths = ["lib"] + s.rubyforge_project = %q{compass} + s.rubygems_version = %q{1.3.5} + s.summary = %q{A Real Stylesheet Framework} + s.test_files = ["test/command_line_helper.rb", "test/command_line_test.rb", "test/compass_png_test.rb", "test/compass_test.rb", "test/configuration_test.rb", "test/fixtures/stylesheets/blueprint/config.rb", "test/fixtures/stylesheets/blueprint/css/typography.css", "test/fixtures/stylesheets/blueprint/images/grid.png", "test/fixtures/stylesheets/blueprint/sass/ie.sass", "test/fixtures/stylesheets/blueprint/sass/print.sass", "test/fixtures/stylesheets/blueprint/sass/screen.sass", "test/fixtures/stylesheets/blueprint/sass/typography.sass", "test/fixtures/stylesheets/compass/config.rb", "test/fixtures/stylesheets/compass/css/layout.css", "test/fixtures/stylesheets/compass/css/print.css", "test/fixtures/stylesheets/compass/css/reset.css", "test/fixtures/stylesheets/compass/css/utilities.css", "test/fixtures/stylesheets/compass/sass/layout.sass", "test/fixtures/stylesheets/compass/sass/print.sass", "test/fixtures/stylesheets/compass/sass/reset.sass", "test/fixtures/stylesheets/compass/sass/utilities.sass", "test/fixtures/stylesheets/image_urls/config.rb", "test/fixtures/stylesheets/image_urls/css/screen.css", "test/fixtures/stylesheets/image_urls/images/grid.png", "test/fixtures/stylesheets/image_urls/sass/screen.sass", "test/fixtures/stylesheets/relative/assets/images/testing.png", "test/fixtures/stylesheets/relative/config.rb", "test/fixtures/stylesheets/relative/css/ie.css", "test/fixtures/stylesheets/relative/css/print.css", "test/fixtures/stylesheets/relative/css/screen.css", "test/fixtures/stylesheets/relative/sass/ie.sass", "test/fixtures/stylesheets/relative/sass/print.sass", "test/fixtures/stylesheets/relative/sass/screen.sass", "test/io_helper.rb", "test/rails_helper.rb", "test/rails_integration_test.rb", "test/sass_extensions_test.rb", "test/test_case_helper.rb", "test/test_helper.rb", "test/test_rails_helper.rb", "features/command_line.feature", "features/extensions.feature", "features/step_definitions/command_line_steps.rb", "features/step_definitions/extension_steps.rb"] + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 3 + + if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 2.2.14"]) + else + s.add_dependency(%q, [">= 2.2.14"]) + end + else + s.add_dependency(%q, [">= 2.2.14"]) + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/configuration-1.1.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/configuration-1.1.0.gemspec deleted file mode 100644 index cc56d537..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/configuration-1.1.0.gemspec +++ /dev/null @@ -1,27 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{configuration} - s.version = "1.1.0" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Ara T. Howard"] - s.date = %q{2009-09-22} - s.email = %q{ara.t.howard@gmail.com} - s.files = ["config", "config/a.rb", "config/b.rb", "config/c.rb", "config/d.rb", "config/e.rb", "configuration.gemspec", "lib", "lib/configuration.rb", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb"] - s.homepage = %q{http://github.com/ahoward/configuration/tree/master} - s.require_paths = ["lib"] - s.rubyforge_project = %q{codeforpeople} - s.rubygems_version = %q{1.3.5} - s.summary = %q{configuration} - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 2 - - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - else - end - else - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.7.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.9.gemspec similarity index 80% rename from lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.7.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.9.gemspec index 24101d5d..e7a4b583 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.7.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.9.gemspec @@ -2,15 +2,15 @@ Gem::Specification.new do |s| s.name = %q{fancy-buttons} - s.version = "0.3.7" + s.version = "0.3.9" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Brandon Mathis"] - s.date = %q{2009-12-14} - s.description = %q{Make fancy buttons with the Compass stylesheet authoring framework.} + s.date = %q{2010-01-23} + s.description = %q{Easily style buttons with beautiful CSS3 features like gradients, rounded corners, etc. Don't worry the buttons also degrade nicely for browsers with no support. This requires the Compass stylesheet authoring framework.} s.email = %q{brandon@imathis.com} s.extra_rdoc_files = ["README.markdown"] - s.files = ["README.markdown", "Rakefile", "fancy-buttons.gemspec", "lib/fancy-buttons.rb", "lib/sass/_fancy_buttons.sass", "lib/sass/_fancy_gradient.sass", "lib/templates/project/button_bg.png", "lib/templates/project/buttons.sass", "lib/templates/project/index.html", "lib/templates/project/manifest.rb"] + s.files = ["README.markdown", "Rakefile", "fancy-buttons.gemspec", "lib/fancy-buttons.rb", "lib/sass/_fancy_buttons.sass", "lib/sass/_fancy_gradient.sass", "lib/templates/project/button_bg.png", "lib/templates/project/buttons.sass", "lib/templates/project/ie6.sass", "lib/templates/project/index.html", "lib/templates/project/manifest.rb"] s.homepage = %q{http://github.com/imathis/fancy-buttons} s.rdoc_options = ["--charset=UTF-8"] s.require_paths = ["lib"] diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/launchy-0.3.5.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/launchy-0.3.5.gemspec deleted file mode 100644 index 076355b7..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/launchy-0.3.5.gemspec +++ /dev/null @@ -1,44 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{launchy} - s.version = "0.3.5" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Jeremy Hinegardner"] - s.date = %q{2009-12-16} - s.default_executable = %q{launchy} - s.description = %q{Launchy is helper class for launching cross-platform applications in a -fire and forget manner. - -There are application concepts (browser, email client, etc) that are -common across all platforms, and they may be launched differently on -each platform. Launchy is here to make a common approach to launching -external application from within ruby programs.} - s.email = %q{jeremy@copiousfreetime.org} - s.executables = ["launchy"] - s.extra_rdoc_files = ["README", "HISTORY", "LICENSE", "lib/launchy/application.rb", "lib/launchy/browser.rb", "lib/launchy/command_line.rb", "lib/launchy/paths.rb", "lib/launchy/version.rb", "lib/launchy.rb"] - s.files = ["bin/launchy", "lib/launchy/application.rb", "lib/launchy/browser.rb", "lib/launchy/command_line.rb", "lib/launchy/paths.rb", "lib/launchy/version.rb", "lib/launchy.rb", "spec/application_spec.rb", "spec/browser_spec.rb", "spec/launchy_spec.rb", "spec/paths_spec.rb", "spec/spec_helper.rb", "spec/version_spec.rb", "spec/tattle-host-os.yml", "README", "HISTORY", "LICENSE", "tasks/announce.rake", "tasks/distribution.rake", "tasks/documentation.rake", "tasks/rspec.rake", "tasks/rubyforge.rake", "tasks/config.rb", "tasks/utils.rb", "Rakefile", "gemspec.rb"] - s.homepage = %q{http://copiousfreetime.rubyforge.org/launchy/} - s.rdoc_options = ["--line-numbers", "--inline-source", "--main", "README"] - s.require_paths = ["lib"] - s.rubyforge_project = %q{copiousfreetime} - s.rubygems_version = %q{1.3.5} - s.summary = %q{Launchy is helper class for launching cross-platform applications in a fire and forget manner} - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0.8.1"]) - s.add_runtime_dependency(%q, [">= 0.0.5"]) - else - s.add_dependency(%q, [">= 0.8.1"]) - s.add_dependency(%q, [">= 0.0.5"]) - end - else - s.add_dependency(%q, [">= 0.8.1"]) - s.add_dependency(%q, [">= 0.0.5"]) - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.6.gemspec similarity index 79% rename from lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.6.gemspec index 65bb8ac7..65dbe0a8 100644 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.6.gemspec @@ -2,21 +2,22 @@ Gem::Specification.new do |s| s.name = %q{shotgun} - s.version = "0.5" + s.version = "0.6" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Ryan Tomayko"] - s.date = %q{2010-01-16} + s.date = %q{2010-01-28} s.default_executable = %q{shotgun} s.description = %q{Because reloading sucks.} s.email = %q{r@tomayko.com} s.executables = ["shotgun"] s.extra_rdoc_files = ["README"] - s.files = ["README", "COPYING", "Rakefile", "shotgun.gemspec", "lib/shotgun.rb", "bin/shotgun"] + s.files = ["README", "COPYING", "Rakefile", "shotgun.gemspec", "lib/shotgun.rb", "bin/shotgun", "test/shotgun_test.rb", "test/test.ru"] s.homepage = %q{http://github.com/rtomayko/shotgun/} s.require_paths = ["lib"] s.rubygems_version = %q{1.3.5} s.summary = %q{Because reloading sucks.} + s.test_files = ["test/shotgun_test.rb"] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION @@ -24,13 +25,10 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, [">= 0.9.1"]) - s.add_runtime_dependency(%q, [">= 0.3.3", "< 1.0"]) else s.add_dependency(%q, [">= 0.9.1"]) - s.add_dependency(%q, [">= 0.3.3", "< 1.0"]) end else s.add_dependency(%q, [">= 0.9.1"]) - s.add_dependency(%q, [">= 0.3.3", "< 1.0"]) end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-0.9.4.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-0.9.4.gemspec deleted file mode 100644 index d4f7584a..00000000 --- a/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-0.9.4.gemspec +++ /dev/null @@ -1,40 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{sinatra} - s.version = "0.9.4" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Blake Mizerany"] - s.date = %q{2009-07-26} - s.description = %q{Classy web-development dressed in a DSL} - s.email = %q{sinatrarb@googlegroups.com} - s.extra_rdoc_files = ["README.rdoc", "LICENSE"] - s.files = ["AUTHORS", "CHANGES", "LICENSE", "README.rdoc", "Rakefile", "compat/app_test.rb", "compat/application_test.rb", "compat/builder_test.rb", "compat/compat_test.rb", "compat/custom_error_test.rb", "compat/erb_test.rb", "compat/events_test.rb", "compat/filter_test.rb", "compat/haml_test.rb", "compat/helper.rb", "compat/mapped_error_test.rb", "compat/pipeline_test.rb", "compat/public/foo.xml", "compat/sass_test.rb", "compat/sessions_test.rb", "compat/streaming_test.rb", "compat/sym_params_test.rb", "compat/template_test.rb", "compat/use_in_file_templates_test.rb", "compat/views/foo.builder", "compat/views/foo.erb", "compat/views/foo.haml", "compat/views/foo.sass", "compat/views/foo_layout.erb", "compat/views/foo_layout.haml", "compat/views/layout_test/foo.builder", "compat/views/layout_test/foo.erb", "compat/views/layout_test/foo.haml", "compat/views/layout_test/foo.sass", "compat/views/layout_test/layout.builder", "compat/views/layout_test/layout.erb", "compat/views/layout_test/layout.haml", "compat/views/layout_test/layout.sass", "compat/views/no_layout/no_layout.builder", "compat/views/no_layout/no_layout.haml", "lib/sinatra.rb", "lib/sinatra/base.rb", "lib/sinatra/compat.rb", "lib/sinatra/images/404.png", "lib/sinatra/images/500.png", "lib/sinatra/main.rb", "lib/sinatra/showexceptions.rb", "lib/sinatra/test.rb", "lib/sinatra/test/bacon.rb", "lib/sinatra/test/rspec.rb", "lib/sinatra/test/spec.rb", "lib/sinatra/test/unit.rb", "sinatra.gemspec", "test/base_test.rb", "test/builder_test.rb", "test/contest.rb", "test/data/reload_app_file.rb", "test/erb_test.rb", "test/extensions_test.rb", "test/filter_test.rb", "test/haml_test.rb", "test/helper.rb", "test/helpers_test.rb", "test/mapped_error_test.rb", "test/middleware_test.rb", "test/options_test.rb", "test/render_backtrace_test.rb", "test/request_test.rb", "test/response_test.rb", "test/result_test.rb", "test/route_added_hook_test.rb", "test/routing_test.rb", "test/sass_test.rb", "test/server_test.rb", "test/sinatra_test.rb", "test/static_test.rb", "test/templates_test.rb", "test/test_test.rb", "test/views/error.builder", "test/views/error.erb", "test/views/error.haml", "test/views/error.sass", "test/views/foo/hello.test", "test/views/hello.builder", "test/views/hello.erb", "test/views/hello.haml", "test/views/hello.sass", "test/views/hello.test", "test/views/layout2.builder", "test/views/layout2.erb", "test/views/layout2.haml", "test/views/layout2.test"] - s.homepage = %q{http://sinatra.rubyforge.org} - s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"] - s.require_paths = ["lib"] - s.rubyforge_project = %q{sinatra} - s.rubygems_version = %q{1.3.5} - s.summary = %q{Classy web-development dressed in a DSL} - s.test_files = ["test/base_test.rb", "test/builder_test.rb", "test/erb_test.rb", "test/extensions_test.rb", "test/filter_test.rb", "test/haml_test.rb", "test/helpers_test.rb", "test/mapped_error_test.rb", "test/middleware_test.rb", "test/options_test.rb", "test/render_backtrace_test.rb", "test/request_test.rb", "test/response_test.rb", "test/result_test.rb", "test/route_added_hook_test.rb", "test/routing_test.rb", "test/sass_test.rb", "test/server_test.rb", "test/sinatra_test.rb", "test/static_test.rb", "test/templates_test.rb", "test/test_test.rb"] - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 2 - - if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0.9.1"]) - s.add_development_dependency(%q, [">= 0.2", "< 1.0"]) - s.add_development_dependency(%q, [">= 0.3.0"]) - else - s.add_dependency(%q, [">= 0.9.1"]) - s.add_dependency(%q, [">= 0.2", "< 1.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - end - else - s.add_dependency(%q, [">= 0.9.1"]) - s.add_dependency(%q, [">= 0.2", "< 1.0"]) - s.add_dependency(%q, [">= 0.3.0"]) - end -end diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-1.0.a.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-1.0.a.gemspec new file mode 100644 index 00000000..7eb59eff --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-1.0.a.gemspec @@ -0,0 +1,49 @@ +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{sinatra} + s.version = "1.0.a" + + s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= + s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"] + s.date = %q{2010-01-28} + s.description = %q{Classy web-development dressed in a DSL} + s.email = %q{sinatrarb@googlegroups.com} + s.extra_rdoc_files = ["README.rdoc", "LICENSE"] + s.files = ["AUTHORS", "CHANGES", "LICENSE", "README.jp.rdoc", "README.rdoc", "Rakefile", "lib/sinatra.rb", "lib/sinatra/base.rb", "lib/sinatra/images/404.png", "lib/sinatra/images/500.png", "lib/sinatra/main.rb", "lib/sinatra/showexceptions.rb", "lib/sinatra/tilt.rb", "sinatra.gemspec", "test/base_test.rb", "test/builder_test.rb", "test/contest.rb", "test/erb_test.rb", "test/erubis_test.rb", "test/extensions_test.rb", "test/filter_test.rb", "test/haml_test.rb", "test/helper.rb", "test/helpers_test.rb", "test/mapped_error_test.rb", "test/middleware_test.rb", "test/public/favicon.ico", "test/request_test.rb", "test/response_test.rb", "test/result_test.rb", "test/route_added_hook_test.rb", "test/routing_test.rb", "test/sass_test.rb", "test/server_test.rb", "test/settings_test.rb", "test/sinatra_test.rb", "test/static_test.rb", "test/templates_test.rb", "test/views/error.builder", "test/views/error.erb", "test/views/error.erubis", "test/views/error.haml", "test/views/error.sass", "test/views/foo/hello.test", "test/views/hello.builder", "test/views/hello.erb", "test/views/hello.erubis", "test/views/hello.haml", "test/views/hello.sass", "test/views/hello.test", "test/views/layout2.builder", "test/views/layout2.erb", "test/views/layout2.erubis", "test/views/layout2.haml", "test/views/layout2.test"] + s.homepage = %q{http://sinatra.rubyforge.org} + s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"] + s.require_paths = ["lib"] + s.rubyforge_project = %q{sinatra} + s.rubygems_version = %q{1.3.5} + s.summary = %q{Classy web-development dressed in a DSL} + s.test_files = ["test/base_test.rb", "test/builder_test.rb", "test/erb_test.rb", "test/erubis_test.rb", "test/extensions_test.rb", "test/filter_test.rb", "test/haml_test.rb", "test/helpers_test.rb", "test/mapped_error_test.rb", "test/middleware_test.rb", "test/request_test.rb", "test/response_test.rb", "test/result_test.rb", "test/route_added_hook_test.rb", "test/routing_test.rb", "test/sass_test.rb", "test/server_test.rb", "test/settings_test.rb", "test/sinatra_test.rb", "test/static_test.rb", "test/templates_test.rb"] + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 2 + + if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 1.0"]) + s.add_development_dependency(%q, [">= 0.6", "< 1.0"]) + s.add_development_dependency(%q, [">= 0.3.0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + else + s.add_dependency(%q, [">= 1.0"]) + s.add_dependency(%q, [">= 0.6", "< 1.0"]) + s.add_dependency(%q, [">= 0.3.0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end + else + s.add_dependency(%q, [">= 1.0"]) + s.add_dependency(%q, [">= 0.6", "< 1.0"]) + s.add_dependency(%q, [">= 0.3.0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end +end