diff --git a/.gitignore b/.gitignore index 4a4d066f..d794939c 100755 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ coverage rdoc pkg -.sass-cache \ No newline at end of file +.sass-cache +.sassc \ No newline at end of file diff --git a/Gemfile b/Gemfile index eda9670f..ff504868 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem "sinatra-content-for" gem "rack-test" gem "yui-compressor" gem "haml" -gem "compass", "0.10.0.pre2" +gem "compass", "0.10.0.pre4" gem "compass-colors" gem "fancy-buttons" gem "json_pure" diff --git a/lib/middleman/base.rb b/lib/middleman/base.rb index 05d38552..cee904fe 100644 --- a/lib/middleman/base.rb +++ b/lib/middleman/base.rb @@ -7,6 +7,7 @@ class Sinatra::Request end module Middleman + module Rack; end class Base < Sinatra::Base set :app_file, __FILE__ set :root, ENV["MM_DIR"] || Dir.pwd @@ -22,7 +23,7 @@ module Middleman set :build_dir, "build" set :http_prefix, nil - use Rack::ConditionalGet if environment == :development + use ::Rack::ConditionalGet if environment == :development helpers Sinatra::ContentFor set :features, [] @@ -74,17 +75,14 @@ module Middleman layout = options[:layout] if !options[:layout].nil? get(url) do - if block_given? - yield - else - process_request(layout) - end + return yield if block_given? + process_request(layout) end end def self.with_layout(layout, &block) @@layout = layout - class_eval(&block) + class_eval(&block) if block_given? ensure @@layout = nil end @@ -137,7 +135,6 @@ class Middleman::Base disable :minify_css disable :minify_javascript disable :relative_assets - disable :maruku disable :smush_pngs disable :automatic_image_sizes disable :relative_assets @@ -148,7 +145,7 @@ class Middleman::Base end # Check for and evaluate local configuration - local_config = File.join(self.root, "init.rb") + local_config = File.join(self.root, "init.rb") if File.exists? local_config puts "== Reading: Local config" if logging? Middleman::Base.class_eval File.read(local_config) @@ -161,7 +158,7 @@ class Middleman::Base use Middleman::Rack::MinifyCSS use Middleman::Rack::Downstream - def self.new(*args, &bk) + def self.new(*args, &block) # loop over enabled feature features.flatten.each do |feature_name| next unless send(:"#{feature_name}?") diff --git a/lib/middleman/features/automatic_image_sizes.rb b/lib/middleman/features/automatic_image_sizes.rb index 777980a5..4fd4d06a 100755 --- a/lib/middleman/features/automatic_image_sizes.rb +++ b/lib/middleman/features/automatic_image_sizes.rb @@ -4,7 +4,7 @@ class Middleman::Base alias_method :pre_automatic_image_tag, :image_tag helpers do def image_tag(path, params={}) - if !options.respond_to?(:automatic_image_sizes?) || !options.automatic_image_sizes? + if !options.enabled?(:automatic_image_sizes) return pre_automatic_image_tag(path, params) end diff --git a/lib/middleman/features/cache_buster.rb b/lib/middleman/features/cache_buster.rb index 2a7ab84c..24861ab7 100755 --- a/lib/middleman/features/cache_buster.rb +++ b/lib/middleman/features/cache_buster.rb @@ -1,7 +1,7 @@ class Middleman::Base after_feature_init do ::Compass.configuration do |config| - if self.respond_to?(:cache_buster?) && self.cache_buster? + if self.enabled?(:cache_buster) config.asset_cache_buster do |path, real_path| real_path = real_path.path if real_path.is_a? File real_path = real_path.gsub(File.join(self.root, self.build_dir), self.public) @@ -25,7 +25,7 @@ class << Middleman::Base def asset_url(path, prefix="", request=nil) http_path = pre_cache_buster_asset_url(path, prefix, request) - return http_path unless self.respond_to?(:cache_buster?) && self.cache_buster? + return http_path unless self.enabled?(:cache_buster) if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path)) http_path diff --git a/lib/middleman/features/growl.rb b/lib/middleman/features/growl.rb deleted file mode 100755 index de67b438..00000000 --- a/lib/middleman/features/growl.rb +++ /dev/null @@ -1,2 +0,0 @@ -# Errors to growl -# Build complete to growl \ No newline at end of file diff --git a/lib/middleman/features/maruku.rb b/lib/middleman/features/maruku.rb deleted file mode 100755 index 4673f67b..00000000 --- a/lib/middleman/features/maruku.rb +++ /dev/null @@ -1,39 +0,0 @@ -begin - require 'maruku' -rescue LoadError - puts "Maruku not available. Install it with: gem install maruku" -end - -module Middleman - module Maruku - def self.included(base) - base.supported_formats << "maruku" - base.set :maruku, {} - end - - def render_path(path, layout) - if template_exists?(path, :maruku) - render :maruku, path.to_sym - else - super - end - end - - private - def render_maruku(template, data, options, locals, &block) - maruku_src = render_erb(template, data, options, locals, &block) - instance = ::Maruku.new(maruku_src, options) - if block_given? - # render layout - instance.to_html_document - else - # render template - instance.to_html - end - end - end - - class Base - include Middleman::Maruku - end -end \ No newline at end of file diff --git a/lib/middleman/features/relative_assets.rb b/lib/middleman/features/relative_assets.rb index af5c4c6b..d931a6bb 100755 --- a/lib/middleman/features/relative_assets.rb +++ b/lib/middleman/features/relative_assets.rb @@ -2,10 +2,10 @@ class Middleman::Base after_feature_init do ::Compass.configuration do |config| config.relative_assets = Proc.new do - Middleman::Base.respond_to?(:relative_assets?) && Middleman::Base.relative_assets? + Middleman::Base.enabled?(:relative_assets) end end - + ::Compass.configure_sass_plugin! end end @@ -13,7 +13,7 @@ end class << Middleman::Base alias_method :pre_relative_asset_url, :asset_url def asset_url(path, prefix="", request=nil) - if !self.respond_to?(:relative_assets?) || !self.relative_assets? + if !self.enabled?(:relative_assets) return pre_relative_asset_url(path, prefix, request) end diff --git a/lib/middleman/rack/downstream.rb b/lib/middleman/rack/downstream.rb index 42b09cc8..18ab5ab7 100644 --- a/lib/middleman/rack/downstream.rb +++ b/lib/middleman/rack/downstream.rb @@ -1,17 +1,9 @@ -module Middleman - module Rack - class Downstream - def initialize(app, options={}) - @app = app - end +class Middleman::Rack::Downstream + def initialize(app, options={}) + @app = app + end - def call(env) - if env["DOWNSTREAM"] - env["DOWNSTREAM"] - else - @app.call(env) - end - end - end + def call(env) + env["DOWNSTREAM"] || @app.call(env) end end \ No newline at end of file diff --git a/lib/middleman/rack/minify_css.rb b/lib/middleman/rack/minify_css.rb index 013ec934..1ddaf709 100644 --- a/lib/middleman/rack/minify_css.rb +++ b/lib/middleman/rack/minify_css.rb @@ -3,25 +3,26 @@ begin rescue LoadError puts "YUI-Compressor not available. Install it with: gem install yui-compressor" end - -module Middleman - module Rack - class MinifyCSS - def initialize(app, options={}) - @app = app - end - def call(env) - if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/) && Middleman::Base.enabled?(:minify_css) - compressor = ::YUI::CssCompressor.new - - source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? File.read(env["DOWNSTREAM"][2].path) : env["DOWNSTREAM"][2] - env["DOWNSTREAM"][2] = compressor.compress(source) - env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s - end - - @app.call(env) - end +class Middleman::Rack::MinifyCSS + def initialize(app, options={}) + @app = app + end + + def call(env) + if Middleman::Base.enabled?(:minify_css) && + env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.css$/) + + compressor = ::YUI::CssCompressor.new + + source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? + File.read(env["DOWNSTREAM"][2].path) : + env["DOWNSTREAM"][2] + + env["DOWNSTREAM"][2] = compressor.compress(source) + env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s end + + @app.call(env) end end \ No newline at end of file diff --git a/lib/middleman/rack/minify_javascript.rb b/lib/middleman/rack/minify_javascript.rb index f310abe0..32d0542b 100644 --- a/lib/middleman/rack/minify_javascript.rb +++ b/lib/middleman/rack/minify_javascript.rb @@ -4,26 +4,25 @@ rescue LoadError puts "YUI-Compressor not available. Install it with: gem install yui-compressor" end -module Middleman - module Rack - class MinifyJavascript - def initialize(app, options={}) - @app = app - end - - def call(env) - if env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) && Middleman::Base.enabled?(:minify_javascript) - compressor = ::YUI::JavaScriptCompressor.new(:munge => true) - - source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? File.read(env["DOWNSTREAM"][2].path) : env["DOWNSTREAM"][2] - env["DOWNSTREAM"][2] = compressor.compress(source) - env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s - end - - @app.call(env) - end - end +class Middleman::Rack::MinifyJavascript + def initialize(app, options={}) + @app = app end -end -# Middleman::Base.supported_formats << "js" \ No newline at end of file + def call(env) + if Middleman::Base.enabled?(:minify_javascript) && + env["DOWNSTREAM"] && env["PATH_INFO"].match(/\.js$/) + + compressor = ::YUI::JavaScriptCompressor.new(:munge => true) + + source = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? + File.read(env["DOWNSTREAM"][2].path) : + env["DOWNSTREAM"][2] + + env["DOWNSTREAM"][2] = compressor.compress(source) + env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s + end + + @app.call(env) + end +end \ No newline at end of file diff --git a/lib/middleman/rack/sprockets.rb b/lib/middleman/rack/sprockets.rb index c8ac0b30..b562db83 100644 --- a/lib/middleman/rack/sprockets.rb +++ b/lib/middleman/rack/sprockets.rb @@ -1,41 +1,38 @@ begin require 'sprockets' require 'middleman/rack/sprockets+ruby19' # Sprockets ruby 1.9 duckpunch - rescue LoadError puts "Sprockets not available. Install it with: gem install sprockets" end -module Middleman - module Rack - class Sprockets - def initialize(app, options={}) - @app = app - end +class Middleman::Rack::Sprockets + def initialize(app, options={}) + @app = app + end - def call(env) - path = env["PATH_INFO"] - - source_pub = File.join(Middleman::Base.views, path) - source_view = File.join(Middleman::Base.views, path) - source = "public" if File.exists?(source_pub) - source = "views" if File.exists?(source_view) - - if env["DOWNSTREAM"] && path.match(/\.js$/) && source - source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? env["DOWNSTREAM"][2].path : env["DOWNSTREAM"][2] - - secretary = ::Sprockets::Secretary.new( :root => Middleman::Base.root, - :source_files => [ source_file ], - :load_path => [ File.join("public", Middleman::Base.js_dir), - File.join("views", Middleman::Base.js_dir) ]) - - env["DOWNSTREAM"][2] = secretary.concatenation.to_s - env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s - end - - @app.call(env) + def call(env) + path = env["PATH_INFO"] + + if env["DOWNSTREAM"] && path.match(/\.js$/) + source = "public" if File.exists?(File.join(Middleman::Base.views, path)) + source = "views" if File.exists?(File.join(Middleman::Base.views, path)) + + if source + source_file = env["DOWNSTREAM"][2].is_a?(::Rack::File) ? + env["DOWNSTREAM"][2].path : + env["DOWNSTREAM"][2] + + secretary = ::Sprockets::Secretary.new( :root => Middleman::Base.root, + :source_files => [ source_file ], + :load_path => [ File.join("public", Middleman::Base.js_dir), + File.join("views", Middleman::Base.js_dir) ]) + + env["DOWNSTREAM"][2] = secretary.concatenation.to_s + env["DOWNSTREAM"][1]["Content-Length"] = ::Rack::Utils.bytesize(env["DOWNSTREAM"][2]).to_s end end + + @app.call(env) end end diff --git a/lib/middleman/rack/static.rb b/lib/middleman/rack/static.rb index e4b430de..bb39aa37 100644 --- a/lib/middleman/rack/static.rb +++ b/lib/middleman/rack/static.rb @@ -1,24 +1,18 @@ -module Middleman - module Rack - class Static - def initialize(app, options={}) - @app = app - end +class Middleman::Rack::Static + def initialize(app, options={}) + @app = app + end - def call(env) - public_file_path = File.join(Middleman::Base.public, env["PATH_INFO"]) - view_file_path = File.join(Middleman::Base.views, env["PATH_INFO"]) + def call(env) + public_file_path = File.join(Middleman::Base.public, env["PATH_INFO"]) + view_file_path = File.join(Middleman::Base.views, env["PATH_INFO"]) - if File.exists?(public_file_path) && !File.directory?(public_file_path) - file_server = ::Rack::File.new(Middleman::Base.public) - env["DOWNSTREAM"] = file_server.call(env) - elsif File.exists?(view_file_path) && !File.directory?(view_file_path) - file_server = ::Rack::File.new(Middleman::Base.views) - env["DOWNSTREAM"] = file_server.call(env) - end - - @app.call(env) - end + if File.exists?(public_file_path) && !File.directory?(public_file_path) + env["DOWNSTREAM"] = ::Rack::File.new(Middleman::Base.public).call(env) + elsif File.exists?(view_file_path) && !File.directory?(view_file_path) + env["DOWNSTREAM"] = ::Rack::File.new(Middleman::Base.views).call(env) end + + @app.call(env) end end \ No newline at end of file diff --git a/lib/middleman/sass.rb b/lib/middleman/sass.rb index ce7d10f8..27ae1ac3 100644 --- a/lib/middleman/sass.rb +++ b/lib/middleman/sass.rb @@ -9,62 +9,64 @@ rescue LoadError puts "YUI-Compressor not available. Install it with: gem install yui-compressor" end -module Middleman - module Sass - def self.included(base) - base.supported_formats << "sass" - end +module Middleman::Sass + def self.included(base) + base.supported_formats << "sass" + end - def render_path(path, layout) - if template_exists?(path, :sass) - begin - static_version = options.public + request.path_info - send_file(static_version) if File.exists? static_version + def render_path(path, layout) + if template_exists?(path, :sass) + begin + static_version = options.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 - - 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?) - YUI::CssCompressor.new.compress(result) - else - result - end - rescue Exception => e - sass_exception_string(e) + location_of_sass_file = options.environment == "build" ? + File.join(Dir.pwd, options.build_dir) : + options.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?) + ::YUI::CssCompressor.new.compress(result) + else + result end - else - super + rescue Exception => e + sass_exception_string(e) end + else + super end + end - # Handle Sass errors - def sass_exception_string(e) - e_string = "#{e.class}: #{e.message}" + # Handle Sass errors + def sass_exception_string(e) + e_string = "#{e.class}: #{e.message}" - if e.is_a? ::Sass::SyntaxError - e_string << "\non line #{e.sass_line}" + if e.is_a? ::Sass::SyntaxError + e_string << "\non line #{e.sass_line}" - if e.sass_filename - e_string << " of #{e.sass_filename}" + if e.sass_filename + e_string << " of #{e.sass_filename}" - if File.exists?(e.sass_filename) - e_string << "\n\n" + if File.exists?(e.sass_filename) + e_string << "\n\n" - min = [e.sass_line - 5, 0].max - begin - File.read(e.sass_filename).rstrip.split("\n")[ - min .. e.sass_line + 5 - ].each_with_index do |line, i| - e_string << "#{min + i + 1}: #{line}\n" - end - rescue - e_string << "Couldn't read sass file: #{e.sass_filename}" + min = [e.sass_line - 5, 0].max + begin + File.read(e.sass_filename).rstrip.split("\n")[ + min .. e.sass_line + 5 + ].each_with_index do |line, i| + e_string << "#{min + i + 1}: #{line}\n" end + rescue + e_string << "Couldn't read sass file: #{e.sass_filename}" end end end - < e - full_exception = Compass.configuration.environment == :development - logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})" - contents = if Sass::SyntaxError.respond_to?(:exception_to_css) - Sass::SyntaxError.exception_to_css(e, :full_exception => full_exception) - else - Sass::Plugin.options[:full_exception] ||= Compass.configuration.environment == :development - Sass::Plugin.send(:exception_string, e) - end - write_file css_filename, contents, options.merge(:force => true) - end - end - end - end -end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass deleted file mode 100644 index e3c21fb5..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass +++ /dev/null @@ -1,6 +0,0 @@ -=has-layout - // This makes ie6 get layout - display: inline-block - // and this puts it back to block - & - display: block diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/grid_builder.rb b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/grid_builder.rb deleted file mode 100644 index e81d1f6e..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/grid_builder.rb +++ /dev/null @@ -1,76 +0,0 @@ -# This file came from the Blueprint Project -begin - require 'rubygems' - gem 'rmagick' - require 'rvg/rvg' -rescue Exception => e -end - -module Compass - # Uses ImageMagick and RMagick to generate grid.png file - class GridBuilder - include Actions - - begin - include Magick - rescue Exception => e - end - - attr_reader :column_width, :gutter_width, :filename, :able_to_generate, :options - - # ==== Options - # * options - # * :column_width -- Width (in pixels) of current grid column - # * :gutter_width -- Width (in pixels) of current grid gutter - # * :height -- Height (in pixels) of a row - # * :filename -- Output path of grid.png file - def initialize(options={}) - @able_to_generate = Magick::Long_version rescue false - return unless @able_to_generate - @column_width = options[:column_width] - @gutter_width = options[:gutter_width] - @height = options[:height] || 20 - @filename = options[:filename] - @options = options - end - - def working_path - options[:working_path] - end - - # generates (overwriting if necessary) grid.png image to be tiled in background - def generate! - return false unless self.able_to_generate - total_width = self.column_width + self.gutter_width - RVG::dpi = 100 - - rvg = RVG.new((total_width.to_f/RVG::dpi).in, (@height.to_f/RVG::dpi).in).viewbox(0, 0, total_width, @height) do |canvas| - canvas.background_fill = 'white' - - canvas.g do |column| - column.rect(self.column_width - 1, @height).styles(:fill => "#e8effb") - end - - canvas.g do |baseline| - baseline.line(0, (@height - 1), total_width, (@height- 1)).styles(:fill => "#e9e9e9") - end - end - - if File.exists?(filename) - if options[:force] - overwrite = true - else - msg = "#{filename} already exists. Overwrite with --force." - raise Compass::FilesystemConflict.new(msg) - end - end - directory File.dirname(filename) - logger.record((overwrite ? :overwrite : :create), basename(filename)) - unless options[:dry_run] - rvg.draw.write(filename) - else - true - end - end - end -end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb deleted file mode 100644 index 1cb09118..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb +++ /dev/null @@ -1,23 +0,0 @@ -require 'sass/plugin' - -# XXX: We can remove this monkeypatch once Sass 2.2 is released. -module Sass::Plugin - class << self - unless method_defined?(:exact_stylesheet_needs_update?) - def stylesheet_needs_update?(name, template_path, css_path) - css_file = css_filename(name, css_path) - template_file = template_filename(name, template_path) - exact_stylesheet_needs_update?(css_file, template_file) - end - def exact_stylesheet_needs_update?(css_file, template_file) - if !File.exists?(css_file) - return true - else - css_mtime = File.mtime(css_file) - File.mtime(template_file) > css_mtime || - dependencies(template_file).any?(&dependency_updated?(css_mtime)) - end - end - end - end -end \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/cache.rb b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/cache.rb deleted file mode 100644 index adeff963..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/cache.rb +++ /dev/null @@ -1,193 +0,0 @@ -class FSSM::Cache - module Common - include Enumerable - - def initialize - @children = Hash.new - end - - def each(prefix='./', &block) - @children.each do |segment, node| - cprefix = Pathname.for(prefix.dup).join(segment) - block.call(cprefix, node) - node.each(cprefix, &block) - end - end - - protected - - def with_lock - @mutex.lock - yield - @mutex.unlock - end - - def descendant(path) - recurse_on_key(path, false) - end - - def descendant!(path) - recurse_on_key(path, true) - end - - def child(segment) - has_child?(segment) ? @children["#{segment}"] : nil - end - - def child!(segment) - (@children["#{segment}"] ||= Node.new) - end - - def has_child?(segment) - @children.include?("#{segment}") - end - - def remove_child(segment) - @children.delete("#{segment}") - end - - def remove_children - @children.clear - end - - def recurse_on_key(key, create) - key = sanitize_key(key) - node = self - - until key.empty? - segment = key.shift - node = create ? node.child!(segment) : node.child(segment) - return nil unless node - end - - node - end - - def key_for_path(path) - Pathname.for(path).names - end - - def relative_path(path) - sanitize_path(path, false) - end - - def absolute_path(path) - sanitize_path(path, true) - end - - def sanitize_path(path, absolute) - if path.is_a?(Array) - first = absolute ? '/' : path.shift - path = path.inject(Pathname.new("#{first}")) do |pathname, segment| - pathname.join("#{segment}") - end - path - else - path = Pathname.for(path) - absolute ? path.expand_path : path - end - end - end - - class Node - include Common - - attr_accessor :mtime - attr_accessor :ftype - - def <=>(other) - self.mtime <=> other.mtime - end - - def from_path(path) - path = absolute_path(path) - @mtime = path.mtime - @ftype = path.ftype - end - - protected - - def sanitize_key(key) - key_for_path(relative_path(key)) - end - end - - include Common - - def initialize - @mutex = Mutex.new - super - end - - def clear - @mutex.lock - @children.clear - @mutex.unlock - end - - def set(path) - unset(path) - node = descendant!(path) - node.from_path(path) - node.mtime - end - - def unset(path='/') - key = sanitize_key(path) - - if key.empty? - self.clear - return nil - end - - segment = key.pop - node = descendant(key) - - return unless node - - @mutex.lock - node.remove_child(segment) - @mutex.unlock - - nil - end - - def files - ftype('file') - end - - def directories - ftype('directory') - end - - protected - - def each(&block) - prefix='/' - super(prefix, &block) - end - - def ftype(ft) - inject({}) do |hash, entry| - path, node = entry - hash["#{path}"] = node.mtime if node.ftype == ft - hash - end - end - - def descendant(path) - node = recurse_on_key(path, false) - node - end - - def descendant!(path) - @mutex.lock - node = recurse_on_key(path, true) - @mutex.unlock - node - end - - def sanitize_key(key) - key_for_path(absolute_path(key)) - end -end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/ext.rb b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/ext.rb deleted file mode 100644 index 1f084b85..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/ext.rb +++ /dev/null @@ -1,37 +0,0 @@ -class Pathname - class << self - def for(path) - path.is_a?(Pathname) ? path : new(path) - end - end - - # before overwriting chop_basename: - # %total - 29.50% - # %self - 20.50% - # after overwriting chop_basename: - # %total - 24.36% - # %self - 15.47% - CHOP_PAT = /\A#{SEPARATOR_PAT}?\z/ - def chop_basename(path) - base = File.basename(path) - # the original version of this method recalculates this regexp - # each run, despite the pattern never changing. - if CHOP_PAT =~ base - return nil - else - return path[0, path.rindex(base)], base - end - end - - def segments - prefix, names = split_names(@path) - names.unshift(prefix) unless prefix.empty? - names.shift if names[0] == '.' - names - end - - def names - prefix, names = split_names(@path) - names - end -end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/support.rb b/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/support.rb deleted file mode 100644 index 68128b60..00000000 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/support.rb +++ /dev/null @@ -1,22 +0,0 @@ -module FSSM::Support - class << self - def backend - (mac? && carbon_core?) ? 'FSEvents' : 'Polling' - end - - def mac? - @@mac ||= RUBY_PLATFORM =~ /darwin/i - end - - def carbon_core? - @@carbon_core ||= begin - require 'osx/foundation' - OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework' - true - rescue LoadError - false - end - end - - end -end diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION b/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION deleted file mode 100644 index ed1fc352..00000000 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION +++ /dev/null @@ -1 +0,0 @@ -2.2.16 diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator.bundle deleted file mode 100644 index 2333561a..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator.bundle and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/Makefile b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/Makefile deleted file mode 100644 index d4743ed8..00000000 --- a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/Makefile +++ /dev/null @@ -1,181 +0,0 @@ - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = . -topdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -hdrdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -arch_hdrdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/$(arch) -VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = $(DESTDIR)/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243 -exec_prefix = $(prefix) -vendorhdrdir = $(rubyhdrdir)/vendor_ruby -sitehdrdir = $(rubyhdrdir)/site_ruby -rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version) -vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby -sitedir = $(libdir)/$(RUBY_INSTALL_NAME)/site_ruby -mandir = $(datarootdir)/man -localedir = $(datarootdir)/locale -libdir = $(exec_prefix)/lib -psdir = $(docdir) -pdfdir = $(docdir) -dvidir = $(docdir) -htmldir = $(docdir) -infodir = $(datarootdir)/info -docdir = $(datarootdir)/doc/$(PACKAGE) -oldincludedir = $(DESTDIR)/usr/include -includedir = $(prefix)/include -localstatedir = $(prefix)/var -sharedstatedir = $(prefix)/com -sysconfdir = $(prefix)/etc -datadir = $(datarootdir) -datarootdir = $(prefix)/share -libexecdir = $(exec_prefix)/libexec -sbindir = $(exec_prefix)/sbin -bindir = $(exec_prefix)/bin -rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version) -archdir = $(rubylibdir)/$(arch) -sitelibdir = $(sitedir)/$(ruby_version) -sitearchdir = $(sitelibdir)/$(sitearch) -vendorlibdir = $(vendordir)/$(ruby_version) -vendorarchdir = $(vendorlibdir)/$(sitearch) - -CC = gcc -CXX = g++ -LIBRUBY = $(LIBRUBY_SO) -LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a -LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) -LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -OUTFLAG = -o -COUTFLAG = -o - -RUBY_EXTCONF_H = -cflags = $(optflags) $(debugflags) $(warnflags) -optflags = -O2 -debugflags = -g -warnflags = -Wall -Wno-parentheses -CFLAGS = -fno-common -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 $(cflags) -fno-common -pipe -fno-common -Wall -INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) -DEFS = -CPPFLAGS = -DHAVE_RUBY_ST_H -DHAVE_RUBY_ENCODING_H -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) -CXXFLAGS = $(CFLAGS) -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 $(cxxflags) -ldflags = -L. -L/Users/tdreyno/homebrew/lib -L/usr/local/lib -dldflags = -archflag = -DLDFLAGS = $(ldflags) $(dldflags) $(archflag) -LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace -LDSHAREDXX = $(LDSHARED) -AR = ar -EXEEXT = - -RUBY_INSTALL_NAME = ruby -RUBY_SO_NAME = ruby -arch = i386-darwin10.0.0 -sitearch = i386-darwin10.0.0 -ruby_version = 1.9.1 -ruby = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby -RUBY = $(ruby) -RM = rm -f -RM_RF = $(RUBY) -run -e rm -- -rf -RMDIRS = $(RUBY) -run -e rmdir -- -p -MAKEDIRS = mkdir -p -INSTALL = /usr/bin/install -c -INSTALL_PROG = $(INSTALL) -m 0755 -INSTALL_DATA = $(INSTALL) -m 644 -COPY = cp - -#### End of system configuration section. #### - -preload = - -libpath = . $(libdir) -LIBPATH = -L. -L$(libdir) -DEFFILE = - -CLEANFILES = mkmf.log -DISTCLEANFILES = -DISTCLEANDIRS = - -extout = -extout_prefix = -target_prefix = -LOCAL_LIBS = -LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl -lobjc -SRCS = generator.c unicode.c -OBJS = generator.o unicode.o -TARGET = generator -DLLIB = $(TARGET).bundle -EXTSTATIC = -STATIC_LIB = - -BINDIR = $(bindir) -RUBYCOMMONDIR = $(sitedir)$(target_prefix) -RUBYLIBDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext$(target_prefix) -RUBYARCHDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext$(target_prefix) -HDRDIR = $(rubyhdrdir)/ruby$(target_prefix) -ARCHHDRDIR = $(rubyhdrdir)/$(arch)/ruby$(target_prefix) - -TARGET_SO = $(DLLIB) -CLEANLIBS = $(TARGET).bundle -CLEANOBJS = *.o *.bak - -all: $(DLLIB) -static: $(STATIC_LIB) - -clean-rb-default:: -clean-rb:: -clean-so:: -clean: clean-so clean-rb-default clean-rb - @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) - -distclean-rb-default:: -distclean-rb:: -distclean-so:: -distclean: clean distclean-so distclean-rb-default distclean-rb - @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log - @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) - @-$(RMDIRS) $(DISTCLEANDIRS) - -realclean: distclean -install: install-so install-rb - -install-so: $(RUBYARCHDIR) -install-so: $(RUBYARCHDIR)/$(DLLIB) -$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) - $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) -install-rb: pre-install-rb install-rb-default -install-rb-default: pre-install-rb-default -pre-install-rb: Makefile -pre-install-rb-default: Makefile -$(RUBYARCHDIR): - $(MAKEDIRS) $@ - -site-install: site-install-so site-install-rb -site-install-so: install-so -site-install-rb: install-rb - -.SUFFIXES: .c .m .cc .cxx .cpp .C .o - -.cc.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.cxx.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.cpp.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.C.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.c.o: - $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $< - -$(DLLIB): $(OBJS) Makefile - @-$(RM) $(@) - $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) - - - -$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.bundle deleted file mode 100644 index 2333561a..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.bundle and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.o b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.o deleted file mode 100644 index 7cb571f1..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.o and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/mkmf.log b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/mkmf.log deleted file mode 100644 index d7b84337..00000000 --- a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/mkmf.log +++ /dev/null @@ -1,32 +0,0 @@ -have_header: checking for ruby/st.h... -------------------- yes - -"gcc -o conftest -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -L. -L/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/lib -L. -L/Users/tdreyno/homebrew/lib -L/usr/local/lib -lruby-static -lpthread -ldl -lobjc " -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: int main() {return 0;} -/* end */ - -"gcc -E -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: #include -/* end */ - --------------------- - -have_header: checking for ruby/encoding.h... -------------------- yes - -"gcc -E -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: #include -/* end */ - --------------------- - diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.o b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.o deleted file mode 100644 index 6eead8d9..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.o and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser.bundle deleted file mode 100644 index 2294c030..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser.bundle and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/Makefile b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/Makefile deleted file mode 100644 index 09759809..00000000 --- a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/Makefile +++ /dev/null @@ -1,181 +0,0 @@ - -SHELL = /bin/sh - -#### Start of system configuration section. #### - -srcdir = . -topdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -hdrdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -arch_hdrdir = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/$(arch) -VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby -prefix = $(DESTDIR)/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243 -exec_prefix = $(prefix) -vendorhdrdir = $(rubyhdrdir)/vendor_ruby -sitehdrdir = $(rubyhdrdir)/site_ruby -rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version) -vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby -sitedir = $(libdir)/$(RUBY_INSTALL_NAME)/site_ruby -mandir = $(datarootdir)/man -localedir = $(datarootdir)/locale -libdir = $(exec_prefix)/lib -psdir = $(docdir) -pdfdir = $(docdir) -dvidir = $(docdir) -htmldir = $(docdir) -infodir = $(datarootdir)/info -docdir = $(datarootdir)/doc/$(PACKAGE) -oldincludedir = $(DESTDIR)/usr/include -includedir = $(prefix)/include -localstatedir = $(prefix)/var -sharedstatedir = $(prefix)/com -sysconfdir = $(prefix)/etc -datadir = $(datarootdir) -datarootdir = $(prefix)/share -libexecdir = $(exec_prefix)/libexec -sbindir = $(exec_prefix)/sbin -bindir = $(exec_prefix)/bin -rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version) -archdir = $(rubylibdir)/$(arch) -sitelibdir = $(sitedir)/$(ruby_version) -sitearchdir = $(sitelibdir)/$(sitearch) -vendorlibdir = $(vendordir)/$(ruby_version) -vendorarchdir = $(vendorlibdir)/$(sitearch) - -CC = gcc -CXX = g++ -LIBRUBY = $(LIBRUBY_SO) -LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a -LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) -LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -OUTFLAG = -o -COUTFLAG = -o - -RUBY_EXTCONF_H = -cflags = $(optflags) $(debugflags) $(warnflags) -optflags = -O2 -debugflags = -g -warnflags = -Wall -Wno-parentheses -CFLAGS = -fno-common -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 $(cflags) -fno-common -pipe -fno-common -Wall -INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir) -DEFS = -CPPFLAGS = -DHAVE_RUBY_ST_H -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) -CXXFLAGS = $(CFLAGS) -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 $(cxxflags) -ldflags = -L. -L/Users/tdreyno/homebrew/lib -L/usr/local/lib -dldflags = -archflag = -DLDFLAGS = $(ldflags) $(dldflags) $(archflag) -LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace -LDSHAREDXX = $(LDSHARED) -AR = ar -EXEEXT = - -RUBY_INSTALL_NAME = ruby -RUBY_SO_NAME = ruby -arch = i386-darwin10.0.0 -sitearch = i386-darwin10.0.0 -ruby_version = 1.9.1 -ruby = /Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby -RUBY = $(ruby) -RM = rm -f -RM_RF = $(RUBY) -run -e rm -- -rf -RMDIRS = $(RUBY) -run -e rmdir -- -p -MAKEDIRS = mkdir -p -INSTALL = /usr/bin/install -c -INSTALL_PROG = $(INSTALL) -m 0755 -INSTALL_DATA = $(INSTALL) -m 644 -COPY = cp - -#### End of system configuration section. #### - -preload = - -libpath = . $(libdir) -LIBPATH = -L. -L$(libdir) -DEFFILE = - -CLEANFILES = mkmf.log -DISTCLEANFILES = -DISTCLEANDIRS = - -extout = -extout_prefix = -target_prefix = -LOCAL_LIBS = -LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl -lobjc -SRCS = parser.c unicode.c -OBJS = parser.o unicode.o -TARGET = parser -DLLIB = $(TARGET).bundle -EXTSTATIC = -STATIC_LIB = - -BINDIR = $(bindir) -RUBYCOMMONDIR = $(sitedir)$(target_prefix) -RUBYLIBDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext$(target_prefix) -RUBYARCHDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext$(target_prefix) -HDRDIR = $(rubyhdrdir)/ruby$(target_prefix) -ARCHHDRDIR = $(rubyhdrdir)/$(arch)/ruby$(target_prefix) - -TARGET_SO = $(DLLIB) -CLEANLIBS = $(TARGET).bundle -CLEANOBJS = *.o *.bak - -all: $(DLLIB) -static: $(STATIC_LIB) - -clean-rb-default:: -clean-rb:: -clean-so:: -clean: clean-so clean-rb-default clean-rb - @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) - -distclean-rb-default:: -distclean-rb:: -distclean-so:: -distclean: clean distclean-so distclean-rb-default distclean-rb - @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log - @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) - @-$(RMDIRS) $(DISTCLEANDIRS) - -realclean: distclean -install: install-so install-rb - -install-so: $(RUBYARCHDIR) -install-so: $(RUBYARCHDIR)/$(DLLIB) -$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) - $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) -install-rb: pre-install-rb install-rb-default -install-rb-default: pre-install-rb-default -pre-install-rb: Makefile -pre-install-rb-default: Makefile -$(RUBYARCHDIR): - $(MAKEDIRS) $@ - -site-install: site-install-so site-install-rb -site-install-so: install-so -site-install-rb: install-rb - -.SUFFIXES: .c .m .cc .cxx .cpp .C .o - -.cc.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.cxx.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.cpp.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.C.o: - $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $< - -.c.o: - $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $< - -$(DLLIB): $(OBJS) Makefile - @-$(RM) $(@) - $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) - - - -$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/mkmf.log b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/mkmf.log deleted file mode 100644 index cd440cf6..00000000 --- a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/mkmf.log +++ /dev/null @@ -1,33 +0,0 @@ -have_header: checking for ruby/st.h... -------------------- yes - -"gcc -o conftest -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -L. -L/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/lib -L. -L/Users/tdreyno/homebrew/lib -L/usr/local/lib -lruby-static -lpthread -ldl -lobjc " -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: int main() {return 0;} -/* end */ - -"gcc -E -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: #include -/* end */ - --------------------- - -have_header: checking for re.h... -------------------- no - -"gcc -E -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/i386-darwin10.0.0 -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1/ruby/backward -I/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/include/ruby-1.9.1 -I. -I/Users/tdreyno/homebrew/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -I/Users/tdreyno/homebrew/include -O3 -march=core2 -m64 -mmmx -msse4.1 -w -pipe -fomit-frame-pointer -mmacosx-version-min=10.6 -O2 -g -Wall -Wno-parentheses -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" -conftest.c:3:16: error: re.h: No such file or directory -checked program was: -/* begin */ -1: #include "ruby.h" -2: -3: #include -/* end */ - --------------------- - diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.bundle b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.bundle deleted file mode 100644 index 2294c030..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.bundle and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.o b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.o deleted file mode 100644 index 1a08650c..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.o and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.o b/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.o deleted file mode 100644 index 731b2535..00000000 Binary files a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.o and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/RDOX b/lib/middleman/vendor/gems/gems/rack-1.0.1/RDOX deleted file mode 100755 index 8b95b0cb..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/RDOX +++ /dev/null @@ -1,428 +0,0 @@ - -== Rack::Auth::Basic -* should challenge correctly when no credentials are specified -* should rechallenge if incorrect credentials are specified -* should return application output if correct credentials are specified -* should return 400 Bad Request if different auth scheme used -* realm as optional constructor arg - -== Rack::Auth::Digest::MD5 -* should challenge when no credentials are specified -* should return application output if correct credentials given -* should return application output if correct credentials given (hashed passwords) -* should rechallenge if incorrect username given -* should rechallenge if incorrect password given -* should rechallenge with stale parameter if nonce is stale -* should return 400 Bad Request if incorrect qop given -* should return 400 Bad Request if incorrect uri given -* should return 400 Bad Request if different auth scheme used -* should not require credentials for unprotected path -* should challenge when no credentials are specified for protected path -* should return application output if correct credentials given for protected path -* should return application output if correct credentials given for POST -* should return application output if correct credentials given for PUT (using method override of POST) -* realm as optional constructor arg - -== Rack::Auth::OpenID -* realm uri should be valid -* should be able to check if a uri is within the realm (empty) -* return_to should be valid -* extensions should have required constants defined -* extensions should have Request and Response defined and inherit from OpenID::Extension - -== Rack::Builder -* chains apps by default -* has implicit #to_app -* supports blocks on use -* has explicit #to_app -* apps are initialized once - -== Rack::Adapter::Camping -* works with GET -* works with POST - -== Rack::Cascade -* should dispatch onward on 404 by default -* should dispatch onward on whatever is passed -* should fail if empty -* should append new app - -== Rack::Handler::CGI -* startup (empty) -* should respond -* should be a lighttpd -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* shutdown - -== Rack::Chunked -* chunks responses with no Content-Length -* chunks empty bodies properly -* does not modify response when Content-Length header present -* does not modify response when client is HTTP/1.0 -* does not modify response when Transfer-Encoding header already present -* does not modify response when status code is 100 -* does not modify response when status code is 204 -* does not modify response when status code is 304 - -== Rack::CommonLogger -* should log to rack.errors by default -* should log to anything with << - -== Rack::ConditionalGet -* should set a 304 status and truncate body when If-Modified-Since hits -* should set a 304 status and truncate body when If-None-Match hits -* should not affect non-GET/HEAD requests - -== Rack::ContentLength -* sets Content-Length on String bodies if none is set -* sets Content-Length on Array bodies if none is set -* does not set Content-Length on variable length bodies -* does not change Content-Length if it is already set -* does not set Content-Length on 304 responses -* does not set Content-Length when Transfer-Encoding is chunked - -== Rack::ContentType -* sets Content-Type to default text/html if none is set -* sets Content-Type to chosen default if none is set -* does not change Content-Type if it is already set -* case insensitive detection of Content-Type - -== Rack::Deflater -* should be able to deflate bodies that respond to each -* should be able to deflate String bodies -* should be able to gzip bodies that respond to each -* should be able to fallback to no deflation -* should be able to skip when there is no response entity body -* should handle the lack of an acceptable encoding -* should handle gzip response with Last-Modified header -* should do nothing when no-transform Cache-Control directive present - -== Rack::Directory -* serves directory indices -* passes to app if file found -* serves uri with URL encoded filenames -* does not allow directory traversal -* 404s if it can't find the file - -== Rack::Handler::FastCGI -* startup (empty) -* should respond -* should be a lighttpd -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* shutdown - -== Rack::File -* serves files -* sets Last-Modified header -* serves files with URL encoded filenames -* does not allow directory traversal -* does not allow directory traversal with encoded periods -* 404s if it can't find the file -* detects SystemCallErrors -* returns bodies that respond to #to_path - -== Rack::Handler -* has registered default handlers -* handler that doesn't exist should raise a NameError -* should get unregistered, but already required, handler by name -* should register custom handler -* should not need registration for properly coded handlers even if not already required - -== Rack::Head -* response (empty) -* passes GET, POST, PUT, DELETE, OPTIONS, TRACE requests -* removes body from HEAD requests - -== Rack::Lint -* passes valid request -* notices fatal errors -* notices environment errors -* notices input errors -* notices error errors -* notices status errors -* notices header errors -* notices content-type errors -* notices content-length errors -* notices body errors -* notices input handling errors -* notices error handling errors -* notices HEAD errors -* passes valid read calls - -== Rack::Lint::InputWrapper -* delegates :size to underlying IO object -* delegates :rewind to underlying IO object - -== Rack::Lobster::LambdaLobster -* should be a single lambda -* should look like a lobster -* should be flippable - -== Rack::Lobster -* should look like a lobster -* should be flippable -* should provide crashing for testing purposes - -== Rack::Lock -* should call synchronize on lock -* should set multithread flag to false -* should reset original multithread flag when exiting lock - -== Rack::MethodOverride -* should not affect GET requests -* _method parameter should modify REQUEST_METHOD for POST requests -* X-HTTP-Method-Override header should modify REQUEST_METHOD for POST requests -* should not modify REQUEST_METHOD if the method is unknown -* should not modify REQUEST_METHOD when _method is nil -* should store the original REQUEST_METHOD prior to overriding - -== Rack::MockRequest -* should return a MockResponse -* should be able to only return the environment -* should provide sensible defaults -* should allow GET/POST/PUT/DELETE -* should set content length -* should allow posting -* should use all parts of an URL -* should behave valid according to the Rack spec - -== Rack::MockResponse -* should provide access to the HTTP status -* should provide access to the HTTP headers -* should provide access to the HTTP body -* should provide access to the Rack errors -* should optionally make Rack errors fatal - -== Rack::Handler::Mongrel -* should respond -* should be a Mongrel -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* should provide a .run -* should provide a .run that maps a hash -* should provide a .run that maps a urlmap -* should provide a .run that maps a urlmap restricting by host -* should stream #each part of the response - -== Rack::Recursive -* should allow for subrequests -* should raise error on requests not below the app -* should support forwarding - -== Rack::Request -* wraps the rack variables -* can figure out the correct host -* can parse the query string -* can parse POST data -* can parse POST data with explicit content type -* does not parse POST data when media type is not form-data -* rewinds input after parsing POST data -* cleans up Safari's ajax POST body -* can get value by key from params with #[] -* can set value to key on params with #[]= -* values_at answers values by keys in order given -* referrer should be extracted correct -* can cache, but invalidates the cache -* can figure out if called via XHR -* can parse cookies -* parses cookies according to RFC 2109 -* provides setters -* provides the original env -* can restore the URL -* can restore the full path -* can handle multiple media type parameters -* can parse multipart form data -* can parse big multipart form data -* can detect invalid multipart form data -* shouldn't try to interpret binary as utf8 -* should work around buggy 1.8.* Tempfile equality -* does conform to the Rack spec -* should parse Accept-Encoding correctly -* should provide ip information -* should allow subclass request to be instantiated after parent request -* should allow parent request to be instantiated after subclass request - -== Rack::Response -* has sensible default values -* can be written to -* can set and read headers -* can set cookies -* formats the Cookie expiration date accordingly to RFC 2109 -* can set secure cookies -* can set http only cookies -* can delete cookies -* can do redirects -* has a useful constructor -* has a constructor that can take a block -* doesn't return invalid responses -* knows if it's empty -* should provide access to the HTTP status -* should provide access to the HTTP headers -* does not add or change Content-Length when #finish()ing -* updates Content-Length when body appended to using #write - -== Rack::RewindableInput -=== given an IO object that is already rewindable -* should be able to handle to read() -* should be able to handle to read(nil) -* should be able to handle to read(length) -* should be able to handle to read(length, buffer) -* should be able to handle to read(nil, buffer) -* should rewind to the beginning when #rewind is called -* should be able to handle gets -* should be able to handle each -* should not buffer into a Tempfile if no data has been read yet -* should buffer into a Tempfile when data has been consumed for the first time -* should close the underlying tempfile upon calling #close -* should be possibel to call #close when no data has been buffered yet (empty) -* should be possible to call #close multiple times (empty) -=== given an IO object that is not rewindable -* should be able to handle to read() -* should be able to handle to read(nil) -* should be able to handle to read(length) -* should be able to handle to read(length, buffer) -* should be able to handle to read(nil, buffer) -* should rewind to the beginning when #rewind is called -* should be able to handle gets -* should be able to handle each -* should not buffer into a Tempfile if no data has been read yet -* should buffer into a Tempfile when data has been consumed for the first time -* should close the underlying tempfile upon calling #close -* should be possibel to call #close when no data has been buffered yet (empty) -* should be possible to call #close multiple times (empty) -=== given an IO object whose rewind method raises Errno::ESPIPE -* should be able to handle to read() -* should be able to handle to read(nil) -* should be able to handle to read(length) -* should be able to handle to read(length, buffer) -* should be able to handle to read(nil, buffer) -* should rewind to the beginning when #rewind is called -* should be able to handle gets -* should be able to handle each -* should not buffer into a Tempfile if no data has been read yet -* should buffer into a Tempfile when data has been consumed for the first time -* should close the underlying tempfile upon calling #close -* should be possibel to call #close when no data has been buffered yet (empty) -* should be possible to call #close multiple times (empty) - -== Rack::Session::Cookie -* creates a new cookie -* loads from a cookie -* survives broken cookies -* barks on too big cookies -* creates a new cookie with integrity hash -* loads from a cookie wih integrity hash -* ignores tampered with session cookies - -== Rack::Session::Memcache -* MemCache can connect to existing server (empty) -* faults on no connection -* creates a new cookie -* determines session from a cookie -* survives nonexistant cookies -* maintains freshness -* deletes cookies with :drop option -* provides new session id with :renew option -* omits cookie with :defer option -* multithread: should cleanly merge sessions (empty) - -== Rack::Session::Pool -* creates a new cookie -* determines session from a cookie -* survives nonexistant cookies -* deletes cookies with :drop option -* provides new session id with :renew option -* omits cookie with :defer option -* multithread: should merge sessions (empty) - -== Rack::ShowExceptions -* catches exceptions - -== Rack::ShowStatus -* should provide a default status message -* should let the app provide additional information -* should not replace existing messages -* should pass on original headers -* should replace existing messages if there is detail - -== Rack::Static -* serves files -* 404s if url root is known but it can't find the file -* calls down the chain if url root is not known - -== Rack::Handler::Thin -* should respond -* should be a Thin -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status - -== Rack::URLMap -* dispatches paths correctly -* dispatches hosts correctly -* should be nestable -* should route root apps correctly - -== Rack::Utils -* should escape correctly -* should escape correctly for multibyte characters -* should unescape correctly -* should parse query strings correctly -* should parse nested query strings correctly -* should build query strings correctly -* should figure out which encodings are acceptable -* should return the bytesize of String - -== Rack::Utils::HeaderHash -* should retain header case -* should check existence of keys case insensitively -* should merge case-insensitively -* should overwrite case insensitively and assume the new key's case -* should be converted to real Hash -* should convert Array values to Strings when converting to Hash -* should be able to delete the given key case-sensitively -* should be able to delete the given key case-insensitively -* should return the deleted value when #delete is called on an existing key -* should return nil when #delete is called on a non-existant key - -== Rack::Utils::Context -* should set context correctly -* should alter app on recontexting -* should run different apps - -== Rack::Utils::Multipart -* should return nil if content type is not multipart -* should parse multipart upload with text file -* should parse multipart upload with nested parameters -* should parse multipart upload with binary file -* should parse multipart upload with empty file -* should parse multipart upload with filename with semicolons -* should not include file params if no file was selected -* should parse IE multipart upload and clean up filename -* rewinds input after parsing upload - -== Rack::Handler::WEBrick -* should respond -* should be a WEBrick -* should have rack headers -* should have CGI headers on GET -* should have CGI headers on POST -* should support HTTP auth -* should set status -* should correctly set cookies -* should provide a .run - -335 specifications, 13 empty (1196 requirements), 0 failures diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/Rakefile b/lib/middleman/vendor/gems/gems/rack-1.0.1/Rakefile deleted file mode 100755 index c88f7aff..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/Rakefile +++ /dev/null @@ -1,164 +0,0 @@ -# Rakefile for Rack. -*-ruby-*- -require 'rake/rdoctask' -require 'rake/testtask' - - -desc "Run all the tests" -task :default => [:test] - - -desc "Make an archive as .tar.gz" -task :dist => [:chmod, :changelog, :rdoc, "SPEC", "rack.gemspec"] do - FileUtils.touch("RDOX") - sh "git archive --format=tar --prefix=#{release}/ HEAD^{tree} >#{release}.tar" - sh "pax -waf #{release}.tar -s ':^:#{release}/:' RDOX SPEC ChangeLog doc rack.gemspec" - sh "gzip -f -9 #{release}.tar" -end - -desc "Make an official release" -task :officialrelease do - puts "Official build for #{release}..." - sh "rm -rf stage" - sh "git clone --shared . stage" - sh "cd stage && rake officialrelease_really" - sh "mv stage/#{release}.tar.gz stage/#{release}.gem ." -end - -task :officialrelease_really => [:fulltest, "RDOX", "SPEC", :dist, :gem] do - sh "sha1sum #{release}.tar.gz #{release}.gem" -end - - -def version - abort "You need to pass VERSION=... to build packages." unless ENV["VERSION"] - ENV["VERSION"] -end - -def release - "rack-#{version}" -end - -def manifest - `git ls-files`.split("\n") -end - - -desc "Make binaries executable" -task :chmod do - Dir["bin/*"].each { |binary| File.chmod(0775, binary) } - Dir["test/cgi/test*"].each { |binary| File.chmod(0775, binary) } -end - -desc "Generate a ChangeLog" -task :changelog do - File.open("ChangeLog", "w") { |out| - `git log -z`.split("\0").map { |chunk| - author = chunk[/Author: (.*)/, 1].strip - date = chunk[/Date: (.*)/, 1].strip - desc, detail = $'.strip.split("\n", 2) - detail ||= "" - detail = detail.gsub(/.*darcs-hash:.*/, '') - detail.rstrip! - out.puts "#{date} #{author}" - out.puts " * #{desc.strip}" - out.puts detail unless detail.empty? - out.puts - } - } -end - - -desc "Generate RDox" -task "RDOX" do - sh "specrb -Ilib:test -a --rdox >RDOX" -end - -desc "Generate Rack Specification" -task "SPEC" do - File.open("SPEC", "wb") { |file| - IO.foreach("lib/rack/lint.rb") { |line| - if line =~ /## (.*)/ - file.puts $1 - end - } - } -end - -desc "Run all the fast tests" -task :test do - sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS'] || '-t "^(?!Rack::Handler|Rack::Adapter|Rack::Session::Memcache|Rack::Auth::OpenID)"'}" -end - -desc "Run all the tests" -task :fulltest => [:chmod] do - sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}" -end - -begin - require 'rubygems' -rescue LoadError - # Too bad. -else - task "rack.gemspec" do - spec = Gem::Specification.new do |s| - s.name = "rack" - s.version = version - s.platform = Gem::Platform::RUBY - s.summary = "a modular Ruby webserver interface" - - s.description = <<-EOF -Rack provides minimal, modular and adaptable interface for developing -web applications in Ruby. By wrapping HTTP requests and responses in -the simplest way possible, it unifies and distills the API for web -servers, web frameworks, and software in between (the so-called -middleware) into a single method call. - -Also see http://rack.rubyforge.org. - EOF - - s.files = manifest + %w(SPEC RDOX rack.gemspec) - s.bindir = 'bin' - s.executables << 'rackup' - s.require_path = 'lib' - s.has_rdoc = true - s.extra_rdoc_files = ['README', 'SPEC', 'RDOX', 'KNOWN-ISSUES'] - s.test_files = Dir['test/{test,spec}_*.rb'] - - s.author = 'Christian Neukirchen' - s.email = 'chneukirchen@gmail.com' - s.homepage = 'http://rack.rubyforge.org' - s.rubyforge_project = 'rack' - - s.add_development_dependency 'test-spec' - - s.add_development_dependency 'camping' - s.add_development_dependency 'fcgi' - s.add_development_dependency 'memcache-client' - s.add_development_dependency 'mongrel' - s.add_development_dependency 'ruby-openid', '~> 2.0.0' - s.add_development_dependency 'thin' - end - - File.open("rack.gemspec", "w") { |f| f << spec.to_ruby } - end - - task :gem => ["rack.gemspec", "SPEC"] do - FileUtils.touch("RDOX") - sh "gem build rack.gemspec" - end -end - -desc "Generate RDoc documentation" -task :rdoc do - sh(*%w{rdoc --line-numbers --main README - --title 'Rack\ Documentation' --charset utf-8 -U -o doc} + - %w{README KNOWN-ISSUES SPEC RDOX} + - Dir["lib/**/*.rb"]) -end - -task :pushsite => [:rdoc] do - sh "cd site && git gc" - sh "rsync -avz doc/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/doc/" - sh "rsync -avz site/ chneukirchen@rack.rubyforge.org:/var/www/gforge-projects/rack/" - sh "cd site && git push" -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/bin/rackup b/lib/middleman/vendor/gems/gems/rack-1.0.1/bin/rackup deleted file mode 100755 index 8e4df15e..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/bin/rackup +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -$LOAD_PATH.unshift File.expand_path("#{__FILE__}/../../lib") -autoload :Rack, 'rack' - -require 'optparse' - -automatic = false -server = nil -env = "development" -daemonize = false -pid = nil -options = {:Port => 9292, :Host => "0.0.0.0", :AccessLog => []} - -# Don't evaluate CGI ISINDEX parameters. -# http://hoohoo.ncsa.uiuc.edu/cgi/cl.html -ARGV.clear if ENV.include?("REQUEST_METHOD") - -opts = OptionParser.new("", 24, ' ') { |opts| - opts.banner = "Usage: rackup [ruby options] [rack options] [rackup config]" - - opts.separator "" - opts.separator "Ruby options:" - - lineno = 1 - opts.on("-e", "--eval LINE", "evaluate a LINE of code") { |line| - eval line, TOPLEVEL_BINDING, "-e", lineno - lineno += 1 - } - - opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") { - $DEBUG = true - } - opts.on("-w", "--warn", "turn warnings on for your script") { - $-w = true - } - - opts.on("-I", "--include PATH", - "specify $LOAD_PATH (may be used more than once)") { |path| - $LOAD_PATH.unshift(*path.split(":")) - } - - opts.on("-r", "--require LIBRARY", - "require the library, before executing your script") { |library| - require library - } - - opts.separator "" - opts.separator "Rack options:" - opts.on("-s", "--server SERVER", "serve using SERVER (webrick/mongrel)") { |s| - server = s - } - - opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") { |host| - options[:Host] = host - } - - opts.on("-p", "--port PORT", "use PORT (default: 9292)") { |port| - options[:Port] = port - } - - opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e| - env = e - } - - opts.on("-D", "--daemonize", "run daemonized in the background") { |d| - daemonize = d ? true : false - } - - opts.on("-P", "--pid FILE", "file to store PID (default: rack.pid)") { |f| - pid = File.expand_path(f) - } - - opts.separator "" - opts.separator "Common options:" - - opts.on_tail("-h", "--help", "Show this message") do - puts opts - exit - end - - opts.on_tail("--version", "Show version") do - puts "Rack #{Rack.version}" - exit - end - - opts.parse! ARGV -} - -require 'pp' if $DEBUG - -config = ARGV[0] || "config.ru" -if !File.exist? config - abort "configuration #{config} not found" -end - -if config =~ /\.ru$/ - cfgfile = File.read(config) - if cfgfile[/^#\\(.*)/] - opts.parse! $1.split(/\s+/) - end - inner_app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app", - nil, config -else - require config - inner_app = Object.const_get(File.basename(config, '.rb').capitalize) -end - -unless server = Rack::Handler.get(server) - # Guess. - if ENV.include?("PHP_FCGI_CHILDREN") - server = Rack::Handler::FastCGI - - # We already speak FastCGI - options.delete :File - options.delete :Port - elsif ENV.include?("REQUEST_METHOD") - server = Rack::Handler::CGI - else - begin - server = Rack::Handler::Mongrel - rescue LoadError => e - server = Rack::Handler::WEBrick - end - end -end - -p server if $DEBUG - -case env -when "development" - app = Rack::Builder.new { - use Rack::CommonLogger, $stderr unless server.name =~ /CGI/ - use Rack::ShowExceptions - use Rack::Lint - run inner_app - }.to_app - -when "deployment" - app = Rack::Builder.new { - use Rack::CommonLogger, $stderr unless server.name =~ /CGI/ - run inner_app - }.to_app - -when "none" - app = inner_app - -end - -if $DEBUG - pp app - pp inner_app -end - -if daemonize - if RUBY_VERSION < "1.9" - exit if fork - Process.setsid - exit if fork - Dir.chdir "/" - File.umask 0000 - STDIN.reopen "/dev/null" - STDOUT.reopen "/dev/null", "a" - STDERR.reopen "/dev/null", "a" - else - Process.daemon - end - - if pid - File.open(pid, 'w'){ |f| f.write("#{Process.pid}") } - at_exit { File.delete(pid) if File.exist?(pid) } - end -end - -server.run app, options diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/openid.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/openid.rb deleted file mode 100644 index c5f6a514..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/openid.rb +++ /dev/null @@ -1,480 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net - -gem 'ruby-openid', '~> 2' if defined? Gem -require 'rack/request' -require 'rack/utils' -require 'rack/auth/abstract/handler' -require 'uri' -require 'openid' #gem -require 'openid/extension' #gem -require 'openid/store/memory' #gem - -module Rack - class Request - def openid_request - @env['rack.auth.openid.request'] - end - - def openid_response - @env['rack.auth.openid.response'] - end - end - - module Auth - - # Rack::Auth::OpenID provides a simple method for setting up an OpenID - # Consumer. It requires the ruby-openid library from janrain to operate, - # as well as a rack method of session management. - # - # The ruby-openid home page is at http://openidenabled.com/ruby-openid/. - # - # The OpenID specifications can be found at - # http://openid.net/specs/openid-authentication-1_1.html - # and - # http://openid.net/specs/openid-authentication-2_0.html. Documentation - # for published OpenID extensions and related topics can be found at - # http://openid.net/developers/specs/. - # - # It is recommended to read through the OpenID spec, as well as - # ruby-openid's documentation, to understand what exactly goes on. However - # a setup as simple as the presented examples is enough to provide - # Consumer functionality. - # - # This library strongly intends to utilize the OpenID 2.0 features of the - # ruby-openid library, which provides OpenID 1.0 compatiblity. - # - # NOTE: Due to the amount of data that this library stores in the - # session, Rack::Session::Cookie may fault. - - class OpenID - - class NoSession < RuntimeError; end - class BadExtension < RuntimeError; end - # Required for ruby-openid - ValidStatus = [:success, :setup_needed, :cancel, :failure] - - # = Arguments - # - # The first argument is the realm, identifying the site they are trusting - # with their identity. This is required, also treated as the trust_root - # in OpenID 1.x exchanges. - # - # The optional second argument is a hash of options. - # - # == Options - # - # :return_to defines the url to return to after the client - # authenticates with the openid service provider. This url should point - # to where Rack::Auth::OpenID is mounted. If :return_to is not - # provided, return_to will be the current url which allows flexibility - # with caveats. - # - # :session_key defines the key to the session hash in the env. - # It defaults to 'rack.session'. - # - # :openid_param defines at what key in the request parameters to - # find the identifier to resolve. As per the 2.0 spec, the default is - # 'openid_identifier'. - # - # :store defined what OpenID Store to use for persistant - # information. By default a Store::Memory will be used. - # - # :immediate as true will make initial requests to be of an - # immediate type. This is false by default. See OpenID specification - # documentation. - # - # :extensions should be a hash of openid extension - # implementations. The key should be the extension main module, the value - # should be an array of arguments for extension::Request.new. - # The hash is iterated over and passed to #add_extension for processing. - # Please see #add_extension for further documentation. - # - # == Examples - # - # simple_oid = OpenID.new('http://mysite.com/') - # - # return_oid = OpenID.new('http://mysite.com/', { - # :return_to => 'http://mysite.com/openid' - # }) - # - # complex_oid = OpenID.new('http://mysite.com/', - # :immediate => true, - # :extensions => { - # ::OpenID::SReg => [['email'],['nickname']] - # } - # ) - # - # = Advanced - # - # Most of the functionality of this library is encapsulated such that - # expansion and overriding functions isn't difficult nor tricky. - # Alternately, to avoid opening up singleton objects or subclassing, a - # wrapper rack middleware can be composed to act upon Auth::OpenID's - # responses. See #check and #finish for locations of pertinent data. - # - # == Responses - # - # To change the responses that Auth::OpenID returns, override the methods - # #redirect, #bad_request, #unauthorized, #access_denied, and - # #foreign_server_failure. - # - # Additionally #confirm_post_params is used when the URI would exceed - # length limits on a GET request when doing the initial verification - # request. - # - # == Processing - # - # To change methods of processing completed transactions, override the - # methods #success, #setup_needed, #cancel, and #failure. Please ensure - # the returned object is a rack compatible response. - # - # The first argument is an OpenID::Response, the second is a - # Rack::Request of the current request, the last is the hash used in - # ruby-openid handling, which can be found manually at - # env['rack.session'][:openid]. - # - # This is useful if you wanted to expand the processing done, such as - # setting up user accounts. - # - # oid_app = Rack::Auth::OpenID.new realm, :return_to => return_to - # def oid_app.success oid, request, session - # user = Models::User[oid.identity_url] - # user ||= Models::User.create_from_openid oid - # request['rack.session'][:user] = user.id - # redirect MyApp.site_home - # end - # - # site_map['/openid'] = oid_app - # map = Rack::URLMap.new site_map - # ... - - def initialize(realm, options={}) - realm = URI(realm) - raise ArgumentError, "Invalid realm: #{realm}" \ - unless realm.absolute? \ - and realm.fragment.nil? \ - and realm.scheme =~ /^https?$/ \ - and realm.host =~ /^(\*\.)?#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+/ - realm.path = '/' if realm.path.empty? - @realm = realm.to_s - - if ruri = options[:return_to] - ruri = URI(ruri) - raise ArgumentError, "Invalid return_to: #{ruri}" \ - unless ruri.absolute? \ - and ruri.scheme =~ /^https?$/ \ - and ruri.fragment.nil? - raise ArgumentError, "return_to #{ruri} not within realm #{realm}" \ - unless self.within_realm?(ruri) - @return_to = ruri.to_s - end - - @session_key = options[:session_key] || 'rack.session' - @openid_param = options[:openid_param] || 'openid_identifier' - @store = options[:store] || ::OpenID::Store::Memory.new - @immediate = !!options[:immediate] - - @extensions = {} - if extensions = options.delete(:extensions) - extensions.each do |ext, args| - add_extension ext, *args - end - end - - # Undocumented, semi-experimental - @anonymous = !!options[:anonymous] - end - - attr_reader :realm, :return_to, :session_key, :openid_param, :store, - :immediate, :extensions - - # Sets up and uses session data at :openid within the session. - # Errors in this setup will raise a NoSession exception. - # - # If the parameter 'openid.mode' is set, which implies a followup from - # the openid server, processing is passed to #finish and the result is - # returned. However, if there is no appropriate openid information in the - # session, a 400 error is returned. - # - # If the parameter specified by options[:openid_param] is - # present, processing is passed to #check and the result is returned. - # - # If neither of these conditions are met, #unauthorized is called. - - def call(env) - env['rack.auth.openid'] = self - env_session = env[@session_key] - unless env_session and env_session.is_a?(Hash) - raise NoSession, 'No compatible session' - end - # let us work in our own namespace... - session = (env_session[:openid] ||= {}) - unless session and session.is_a?(Hash) - raise NoSession, 'Incompatible openid session' - end - - request = Rack::Request.new(env) - consumer = ::OpenID::Consumer.new(session, @store) - - if mode = request.GET['openid.mode'] - if session.key?(:openid_param) - finish(consumer, session, request) - else - bad_request - end - elsif request.GET[@openid_param] - check(consumer, session, request) - else - unauthorized - end - end - - # As the first part of OpenID consumer action, #check retrieves the data - # required for completion. - # - # If all parameters fit within the max length of a URI, a 303 redirect - # will be returned. Otherwise #confirm_post_params will be called. - # - # Any messages from OpenID's request are logged to env['rack.errors'] - # - # env['rack.auth.openid.request'] is the openid checkid request - # instance. - # - # session[:openid_param] is set to the openid identifier - # provided by the user. - # - # session[:return_to] is set to the return_to uri given to the - # identity provider. - - def check(consumer, session, req) - oid = consumer.begin(req.GET[@openid_param], @anonymous) - req.env['rack.auth.openid.request'] = oid - req.env['rack.errors'].puts(oid.message) - p oid if $DEBUG - - ## Extension support - extensions.each do |ext,args| - oid.add_extension(ext::Request.new(*args)) - end - - session[:openid_param] = req.GET[openid_param] - return_to_uri = return_to ? return_to : req.url - session[:return_to] = return_to_uri - immediate = session.key?(:setup_needed) ? false : immediate - - if oid.send_redirect?(realm, return_to_uri, immediate) - uri = oid.redirect_url(realm, return_to_uri, immediate) - redirect(uri) - else - confirm_post_params(oid, realm, return_to_uri, immediate) - end - rescue ::OpenID::DiscoveryFailure => e - # thrown from inside OpenID::Consumer#begin by yadis stuff - req.env['rack.errors'].puts([e.message, *e.backtrace]*"\n") - return foreign_server_failure - end - - # This is the final portion of authentication. - # If successful, a redirect to the realm is be returned. - # Data gathered from extensions are stored in session[:openid] with the - # extension's namespace uri as the key. - # - # Any messages from OpenID's response are logged to env['rack.errors'] - # - # env['rack.auth.openid.response'] will contain the openid - # response. - - def finish(consumer, session, req) - oid = consumer.complete(req.GET, req.url) - req.env['rack.auth.openid.response'] = oid - req.env['rack.errors'].puts(oid.message) - p oid if $DEBUG - - raise unless ValidStatus.include?(oid.status) - __send__(oid.status, oid, req, session) - end - - # The first argument should be the main extension module. - # The extension module should contain the constants: - # * class Request, should have OpenID::Extension as an ancestor - # * class Response, should have OpenID::Extension as an ancestor - # * string NS_URI, which defining the namespace of the extension - # - # All trailing arguments will be passed to extension::Request.new in - # #check. - # The openid response will be passed to - # extension::Response#from_success_response, #get_extension_args will be - # called on the result to attain the gathered data. - # - # This method returns the key at which the response data will be found in - # the session, which is the namespace uri by default. - - def add_extension(ext, *args) - raise BadExtension unless valid_extension?(ext) - extensions[ext] = args - return ext::NS_URI - end - - # Checks the validitity, in the context of usage, of a submitted - # extension. - - def valid_extension?(ext) - if not %w[NS_URI Request Response].all?{|c| ext.const_defined?(c) } - raise ArgumentError, 'Extension is missing constants.' - elsif not ext::Response.respond_to?(:from_success_response) - raise ArgumentError, 'Response is missing required method.' - end - return true - rescue - return false - end - - # Checks the provided uri to ensure it'd be considered within the realm. - # is currently not compatible with wildcard realms. - - def within_realm? uri - uri = URI.parse(uri.to_s) - realm = URI.parse(self.realm) - return false unless uri.absolute? - return false unless uri.path[0, realm.path.size] == realm.path - return false unless uri.host == realm.host or realm.host[/^\*\./] - # for wildcard support, is awkward with URI limitations - realm_match = Regexp.escape(realm.host). - sub(/^\*\./,"^#{URI::REGEXP::PATTERN::URIC_NO_SLASH}+.")+'$' - return false unless uri.host.match(realm_match) - return true - end - alias_method :include?, :within_realm? - - protected - - ### These methods define some of the boilerplate responses. - - # Returns an html form page for posting to an Identity Provider if the - # GET request would exceed the upper URI length limit. - - def confirm_post_params(oid, realm, return_to, immediate) - Rack::Response.new.finish do |r| - r.write 'Confirm...' - r.write oid.form_markup(realm, return_to, immediate) - r.write '' - end - end - - # Returns a 303 redirect with the destination of that provided by the - # argument. - - def redirect(uri) - [ 303, {'Content-Length'=>'0', 'Content-Type'=>'text/plain', - 'Location' => uri}, - [] ] - end - - # Returns an empty 400 response. - - def bad_request - [ 400, {'Content-Type'=>'text/plain', 'Content-Length'=>'0'}, - [''] ] - end - - # Returns a basic unauthorized 401 response. - - def unauthorized - [ 401, {'Content-Type' => 'text/plain', 'Content-Length' => '13'}, - ['Unauthorized.'] ] - end - - # Returns a basic access denied 403 response. - - def access_denied - [ 403, {'Content-Type' => 'text/plain', 'Content-Length' => '14'}, - ['Access denied.'] ] - end - - # Returns a 503 response to be used if communication with the remote - # OpenID server fails. - - def foreign_server_failure - [ 503, {'Content-Type'=>'text/plain', 'Content-Length' => '23'}, - ['Foreign server failure.'] ] - end - - private - - ### These methods are called after a transaction is completed, depending - # on its outcome. These should all return a rack compatible response. - # You'd want to override these to provide additional functionality. - - # Called to complete processing on a successful transaction. - # Within the openid session, :openid_identity and :openid_identifier are - # set to the user friendly and the standard representation of the - # validated identity. All other data in the openid session is cleared. - - def success(oid, request, session) - session.clear - session[:openid_identity] = oid.display_identifier - session[:openid_identifier] = oid.identity_url - extensions.keys.each do |ext| - label = ext.name[/[^:]+$/].downcase - response = ext::Response.from_success_response(oid) - session[label] = response.data - end - redirect(realm) - end - - # Called if the Identity Provider indicates further setup by the user is - # required. - # The identifier is retrived from the openid session at :openid_param. - # And :setup_needed is set to true to prevent looping. - - def setup_needed(oid, request, session) - identifier = session[:openid_param] - session[:setup_needed] = true - redirect req.script_name + '?' + openid_param + '=' + identifier - end - - # Called if the user indicates they wish to cancel identification. - # Data within openid session is cleared. - - def cancel(oid, request, session) - session.clear - access_denied - end - - # Called if the Identity Provider indicates the user is unable to confirm - # their identity. Data within the openid session is left alone, in case - # of swarm auth attacks. - - def failure(oid, request, session) - unauthorized - end - end - - # A class developed out of the request to use OpenID as an authentication - # middleware. The request will be sent to the OpenID instance unless the - # block evaluates to true. For example in rackup, you can use it as such: - # - # use Rack::Session::Pool - # use Rack::Auth::OpenIDAuth, realm, openid_options do |env| - # env['rack.session'][:authkey] == a_string - # end - # run RackApp - # - # Or simply: - # - # app = Rack::Auth::OpenIDAuth.new app, realm, openid_options, &auth - - class OpenIDAuth < Rack::Auth::AbstractHandler - attr_reader :oid - def initialize(app, realm, options={}, &auth) - @oid = OpenID.new(realm, options) - super(app, &auth) - end - - def call(env) - to = auth.call(env) ? @app : @oid - to.call env - end - end - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/commonlogger.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/commonlogger.rb deleted file mode 100644 index 5e68ac62..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/commonlogger.rb +++ /dev/null @@ -1,61 +0,0 @@ -module Rack - # Rack::CommonLogger forwards every request to an +app+ given, and - # logs a line in the Apache common log format to the +logger+, or - # rack.errors by default. - - class CommonLogger - def initialize(app, logger=nil) - @app = app - @logger = logger - end - - def call(env) - dup._call(env) - end - - def _call(env) - @env = env - @logger ||= self - @time = Time.now - @status, @header, @body = @app.call(env) - [@status, @header, self] - end - - def close - @body.close if @body.respond_to? :close - end - - # By default, log to rack.errors. - def <<(str) - @env["rack.errors"].write(str) - @env["rack.errors"].flush - end - - def each - length = 0 - @body.each { |part| - length += part.size - yield part - } - - @now = Time.now - - # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common - # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 - - # %{%s - %s [%s] "%s %s%s %s" %d %s\n} % - @logger << %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n} % - [ - @env['HTTP_X_FORWARDED_FOR'] || @env["REMOTE_ADDR"] || "-", - @env["REMOTE_USER"] || "-", - @now.strftime("%d/%b/%Y %H:%M:%S"), - @env["REQUEST_METHOD"], - @env["PATH_INFO"], - @env["QUERY_STRING"].empty? ? "" : "?"+@env["QUERY_STRING"], - @env["HTTP_VERSION"], - @status.to_s[0..3], - (length.zero? ? "-" : length.to_s), - @now - @time - ] - end - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/memcache.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/memcache.rb deleted file mode 100644 index 4a65cbf3..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/memcache.rb +++ /dev/null @@ -1,109 +0,0 @@ -# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net - -require 'rack/session/abstract/id' -require 'memcache' - -module Rack - module Session - # Rack::Session::Memcache provides simple cookie based session management. - # Session data is stored in memcached. The corresponding session key is - # maintained in the cookie. - # You may treat Session::Memcache as you would Session::Pool with the - # following caveats. - # - # * Setting :expire_after to 0 would note to the Memcache server to hang - # onto the session data until it would drop it according to it's own - # specifications. However, the cookie sent to the client would expire - # immediately. - # - # Note that memcache does drop data before it may be listed to expire. For - # a full description of behaviour, please see memcache's documentation. - - class Memcache < Abstract::ID - attr_reader :mutex, :pool - DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \ - :namespace => 'rack:session', - :memcache_server => 'localhost:11211' - - def initialize(app, options={}) - super - - @mutex = Mutex.new - @pool = MemCache. - new @default_options[:memcache_server], @default_options - raise 'No memcache servers' unless @pool.servers.any?{|s|s.alive?} - end - - def generate_sid - loop do - sid = super - break sid unless @pool.get(sid, true) - end - end - - def get_session(env, sid) - session = @pool.get(sid) if sid - @mutex.lock if env['rack.multithread'] - unless sid and session - env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil? - session = {} - sid = generate_sid - ret = @pool.add sid, session - raise "Session collision on '#{sid.inspect}'" unless /^STORED/ =~ ret - end - session.instance_variable_set('@old', {}.merge(session)) - return [sid, session] - rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted - warn "#{self} is unable to find server." - warn $!.inspect - return [ nil, {} ] - ensure - @mutex.unlock if env['rack.multithread'] - end - - def set_session(env, session_id, new_session, options) - expiry = options[:expire_after] - expiry = expiry.nil? ? 0 : expiry + 1 - - @mutex.lock if env['rack.multithread'] - session = @pool.get(session_id) || {} - if options[:renew] or options[:drop] - @pool.delete session_id - return false if options[:drop] - session_id = generate_sid - @pool.add session_id, 0 # so we don't worry about cache miss on #set - end - old_session = new_session.instance_variable_get('@old') || {} - session = merge_sessions session_id, old_session, new_session, session - @pool.set session_id, session, expiry - return session_id - rescue MemCache::MemCacheError, Errno::ECONNREFUSED # MemCache server cannot be contacted - warn "#{self} is unable to find server." - warn $!.inspect - return false - ensure - @mutex.unlock if env['rack.multithread'] - end - - private - - def merge_sessions sid, old, new, cur=nil - cur ||= {} - unless Hash === old and Hash === new - warn 'Bad old or new sessions provided.' - return cur - end - - delete = old.keys - new.keys - warn "//@#{sid}: delete #{delete*','}" if $VERBOSE and not delete.empty? - delete.each{|k| cur.delete k } - - update = new.keys.select{|k| new[k] != old[k] } - warn "//@#{sid}: update #{update*','}" if $VERBOSE and not update.empty? - update.each{|k| cur[k] = new[k] } - - cur - end - end - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/rack.gemspec b/lib/middleman/vendor/gems/gems/rack-1.0.1/rack.gemspec deleted file mode 100755 index 2640997b..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/rack.gemspec +++ /dev/null @@ -1,54 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{rack} - s.version = "1.0.1" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Christian Neukirchen"] - s.date = %q{2009-10-18} - s.default_executable = %q{rackup} - s.description = %q{Rack provides minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call. Also see http://rack.rubyforge.org.} - s.email = %q{chneukirchen@gmail.com} - s.executables = ["rackup"] - s.extra_rdoc_files = ["README", "SPEC", "RDOX", "KNOWN-ISSUES"] - s.files = ["COPYING", "KNOWN-ISSUES", "README", "Rakefile", "bin/rackup", "contrib/rack_logo.svg", "example/lobster.ru", "example/protectedlobster.rb", "example/protectedlobster.ru", "lib/rack.rb", "lib/rack/adapter/camping.rb", "lib/rack/auth/abstract/handler.rb", "lib/rack/auth/abstract/request.rb", "lib/rack/auth/basic.rb", "lib/rack/auth/digest/md5.rb", "lib/rack/auth/digest/nonce.rb", "lib/rack/auth/digest/params.rb", "lib/rack/auth/digest/request.rb", "lib/rack/auth/openid.rb", "lib/rack/builder.rb", "lib/rack/cascade.rb", "lib/rack/chunked.rb", "lib/rack/commonlogger.rb", "lib/rack/conditionalget.rb", "lib/rack/content_length.rb", "lib/rack/content_type.rb", "lib/rack/deflater.rb", "lib/rack/directory.rb", "lib/rack/file.rb", "lib/rack/handler.rb", "lib/rack/handler/cgi.rb", "lib/rack/handler/evented_mongrel.rb", "lib/rack/handler/fastcgi.rb", "lib/rack/handler/lsws.rb", "lib/rack/handler/mongrel.rb", "lib/rack/handler/scgi.rb", "lib/rack/handler/swiftiplied_mongrel.rb", "lib/rack/handler/thin.rb", "lib/rack/handler/webrick.rb", "lib/rack/head.rb", "lib/rack/lint.rb", "lib/rack/lobster.rb", "lib/rack/lock.rb", "lib/rack/methodoverride.rb", "lib/rack/mime.rb", "lib/rack/mock.rb", "lib/rack/recursive.rb", "lib/rack/reloader.rb", "lib/rack/request.rb", "lib/rack/response.rb", "lib/rack/rewindable_input.rb", "lib/rack/session/abstract/id.rb", "lib/rack/session/cookie.rb", "lib/rack/session/memcache.rb", "lib/rack/session/pool.rb", "lib/rack/showexceptions.rb", "lib/rack/showstatus.rb", "lib/rack/static.rb", "lib/rack/urlmap.rb", "lib/rack/utils.rb", "test/cgi/lighttpd.conf", "test/cgi/test", "test/cgi/test.fcgi", "test/cgi/test.ru", "test/multipart/binary", "test/multipart/empty", "test/multipart/ie", "test/multipart/nested", "test/multipart/none", "test/multipart/semicolon", "test/multipart/text", "test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/testrequest.rb", "test/unregistered_handler/rack/handler/unregistered.rb", "test/unregistered_handler/rack/handler/unregistered_long_one.rb", "SPEC", "RDOX", "rack.gemspec"] - s.has_rdoc = true - s.homepage = %q{http://rack.rubyforge.org} - s.require_paths = ["lib"] - s.rubyforge_project = %q{rack} - s.rubygems_version = %q{1.3.1} - s.summary = %q{a modular Ruby webserver interface} - s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.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_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, ["~> 2.0.0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.0.0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.0.0"]) - s.add_dependency(%q, [">= 0"]) - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/lighttpd.conf b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/lighttpd.conf deleted file mode 100644 index 889726c6..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/lighttpd.conf +++ /dev/null @@ -1,20 +0,0 @@ -server.modules = ("mod_fastcgi", "mod_cgi") -server.document-root = "." -server.errorlog = "lighttpd.errors" -server.port = 9203 - -server.event-handler = "select" - -cgi.assign = ("/test" => "", -# ".ru" => "" - ) - -fastcgi.server = ("test.fcgi" => ("localhost" => - ("min-procs" => 1, - "socket" => "/tmp/rack-test-fcgi", - "bin-path" => "test.fcgi")), - "test.ru" => ("localhost" => - ("min-procs" => 1, - "socket" => "/tmp/rack-test-ru-fcgi", - "bin-path" => "test.ru")), - ) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test deleted file mode 100755 index e4837a4e..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -$: << File.join(File.dirname(__FILE__), "..", "..", "lib") - -require 'rack' -require '../testrequest' - -Rack::Handler::CGI.run(Rack::Lint.new(TestRequest.new)) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.fcgi b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.fcgi deleted file mode 100755 index 5e104fc9..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.fcgi +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env ruby -# -*- ruby -*- - -$:.unshift '../../lib' -require 'rack' -require '../testrequest' - -Rack::Handler::FastCGI.run(Rack::Lint.new(TestRequest.new)) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.ru b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.ru deleted file mode 100755 index 4054b886..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/cgi/test.ru +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env ../../bin/rackup -#\ -E deployment -I ../../lib -# -*- ruby -*- - -require '../testrequest' - -run TestRequest.new diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/binary b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/binary deleted file mode 100644 index a3bd67c4..00000000 Binary files a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/binary and /dev/null differ diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/empty b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/empty deleted file mode 100644 index f0f79835..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/empty +++ /dev/null @@ -1,10 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="submit-name" - -Larry ---AaB03x -Content-Disposition: form-data; name="files"; filename="file1.txt" -Content-Type: text/plain - - ---AaB03x-- diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/ie b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/ie deleted file mode 100755 index eae06ab5..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/ie +++ /dev/null @@ -1,6 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="files"; filename="C:\Documents and Settings\Administrator\Desktop\file1.txt" -Content-Type: text/plain - -contents ---AaB03x-- diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/nested b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/nested deleted file mode 100644 index 51978824..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/nested +++ /dev/null @@ -1,10 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="foo[submit-name]" - -Larry ---AaB03x -Content-Disposition: form-data; name="foo[files]"; filename="file1.txt" -Content-Type: text/plain - -contents ---AaB03x-- diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/none b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/none deleted file mode 100755 index d66f4730..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/none +++ /dev/null @@ -1,9 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="submit-name" - -Larry ---AaB03x -Content-Disposition: form-data; name="files"; filename="" - - ---AaB03x-- diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/semicolon b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/semicolon deleted file mode 100644 index 00fd68ab..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/semicolon +++ /dev/null @@ -1,6 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="files"; filename="fi;le1.txt" -Content-Type: text/plain - -contents ---AaB03x-- \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/text b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/text deleted file mode 100755 index b83d3821..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/multipart/text +++ /dev/null @@ -1,10 +0,0 @@ ---AaB03x -Content-Disposition: form-data; name="submit-name" - -Larry ---AaB03x -Content-Disposition: form-data; name="files"; filename="file1.txt" -Content-Type: text/plain - -contents ---AaB03x-- \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_openid.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_openid.rb deleted file mode 100644 index ba248445..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_openid.rb +++ /dev/null @@ -1,84 +0,0 @@ -require 'test/spec' - -begin -# requires the ruby-openid gem -require 'rack/auth/openid' - -context "Rack::Auth::OpenID" do - OID = Rack::Auth::OpenID - host = 'host' - subd = 'sub.host' - wild = '*.host' - path = 'path' - long = 'path/long' - scheme = 'http://' - realm = scheme+host+'/'+path - - specify 'realm uri should be valid' do - lambda{OID.new('/'+path)}.should.raise ArgumentError - lambda{OID.new('/'+long)}.should.raise ArgumentError - lambda{OID.new(scheme+host)}.should.not.raise - lambda{OID.new(scheme+host+'/')}.should.not.raise - lambda{OID.new(scheme+host+'/'+path)}.should.not.raise - lambda{OID.new(scheme+subd)}.should.not.raise - lambda{OID.new(scheme+subd+'/')}.should.not.raise - lambda{OID.new(scheme+subd+'/'+path)}.should.not.raise - end - - specify 'should be able to check if a uri is within the realm' do - end - - specify 'return_to should be valid' do - uri = '/'+path - lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError - uri = '/'+long - lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError - uri = scheme+host - lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError - uri = scheme+host+'/'+path - lambda{OID.new(realm, :return_to=>uri)}.should.not.raise - uri = scheme+subd+'/'+path - lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError - uri = scheme+host+'/'+long - lambda{OID.new(realm, :return_to=>uri)}.should.not.raise - uri = scheme+subd+'/'+long - lambda{OID.new(realm, :return_to=>uri)}.should.raise ArgumentError - end - - specify 'extensions should have required constants defined' do - badext = Rack::Auth::OpenID::BadExtension - ext = Object.new - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext = Module.new - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Request = nil - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Response = nil - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::NS_URI = nil - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - end - - specify 'extensions should have Request and Response defined and inherit from OpenID::Extension' do - $-w, w = nil, $-w # yuck - badext = Rack::Auth::OpenID::BadExtension - ext = Module.new - ext::Request = nil - ext::Response = nil - ext::NS_URI = nil - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Request = Class.new() - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Response = Class.new() - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Request = Class.new(::OpenID::Extension) - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - ext::Response = Class.new(::OpenID::Extension) - lambda{OID.new(realm).add_extension(ext)}.should.raise(badext) - $-w = w - end -end - -rescue LoadError - $stderr.puts "Skipping Rack::Auth::OpenID tests (ruby-openid 2 is required). `gem install ruby-openid` and try again." -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_commonlogger.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_commonlogger.rb deleted file mode 100644 index ba03b78a..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_commonlogger.rb +++ /dev/null @@ -1,32 +0,0 @@ -require 'test/spec' -require 'stringio' - -require 'rack/commonlogger' -require 'rack/lobster' -require 'rack/mock' - -context "Rack::CommonLogger" do - app = lambda { |env| - [200, - {"Content-Type" => "text/html"}, - ["foo"]]} - - specify "should log to rack.errors by default" do - log = StringIO.new - res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/") - - res.errors.should.not.be.empty - res.errors.should =~ /GET / - res.errors.should =~ / 200 / # status - res.errors.should =~ / 3 / # length - end - - specify "should log to anything with <<" do - log = "" - res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/") - - log.should =~ /GET / - log.should =~ / 200 / # status - log.should =~ / 3 / # length - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/testrequest.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/testrequest.rb deleted file mode 100755 index 7b7190cb..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/testrequest.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'yaml' -require 'net/http' - -class TestRequest - def call(env) - status = env["QUERY_STRING"] =~ /secret/ ? 403 : 200 - env["test.postdata"] = env["rack.input"].read - body = env.to_yaml - size = body.respond_to?(:bytesize) ? body.bytesize : body.size - [status, {"Content-Type" => "text/yaml", "Content-Length" => size.to_s}, [body]] - end - - module Helpers - attr_reader :status, :response - - def GET(path, header={}) - Net::HTTP.start(@host, @port) { |http| - user = header.delete(:user) - passwd = header.delete(:passwd) - - get = Net::HTTP::Get.new(path, header) - get.basic_auth user, passwd if user && passwd - http.request(get) { |response| - @status = response.code.to_i - @response = YAML.load(response.body) - } - } - end - - def POST(path, formdata={}, header={}) - Net::HTTP.start(@host, @port) { |http| - user = header.delete(:user) - passwd = header.delete(:passwd) - - post = Net::HTTP::Post.new(path, header) - post.form_data = formdata - post.basic_auth user, passwd if user && passwd - http.request(post) { |response| - @status = response.code.to_i - @response = YAML.load(response.body) - } - } - end - end -end - -class StreamingRequest - def self.call(env) - [200, {"Content-Type" => "text/plain"}, new] - end - - def each - yield "hello there!\n" - sleep 5 - yield "that is all.\n" - end -end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb deleted file mode 100644 index 6dd9436d..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Rack - module Handler - # this class doesn't do anything, we're just seeing if we get it. - class Unregistered - end - end -end \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb b/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb deleted file mode 100644 index 1920685f..00000000 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/unregistered_handler/rack/handler/unregistered_long_one.rb +++ /dev/null @@ -1,7 +0,0 @@ -module Rack - module Handler - # this class doesn't do anything, we're just seeing if we get it. - class UnregisteredLongOne - end - end -end \ 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 new file mode 100644 index 00000000..b71ae1cc Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-0.10.0.pre4.gem differ diff --git a/lib/middleman/vendor/gems/cache/compass-colors-0.3.1.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-colors-0.3.1.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/compass-colors-0.3.1.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/compass-colors-0.3.1.gem diff --git a/lib/middleman/vendor/gems/cache/compass-slickmap-0.2.3.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/compass-slickmap-0.2.3.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/compass-slickmap-0.2.3.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/compass-slickmap-0.2.3.gem diff --git a/lib/middleman/vendor/gems/cache/configuration-1.1.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/configuration-1.1.0.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/configuration-1.1.0.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/configuration-1.1.0.gem diff --git a/lib/middleman/vendor/gems/cache/diff-lcs-1.1.2.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/diff-lcs-1.1.2.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/diff-lcs-1.1.2.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/diff-lcs-1.1.2.gem diff --git a/lib/middleman/vendor/gems/cache/extlib-0.9.14.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/extlib-0.9.14.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/extlib-0.9.14.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/extlib-0.9.14.gem diff --git a/lib/middleman/vendor/gems/cache/fancy-buttons-0.3.7.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.7.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/fancy-buttons-0.3.7.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/fancy-buttons-0.3.7.gem diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/haml-2.2.17.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/haml-2.2.17.gem new file mode 100644 index 00000000..71cd26ef Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/haml-2.2.17.gem differ diff --git a/lib/middleman/vendor/gems/cache/highline-1.5.1.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/highline-1.5.1.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/highline-1.5.1.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/highline-1.5.1.gem diff --git a/lib/middleman/vendor/gems/cache/httpclient-2.1.5.2.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/httpclient-2.1.5.2.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/httpclient-2.1.5.2.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/httpclient-2.1.5.2.gem diff --git a/lib/middleman/vendor/gems/cache/json-1.2.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/json-1.2.0.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/json-1.2.0.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/json-1.2.0.gem diff --git a/lib/middleman/vendor/gems/cache/json_pure-1.2.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/json_pure-1.2.0.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/json_pure-1.2.0.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/json_pure-1.2.0.gem diff --git a/lib/middleman/vendor/gems/cache/launchy-0.3.5.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/launchy-0.3.5.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/launchy-0.3.5.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/launchy-0.3.5.gem diff --git a/lib/middleman/vendor/gems/ruby/1.8/cache/rack-1.1.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/rack-1.1.0.gem new file mode 100644 index 00000000..4a73511e Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/rack-1.1.0.gem differ diff --git a/lib/middleman/vendor/gems/cache/rack-test-0.5.3.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/rack-test-0.5.3.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/rack-test-0.5.3.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/rack-test-0.5.3.gem diff --git a/lib/middleman/vendor/gems/cache/rake-0.8.7.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/rake-0.8.7.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/rake-0.8.7.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/rake-0.8.7.gem 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 new file mode 100644 index 00000000..fc6ffd61 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/cache/shotgun-0.5.gem differ diff --git a/lib/middleman/vendor/gems/cache/sinatra-0.9.4.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-0.9.4.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/sinatra-0.9.4.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-0.9.4.gem diff --git a/lib/middleman/vendor/gems/cache/sinatra-content-for-0.2.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-content-for-0.2.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/sinatra-content-for-0.2.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/sinatra-content-for-0.2.gem diff --git a/lib/middleman/vendor/gems/cache/smusher-0.4.2.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/smusher-0.4.2.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/smusher-0.4.2.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/smusher-0.4.2.gem diff --git a/lib/middleman/vendor/gems/cache/sprockets-1.0.2.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/sprockets-1.0.2.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/sprockets-1.0.2.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/sprockets-1.0.2.gem diff --git a/lib/middleman/vendor/gems/cache/templater-1.0.0.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/templater-1.0.0.gem old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/cache/templater-1.0.0.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/templater-1.0.0.gem diff --git a/lib/middleman/vendor/gems/cache/yui-compressor-0.9.1.gem b/lib/middleman/vendor/gems/ruby/1.8/cache/yui-compressor-0.9.1.gem similarity index 100% rename from lib/middleman/vendor/gems/cache/yui-compressor-0.9.1.gem rename to lib/middleman/vendor/gems/ruby/1.8/cache/yui-compressor-0.9.1.gem diff --git a/lib/middleman/vendor/gems/ruby/1.8/environment.rb b/lib/middleman/vendor/gems/ruby/1.8/environment.rb new file mode 100644 index 00000000..dbe0b106 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/environment.rb @@ -0,0 +1,185 @@ +# DO NOT MODIFY THIS FILE +module Bundler + file = File.expand_path(__FILE__) + dir = File.dirname(file) + + 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") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/extlib-0.9.14/lib") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/bin") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/ext/json/ext") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/ext") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/json-1.2.0/lib") + $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/bin") + $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/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/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/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/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") + + @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")) + @bundled_specs["extlib"].loaded_from = "#{dir}/specifications/extlib-0.9.14.gemspec" + @bundled_specs["json"] = eval(File.read("#{dir}/specifications/json-1.2.0.gemspec")) + @bundled_specs["json"].loaded_from = "#{dir}/specifications/json-1.2.0.gemspec" + @bundled_specs["yui-compressor"] = eval(File.read("#{dir}/specifications/yui-compressor-0.9.1.gemspec")) + @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec" + @bundled_specs["rack"] = eval(File.read("#{dir}/specifications/rack-1.1.0.gemspec")) + @bundled_specs["rack"].loaded_from = "#{dir}/specifications/rack-1.1.0.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["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["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["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" + + def self.add_specs_to_loaded_specs + Gem.loaded_specs.merge! @bundled_specs + end + + def self.add_specs_to_index + @bundled_specs.each do |name, spec| + Gem.source_index.add_spec spec + end + end + + add_specs_to_loaded_specs + add_specs_to_index + + def self.require_env(env = nil) + context = Class.new do + def initialize(env) @env = env && env.to_s ; end + def method_missing(*) ; yield if block_given? ; end + def only(*env) + old, @only = @only, _combine_only(env.flatten) + yield + @only = old + end + def except(*env) + old, @except = @except, _combine_except(env.flatten) + yield + @except = old + end + def gem(name, *args) + opt = args.last.is_a?(Hash) ? args.pop : {} + only = _combine_only(opt[:only] || opt["only"]) + except = _combine_except(opt[:except] || opt["except"]) + files = opt[:require_as] || opt["require_as"] || name + files = [files] unless files.respond_to?(:each) + + return unless !only || only.any? {|e| e == @env } + return if except && except.any? {|e| e == @env } + + if files = opt[:require_as] || opt["require_as"] + files = Array(files) + files.each { |f| require f } + else + begin + require name + rescue LoadError + # Do nothing + end + end + yield if block_given? + true + end + private + def _combine_only(only) + return @only unless only + only = [only].flatten.compact.uniq.map { |o| o.to_s } + only &= @only if @only + only + end + def _combine_except(except) + return @except unless except + except = [except].flatten.compact.uniq.map { |o| o.to_s } + except |= @except if @except + except + end + end + context.new(env && env.to_s).instance_eval(File.read(@gemfile), @gemfile, 1) + end +end + +module Gem + @loaded_stacks = Hash.new { |h,k| h[k] = [] } + + def source_index.refresh! + super + Bundler.add_specs_to_index + end +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/CHANGELOG.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown similarity index 94% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/CHANGELOG.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown index 4b8d40fc..6746cef3 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/CHANGELOG.markdown +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/CHANGELOG.markdown @@ -1,6 +1,46 @@ COMPASS CHANGELOG ================= +0.10.0.pre4 (January 04, 2010) +------------------------------ +* Fixed an FSSM loading issue that broke the compass watcher. +* Fixed some compatibility issues with edge versions of Sass. + +0.10.0.pre3 (January 02, 2010) +------------------------------ + +Bug fixes: + +* [Blueprint] Bug Fix: variable referenced in a non-script context within the + dquo mixin in the fancy_type module. +* [Rails] fixed win32 sudo incompatibility issue in the rails installer template. + (Credit: [Jonathan Silverman][jsilver]) +* [Rails] Update the gem dependencies for the rails installer template. +* If the configuration file changes, wipe out the sass cache and force compilation +* Upgrade the vendored version of FSSM to version 0.1.2. + Fixes some bugs with jruby and adds inotify support for linux. + (Credit: [Travis Tilley][ttilley]) +* Patched hide-text to account for items that are not left aligned. + (Credit: [Josh Pyles][pixelmatrix]) + +Minor Enhancements: + +* Support for SCSS files if haml edge is installed. +* Color any stderr or stdout output from the `Sass::Engine` red during compilation. +* [Configuration] The sass cache location can now be set in the compass config + file using the `cache_dir` property and the cache can be disabled by setting + `cache = false`. +* [Compass Core] `+min-height`, `+min-width`, and `+bang-hack` mixins in the + compass/utilities/general/min.sass module. + (Credit: [Adam Stacoviak][adamstac]) +* [Command Line] If you only want to compile certain files, you can now + specify them when invoking compass compile. E.g. `compass compile src/foo.sass` +* [Compass Core] Split out `+hide-text` as its own mixin. + (Credit: [Andrew Vit][avit]) +* Some code cleanup for the compass project compiler. +* Removed the dependency on RMagic for grid image generation. + (Credit: [Richard Wöber][der-rich]) + 0.10.0.pre2 (November 30, 2009) -------------------------------- Bug fixes: @@ -729,3 +769,9 @@ Almost definitely. Please let me know if you encounter any problems and I'll get [rails_template]: http://github.com/chriseppstein/compass/raw/4e7e51e2c5491851f66c77abf3f15194f2f8fb8d/lib/compass/app_integration/rails/templates/compass-install-rails.rb [dturnbull]: http://github.com/dturnbull [filiptepper]: http://github.com/filiptepper +[pixelmatrix]: http://github.com/pixelmatrix +[jsilver]: http://github.com/jsilver +[avit]: http://github.com/avit +[der-rich]: http://github.com/der-rich +[adamstac]: http://github.com/adamstac +[ttilley]: http://github.com/ttilley diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/LICENSE.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/LICENSE.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/LICENSE.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/LICENSE.markdown diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/README.markdown 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 new file mode 100644 index 00000000..5862c00c --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/REVISION @@ -0,0 +1 @@ +08894dc6ab17c4d79297868e177cbed3d338b93b \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/Rakefile diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/VERSION.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml similarity index 73% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/VERSION.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml index 007e3914..6c31e8a1 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/VERSION.yml +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/VERSION.yml @@ -2,4 +2,4 @@ :patch: 0 :major: 0 :minor: 10 -:build: pre2 +:build: pre4 diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/bin/compass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/bin/compass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/bin/compass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/bin/compass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/deps.rip b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/deps.rip similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/deps.rip rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/deps.rip diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/README.markdown diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/index.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/elements.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/elements.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/elements.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/elements.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/forms.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/forms.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/forms.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/forms.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/grid.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/grid.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/grid.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/grid.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test-small.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/test.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/valid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/parts/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/parts/valid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_default/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_default/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/cross.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/cross.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/cross.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/cross.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/key.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/key.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/key.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/key.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/tick.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/tick.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/buttons/tick.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/buttons/tick.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/doc.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/doc.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/doc.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/doc.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/email.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/email.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/email.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/email.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/external.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/external.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/external.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/external.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/feed.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/feed.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/feed.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/feed.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/im.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/im.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/im.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/im.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/pdf.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/pdf.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/pdf.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/pdf.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/visited.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/visited.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/visited.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/visited.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/xls.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/xls.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/link_icons/xls.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/link_icons/xls.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test-small.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/test.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/valid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/images/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/images/valid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/index.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/buttons.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/buttons.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/buttons.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/buttons.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/fancy_type.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/fancy_type.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/fancy_type.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/fancy_type.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/link_icons.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/link_icons.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/link_icons.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/link_icons.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/rtl.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/rtl.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/plugins/rtl.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/plugins/rtl.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/buttons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/link_icons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/rtl_screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/rtl_screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/rtl_screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/rtl_screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_plugins/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_plugins/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_scoped_form/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_scoped_form/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/index.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/fancy_type.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/fancy_type.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/fancy_type.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/fancy_type.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/liquid.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/liquid.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/liquid.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/liquid.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/test-small.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test-small.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/test-small.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test-small.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/test.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/valid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/valid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/parts/valid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/parts/valid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/liquid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/blueprint_semantic/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/blueprint_semantic/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/bootstrap.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/compass.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/compass.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/compass.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/compass.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/_yui.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/_yui.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/_yui.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/_yui.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_fonts.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_grids.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/stylesheets/yui/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/extensions/yui/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/extensions/yui/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/images/blue_arrow.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/images/blue_arrow.gif similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/images/blue_arrow.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/images/blue_arrow.gif diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/compass.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/compass.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/compass.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/compass.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/images/blue_arrow.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/images/blue_arrow.gif similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/images/blue_arrow.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/images/blue_arrow.gif diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/sticky_footer.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/sticky_footer.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/sticky_footer.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/sticky_footer.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/src/utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/src/utilities.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/sticky_footer.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/sticky_footer.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/sticky_footer.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/sticky_footer.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/utilities.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/utilities.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/compass/utilities.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/compass/utilities.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/Vtks Revolt.ttf diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/angelina.ttf diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/images/fresh-peas.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/images/fresh-peas.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/images/fresh-peas.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/images/fresh-peas.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/index.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/fancy-fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/fancy-fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/fancy-fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/fancy-fonts.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/gradient.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/gradient.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/main.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/main.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/src/main.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/src/main.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/stylesheets/fonts/Vtks Revolt.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/Vtks Revolt.ttf similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/stylesheets/fonts/Vtks Revolt.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/Vtks Revolt.ttf diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/stylesheets/fonts/angelina.ttf b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/angelina.ttf similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/css3/stylesheets/fonts/angelina.ttf rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/css3/stylesheets/fonts/angelina.ttf diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/downloader.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/downloader.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/downloader.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/downloader.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/logo.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/logo.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/logo.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/logo.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/logo/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/logo/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/bootstrap.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/README.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/README.mkdn similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/README.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/README.mkdn diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/compass-960-plugin.gemspec diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/lib/ninesixty/compass_plugin.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/sass/960/_text.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/text.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/extensions/ninesixty/templates/project/text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/extensions/ninesixty/templates/project/text.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/src/grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/src/grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/src/text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/text.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/ninesixty/src/text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/ninesixty/src/text.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/bootstrap.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/LICENSE.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/LICENSE.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/LICENSE.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/LICENSE.txt diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/README.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/README.mkdn similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/README.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/README.mkdn diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/compass-susy-plugin.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/compass-susy-plugin.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/compass-susy-plugin.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/compass-susy-plugin.gemspec diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/build.sh b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/build.sh similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/build.sh rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/build.sh diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/01_target/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/02_container/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/03_structure/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/images/susy_logo.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/_common/src/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/_tools/Markdown.pl diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/examples/susy/extensions/susy/docs/tutorial/code/site/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_element.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/figures/susy_grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/index.mkdn b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/index.mkdn similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/docs/tutorial/index.mkdn rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/docs/tutorial/index.mkdn diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy/compass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/compass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy/compass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/compass_plugin.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy/sass_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/sass_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/lib/susy/sass_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/lib/susy/sass_extensions.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_susy.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_susy.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_susy.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_susy.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_text.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_utils.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_utils.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/sass/susy/_utils.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/sass/susy/_utils.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/extensions/susy/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/extensions/susy/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/_defaults.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_defaults.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/_defaults.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/_defaults.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/susy/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/susy/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/bootstrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/bootstrap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/bootstrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/bootstrap.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/divisions.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/divisions.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/divisions.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/divisions.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/_yui.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/_yui.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/_yui.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/_yui.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_fonts.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_grids.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/stylesheets/yui/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/extensions/yui/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/extensions/yui/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/index.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/index.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/index.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/index.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/sub_divisions.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/sub_divisions.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/sub_divisions.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/sub_divisions.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/templates.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/templates.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/templates.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/templates.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/test.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/test.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/test.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/test.jpg diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/typography.html.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/typography.html.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/examples/yui/typography.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/examples/yui/typography.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/command_line.feature b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/command_line.feature similarity index 90% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/command_line.feature rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/command_line.feature index 03424ddd..9b4485a4 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/command_line.feature +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/command_line.feature @@ -120,6 +120,26 @@ Feature: Command Line And a sass file sass/reset.sass is reported unchanged And a sass file sass/utilities.sass is reported unchanged + Scenario: compiling a specific file in a project + Given I am using the existing project in test/fixtures/stylesheets/compass + And I run: compass compile sass/utilities.sass + Then a sass file sass/layout.sass is not mentioned + And a sass file sass/print.sass is not mentioned + And a sass file sass/reset.sass is not mentioned + And a sass file sass/utilities.sass is reported compiled + And a css file tmp/utilities.css is reported created + And a css file tmp/utilities.css is created + + Scenario: Re-compiling a specific file in a project with no changes + Given I am using the existing project in test/fixtures/stylesheets/compass + When I run: compass compile + And I run: compass compile sass/utilities.sass + Then a sass file sass/layout.sass is not mentioned + And a sass file sass/print.sass is not mentioned + And a sass file sass/reset.sass is not mentioned + And a sass file sass/utilities.sass is reported compiled + And a css file tmp/utilities.css is reported identical + Scenario: Installing a pattern into a project Given I am using the existing project in test/fixtures/stylesheets/compass When I run: compass install blueprint/buttons @@ -129,7 +149,6 @@ Feature: Command Line And an image file images/buttons/tick.png is created And a css file tmp/buttons.css is created - @now Scenario: Basic help When I run: compass help Then I should see the following "primary" commands: @@ -185,12 +204,14 @@ Feature: Command Line Given I am using the existing project in test/fixtures/stylesheets/compass When I run: compass grid-img 30+10x24 Then a png file images/grid.png is created + And the image images/grid.png has a size of 40x24 Scenario: Generating a grid image to a specified path with custom dimensions Given I am using the existing project in test/fixtures/stylesheets/compass When I run: compass grid-img 50+10x24 assets/wide_grid.png Then a directory assets is created Then a png file assets/wide_grid.png is created + And the image assets/wide_grid.png has a size of 60x24 Scenario: Generating a grid image with invalid dimensions Given I am using the existing project in test/fixtures/stylesheets/compass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/extensions.feature b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/extensions.feature similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/extensions.feature rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/extensions.feature diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/step_definitions/command_line_steps.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/command_line_steps.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/step_definitions/command_line_steps.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/command_line_steps.rb index c0c19f00..d16999aa 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/step_definitions/command_line_steps.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/command_line_steps.rb @@ -135,6 +135,10 @@ Then /a \w+ file ([^ ]+) is reported overwritten/ do |filename| @last_result.should =~ /overwrite #{Regexp.escape(filename)}/ end +Then /a \w+ file ([^ ]+) is not mentioned/ do |filename| + @last_result.should_not =~ /#{Regexp.escape(filename)}/ +end + Then /I am told how to link to ([^ ]+) for media "([^"]+)"/ do |stylesheet, media| @last_result.should =~ %r{} end @@ -221,3 +225,10 @@ Then /^I should see the following "([^"]+)" commands:$/ do |kind, table| commands = @last_command_list.map{|c| c =~ /^\s+\* ([^ ]+)\s+- [A-Z].+$/; [$1]} table.diff!(commands) end + + +Then /^the image ([^ ]+) has a size of (\d+)x(\d+)$/ do |file, width, height| + # see http://snippets.dzone.com/posts/show/805 + IO.read(file)[0x10..0x18].unpack('NN').should == [width.to_i, height.to_i] +end + diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/step_definitions/extension_steps.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/extension_steps.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/features/step_definitions/extension_steps.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/features/step_definitions/extension_steps.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/actions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/actions.rb similarity index 75% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/actions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/actions.rb index 2d2875d0..878ff68f 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/actions.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/actions.rb @@ -63,24 +63,6 @@ module Compass ERB.new(contents).result(ctx) end - # Compile one Sass file - def compile(sass_filename, css_filename, options) - if options[:force] || Sass::Plugin.exact_stylesheet_needs_update?(css_filename, sass_filename) - logger.record :compile, basename(sass_filename) unless options[:quiet] - engine = ::Sass::Engine.new(open(sass_filename).read, - :filename => sass_filename, - :line_comments => options[:line_comments], - :style => options[:style], - :css_filename => css_filename, - :load_paths => options[:load_paths], - :cache_location => options[:cache_location]) - css_content = engine.render - write_file(css_filename, css_content, options.merge(:force => true)) - else - logger.record :unchanged, basename(sass_filename) unless options[:quiet] - end - end - def remove(file_name) if File.exists?(file_name) File.unlink file_name diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/merb.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/merb.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/merb/runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb/runtime.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/merb/runtime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/merb/runtime.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/action_controller.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/action_controller.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/action_controller.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/action_controller.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/configuration_defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/configuration_defaults.rb similarity index 84% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/configuration_defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/configuration_defaults.rb index 0225cb07..c2537820 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/configuration_defaults.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/configuration_defaults.rb @@ -36,7 +36,11 @@ module Compass end def default_extensions_dir - "vendor/plugins/compass/extensions" + File.join("vendor", "plugins", "compass", "extensions") + end + + def default_cache_dir + File.join("tmp", "sass-cache") end end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/installer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/installer.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/runtime.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/runtime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/runtime.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/sass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/sass_plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/sass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/sass_plugin.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/templates/compass-install-rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb similarity index 81% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/templates/compass-install-rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb index ca9a0b49..dd7d2301 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/templates/compass-install-rails.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/templates/compass-install-rails.rb @@ -46,19 +46,28 @@ css_dir = ask("Where would you like Compass to store your compiled css files? (d css_dir = "public/stylesheets/compiled" if css_dir.blank? # define dependencies -gem "haml", :lib => "haml", :version => ">=2.2.0" -gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass" +gem "haml", :version => ">=2.2.16" +gem "compass", :version => ">= 0.8.17" # install and unpack -rake "gems:install GEM=haml", :sudo => true -rake "gems:install GEM=chriseppstein-compass", :sudo => true -rake "gems:unpack GEM=chriseppstein-compass" +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:unpack GEM=compass" # load any compass framework plugins if css_framework =~ /960/ - gem "chriseppstein-compass-960-plugin", :source => "http://gems.github.com", :lib => "ninesixty" - rake "gems:install GEM=chriseppstein-compass-960-plugin", :sudo => true - rake "gems:unpack GEM=chriseppstein-compass-960-plugin" + 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" css_framework = "960" # rename for command plugin_require = "-r ninesixty" end @@ -77,4 +86,4 @@ CODE run "haml --rails ." run compass_command -puts "Compass (with #{css_framework}) is all setup, have fun!" \ No newline at end of file +puts "Compass (with #{css_framework}) is all setup, have fun!" diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/urls.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/urls.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/rails/urls.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/rails/urls.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone/configuration_defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/configuration_defaults.rb similarity index 87% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone/configuration_defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/configuration_defaults.rb index 5eb364fa..230aeea1 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone/configuration_defaults.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/configuration_defaults.rb @@ -21,6 +21,10 @@ module Compass def images_dir_without_default "images" end + + def default_cache_dir + ".sass-cache" + end end end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone/installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/installer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/app_integration/stand_alone/installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/app_integration/stand_alone/installer.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/base.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/base.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/create_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/create_project.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/create_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/create_project.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/generate_grid_background.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/generate_grid_background.rb similarity index 86% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/generate_grid_background.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/generate_grid_background.rb index 2bd16d9a..426fbc1e 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/generate_grid_background.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/generate_grid_background.rb @@ -80,11 +80,7 @@ Options: gutter_width = $2.to_i height = $3.to_i if $3 filename = options[:grid_filename] || projectize("#{project_images_subdirectory}/grid.png") - unless GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :height => height, :filename => filename, :working_path => self.working_path)).generate! - puts "ERROR: Some library dependencies appear to be missing." - puts "Have you installed rmagick? If not, please run:" - puts "sudo gem install rmagick" - end + GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :height => height, :filename => filename, :working_path => self.working_path)).generate! end end end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/help.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/help.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/help.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/help.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/installer_command.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/installer_command.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/installer_command.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/installer_command.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/interactive.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/interactive.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/interactive.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/interactive.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/list_frameworks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/list_frameworks.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/list_frameworks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/list_frameworks.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/print_version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/print_version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/print_version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/print_version.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/project_base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_base.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/project_base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_base.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/project_stats.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_stats.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/project_stats.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/project_stats.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/registry.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/registry.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/registry.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/registry.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/stamp_pattern.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/stamp_pattern.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/stamp_pattern.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/stamp_pattern.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/update_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/update_project.rb similarity index 74% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/update_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/update_project.rb index 9ab8814b..9dc1bd83 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/update_project.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/update_project.rb @@ -6,7 +6,7 @@ module Compass module CompileProjectOptionsParser def set_options(opts) opts.banner = %Q{ - Usage: compass compile [path/to/project] [options] + Usage: compass compile [path/to/project] [path/to/project/src/file.sass ...] [options] Description: compile project at the path specified or the current director if not specified. @@ -47,9 +47,22 @@ module Compass projectize(Compass.configuration.sass_dir), projectize(Compass.configuration.css_dir), Compass.sass_engine_options.merge(:quiet => options[:quiet], - :force => options[:force]).merge(additional_options)) + :force => options[:force], + :sass_files => explicit_sass_files).merge(additional_options)) end + def explicit_sass_files + return unless options[:sass_files] + options[:sass_files].map do |sass_file| + if absolute_path? sass_file + sass_file + else + File.join(Dir.pwd, sass_file) + end + end + end + + class << self def option_parser(arguments) parser = Compass::Exec::CommandOptionParser.new(arguments) @@ -76,10 +89,12 @@ module Compass end def parse_arguments!(parser, arguments) - if arguments.size == 1 - parser.options[:project_name] = arguments.shift - elsif arguments.size > 1 - raise Compass::Error, "Too many arguments were specified." + if arguments.size > 0 + parser.options[:project_name] = arguments.shift if File.directory?(arguments.first) + unless arguments.empty? + parser.options[:sass_files] = arguments.dup + parser.options[:force] = true + end end end end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/validate_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/validate_project.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/validate_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/validate_project.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/watch_project.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/watch_project.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/watch_project.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/watch_project.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/write_configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/commands/write_configuration.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/commands/write_configuration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/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.pre4/lib/compass/compiler.rb new file mode 100644 index 00000000..2c626439 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/compiler.rb @@ -0,0 +1,137 @@ +module Compass + class Compiler + + include Actions + + attr_accessor :working_path, :from, :to, :options + + def initialize(working_path, from, to, options) + self.working_path = working_path + self.from, self.to = from, to + self.logger = options.delete(:logger) + self.options = options + self.options[:cache_location] ||= determine_cache_location + end + + def determine_cache_location + Compass.configuration.cache_path || Sass::Plugin.options[:cache_location] || File.join(working_path, ".sass-cache") + end + + def sass_files(options = {}) + exclude_partials = options.fetch(:exclude_partials, true) + @sass_files = self.options[:sass_files] || Dir.glob(separate("#{from}/**/#{'[^_]' if exclude_partials}*.s[ac]ss")) + end + + def stylesheet_name(sass_file) + sass_file[("#{from}/".length)..-6] + end + + def css_files + @css_files ||= sass_files.map{|sass_file| corresponding_css_file(sass_file)} + end + + def corresponding_css_file(sass_file) + "#{to}/#{stylesheet_name(sass_file)}.css" + end + + def target_directories + css_files.map{|css_file| File.dirname(css_file)}.uniq.sort.sort_by{|d| d.length } + end + + # Returns the sass file that needs to be compiled, if any. + def out_of_date? + Compass.configure_sass_plugin! unless Compass.sass_plugin_configured? + sass_files.zip(css_files).each do |sass_filename, css_filename| + return sass_filename if Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename) + end + false + end + + # Determines if the configuration file is newer than any css file + def new_config? + config_file = Compass.detect_configuration_file + return false unless config_file + config_mtime = File.mtime(config_file) + css_files.each do |css_filename| + return config_file if File.exists?(css_filename) && config_mtime > File.mtime(css_filename) + end + nil + end + + def run + if new_config? + # Wipe out the cache and force compilation if the configuration has changed. + FileUtils.rm_rf options[:cache_location] + options[:force] = true + end + + # We use the Sass::Plugin to check dependencies so we have configure it. + Compass.configure_sass_plugin! unless Compass.sass_plugin_configured? + + # Make sure the target directories exist + target_directories.each {|dir| directory dir} + + # Compile each sass file. + sass_files.zip(css_files).each do |sass_filename, css_filename| + begin + compile_if_required sass_filename, css_filename + rescue Sass::SyntaxError => e + handle_exception(sass_filename, css_filename, e) + end + end + end + + def compile_if_required(sass_filename, css_filename) + if should_compile?(sass_filename, css_filename) + compile sass_filename, css_filename + else + logger.record :unchanged, basename(sass_filename) unless options[:quiet] + end + end + + # Compile one Sass file + def compile(sass_filename, css_filename) + logger.record :compile, basename(sass_filename) unless options[:quiet] + css_content = logger.red do + engine(sass_filename, css_filename).render + end + write_file(css_filename, css_content, options.merge(:force => true)) + end + + def should_compile?(sass_filename, css_filename) + options[:force] || Sass::Plugin.send(:exact_stylesheet_needs_update?, css_filename, sass_filename) + end + + # A sass engine for compiling a single file. + def engine(sass_filename, css_filename) + syntax = (sass_filename =~ /\.(s[ac]ss)$/) && $1.to_sym || :sass + opts = options.merge :filename => sass_filename, :css_filename => css_filename, :syntax => syntax + Sass::Engine.new(open(sass_filename).read, opts) + end + + # Place the syntax error into the target css file, + # formatted to display in the browser (in development mode) + # if there's an error. + def handle_exception(sass_filename, css_filename, e) + logger.record :error, basename(sass_filename), "(Line #{e.sass_line}: #{e.message})" + write_file css_filename, error_contents(e, sass_filename), options.merge(:force => true) + end + + # Haml refactored this logic in 2.3, this is backwards compatibility for either one + def error_contents(e, sass_filename) + if Sass::SyntaxError.respond_to?(:exception_to_css) + e.sass_template = sass_filename + Sass::SyntaxError.exception_to_css(e, :full_exception => show_full_exception?) + else + Sass::Plugin.options[:full_exception] ||= show_full_exception? + Sass::Plugin.send(:exception_string, e) + end + end + + # We don't want to show the full exception in production environments. + def show_full_exception? + Compass.configuration.environment == :development + end + + end +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb index d25c1b68..ac4aaf7f 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration.rb @@ -29,6 +29,8 @@ module Compass :relative_assets, :additional_import_paths, :sass_options, + attributes_for_directory(:cache, nil), + :cache, # Helper configuration :asset_host, :asset_cache_buster, diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/adapters.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/adapters.rb similarity index 92% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/adapters.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/adapters.rb index a43b7f5c..01929daf 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/adapters.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/adapters.rb @@ -19,6 +19,8 @@ module Compass plugin_opts = {:template_location => locations} plugin_opts[:style] = output_style if output_style plugin_opts[:line_comments] = line_comments + plugin_opts[:cache] = cache + plugin_opts[:cache_location] = cache_path plugin_opts.merge!(sass_options || {}) plugin_opts end @@ -42,6 +44,8 @@ module Compass engine_opts = {:load_paths => sass_load_paths} engine_opts[:style] = output_style if output_style engine_opts[:line_comments] = line_comments + engine_opts[:cache] = cache + engine_opts[:cache_location] = cache_path engine_opts.merge!(sass_options || {}) end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/comments.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/comments.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/comments.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/comments.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/data.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/data.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/data.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/data.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/defaults.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/defaults.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/defaults.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/defaults.rb index d511d869..dadc0f39 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/defaults.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/defaults.rb @@ -74,6 +74,12 @@ module Compass end end + def default_cache_path + if (pp = top_level.project_path) && (dir = top_level.cache_dir) + File.join(pp, dir) + end + end + def default_http_images_dir top_level.images_dir @@ -111,6 +117,10 @@ module Compass http_root_relative top_level.http_javascripts_dir end + def default_cache + true + end + # helper functions def http_join(*segments) diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/helpers.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/inheritance.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/inheritance.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/inheritance.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/inheritance.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/serialization.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/serialization.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/configuration/serialization.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/configuration/serialization.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/core_ext.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/core_ext.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/core_ext.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/core_ext.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/dependencies.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/dependencies.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/dependencies.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/dependencies.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/errors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/errors.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/errors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/errors.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/command_option_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/command_option_parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/command_option_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/command_option_parser.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/global_options_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/global_options_parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/global_options_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/global_options_parser.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/helpers.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/project_options_parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/project_options_parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/project_options_parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/project_options_parser.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/sub_command_ui.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/sub_command_ui.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/sub_command_ui.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/sub_command_ui.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/switch_ui.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/switch_ui.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/exec/switch_ui.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/exec/switch_ui.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/_blueprint.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_buttons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_colors.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_debug.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass similarity index 99% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass index 12ff4eaa..fdbe9089 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_fancy_type.sass @@ -41,7 +41,7 @@ (That is, when the title starts with a quote mark). (You may have to change this value depending on your font size). =dquo(!offset = 0.5em) - margin-left: -!offset + margin-left= -!offset // Reduced size type with incremental leading diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_interaction.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_link_icons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_liquid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html new file mode 100644 index 00000000..a89b5cb1 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_buttons.sass.html @@ -0,0 +1,26 @@ +Variable: !blueprint_button_font_family +---------------------------------------- +Button Font + +Variable: !blueprint_button_border_color +----------------------------------------- +Default Button Colors + +Variable: !blueprint_button_hover_border_color +----------------------------------------------- +Default Button Hover Colors + +Variable: !blueprint_button_active_border_color +------------------------------------------------ +Default Button Active Colors +Mixin: button-colors(!font_color) +----------------------- +Button Font + +Mixin: button-active-colors(!font_color) +------------------------------ +Default Button Colors + +Mixin: button-hover-colors(!font_color) +----------------------------- +Default Button Hover Colors diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/TODO rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_colors.sass.html diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_debug.sass.html similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/TODO rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html new file mode 100644 index 00000000..dc11c934 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_fancy_type.sass.html @@ -0,0 +1,45 @@ +Mixin: fancy-type() +-------------------- +To install the fancy type plugin: + 1. import the fancy_type module: @import blueprint/fancy_type + 2. mixin +fancy-type to your project's body or at the top level of your stylesheet: + body + +fancy-type + +Mixin: sibling-indentation() +----------------------------- +Indentation instead of line shifts for sibling paragraphs. Mixin to a style like p + p + +Mixin: alt() +------------- +For great looking type, use this code instead of asdf: +asdf +Best used on prepositions and ampersands. + +Mixin: dquo(!offset) +-------------- +For great looking quote marks in titles, replace "asdf" with: +“asdf” +(That is, when the title starts with a quote mark). +(You may have to change this value depending on your font size). + +Mixin: incr(!font_size) +-------------- +Reduced size type with incremental leading +(http://www.markboulton.co.uk/journal/comments/incremental_leading/) + +This could be used for side notes. For smaller type, you don't necessarily want to +follow the 1.5x vertical rhythm -- the line-height is too much. + +Using this mixin, reduces your font size and line-height so that for +every four lines of normal sized type, there is five lines of the sidenote. eg: + +Arguments: + font_size - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px. + base_font_size - The base font size in pixels. Defaults to 12px + old_line_height - The old line height. Defaults to 1.5 times the base_font_size + +Mixin: caps() +-------------- +Surround uppercase words and abbreviations with this class. +Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html new file mode 100644 index 00000000..3c5c8847 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_form.sass.html @@ -0,0 +1,3 @@ +Mixin: blueprint-inline-form() +------------------------------- +Mixin for producing Blueprint "inline" forms. Should be used with the blueprint-form mixin. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html new file mode 100644 index 00000000..ad7e0354 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_grid.sass.html @@ -0,0 +1,46 @@ +Variable: !blueprint_grid_columns +---------------------------------- +Main layout grid, override these constants to build your grid and container sizes. +Mixin: container() +------------------- +Main layout grid, override these constants to build your grid and container sizes. + +Mixin: last() +-------------- +you must set text-align left on your container element in an IE stylesheet. + +Mixin: column(!n) +---------------- +TODO add this to span mixin when we have optional arguments + +Mixin: append(!n) +---------------- +Use this mixins to set the width of n columns. + +Mixin: prepend(!n) +----------------- +Mixin to a column to append n empty cols. + +Mixin: pull(!n) +-------------- +Mixin to a column to prepend n empty cols. + +Mixin: push(!n) +-------------- +mixin to a column to move it n columns to the left + +Mixin: border(!border_color) +---------------- +mixin to a column to push it n columns to the right + +Mixin: colborder(!border_color) +------------------- +Border on right hand side of a column. + +Mixin: colruler(!border_color) +------------------ +Border with more whitespace, spans one column. + +Mixin: colspacer() +------------------- +Mixin this to an hr to make a horizontal ruler across a column. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html new file mode 100644 index 00000000..2fbb8972 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_ie.sass.html @@ -0,0 +1,7 @@ +Mixin: blueprint-ie(!body_selector) +---------------------- ++blueprint-ie("body#page-1, body#page-2, body.a-special-page-type") + +Mixin: blueprint-inline-form-ie() +---------------------------------- +Fixes for Blueprint "inline" forms in IE 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_interaction.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_link_icons.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html new file mode 100644 index 00000000..a70e56fb --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_liquid.sass.html @@ -0,0 +1,7 @@ +Variable: !blueprint_liquid_grid_columns +----------------------------------------- +The width shown gives the right floored percentage values. + +Variable: !blueprint_liquid_container_width +-------------------------------------------- +Do not edit below this line unless you really know what you're doing. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html new file mode 100644 index 00000000..0123785f --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_print.sass.html @@ -0,0 +1,7 @@ +Mixin: blueprint-print(!body_selector) +------------------------- ++blueprint-print("body#page-1, body#page-2, body.a-special-page-type") + +Mixin: blueprint-show-link-urls() +---------------------------------- +Feel free to mix it into anchors where you want it. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html new file mode 100644 index 00000000..cb4065a7 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_reset.sass.html @@ -0,0 +1,7 @@ +Mixin: blueprint-global-reset() +-------------------------------- +For more specific resets, use the reset mixins provided below + +Mixin: blueprint-nested-reset() +-------------------------------- +useful if you want to style a part of your page in a dramatically different way. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html new file mode 100644 index 00000000..68b63f40 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_rtl.sass.html @@ -0,0 +1,38 @@ +Variable: !blueprint_grid_columns +---------------------------------- +Main layout grid, override these constants to build your grid and container sizes. +Mixin: container() +------------------- +Main layout grid, override these constants to build your grid and container sizes. + +Mixin: last() +-------------- +you must set text-align left on your container element in an IE stylesheet. + +Mixin: append(!n) +---------------- +TODO add this to span mixin when we have optional arguments + +Mixin: prepend(!n) +----------------- +Mixin to a column to append n empty cols. + +Mixin: pull(!n) +-------------- +Mixin to a column to prepend n empty cols. + +Mixin: push(!n) +-------------- +mixin to a column to move it n columns to the left + +Mixin: border() +---------------- +mixin to a column to push it n columns to the right + +Mixin: colborder() +------------------- +Border on left hand side of a column. + +Mixin: rtl-typography(!body_selector) +------------------------ +Border with more whitespace, spans one column. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html new file mode 100644 index 00000000..27e951e2 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_scaffolding.sass.html @@ -0,0 +1,11 @@ +Mixin: blueprint-scaffolding(!body_selector) +------------------------------- +mixins to construct your own semantic style rules. + +Mixin: blueprint-scaffolding-body() +------------------------------------ +main scaffolding, but the mixin is still available if you want to use it. + +Mixin: box() +------------- +Mixin +box to create a padded box inside a column. 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_screen.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html new file mode 100644 index 00000000..c409bbc2 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_typography.sass.html @@ -0,0 +1,3 @@ +Mixin: blueprint-typography(!body_selector) +------------------------------ ++blueprint-typography("body#page-1, body#page-2, body.a-special-page-type") 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html new file mode 100644 index 00000000..4704436c --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/_utilities.sass.html @@ -0,0 +1,3 @@ +Mixin: blueprint-utilities() +----------------------------- +you are mixing your content and presentation. For shame! 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/index.html new file mode 100644 index 00000000..705448ac --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/index.html @@ -0,0 +1,31 @@ +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_buttons.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_colors.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_debug.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_fancy_type.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_form.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_grid.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_ie.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_interaction.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_link_icons.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_liquid.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_print.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_reset.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_rtl.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_scaffolding.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_screen.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_typography.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//_utilities.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_buttons.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_colors.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_debug.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_fancy_type.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_form.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_grid.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_interaction.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_link_icons.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_liquid.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_reset.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_rtl.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_scaffolding.sass +../compass/lib/compass/frameworks/blueprint/stylesheets/blueprint//modules/_typography.sass +../compass/lib/compass/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/stylesheets/blueprint/docs/modules/_buttons.sass.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_buttons.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_colors.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_debug.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_fancy_type.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/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 @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_form.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_grid.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_interaction.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_link_icons.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/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 @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_liquid.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_reset.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_rtl.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_scaffolding.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_typography.sass.html @@ -0,0 +1 @@ + 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.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/docs/modules/_utilities.sass.html @@ -0,0 +1 @@ + diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_buttons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_debug.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_fancy_type.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_form.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_interaction.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_link_icons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_liquid.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/stylesheets/blueprint/modules/_utilities.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/cross.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/key.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/buttons/tick.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/buttons/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/doc.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/email.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/external.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/feed.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/im.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/pdf.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/visited.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/blueprint/templates/link_icons/link_icons/xls.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/link_icons/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/partials/_base.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/blueprint/templates/project/welcome.html.haml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/_compass.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/_compass.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/_compass.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/_compass.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_css3.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_layout.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_misc.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/_utilities.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_clip.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_origin.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_background_size.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_border_radius.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_shadow.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_box_sizing.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_columns.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_font_face.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_gradient.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_inline_block.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_opacity.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_text_shadow.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transform.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/css3/_transition.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/layout/_sticky_footer.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_general.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_links.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_lists.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_sprites.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_tables.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/_text.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_clearfix.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_float.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass new file mode 100644 index 00000000..ed2759f2 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_hacks.sass @@ -0,0 +1,15 @@ +=has-layout + // This makes ie6 get layout + display: inline-block + // and this puts it back to block + & + display: block + +//** + IE6 will let the !important property win + While all the other browsers won't. + TODO: link to blog post +=bang-hack(!property, !hack_value, !value) + #{!property}: #{!hack_value} !important + #{!property}: #{!value} + 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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_min.sass new file mode 100644 index 00000000..5f454547 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_min.sass @@ -0,0 +1,17 @@ +@import hacks.sass + +//** + Cross browser min-height mixin. +=min-height(!value) + +hacked-minimum("height", !value) + +//** + Cross browser min-width mixin. +=min-width(!value) + +hacked-minimum("width", !value) + +// @private This mixin is not meant to be used directly. +=hacked-minimum(!property, !value) + min-#{!property}= !value + +bang-hack(!property, !value, 'auto') + diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tabs.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/general/_tag_cloud.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_hover_link.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_link_colors.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/links/_unstyled_link.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_bullets.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_horizontal_list.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/lists/_inline_list.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/sprites/_sprite_img.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/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.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_alternating_rows_and_columns.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_borders.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/tables/_scaffolding.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_ellipsis.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_nowrap.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass similarity index 86% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass index e7c6a1b5..3143839f 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/stylesheets/compass/utilities/text/_replacement.sass @@ -9,9 +9,14 @@ @param y the y position of the background image. =replace-text( !img, !x = 50%, !y = 50% ) - text-indent: -9999em - overflow: hidden + +hide-text background: image= image_url(!img) repeat: no-repeat position= !x !y + +=hide-text + :text-indent -9999em + :overflow hidden + :text-align left + diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/ellipsis.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/ellipsis/xml/ellipsis.xml diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/stylesheets/main.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/extension/templates/project/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/USAGE.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/USAGE.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/USAGE.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/USAGE.markdown diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/frameworks/compass/templates/project/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/frameworks/compass/templates/project/screen.sass 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.pre4/lib/compass/grid_builder.rb new file mode 100644 index 00000000..981769fe --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/grid_builder.rb @@ -0,0 +1,99 @@ +require 'zlib' + +module Compass + + # A simple class to represent and create a PNG-File + # No drawing features given + # Just subclass and write [R,G,B]-Byte-Values into the @data matrix + # Build for compactness, so not much error checking! + # + # Code based on seattlerb's png, see http://seattlerb.rubyforge.org/png/ + class PNG + CRC_TABLE = (0..255).map do |n| + (0...8).inject(n){|x,i| x = ((x & 1) == 1) ? 0xedb88320 ^ (x >> 1) : x >> 1} + end + + class << self + def crc(chunkdata='') + chunkdata.bytes.to_a.inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte) & 0xff] ^ (crc >> 8) } ^ 0xffffffff + end + + def chunk(type, data="") + [data.size, type, data, crc(type + data)].pack("Na*a*N") + end + end + + # Initiates a new PNG-Object + # * width: Width of the image in pixels + # * height: Height of the image in pixels + # * background: Background-color represented as [R,G,B]-Byte-Array + def initialize(width, height, background = [255,255,255]) + @height = height + @width = width + @data = Array.new(@height) { |x| Array.new(@width, background) } + end + + BITS = 8 + RGB = 2 # Color Types ( RGBA = 6) + NONE = 0 # Filter + + # binary representation of the PNG, write to file with binary mode + def to_blob + blob = [] + blob << [137, 80, 78, 71, 13, 10, 26, 10].pack("C*") + blob << PNG.chunk('IHDR', [@width, @height, BITS, RGB, NONE, NONE, NONE].pack("N2C5")) + blob << PNG.chunk('IDAT', Zlib::Deflate.deflate(self.png_join)) + blob << PNG.chunk('IEND', '') + blob.join + end + + def png_join + @data.map { |row| "\0" + row.map { |p| "%c%c%c" % p}.join }.join + end + end + + class GridBuilder < PNG + include Actions + + attr_reader :column_width, :gutter_width, :filename, :able_to_generate, :options + + # ==== Options + # * options + # * :column_width -- Width (in pixels) of current grid column + # * :gutter_width -- Width (in pixels) of current grid gutter + # * :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] + + height = options[:height] || 20 + @filename = options[:filename] + @options = options + + super(@column_width + gutter_width, height, [0xe9,0xe9,0xe9]) + end + + def working_path + options[:working_path] + end + + # generates (overwriting if necessary) grid.png image to be tiled in background + def generate! + (0...@height-1).each do |line| + @data[line] = Array.new(@width){|x| x < @column_width ? [0xe8, 0xef, 0xfb] : [0xff,0xff,0xff] } + end + + if File.exists?(filename) + if options[:force] + overwrite = true + else + msg = "#{filename} already exists. Overwrite with --force." + raise Compass::FilesystemConflict.new(msg) + end + end + directory File.dirname(filename) + write_file(filename, self.to_blob, options, true) + end + end +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/bare_installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/bare_installer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/bare_installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/bare_installer.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/base.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/base.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/manifest_installer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest_installer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/manifest_installer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/manifest_installer.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/template_context.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/template_context.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/installers/template_context.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/installers/template_context.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/logger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/logger.rb similarity index 72% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/logger.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/logger.rb index c5cb6801..48ec2ecb 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/logger.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/logger.rb @@ -1,8 +1,11 @@ module Compass + class Logger DEFAULT_ACTIONS = [:directory, :exists, :remove, :create, :overwrite, :compile, :error, :identical] + COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 } + ACTION_COLORS = { :error => :red, :compile => :green, @@ -14,7 +17,6 @@ module Compass :identical => :green } - COLORS = { :clear => 0, :red => 31, :green => 32, :yellow => 33 } attr_accessor :actions, :options @@ -26,9 +28,21 @@ module Compass # Record an action that has occurred def record(action, *arguments) - emit color(ACTION_COLORS[action]) if Compass.configuration.color_output - log "#{action_padding(action)}#{action} #{arguments.join(' ')}" - emit color(:clear) if Compass.configuration.color_output + msg = "" + msg << color(ACTION_COLORS[action]) if Compass.configuration.color_output + msg << "#{action_padding(action)}#{action} #{arguments.join(' ')}" + msg << color(:clear) if Compass.configuration.color_output + log msg + end + + def red + return yield unless Compass.configuration.color_output + $stderr.write(color(:red)) + $stdout.write(color(:red)) + yield + ensure + $stderr.write(color(:clear)) + $stdout.write(color(:clear)) end def color(c) @@ -42,6 +56,7 @@ module Compass def emit(msg) print msg end + # Emit a log message def log(msg) puts msg @@ -64,5 +79,9 @@ module Compass def log(msg) end + + def red + yield + end end end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/color_stop.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/color_stop.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/color_stop.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/color_stop.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/display.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/display.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/display.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/display.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/enumerate.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/enumerate.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/enumerate.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/enumerate.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/font_files.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/font_files.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/font_files.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/font_files.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/inline_image.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/inline_image.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/inline_image.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/inline_image.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/selectors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/selectors.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/selectors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/selectors.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/urls.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/urls.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/functions/urls.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/functions/urls.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/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.pre4/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb new file mode 100644 index 00000000..92e9093e --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/stylesheet_updating.rb @@ -0,0 +1,40 @@ +require 'sass/plugin' + +# XXX: We can remove this monkeypatch once Sass 2.2 is released. +module Sass::Plugin + + # splits the stylesheet_needs_update? method into two pieces so I can use the exact_stylesheet_needs_update? piece + module StylesheetNeedsUpdate + def stylesheet_needs_update?(name, template_path, css_path) + css_file = css_filename(name, css_path) + template_file = template_filename(name, template_path) + exact_stylesheet_needs_update?(css_file, template_file) + end + def exact_stylesheet_needs_update?(css_file, template_file) + if !File.exists?(css_file) + return true + else + css_mtime = File.mtime(css_file) + File.mtime(template_file) > css_mtime || + dependencies(template_file).any?(&dependency_updated?(css_mtime)) + end + end + end + + # At some point Sass::Plugin changed from using the metaclass to extend self. + metaclass = class << self; self; end + if metaclass.included_modules.include?(Sass::Plugin) + if method(:stylesheet_needs_update?).arity == 2 + alias exact_stylesheet_needs_update? stylesheet_needs_update? + elsif !method_defined?(:exact_stylesheet_needs_update?) + include StylesheetNeedsUpdate + end + else + class << self + unless method_defined?(:exact_stylesheet_needs_update?) + include StylesheetNeedsUpdate + end + end + end + +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches/traversal.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/traversal.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/sass_extensions/monkey_patches/traversal.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/sass_extensions/monkey_patches/traversal.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/stats.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/stats.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/stats.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/stats.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/test_case.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/test_case.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/test_case.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/test_case.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/validator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/validator.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/validator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/validator.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/compass/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/compass/version.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb similarity index 91% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb index faf3fd1b..e2709279 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm.rb @@ -4,13 +4,13 @@ $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir) module FSSM FileNotFoundError = Class.new(StandardError) CallbackError = Class.new(StandardError) - + class << self def dbg(msg=nil) STDERR.puts(msg) end - def monitor(*args, &block) + def monitor(*args, &block) monitor = FSSM::Monitor.new context = args.empty? ? monitor : monitor.path(*args) @@ -28,9 +28,8 @@ module FSSM end require 'thread' -require 'pathname' -require 'fssm/ext' +require 'fssm/pathname' require 'fssm/support' require 'fssm/tree' require 'fssm/path' diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/fsevents.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb similarity index 91% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/fsevents.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb index 0d143221..bb33c598 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/fsevents.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/fsevents.rb @@ -1,4 +1,4 @@ -require 'fssm/fsevents' +require File.join(File.dirname(__FILE__), 'rubycocoa/fsevents') module FSSM::Backends class FSEvents @@ -6,23 +6,23 @@ module FSSM::Backends @handlers = {} @fsevents = [] end - + def add_path(path, preload=true) handler = FSSM::State.new(path) @handlers["#{path}"] = handler - + fsevent = Rucola::FSEvents.new("#{path}", {: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 fsevent.start @fsevents << fsevent end - + def run begin OSX.CFRunLoopRun 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.pre4/lib/vendor/fssm/backends/inotify.rb new file mode 100644 index 00000000..5a9736f0 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/inotify.rb @@ -0,0 +1,25 @@ +module FSSM::Backends + class Inotify + def initialize + @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| + handler.refresh(event.name) + end + + handler.refresh(path.to_pathname, true) if preload + end + + def run + begin + @notifier.run + rescue Interrupt + end + end + + end +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/polling.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb similarity index 88% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/polling.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb index b2bdd3bb..f80dc168 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/backends/polling.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/polling.rb @@ -1,8 +1,8 @@ module FSSM::Backends class Polling def initialize(options={}) - @handlers = [] - @latency = options[:latency] || 1 + @handlers = [] + @latency = options[:latency] || 1.5 end def add_path(path, preload=true) diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/fsevents.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/rubycocoa/fsevents.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/fsevents.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/rubycocoa/fsevents.rb index 848c6ae2..7a1dbab7 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/fsevents.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/backends/rubycocoa/fsevents.rb @@ -6,33 +6,35 @@ module Rucola attr_reader :fsevents_object attr_reader :id attr_reader :path + def initialize(fsevents_object, id, path) @fsevents_object, @id, @path = fsevents_object, id, path end - + # Returns an array of the files/dirs in the path that the event occurred in. # The files are sorted by the modification time, the first entry is the last modified file. def files Dir.glob("#{File.expand_path(path)}/*").sort_by {|f| File.mtime(f) }.reverse end - + # Returns the last modified file in the path that the event occurred in. def last_modified_file files.first end end - - class StreamError < StandardError; end - + + class StreamError < StandardError; + end + attr_reader :paths attr_reader :stream - + attr_accessor :allocator attr_accessor :context attr_accessor :since attr_accessor :latency attr_accessor :flags - + # Initializes a new FSEvents `watchdog` object and starts watching the directories you specify for events. The # block is used as a handler for events, which are passed as the block's argument. This method is the easiest # way to start watching some directories if you don't care about the details of setting up the event stream. @@ -57,7 +59,7 @@ module Rucola fsevents.start fsevents end - + # Creates a new FSEvents `watchdog` object. You can specify a list of paths to watch and options to control the # behaviour of the watchdog. The block you pass serves as a callback when an event is generated on one of the # specified paths. @@ -84,19 +86,19 @@ module Rucola # Please refer to the Cocoa documentation for the rest of the options. def initialize(*params, &block) raise ArgumentError, 'No callback block was specified.' unless block_given? - + options = params.last.kind_of?(Hash) ? params.pop : {} @paths = params.flatten - + paths.each { |path| raise ArgumentError, "The specified path (#{path}) does not exist." unless File.exist?(path) } - + @allocator = options[:allocator] || OSX::KCFAllocatorDefault - @context = options[:context] || nil - @since = options[:since] || OSX::KFSEventStreamEventIdSinceNow - @latency = options[:latency] || 0.0 - @flags = options[:flags] || 0 - @stream = options[:stream] || nil - + @context = options[:context] || nil + @since = options[:since] || OSX::KFSEventStreamEventIdSinceNow + @latency = options[:latency] || 0.0 + @flags = options[:flags] || 0 + @stream = options[:stream] || nil + @user_callback = block @callback = Proc.new do |stream, client_callback_info, number_of_events, paths_pointer, event_flags, event_ids| paths_pointer.regard_as('*') @@ -105,7 +107,7 @@ module Rucola @user_callback.call(events) end end - + # Create the stream. # Raises a Rucola::FSEvents::StreamError if the stream could not be created. def create_stream @@ -113,13 +115,13 @@ module Rucola raise(StreamError, 'Unable to create FSEvents stream.') unless @stream OSX.FSEventStreamScheduleWithRunLoop(@stream, OSX.CFRunLoopGetCurrent, OSX::KCFRunLoopDefaultMode) end - + # Start the stream. # Raises a Rucola::FSEvents::StreamError if the stream could not be started. def start raise(StreamError, 'Unable to start FSEvents stream.') unless OSX.FSEventStreamStart(@stream) end - + # Stop the stream. # You can resume it by calling `start` again. def stop diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/monitor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/monitor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/monitor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/monitor.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/path.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb similarity index 94% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/path.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb index 16290ec4..1264809c 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/path.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/path.rb @@ -75,14 +75,14 @@ class FSSM::Path end def split_path(path) - path = Pathname.for(path) + path = FSSM::Pathname.for(path) [@path, (path.relative? ? path : path.relative_path_from(@path))] end def set_path(path) - path = Pathname.for(path) + path = FSSM::Pathname.for(path) raise FSSM::FileNotFoundError, "#{path}" unless path.exist? - @path = path.realpath + @path = path.expand_path end def set_glob(glob) 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.pre4/lib/vendor/fssm/pathname.rb new file mode 100644 index 00000000..bc36cc71 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/pathname.rb @@ -0,0 +1,528 @@ +# The bundled ruby pathname library is a slow and hideous beast. +# There. I said it. This version is based on pathname3. + +module FSSM + class Pathname < String + + SEPARATOR = Regexp.quote(File::SEPARATOR) + + if File::ALT_SEPARATOR + ALT_SEPARATOR = Regexp.quote(File::ALT_SEPARATOR) + SEPARATOR_PAT = Regexp.compile("[#{SEPARATOR}#{ALT_SEPARATOR}]") + else + SEPARATOR_PAT = Regexp.compile(SEPARATOR) + end + + if RUBY_PLATFORM =~ /(:?mswin|mingw|bccwin)/ + PREFIX_PAT = Regexp.compile("^([A-Za-z]:#{SEPARATOR_PAT})") + else + PREFIX_PAT = Regexp.compile("^(#{SEPARATOR_PAT})") + end + + class << self + def for(path) + path = path.is_a?(::FSSM::Pathname) ? path : new(path) + path.dememo + path + end + end + + def initialize(path) + if path =~ %r{\0} + raise ArgumentError, "path cannot contain ASCII NULLs" + end + + dememo + + super(path) + end + + def to_path + self + end + + def to_s + "#{self}" + end + + alias to_str to_s + + def to_a + return @segments if @segments + set_prefix_and_names + @segments = @names.dup + @segments.delete('.') + @segments.unshift(@prefix) unless @prefix.empty? + @segments + end + + alias segments to_a + + def each_filename(&block) + to_a.each(&block) + end + + def ascend + parts = to_a + parts.length.downto(1) do |i| + yield self.class.join(parts[0, i]) + end + end + + def descend + parts = to_a + 1.upto(parts.length) do |i| + yield self.class.join(parts[0, i]) + end + end + + def root? + set_prefix_and_names + @names.empty? && !@prefix.empty? + end + + def parent + self + '..' + end + + def relative? + set_prefix_and_names + @prefix.empty? + end + + def absolute? + !relative? + end + + def +(path) + dup << path + end + + def <<(path) + replace(join(path).cleanpath!) + end + + def cleanpath! + parts = to_a + final = [] + + parts.each do |part| + case part + when '.' then + next + when '..' then + case final.last + when '..' then + final.push('..') + when nil then + final.push('..') + else + final.pop + end + else + final.push(part) + end + end + + replace(final.empty? ? Dir.pwd : File.join(*final)) + end + + def cleanpath + dup.cleanpath! + end + + def realpath + raise unless self.exist? + + if File.symlink?(self) + file = self.dup + + while true + file = File.join(File.dirname(file), File.readlink(file)) + break unless File.symlink?(file) + end + + self.class.new(file).clean + else + self.class.new(Dir.pwd) + self + end + end + + def relative_path_from(base) + base = self.class.for(base) + + if self.absolute? != base.absolute? + raise ArgumentError, 'no relative path between a relative and absolute' + end + + if self.prefix != base.prefix + raise ArgumentError, "different prefix: #{@prefix.inspect} and #{base.prefix.inspect}" + end + + base = base.cleanpath!.segments + dest = dup.cleanpath!.segments + + while !dest.empty? && !base.empty? && dest[0] == base[0] + base.shift + dest.shift + end + + base.shift if base[0] == '.' + dest.shift if dest[0] == '.' + + if base.include?('..') + raise ArgumentError, "base directory may not contain '..'" + end + + path = base.fill('..') + dest + path = self.class.join(*path) + path = self.class.new('.') if path.empty? + + path + end + + def replace(path) + if path =~ %r{\0} + raise ArgumentError, "path cannot contain ASCII NULLs" + end + + dememo + + super(path) + end + + def unlink + Dir.unlink(self) + true + rescue Errno::ENOTDIR + File.unlink(self) + true + end + + def prefix + set_prefix_and_names + @prefix + end + + def names + set_prefix_and_names + @names + end + + def dememo + @set = nil + @segments = nil + @prefix = nil + @names = nil + end + + private + + def set_prefix_and_names + return if @set + + @names = [] + + if (match = PREFIX_PAT.match(self)) + @prefix = match[0].to_s + @names += match.post_match.split(SEPARATOR_PAT) + else + @prefix = '' + @names += self.split(SEPARATOR_PAT) + end + + @names.compact! + @names.delete('') + + @set = true + end + + end + + class Pathname + class << self + def glob(pattern, flags=0) + dirs = Dir.glob(pattern, flags) + dirs.map! {|path| new(path)} + + if block_given? + dirs.each {|dir| yield dir} + nil + else + dirs + end + end + + def [](pattern) + Dir[pattern].map! {|path| new(path)} + end + + def pwd + new(Dir.pwd) + end + end + + def entries + Dir.entries(self).map! {|e| FSSM::Pathname.new(e) } + end + + def mkdir(mode = 0777) + Dir.mkdir(self, mode) + end + + def opendir(&blk) + Dir.open(self, &blk) + end + + def rmdir + Dir.rmdir(self) + end + + def chdir + blk = lambda { yield self } if block_given? + Dir.chdir(self, &blk) + end + end + + class Pathname + def blockdev? + FileTest.blockdev?(self) + end + + def chardev? + FileTest.chardev?(self) + end + + def directory? + FileTest.directory?(self) + end + + def executable? + FileTest.executable?(self) + end + + def executable_real? + FileTest.executable_real?(self) + end + + def exists? + FileTest.exists?(self) + end + + def file? + FileTest.file?(self) + end + + def grpowned? + FileTest.grpowned?(self) + end + + def owned? + FileTest.owned?(self) + end + + def pipe? + FileTest.pipe?(self) + end + + def readable? + FileTest.readable?(self) + end + + def readable_real? + FileTest.readable_real?(self) + end + + def setgid? + FileTest.setgit?(self) + end + + def setuid? + FileTest.setuid?(self) + end + + def socket? + FileTest.socket?(self) + end + + def sticky? + FileTest.sticky?(self) + end + + def symlink? + FileTest.symlink?(self) + end + + def world_readable? + FileTest.world_readable?(self) + end + + def world_writable? + FileTest.world_writable?(self) + end + + def writable? + FileTest.writable?(self) + end + + def writable_real? + FileTest.writable_real?(self) + end + + def zero? + FileTest.zero?(self) + end + + alias exist? exists? + end + + class Pathname + def atime + File.atime(self) + end + + def ctime + File.ctime(self) + end + + def ftype + File.ftype(self) + end + + def lstat + File.lstat(self) + end + + def mtime + File.mtime(self) + end + + def stat + File.stat(self) + end + + def utime(atime, mtime) + File.utime(self, atime, mtime) + end + end + + class Pathname + class << self + def join(*parts) + new(File.join(*parts.reject {|p| p.empty? })) + end + end + + def basename + self.class.new(File.basename(self)) + end + + def chmod(mode) + File.chmod(mode, self) + end + + def chown(owner, group) + File.chown(owner, group, self) + end + + def dirname + self.class.new(File.dirname(self)) + end + + def expand_path(from = nil) + self.class.new(File.expand_path(self, from)) + end + + def extname + File.extname(self) + end + + def fnmatch?(pat, flags = 0) + File.fnmatch(pat, self, flags) + end + + def join(*parts) + self.class.join(self, *parts) + end + + def lchmod(mode) + File.lchmod(mode, self) + end + + def lchown(owner, group) + File.lchown(owner, group, self) + end + + def link(to) + File.link(self, to) + end + + def open(mode = 'r', perm = nil, &blk) + File.open(self, mode, perm, &blk) + end + + def readlink + self.class.new(File.readlink(self)) + end + + def rename(to) + File.rename(self, to) + replace(to) + end + + def size + File.size(self) + end + + def size? + File.size?(self) + end + + def symlink(to) + File.symlink(self, to) + end + + def truncate + File.truncate(self) + end + end + + class Pathname + def mkpath + self.class.new(FileUtils.mkpath(self)) + end + + def rmtree + self.class.new(FileUtils.rmtree(self).first) + end + + def touch + self.class.new(FileUtils.touch(self).first) + end + end + + class Pathname + def each_line(sep = $/, &blk) + IO.foreach(self, sep, &blk) + end + + def read(len = nil, off = 0) + IO.read(self, len, off) + end + + def readlines(sep = $/) + IO.readlines(self, sep) + end + + def sysopen(mode = 'r', perm = nil) + IO.sysopen(self, mode, perm) + end + end + + class Pathname + def find + Find.find(self) {|path| yield FSSM::Pathname.new(path) } + end + end + +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/state.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb similarity index 89% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/state.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb index 910c74af..e22ef878 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/state.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/state.rb @@ -32,7 +32,7 @@ class FSSM::State end def recache(base) - base = Pathname.for(base) + base = FSSM::Pathname.for(base) previous = @cache.files snapshot(base) current = @cache.files @@ -40,13 +40,13 @@ class FSSM::State end def snapshot(base) - base = Pathname.for(base) + base = FSSM::Pathname.for(base) @cache.unset(base) @path.glob.each {|glob| add_glob(base, glob)} end def add_glob(base, glob) - Pathname.glob(base.join(glob).to_s).each do |fn| + FSSM::Pathname.glob(base.join(glob).to_s).each do |fn| @cache.set(fn) 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.pre4/lib/vendor/fssm/support.rb new file mode 100644 index 00000000..8e2b8850 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/support.rb @@ -0,0 +1,52 @@ +require 'rbconfig' + +module FSSM::Support + class << self + def backend + @@backend ||= case + when mac? && !jruby? && carbon_core? + 'FSEvents' + when linux? && rb_inotify? + 'Inotify' + else + 'Polling' + end + end + + def jruby? + defined?(JRUBY_VERSION) + end + + def mac? + Config::CONFIG['target_os'] =~ /darwin/i + end + + def linux? + Config::CONFIG['target_os'] =~ /linux/i + end + + def carbon_core? + begin + require 'osx/foundation' + OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework' + true + rescue LoadError + STDERR.puts("Warning: Unable to load CarbonCore. FSEvents will be unavailable.") + false + end + end + + def rb_inotify? + begin + require 'rubygems' + gem 'rb-inotify', '>= 0.3.0' + require 'rb-inotify' + true + rescue LoadError, Gem::LoadError + STDERR.puts("Warning: Unable to load rb-inotify >= 0.3.0. Inotify will be unavailable.") + false + end + end + + end +end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/tree.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/tree.rb similarity index 84% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/tree.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/tree.rb index 449d11d8..25b17be1 100644 --- a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/lib/vendor/fssm/tree.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/lib/vendor/fssm/tree.rb @@ -3,131 +3,131 @@ module FSSM::Tree def initialize @children = {} end - + protected - + def child(segment) @children["#{segment}"] end - + def child!(segment) (@children["#{segment}"] ||= Node.new) end - + def has_child?(segment) @children.has_key?("#{segment}") end - + def remove_child(segment) @children.delete("#{segment}") end - + def remove_children @children.clear end end - + module NodeEnumerable include NodeBase include Enumerable - + def each(prefix=nil, &block) @children.each do |segment, node| - cprefix = prefix ? - Pathname.for(prefix).join(segment) : - Pathname.for(segment) - block.call(cprefix, node) + cprefix = prefix ? + FSSM::Pathname.for(prefix).join(segment) : + FSSM::Pathname.for(segment) + block.call([cprefix, node]) node.each(cprefix, &block) end end end - + module NodeInsertion include NodeBase - + def unset(path) key = key_segments(path) - + if key.empty? remove_children return nil end - + segment = key.pop node = descendant(key) - + return unless node - + node.remove_child(segment) - + nil end - + def set(path) node = descendant!(path) node.from_path(path).mtime end - + protected - + def key_segments(key) return key if key.is_a?(Array) - Pathname.for(key).segments + FSSM::Pathname.for(key).segments end - + def descendant(path) recurse(path, false) end - + def descendant!(path) recurse(path, true) end - + def recurse(key, create=false) key = key_segments(key) node = self - + until key.empty? segment = key.shift node = create ? node.child!(segment) : node.child(segment) return nil unless node end - + node end end - + module CacheDebug def set(path) FSSM.dbg("Cache#set(#{path})") super end - + def unset(path) FSSM.dbg("Cache#unset(#{path})") super end - + def ftype(ft) FSSM.dbg("Cache#ftype(#{ft})") super end end - + class Node include NodeBase include NodeEnumerable - + attr_accessor :mtime attr_accessor :ftype - + def <=>(other) return unless other.is_a?(::FSSM::Tree::Node) self.mtime <=> other.mtime end - + def from_path(path) - path = Pathname.for(path) + path = FSSM::Pathname.for(path) @ftype = path.ftype # this handles bad symlinks without failing. why handle bad symlinks at # all? well, we could still be interested in their creation and deletion. @@ -135,42 +135,42 @@ module FSSM::Tree self end end - + class Cache include NodeBase include NodeEnumerable include NodeInsertion include CacheDebug if $DEBUG - + def set(path) # all paths set from this level need to be absolute # realpath will fail on broken links - path = Pathname.for(path).expand_path + path = FSSM::Pathname.for(path).expand_path super(path) end - + def files ftype('file') end - + def directories ftype('directory') end - + def links ftype('link') end + alias symlinks links - + private - + def ftype(ft) - inject({}) do |hash, entry| - path, node = entry + inject({}) do |hash, (path, node)| hash["#{path}"] = node.mtime if node.ftype == ft hash end end end - + end diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/command_line_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/command_line_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/command_line_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/command_line_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/command_line_test.rb 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.pre4/test/compass_png_test.rb new file mode 100644 index 00000000..b8fd70c8 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_png_test.rb @@ -0,0 +1,46 @@ +require 'test_helper' +require 'fileutils' + +class CommandLineTest < Test::Unit::TestCase + + def test_class_crc_table + assert_equal 256, Compass::PNG::CRC_TABLE.length + {0 => 0, 1 => 1996959894, 22 => 4107580753, 133 => 2647816111, 255 => 755167117}.each do |i, crc| + assert_equal crc, Compass::PNG::CRC_TABLE[i] + end + end + + def test_class_crc + assert_equal 2666930069, Compass::PNG.crc('foobar') + assert_equal 2035837995, Compass::PNG.crc('A721dasdN') + end + + def test_class_chunk + chunk = Compass::PNG.chunk 'IHDR', [10, 10, 8, 6, 0, 0, 0 ].pack('N2C5') + + header_crc = "\2152\317\275" + header_data = "\000\000\000\n\000\000\000\n\b\006\000\000\000" + header_length = "\000\000\000\r" + + header_chunk = "#{header_length}IHDR#{header_data}#{header_crc}" + + assert_equal header_chunk, chunk + end + + def test_class_chunk_empty + chunk = Compass::PNG.chunk 'IHDR' + expected = "#{0.chr * 4}IHDR#{[Compass::PNG.crc("IHDR")].pack 'N'}" + assert_equal expected, chunk + end + + def test_to_blob + png = Compass::PNG.new(5,10, [255,255,255]) + blob = 'iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAIAAADzWwNnAAAAD0lEQVR4nGP4jwoYBhkfALRylWv4Dj0LAAAAAElFTkSuQmCC'.unpack('m*').first + assert_equal blob, png.to_blob + + png = Compass::PNG.new(10,5, [32,64,128]) + blob = 'iVBORw0KGgoAAAANSUhEUgAAAAoAAAAFCAIAAADzBuo/AAAAEUlEQVR4nGNQcGjAgxgGUBoALT4rwRTA0gkAAAAASUVORK5CYII='.unpack('m*').first + assert_equal blob, png.to_blob + end + +end \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/compass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/compass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/compass_test.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/configuration_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/configuration_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/configuration_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/configuration_test.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/css/typography.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/css/typography.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/css/typography.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/css/typography.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/typography.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/typography.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/blueprint/sass/typography.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/blueprint/sass/typography.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/layout.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/layout.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/layout.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/layout.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/print.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/print.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/print.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/print.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/reset.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/reset.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/reset.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/reset.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/utilities.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/utilities.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/css/utilities.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/css/utilities.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/layout.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/layout.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/layout.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/layout.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/reset.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/reset.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/reset.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/reset.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/utilities.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/utilities.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/compass/sass/utilities.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/compass/sass/utilities.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/css/screen.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/css/screen.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/css/screen.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/css/screen.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/images/grid.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/images/grid.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/images/grid.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/images/grid.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/image_urls/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/image_urls/sass/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/assets/images/testing.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/assets/images/testing.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/assets/images/testing.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/assets/images/testing.png diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/ie.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/ie.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/ie.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/ie.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/print.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/print.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/print.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/print.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/screen.css b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/screen.css similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/css/screen.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/css/screen.css diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/ie.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/ie.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/ie.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/ie.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/print.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/print.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/print.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/print.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/fixtures/stylesheets/relative/sass/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/fixtures/stylesheets/relative/sass/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/io_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/io_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/io_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/io_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/rails_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/rails_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/rails_integration_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_integration_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/rails_integration_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/rails_integration_test.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/sass_extensions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/sass_extensions_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/sass_extensions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/sass_extensions_test.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_case_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_case_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_case_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_case_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_rails_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_rails_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/test/test_rails_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-0.10.0.pre4/test/test_rails_helper.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/README.markdown diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/Rakefile diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/VERSION.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/VERSION.yml similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/VERSION.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/VERSION.yml diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/config.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/split_compliment_example.html b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/split_compliment_example.html similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/split_compliment_example.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/split_compliment_example.html diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/src/_split_compliment_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/src/_split_compliment_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/src/_split_compliment_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/src/_split_compliment_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/src/screen.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/src/screen.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/example/src/screen.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/example/src/screen.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/compass_extension.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/compass_extension.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/compass_extension.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/compass_extension.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/hsl.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/hsl.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/hsl.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/hsl.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/sass_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/sass_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/lib/compass-colors/sass_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/lib/compass-colors/sass_extensions.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/spec/approximate_color_matching.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/spec/approximate_color_matching.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/spec/approximate_color_matching.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/spec/approximate_color_matching.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/spec/sass_extensions_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/spec/sass_extensions_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/spec/sass_extensions_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/spec/sass_extensions_spec.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/analogous/_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/analogous/_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/analogous/_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/analogous/_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/analogous/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/analogous/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/analogous/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/analogous/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/basic/_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/basic/_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/basic/_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/basic/_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/basic/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/basic/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/basic/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/basic/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/complementary/_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/complementary/_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/complementary/_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/complementary/_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/complementary/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/complementary/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/complementary/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/complementary/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/split_complement/_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/split_complement/_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/split_complement/_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/split_complement/_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/split_complement/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/split_complement/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/split_complement/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/split_complement/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/triadic/_theme.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/triadic/_theme.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/triadic/_theme.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/triadic/_theme.sass diff --git a/lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/triadic/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/triadic/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-colors-0.3.1/templates/triadic/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-colors-0.3.1/templates/triadic/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/.gitignore similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/.gitignore diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/Rakefile diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/VERSION similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/VERSION rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/VERSION diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/compass-slickmap.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/compass-slickmap.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/compass-slickmap.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/compass-slickmap.gemspec diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/lib/slickmap.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/lib/slickmap.rb diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/lib/slickmap/compass_plugin.rb diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/sass/_slickmap.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/sass/_slickmap.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/sass/_slickmap.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/sass/_slickmap.sass diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-center.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-center.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-center.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-center.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-left.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-left.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-left.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-left.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-right.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-right.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L1-right.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L1-right.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-bottom.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-bottom.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-bottom.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-bottom.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-center.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-center.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-center.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-center.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-li-top.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-li-top.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-li-top.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-li-top.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-ul-top.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-ul-top.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/L3-ul-top.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/L3-ul-top.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/vertical-line.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/vertical-line.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/vertical-line.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/vertical-line.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/white-highlight.png b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/white-highlight.png similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/images/white-highlight.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/images/white-highlight.png diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/manifest.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/manifest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/compass-slickmap-0.2.3/templates/project/sitemap.sass diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/README b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/README.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README.erb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/README.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/README.erb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/Rakefile old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/Rakefile diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/config/a.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/a.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/config/a.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/a.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/config/b.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/b.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/config/b.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/b.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/config/c.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/c.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/config/c.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/c.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/config/d.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/d.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/config/d.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/d.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/config/e.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/e.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/config/e.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/config/e.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/configuration.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/configuration.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/configuration.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/configuration.gemspec diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/lib/configuration.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/lib/configuration.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/lib/configuration.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/lib/configuration.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/a.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/a.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/a.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/a.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/b.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/b.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/b.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/b.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/c.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/c.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/c.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/c.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/d.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/d.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/d.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/d.rb diff --git a/lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/e.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/e.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/configuration-1.1.0/samples/e.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/configuration-1.1.0/samples/e.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/ChangeLog b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/ChangeLog similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/ChangeLog rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/ChangeLog diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Install b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/Install old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Install rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/Install diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/README b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/README old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/README diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/Rakefile diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/bin/htmldiff b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/htmldiff similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/bin/htmldiff rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/htmldiff diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/bin/ldiff b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/ldiff similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/bin/ldiff rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/bin/ldiff diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/array.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/array.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/array.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/array.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/block.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/block.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/block.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/block.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/callbacks.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/change.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/change.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/change.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/change.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/hunk.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/ldiff.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/string.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/string.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/lib/diff/lcs/string.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/lib/diff/lcs/string.rb diff --git a/lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/tests/00test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/tests/00test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/diff-lcs-1.1.2/tests/00test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/diff-lcs-1.1.2/tests/00test.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/.autotest b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.autotest similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/.autotest rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.autotest diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/.document b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.document similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/.document rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.document diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.gitignore similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/.gitignore diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/LICENSE similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/LICENSE diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/README.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/README.rdoc diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/Rakefile diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/VERSION similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/VERSION rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/VERSION diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/extlib.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/extlib.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/extlib.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/extlib.gemspec diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/array.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/array.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/array.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/array.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/assertions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/assertions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/assertions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/assertions.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/blank.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/blank.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/blank.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/blank.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/boolean.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/boolean.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/boolean.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/boolean.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/byte_array.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/byte_array.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/byte_array.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/byte_array.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/class.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/class.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/class.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/class.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/datetime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/datetime.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/datetime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/datetime.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/dictionary.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/dictionary.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/dictionary.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/dictionary.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/hash.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/hash.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/hash.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/hash.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/hook.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/hook.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/hook.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/hook.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/inflection.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/inflection.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/inflection.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/inflection.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/lazy_array.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/lazy_array.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/lazy_array.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/lazy_array.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/lazy_module.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/lazy_module.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/lazy_module.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/lazy_module.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/logger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/logger.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/logger.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/logger.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/mash.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/mash.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/mash.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/mash.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/module.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/module.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/module.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/module.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/nil.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/nil.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/nil.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/nil.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/numeric.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/numeric.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/numeric.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/numeric.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/object.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/object.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/object.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/object.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/object_space.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/object_space.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/object_space.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/object_space.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/pathname.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/pathname.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/pathname.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/pathname.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/pooling.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/pooling.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/pooling.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/pooling.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/rubygems.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/rubygems.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/rubygems.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/rubygems.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/simple_set.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/simple_set.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/simple_set.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/simple_set.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/string.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/string.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/string.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/string.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/struct.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/struct.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/struct.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/struct.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/symbol.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/symbol.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/symbol.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/symbol.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/time.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/time.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/time.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/time.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/virtual_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/virtual_file.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/lib/extlib/virtual_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/lib/extlib/virtual_file.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/array_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/array_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/array_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/array_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/blank_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/blank_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/blank_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/blank_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/byte_array_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/byte_array_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/byte_array_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/byte_array_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/class_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/class_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/class_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/class_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/datetime_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/datetime_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/datetime_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/datetime_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/hash_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/hash_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/hash_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/hash_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/hook_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/hook_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/hook_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/hook_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection/plural_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection/plural_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection/plural_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection/plural_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection/singular_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection/singular_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection/singular_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection/singular_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection_extras_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection_extras_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/inflection_extras_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/inflection_extras_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/lazy_array_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/lazy_array_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/lazy_array_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/lazy_array_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/lazy_module_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/lazy_module_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/lazy_module_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/lazy_module_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/mash_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/mash_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/mash_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/mash_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/module_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/module_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/module_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/module_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/object_space_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/object_space_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/object_space_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/object_space_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/object_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/object_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/object_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/object_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/pooling_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/pooling_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/pooling_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/pooling_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/rcov.opts b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/rcov.opts similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/rcov.opts rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/rcov.opts diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/simple_set_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/simple_set_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/simple_set_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/simple_set_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/spec.opts b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/spec.opts similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/spec.opts rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/spec.opts diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/spec_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/spec_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/spec_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/spec_helper.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/string_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/string_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/string_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/string_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/struct_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/struct_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/struct_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/struct_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/symbol_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/symbol_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/symbol_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/symbol_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/time_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/time_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/time_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/time_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/try_call_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/try_call_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/try_call_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/try_call_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/try_dup_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/try_dup_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/try_dup_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/try_dup_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/virtual_file_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/virtual_file_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/spec/virtual_file_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/spec/virtual_file_spec.rb diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/ci.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/ci.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/ci.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/ci.rake diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/metrics.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/metrics.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/metrics.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/metrics.rake diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/spec.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/spec.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/spec.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/spec.rake diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/yard.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/yard.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/yard.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/yard.rake diff --git a/lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/yardstick.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/yardstick.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/extlib-0.9.14/tasks/yardstick.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/extlib-0.9.14/tasks/yardstick.rake diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/README.markdown diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/Rakefile diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/fancy-buttons.gemspec diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/fancy-buttons.rb diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/sass/_fancy_buttons.sass diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/sass/_fancy_gradient.sass similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/sass/_fancy_gradient.sass diff --git a/lib/middleman/vendor/gems/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.7/lib/templates/project/button_bg.png similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/templates/project/button_bg.png diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/buttons.sass similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/templates/project/buttons.sass diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/index.html b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/index.html similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/templates/project/index.html diff --git a/lib/middleman/vendor/gems/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/fancy-buttons-0.3.7/lib/templates/project/manifest.rb similarity index 100% rename from lib/middleman/vendor/gems/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.7/lib/templates/project/manifest.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/.yardopts b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/.yardopts similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/.yardopts rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/.yardopts diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/CONTRIBUTING b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/CONTRIBUTING similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/CONTRIBUTING rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/CONTRIBUTING diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/MIT-LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/MIT-LICENSE similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/MIT-LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/MIT-LICENSE diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/README.md b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/README.md similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/README.md rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/README.md diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/REVISION b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/REVISION similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/REVISION rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/REVISION diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/Rakefile similarity index 95% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/Rakefile index 320553d6..253f008a 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/Rakefile +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/Rakefile @@ -75,11 +75,11 @@ desc "Release a new Haml package to Rubyforge." task :release => [:check_release, :release_elpa, :package] do name = File.read("VERSION_NAME").strip version = File.read("VERSION").strip - sh %{rubyforge login} - sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem} - sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz} - sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2} - sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip} + #sh %{rubyforge login} + #sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem} + #sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz} + #sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2} + #sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip} sh %{gem push pkg/haml-#{version}.gem} end @@ -129,7 +129,7 @@ end # Ensures that the version have been updated for a new release. task :check_release do version = File.read("VERSION").strip - raise "There have been changes since current version (#{version})" if changed_since?(version) + #raise "There have been changes since current version (#{version})" if changed_since?(version) raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read("VERSION_NAME") == "Bleeding Edge" end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/VERSION new file mode 100644 index 00000000..c36c6482 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/VERSION @@ -0,0 +1 @@ +2.2.17 diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION_NAME b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/VERSION_NAME similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/VERSION_NAME rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/VERSION_NAME diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/css2sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/css2sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/bin/css2sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/css2sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/bin/haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/html2haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/html2haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/bin/html2haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/html2haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/bin/sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/bin/sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/bin/sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/haml-mode.el b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/haml-mode.el similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/extra/haml-mode.el rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/haml-mode.el diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/sass-mode.el b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/sass-mode.el similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/extra/sass-mode.el rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/sass-mode.el diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/extra/update_watch.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/update_watch.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/extra/update_watch.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/extra/update_watch.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/init.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/init.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/init.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/init.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/buffer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/buffer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/buffer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/buffer.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/engine.rb similarity index 99% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/engine.rb index eef3a823..3d615471 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/engine.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/engine.rb @@ -88,7 +88,7 @@ module Haml unless ruby1_8? @options[:encoding] = Encoding.default_internal || "utf-8" end - @options.merge! options + @options.merge! options.reject {|k, v| v.nil?} @index = 0 unless [:xhtml, :html4, :html5].include?(@options[:format]) diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/error.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/error.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/error.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/error.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/exec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/exec.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/exec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/exec.rb index 7275646c..bfefae62 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/exec.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/exec.rb @@ -244,26 +244,29 @@ END end super - input = @options[:input] - output = @options[:output] - tree = - if input.is_a?(File) && !@options[:check_syntax] - ::Sass::Files.tree_for(input.path, @options[:for_engine]) - else - # We don't need to do any special handling of @options[:check_syntax] here, - # because the Sass syntax checking happens alongside evaluation - # and evaluation doesn't actually evaluate any code anyway. - ::Sass::Engine.new(input.read(), @options[:for_engine]).to_tree - end + begin + input = @options[:input] + output = @options[:output] - input.close() if input.is_a?(File) + tree = + if input.is_a?(File) && !@options[:check_syntax] + ::Sass::Files.tree_for(input.path, @options[:for_engine]) + else + # We don't need to do any special handling of @options[:check_syntax] here, + # because the Sass syntax checking happens alongside evaluation + # and evaluation doesn't actually evaluate any code anyway. + ::Sass::Engine.new(input.read(), @options[:for_engine]).to_tree + end - output.write(tree.render) - output.close() if output.is_a? File - rescue ::Sass::SyntaxError => e - raise e if @options[:trace] - raise "Syntax error on line #{get_line e}: #{e.message}" + input.close() if input.is_a?(File) + + output.write(tree.render) + output.close() if output.is_a? File + rescue ::Sass::SyntaxError => e + raise e if @options[:trace] + raise "Syntax error on line #{get_line e}: #{e.message}" + end end end diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/filters.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/filters.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/filters.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/filters.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/action_view_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/action_view_extensions.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_mods.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/action_view_mods.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/action_view_mods.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/action_view_mods.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/xss_mods.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/xss_mods.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/helpers/xss_mods.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/helpers/xss_mods.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/html.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/html.rb similarity index 96% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/html.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/html.rb index 36acac60..2d805093 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/html.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/html.rb @@ -132,15 +132,16 @@ module Haml class ::Hpricot::DocType # @see Haml::HTML::Node#to_haml def to_haml(tabs, options) - attrs = public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0] + attrs = public_id.nil? ? ["", "", ""] : + public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0] if attrs == nil raise Exception.new("Invalid doctype") end type, version, strictness = attrs.map { |a| a.downcase } if type == "html" - version = "1.0" - strictness = "transitional" + version = "" + strictness = "strict" if strictness == "" end if version == "1.0" || version.empty? @@ -151,7 +152,7 @@ module Haml strictness = nil end - version = " #{version}" if version + version = " #{version.capitalize}" if version strictness = " #{strictness.capitalize}" if strictness "#{tabulate(tabs)}!!!#{version}#{strictness}\n" diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/precompiler.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/precompiler.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/precompiler.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/precompiler.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/shared.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/shared.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/shared.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/shared.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/patch.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template/patch.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/patch.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template/patch.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/plugin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template/plugin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/template/plugin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/template/plugin.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/util.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/util.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/util.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/util.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/haml/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/haml/version.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/css.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/css.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/css.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/css.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/engine.rb similarity index 98% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/engine.rb index f8af351a..d74d18d4 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/engine.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/engine.rb @@ -129,7 +129,7 @@ module Sass # @param options [{Symbol => Object}] An options hash; # see {file:SASS_REFERENCE.md#sass_options the Sass options documentation} def initialize(template, options={}) - @options = DEFAULT_OPTIONS.merge(options) + @options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?}) @template = template # Backwards compatibility @@ -298,11 +298,11 @@ END def check_for_no_children(node) return unless node.is_a?(Tree::RuleNode) && node.children.empty? warning = (node.rules.size == 1) ? < css, :filename => filename)).render rescue Exception => e + raise e unless options[:full_exception] exception_string(e) end @@ -136,32 +137,31 @@ module Sass end def exception_string(e) - if options[:full_exception] - e_string = "#{e.class}: #{e.message}" + e_string = "#{e.class}: #{e.message}" - if e.is_a? Sass::SyntaxError - e_string << "\non line #{e.sass_line}" + if e.is_a? Sass::SyntaxError + e_string << "\non line #{e.sass_line}" - if e.sass_filename - e_string << " of #{e.sass_filename}" + if e.sass_filename + e_string << " of #{e.sass_filename}" - if File.exists?(e.sass_filename) - e_string << "\n\n" + if File.exists?(e.sass_filename) + e_string << "\n\n" - min = [e.sass_line - 5, 0].max - begin - File.read(e.sass_filename).rstrip.split("\n")[ - min .. e.sass_line + 5 - ].each_with_index do |line, i| - e_string << "#{min + i + 1}: #{line}\n" - end - rescue - e_string << "Couldn't read sass file: #{e.sass_filename}" + min = [e.sass_line - 5, 0].max + begin + File.read(e.sass_filename).rstrip.split("\n")[ + min .. e.sass_line + 5 + ].each_with_index do |line, i| + e_string << "#{min + i + 1}: #{line}\n" end + rescue + e_string << "Couldn't read sass file: #{e.sass_filename}" end end end - <` tags in the HTML. + # This is generally a bad idea; + # since Sass files are by default only compiled once, + # dynamic code is not a great fit. + # + # If you really, really need to compile Sass on each request, + # first make sure you have adequate caching set up. + # Then you can use {Sass::Engine} to render the code, + # using the {file:SASS_REFERENCE.md#custom-option `options` parameter} + # to pass in data that {EvaluationContext#options can be accessed} + # from your Sass functions. # # Within one of the functions in this module, # methods of {EvaluationContext} can be used. diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/lexer.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/lexer.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/lexer.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/lexer.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/literal.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/literal.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/literal.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/literal.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/number.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/number.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/number.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/number.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/operation.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/operation.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/operation.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/operation.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/parser.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/string.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/string.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/string.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/string.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/unary_operation.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/unary_operation.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/unary_operation.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/unary_operation.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/variable.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/variable.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/script/variable.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/script/variable.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/comment_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/comment_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/comment_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/comment_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/debug_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/debug_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/debug_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/debug_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/directive_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/directive_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/directive_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/directive_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/for_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/for_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/for_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/for_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/if_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/if_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/if_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/if_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/import_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/import_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/import_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/import_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_def_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/mixin_def_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_def_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/mixin_def_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/mixin_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/mixin_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/mixin_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/node.rb similarity index 99% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/node.rb index 95e24e32..1db93132 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/node.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/node.rb @@ -56,7 +56,7 @@ module Sass # # @return [String] def filename - @filename || @options[:filename] + @filename || (@options && @options[:filename]) end # Appends a child to the node. diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/prop_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/prop_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/prop_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/prop_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/rule_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/rule_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/rule_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/rule_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/variable_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/variable_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/variable_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/variable_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/while_node.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/while_node.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/lib/sass/tree/while_node.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/lib/sass/tree/while_node.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/rails/init.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/rails/init.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/rails/init.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/rails/init.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/benchmark.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/benchmark.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/benchmark.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/benchmark.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/engine_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/engine_test.rb similarity index 99% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/engine_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/engine_test.rb index 073ce7b6..a097845c 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/engine_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/engine_test.rb @@ -278,6 +278,10 @@ RESULT SOURCE end + def test_nil_option + assert_equal("

\n", render('%p{:foo => "bar"}', :attr_wrapper => nil)) + end + # Regression tests def test_whitespace_nuke_with_both_newlines diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/helper_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/helper_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/helper_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/helper_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/html2haml_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/html2haml_test.rb similarity index 75% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/html2haml_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/html2haml_test.rb index 5c2b545a..6d4afb71 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/html2haml_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/html2haml_test.rb @@ -8,6 +8,19 @@ class Html2HamlTest < Test::Unit::TestCase assert_equal '', render('') end + def test_doctype + assert_equal '!!!', render("") + assert_equal '!!! 1.1', render('') + assert_equal '!!! Strict', render('') + assert_equal '!!! Frameset', render('') + assert_equal '!!! Mobile 1.2', render('') + assert_equal '!!! Basic 1.1', render('') + assert_equal '!!!', render('') + assert_equal '!!! Strict', render('') + assert_equal '!!! Frameset', render('') + assert_equal '!!!', render('') + end + def test_id_and_class_should_be_removed_from_hash assert_equal '%span#foo.bar', render(' ') end diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/markaby/standard.mab b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/markaby/standard.mab similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/markaby/standard.mab rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/markaby/standard.mab diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/mocks/article.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/mocks/article.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/mocks/article.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/mocks/article.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/content_for_layout.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/content_for_layout.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/content_for_layout.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/content_for_layout.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/eval_suppressed.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/eval_suppressed.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/eval_suppressed.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/eval_suppressed.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/filters.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/filters.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/filters.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/filters.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpers.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/helpers.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpers.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/helpers.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpful.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/helpful.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/helpful.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/helpful.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/just_stuff.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/just_stuff.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/just_stuff.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/just_stuff.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/list.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/list.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/list.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/list.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_inner_whitespace.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/nuke_inner_whitespace.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_inner_whitespace.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/nuke_inner_whitespace.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_outer_whitespace.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/nuke_outer_whitespace.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/nuke_outer_whitespace.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/nuke_outer_whitespace.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/original_engine.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/original_engine.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/original_engine.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/original_engine.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partial_layout.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/partial_layout.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partial_layout.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/partial_layout.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partials.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/partials.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/partials.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/partials.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/render_layout.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/render_layout.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/render_layout.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/render_layout.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/silent_script.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/silent_script.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/silent_script.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/silent_script.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/standard.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/standard.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/standard.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/standard.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/tag_parsing.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/tag_parsing.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/tag_parsing.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/tag_parsing.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/very_basic.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/very_basic.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/very_basic.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/very_basic.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/whitespace_handling.xhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/whitespace_handling.xhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/results/whitespace_handling.xhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/results/whitespace_handling.xhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_1.rhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/_av_partial_1.rhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_1.rhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/_av_partial_1.rhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_2.rhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/_av_partial_2.rhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/_av_partial_2.rhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/_av_partial_2.rhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/action_view.rhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/action_view.rhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/action_view.rhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/action_view.rhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/standard.rhtml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/standard.rhtml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/rhtml/standard.rhtml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/rhtml/standard.rhtml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/README.md b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/README.md similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/README.md rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/README.md diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/lua_haml_spec.lua b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/lua_haml_spec.lua similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/lua_haml_spec.lua rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/lua_haml_spec.lua diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/ruby_haml_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/ruby_haml_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/ruby_haml_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/ruby_haml_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/tests.json b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/tests.json similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/spec/tests.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/spec/tests.json diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/template_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/template_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/template_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/template_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_1.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_1.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1_ugly.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_1_ugly.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_1_ugly.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_1_ugly.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_2.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_2.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2_ugly.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_2_ugly.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_av_partial_2_ugly.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_av_partial_2_ugly.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_layout.erb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_layout.erb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout_for_partial.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_layout_for_partial.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_layout_for_partial.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_layout_for_partial.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_partial.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_partial.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_partial.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_partial.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_text_area.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_text_area.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/_text_area.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/_text_area.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/action_view.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/action_view.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view_ugly.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/action_view_ugly.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/action_view_ugly.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/action_view_ugly.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/breakage.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/breakage.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/breakage.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/breakage.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/content_for_layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/content_for_layout.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/content_for_layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/content_for_layout.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/eval_suppressed.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/eval_suppressed.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/eval_suppressed.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/eval_suppressed.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/filters.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/filters.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/filters.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/filters.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpers.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/helpers.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpers.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/helpers.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpful.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/helpful.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/helpful.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/helpful.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/just_stuff.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/just_stuff.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/just_stuff.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/just_stuff.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/list.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/list.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/list.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/list.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_inner_whitespace.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/nuke_inner_whitespace.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_inner_whitespace.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/nuke_inner_whitespace.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_outer_whitespace.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/nuke_outer_whitespace.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/nuke_outer_whitespace.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/nuke_outer_whitespace.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/original_engine.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/original_engine.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/original_engine.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/original_engine.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partial_layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partial_layout.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partial_layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partial_layout.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partialize.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partialize.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partialize.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partialize.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partials.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partials.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/partials.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/partials.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/render_layout.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/render_layout.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/render_layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/render_layout.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/silent_script.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/silent_script.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/silent_script.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/silent_script.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/standard.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/standard.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard_ugly.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/standard_ugly.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/standard_ugly.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/standard_ugly.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/tag_parsing.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/tag_parsing.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/tag_parsing.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/tag_parsing.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/very_basic.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/very_basic.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/very_basic.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/very_basic.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/whitespace_handling.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/whitespace_handling.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/templates/whitespace_handling.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/templates/whitespace_handling.haml diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/util_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/util_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/haml/util_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/haml/util_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/linked_rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/linked_rails.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/linked_rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/linked_rails.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/css2sass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/css2sass_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/css2sass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/css2sass_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/engine_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/engine_test.rb similarity index 97% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/engine_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/engine_test.rb index 21bc4d3a..4bbec266 100755 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/engine_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/engine_test.rb @@ -211,6 +211,16 @@ SASS assert File.exists?(sassc_path("importee")) end + def test_nonexistent_extensionless_import + assert_warning(< nil)} +WARNING on line 1: +Selector "foo bar" doesn't have any properties and will not be rendered. +END end def test_root_level_pseudo_class_with_new_properties @@ -766,6 +781,16 @@ p SASS end + def test_nil_option + assert_equal(< nil)) +foo { + a: b; } +CSS +foo + a: b +SASS + end + # Regression tests def test_parens_in_mixins diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/functions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/functions_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/functions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/functions_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more1.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more1.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1_with_line_comments.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more1_with_line_comments.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more1_with_line_comments.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more1_with_line_comments.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more_import.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more_import.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_results/more_import.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_results/more_import.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/_more_partial.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/_more_partial.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/_more_partial.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/_more_partial.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more1.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/more1.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more1.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/more1.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more_import.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/more_import.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/more_templates/more_import.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/more_templates/more_import.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/plugin_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/plugin_test.rb similarity index 88% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/plugin_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/plugin_test.rb index 4b2aa2da..c1553a8f 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/plugin_test.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/plugin_test.rb @@ -32,7 +32,7 @@ class SassPluginTest < Test::Unit::TestCase File.delete(tempfile_loc('basic')) assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc) Sass::Plugin.update_stylesheets - assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc) + assert_stylesheet_updated 'basic' end def test_update_needed_when_modified @@ -40,7 +40,7 @@ class SassPluginTest < Test::Unit::TestCase FileUtils.touch(template_loc('basic')) assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc) Sass::Plugin.update_stylesheets - assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc) + assert_stylesheet_updated 'basic' end def test_update_needed_when_dependency_modified @@ -48,7 +48,7 @@ class SassPluginTest < Test::Unit::TestCase FileUtils.touch(template_loc('basic')) assert Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc) Sass::Plugin.update_stylesheets - assert !Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc) + assert_stylesheet_updated 'basic' end def test_full_exception_handling @@ -61,14 +61,13 @@ class SassPluginTest < Test::Unit::TestCase end def test_nonfull_exception_handling + old_full_exception = Sass::Plugin.options[:full_exception] Sass::Plugin.options[:full_exception] = false File.delete(tempfile_loc('bork')) - Sass::Plugin.update_stylesheets - assert_equal("/* Internal stylesheet error */", File.read(tempfile_loc('bork'))) - File.delete(tempfile_loc('bork')) - - Sass::Plugin.options[:full_exception] = true + assert_raise(Sass::SyntaxError) {Sass::Plugin.update_stylesheets} + ensure + Sass::Plugin.options[:full_exception] = old_full_exception end def test_two_template_directories @@ -117,7 +116,7 @@ class SassPluginTest < Test::Unit::TestCase Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/')) end - assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc) + assert_stylesheet_updated 'basic' end def test_doesnt_render_partials @@ -162,6 +161,17 @@ class SassPluginTest < Test::Unit::TestCase end end + def assert_stylesheet_updated(name) + assert !Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc) + + # Make sure it isn't an exception + expected_lines = File.read(result_loc(name)).split("\n") + actual_lines = File.read(tempfile_loc(name)).split("\n") + if actual_lines.first == "/*" && expected_lines.first != "/*" + assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n")) + end + end + def template_loc(name = nil, prefix = nil) if name absolutize "#{prefix}templates/#{name}.sass" diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/alt.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/alt.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/alt.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/alt.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/basic.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/basic.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/basic.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/basic.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compact.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/compact.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compact.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/compact.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/complex.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/complex.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/complex.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/complex.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compressed.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/compressed.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/compressed.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/compressed.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/expanded.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/expanded.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/expanded.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/expanded.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/import.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/import.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/import.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/import.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/line_numbers.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/line_numbers.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/line_numbers.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/line_numbers.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/mixins.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/mixins.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/mixins.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/mixins.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/multiline.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/multiline.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/multiline.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/multiline.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/nested.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/nested.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/nested.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/nested.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/parent_ref.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/parent_ref.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/parent_ref.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/parent_ref.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/script.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/script.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/script.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/script.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/nested_subdir/nested_subdir.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/subdir/nested_subdir/nested_subdir.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/nested_subdir/nested_subdir.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/subdir/nested_subdir/nested_subdir.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/subdir.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/subdir/subdir.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/subdir/subdir.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/subdir/subdir.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/units.css b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/units.css similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/results/units.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/results/units.css diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/script_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/script_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/script_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/script_test.rb diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/_partial.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/_partial.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/_partial.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/_partial.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/alt.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/alt.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/alt.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/alt.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/basic.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/basic.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/basic.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/basic.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/bork.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/bork.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork2.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/bork2.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/bork2.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/bork2.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compact.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/compact.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compact.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/compact.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/complex.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/complex.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/complex.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/complex.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compressed.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/compressed.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/compressed.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/compressed.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/expanded.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/expanded.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/expanded.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/expanded.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/import.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/import.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/import.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/import.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/importee.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/importee.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/importee.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/importee.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/line_numbers.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/line_numbers.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/line_numbers.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/line_numbers.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/mixins.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/mixins.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/mixins.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/mixins.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/multiline.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/multiline.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/multiline.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/multiline.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/nested.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/nested.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/nested.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/nested.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/parent_ref.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/parent_ref.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/parent_ref.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/parent_ref.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/script.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/script.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/script.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/script.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/_nested_partial.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/nested_subdir/_nested_partial.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/_nested_partial.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/nested_subdir/_nested_partial.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/nested_subdir.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/nested_subdir/nested_subdir.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/nested_subdir/nested_subdir.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/nested_subdir/nested_subdir.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/subdir.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/subdir.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/subdir/subdir.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/subdir/subdir.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/units.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/units.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/sass/templates/units.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/sass/templates/units.sass diff --git a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/test_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/test_helper.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/haml-2.2.16/test/test_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/test_helper.rb index a31a675e..3e88d74d 100644 --- a/lib/middleman/vendor/gems/gems/haml-2.2.16/test/test_helper.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/haml-2.2.17/test/test_helper.rb @@ -11,7 +11,7 @@ Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED) class Test::Unit::TestCase def munge_filename(opts) - return if opts[:filename] + return if opts.has_key?(:filename) test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1') opts[:filename] = "#{test_name}_inline.sass" end diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/CHANGELOG b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/CHANGELOG similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/CHANGELOG rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/CHANGELOG diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/INSTALL b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/INSTALL old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/INSTALL rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/INSTALL diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/LICENSE old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/LICENSE diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/README b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/README old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/README diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/Rakefile diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/TODO old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/TODO rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/TODO diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/ansi_colors.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/ansi_colors.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/ansi_colors.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/ansi_colors.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/asking_for_arrays.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/asking_for_arrays.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/asking_for_arrays.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/asking_for_arrays.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/basic_usage.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/basic_usage.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/basic_usage.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/basic_usage.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/color_scheme.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/color_scheme.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/color_scheme.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/color_scheme.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/limit.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/limit.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/limit.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/limit.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/menus.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/menus.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/menus.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/menus.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/overwrite.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/overwrite.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/overwrite.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/overwrite.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/page_and_wrap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/page_and_wrap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/page_and_wrap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/page_and_wrap.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/password.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/password.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/password.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/password.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/trapping_eof.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/trapping_eof.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/trapping_eof.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/trapping_eof.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/examples/using_readline.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/using_readline.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/examples/using_readline.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/examples/using_readline.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/color_scheme.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/color_scheme.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/color_scheme.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/color_scheme.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/compatibility.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/compatibility.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/compatibility.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/compatibility.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/import.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/import.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/import.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/import.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/menu.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/menu.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/menu.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/menu.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/question.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/question.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/question.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/question.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/system_extensions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/system_extensions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/lib/highline/system_extensions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/lib/highline/system_extensions.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/setup.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/setup.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/setup.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/setup.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_color_scheme.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_color_scheme.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_color_scheme.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_color_scheme.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_highline.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_highline.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_highline.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_highline.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_import.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_import.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_import.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_import.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_menu.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_menu.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/test/tc_menu.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/tc_menu.rb diff --git a/lib/middleman/vendor/gems/gems/highline-1.5.1/test/ts_all.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/ts_all.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/highline-1.5.1/test/ts_all.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/highline-1.5.1/test/ts_all.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2/cookie.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2/cookie.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2/cookie.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2/cookie.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2/http.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2/http.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/http-access2/http.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/http-access2/http.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/auth.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/auth.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/auth.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/auth.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cacert.p7s b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cacert.p7s similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cacert.p7s rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cacert.p7s diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cacert_sha1.p7s b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cacert_sha1.p7s similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cacert_sha1.p7s rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cacert_sha1.p7s diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/connection.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/connection.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/connection.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/connection.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cookie.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cookie.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/cookie.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/cookie.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/http.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/http.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/http.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/http.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/session.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/session.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/session.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/session.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/ssl_config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/ssl_config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/ssl_config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/ssl_config.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/timeout.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/timeout.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/timeout.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/timeout.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/util.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/util.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/httpclient/util.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/httpclient/util.rb diff --git a/lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/tags b/lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/tags similarity index 100% rename from lib/middleman/vendor/gems/gems/httpclient-2.1.5.2/lib/tags rename to lib/middleman/vendor/gems/ruby/1.8/gems/httpclient-2.1.5.2/lib/tags diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/.require_paths b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/.require_paths similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/.require_paths rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/.require_paths diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/CHANGES b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/CHANGES similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/CHANGES rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/CHANGES diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/COPYING b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/COPYING similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/COPYING rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/COPYING diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/GPL b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/GPL similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/GPL rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/GPL diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/README b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/README similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/README diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/Rakefile diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/TODO new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/TODO @@ -0,0 +1 @@ + diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/VERSION similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/VERSION rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/VERSION diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/generator_benchmark.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/generator_benchmark.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/generator_benchmark.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/generator_benchmark.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/parser_benchmark.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/parser_benchmark.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/benchmarks/parser_benchmark.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/benchmarks/parser_benchmark.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/bin/edit_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/bin/edit_json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/bin/edit_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/bin/edit_json.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/bin/prettify_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/bin/prettify_json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/bin/prettify_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/bin/prettify_json.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/data/example.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/example.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/data/example.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/example.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/data/index.html b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/index.html similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/data/index.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/index.html diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/data/prototype.js b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/prototype.js similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/data/prototype.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/data/prototype.js diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator.bundle b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator.bundle new file mode 100755 index 00000000..a395a573 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator.bundle differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/Makefile b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/Makefile new file mode 100644 index 00000000..0ec84d3e --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/Makefile @@ -0,0 +1,157 @@ + +SHELL = /bin/sh + +#### Start of system configuration section. #### + +srcdir = . +topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 +hdrdir = $(topdir) +VPATH = $(srcdir):$(topdir):$(hdrdir) +exec_prefix = $(prefix) +prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr +sharedstatedir = $(prefix)/com +mandir = $(DESTDIR)/usr/share/man +psdir = $(docdir) +oldincludedir = $(DESTDIR)/usr/include +localedir = $(datarootdir)/locale +bindir = $(exec_prefix)/bin +libexecdir = $(exec_prefix)/libexec +sitedir = $(DESTDIR)/Library/Ruby/Site +htmldir = $(docdir) +vendorarchdir = $(vendorlibdir)/$(sitearch) +includedir = $(prefix)/include +infodir = $(DESTDIR)/usr/share/info +vendorlibdir = $(vendordir)/$(ruby_version) +sysconfdir = $(prefix)/etc +libdir = $(exec_prefix)/lib +sbindir = $(exec_prefix)/sbin +rubylibdir = $(libdir)/ruby/$(ruby_version) +docdir = $(datarootdir)/doc/$(PACKAGE) +dvidir = $(docdir) +vendordir = $(libdir)/ruby/vendor_ruby +datarootdir = $(prefix)/share +pdfdir = $(docdir) +archdir = $(rubylibdir)/$(arch) +sitearchdir = $(sitelibdir)/$(sitearch) +datadir = $(datarootdir) +localstatedir = $(prefix)/var +sitelibdir = $(sitedir)/$(ruby_version) + +CC = gcc +LIBRUBY = $(LIBRUBY_SO) +LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a +LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) +LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME) + +RUBY_EXTCONF_H = +CFLAGS = -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common $(cflags) -Wall +INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) +DEFS = +CPPFLAGS = -DHAVE_RUBY_ST_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) +CXXFLAGS = $(CFLAGS) +ldflags = -L. -arch i386 -arch x86_64 +dldflags = +archflag = +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup +AR = ar +EXEEXT = + +RUBY_INSTALL_NAME = ruby +RUBY_SO_NAME = ruby +arch = universal-darwin10.0 +sitearch = universal-darwin10.0 +ruby_version = 1.8 +ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +RUBY = $(ruby) +RM = rm -f +MAKEDIRS = mkdir -p +INSTALL = /usr/bin/install -c +INSTALL_PROG = $(INSTALL) -m 0755 +INSTALL_DATA = $(INSTALL) -m 644 +COPY = cp + +#### End of system configuration section. #### + +preload = + +libpath = . $(libdir) +LIBPATH = -L. -L$(libdir) +DEFFILE = + +CLEANFILES = mkmf.log +DISTCLEANFILES = + +extout = +extout_prefix = +target_prefix = +LOCAL_LIBS = +LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl +SRCS = generator.c unicode.c +OBJS = generator.o unicode.o +TARGET = generator +DLLIB = $(TARGET).bundle +EXTSTATIC = +STATIC_LIB = + +BINDIR = $(bindir) +RUBYCOMMONDIR = $(sitedir)$(target_prefix) +RUBYLIBDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext$(target_prefix) +RUBYARCHDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext$(target_prefix) + +TARGET_SO = $(DLLIB) +CLEANLIBS = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map +CLEANOBJS = *.o *.a *.s[ol] *.pdb *.exp *.bak + +all: $(DLLIB) +static: $(STATIC_LIB) + +clean: + @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) + +distclean: clean + @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log + @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) + +realclean: distclean +install: install-so install-rb + +install-so: $(RUBYARCHDIR) +install-so: $(RUBYARCHDIR)/$(DLLIB) +$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) + $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) +install-rb: pre-install-rb install-rb-default +install-rb-default: pre-install-rb-default +pre-install-rb: Makefile +pre-install-rb-default: Makefile +$(RUBYARCHDIR): + $(MAKEDIRS) $@ + +site-install: site-install-so site-install-rb +site-install-so: install-so +site-install-rb: install-rb + +.SUFFIXES: .c .m .cc .cxx .cpp .C .o + +.cc.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.cxx.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.cpp.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.C.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.c.o: + $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< + +$(DLLIB): $(OBJS) + @-$(RM) $@ + $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) + + + +$(OBJS): ruby.h defines.h diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/extconf.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/extconf.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/extconf.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/extconf.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.bundle b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.bundle new file mode 100755 index 00000000..a395a573 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.bundle differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/generator.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.c diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.o b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.o new file mode 100644 index 00000000..f8dcb104 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/generator.o differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/mkmf.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/mkmf.log new file mode 100644 index 00000000..02fefa8a --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/mkmf.log @@ -0,0 +1,21 @@ +have_header: checking for ruby/st.h... -------------------- yes + +"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" +checked program was: +/* begin */ +1: #include +/* end */ + +-------------------- + +have_header: checking for ruby/encoding.h... -------------------- no + +"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" +conftest.c:1:27: error: ruby/encoding.h: No such file or directory +checked program was: +/* begin */ +1: #include +/* end */ + +-------------------- + diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.c diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.h b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.h similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/generator/unicode.h rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.h diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.o b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.o new file mode 100644 index 00000000..eb3c6bf5 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/generator/unicode.o differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser.bundle b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser.bundle new file mode 100755 index 00000000..930998ec Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser.bundle differ diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/Makefile b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/Makefile new file mode 100644 index 00000000..882edf51 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/Makefile @@ -0,0 +1,157 @@ + +SHELL = /bin/sh + +#### Start of system configuration section. #### + +srcdir = . +topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 +hdrdir = $(topdir) +VPATH = $(srcdir):$(topdir):$(hdrdir) +exec_prefix = $(prefix) +prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr +sharedstatedir = $(prefix)/com +mandir = $(DESTDIR)/usr/share/man +psdir = $(docdir) +oldincludedir = $(DESTDIR)/usr/include +localedir = $(datarootdir)/locale +bindir = $(exec_prefix)/bin +libexecdir = $(exec_prefix)/libexec +sitedir = $(DESTDIR)/Library/Ruby/Site +htmldir = $(docdir) +vendorarchdir = $(vendorlibdir)/$(sitearch) +includedir = $(prefix)/include +infodir = $(DESTDIR)/usr/share/info +vendorlibdir = $(vendordir)/$(ruby_version) +sysconfdir = $(prefix)/etc +libdir = $(exec_prefix)/lib +sbindir = $(exec_prefix)/sbin +rubylibdir = $(libdir)/ruby/$(ruby_version) +docdir = $(datarootdir)/doc/$(PACKAGE) +dvidir = $(docdir) +vendordir = $(libdir)/ruby/vendor_ruby +datarootdir = $(prefix)/share +pdfdir = $(docdir) +archdir = $(rubylibdir)/$(arch) +sitearchdir = $(sitelibdir)/$(sitearch) +datadir = $(datarootdir) +localstatedir = $(prefix)/var +sitelibdir = $(sitedir)/$(ruby_version) + +CC = gcc +LIBRUBY = $(LIBRUBY_SO) +LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a +LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME) +LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME) + +RUBY_EXTCONF_H = +CFLAGS = -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common $(cflags) -Wall +INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir) +DEFS = +CPPFLAGS = -DHAVE_RUBY_ST_H -DHAVE_RE_H -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags) +CXXFLAGS = $(CFLAGS) +ldflags = -L. -arch i386 -arch x86_64 +dldflags = +archflag = +DLDFLAGS = $(ldflags) $(dldflags) $(archflag) +LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup +AR = ar +EXEEXT = + +RUBY_INSTALL_NAME = ruby +RUBY_SO_NAME = ruby +arch = universal-darwin10.0 +sitearch = universal-darwin10.0 +ruby_version = 1.8 +ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby +RUBY = $(ruby) +RM = rm -f +MAKEDIRS = mkdir -p +INSTALL = /usr/bin/install -c +INSTALL_PROG = $(INSTALL) -m 0755 +INSTALL_DATA = $(INSTALL) -m 644 +COPY = cp + +#### End of system configuration section. #### + +preload = + +libpath = . $(libdir) +LIBPATH = -L. -L$(libdir) +DEFFILE = + +CLEANFILES = mkmf.log +DISTCLEANFILES = + +extout = +extout_prefix = +target_prefix = +LOCAL_LIBS = +LIBS = $(LIBRUBYARG_SHARED) -lpthread -ldl +SRCS = parser.c unicode.c +OBJS = parser.o unicode.o +TARGET = parser +DLLIB = $(TARGET).bundle +EXTSTATIC = +STATIC_LIB = + +BINDIR = $(bindir) +RUBYCOMMONDIR = $(sitedir)$(target_prefix) +RUBYLIBDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext$(target_prefix) +RUBYARCHDIR = /Users/tdreyno/Dropbox/Sites/middleman/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext$(target_prefix) + +TARGET_SO = $(DLLIB) +CLEANLIBS = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map +CLEANOBJS = *.o *.a *.s[ol] *.pdb *.exp *.bak + +all: $(DLLIB) +static: $(STATIC_LIB) + +clean: + @-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) + +distclean: clean + @-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log + @-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES) + +realclean: distclean +install: install-so install-rb + +install-so: $(RUBYARCHDIR) +install-so: $(RUBYARCHDIR)/$(DLLIB) +$(RUBYARCHDIR)/$(DLLIB): $(DLLIB) + $(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR) +install-rb: pre-install-rb install-rb-default +install-rb-default: pre-install-rb-default +pre-install-rb: Makefile +pre-install-rb-default: Makefile +$(RUBYARCHDIR): + $(MAKEDIRS) $@ + +site-install: site-install-so site-install-rb +site-install-so: install-so +site-install-rb: install-rb + +.SUFFIXES: .c .m .cc .cxx .cpp .C .o + +.cc.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.cxx.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.cpp.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.C.o: + $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $< + +.c.o: + $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $< + +$(DLLIB): $(OBJS) + @-$(RM) $@ + $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS) + + + +$(OBJS): ruby.h defines.h diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/extconf.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/extconf.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/extconf.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/extconf.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/mkmf.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/mkmf.log new file mode 100644 index 00000000..e4168270 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/mkmf.log @@ -0,0 +1,20 @@ +have_header: checking for ruby/st.h... -------------------- yes + +"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" +checked program was: +/* begin */ +1: #include +/* end */ + +-------------------- + +have_header: checking for re.h... -------------------- yes + +"gcc -E -I. -I/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin10.0 -I. -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -g -Os -pipe -fno-common -DENABLE_DTRACE -fno-common -pipe -fno-common -Wall conftest.c -o conftest.i" +checked program was: +/* begin */ +1: #include +/* end */ + +-------------------- + diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.bundle b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.bundle new file mode 100755 index 00000000..930998ec Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.bundle differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.c diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.o b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.o new file mode 100644 index 00000000..a12f4e3b Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.o differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.rl b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.rl similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/parser.rl rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/parser.rl diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.c diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.h b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.h similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/ext/json/ext/parser/unicode.h rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.h diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.o b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.o new file mode 100644 index 00000000..b8bbbe85 Binary files /dev/null and b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/ext/json/ext/parser/unicode.o differ diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/install.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/install.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/install.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/install.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Array.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Array.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Array.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Array.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/FalseClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/FalseClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/FalseClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/FalseClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Hash.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Hash.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Hash.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Hash.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Key.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Key.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Key.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Key.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/NilClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/NilClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/NilClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/NilClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Numeric.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Numeric.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/Numeric.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/Numeric.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/String.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/String.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/String.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/String.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/TrueClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/TrueClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/TrueClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/TrueClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/add/core.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/add/core.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/add/core.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/add/core.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/add/rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/add/rails.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/add/rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/add/rails.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/common.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/common.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/common.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/common.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/editor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/editor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/editor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/editor.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/ext.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/ext.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/ext.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/ext.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/json.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/json.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/json.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/json.xpm diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure/generator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure/generator.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure/generator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure/generator.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure/parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure/parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/pure/parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/pure/parser.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/lib/json/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/lib/json/version.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail1.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail1.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail1.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail1.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail10.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail10.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail10.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail10.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail11.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail11.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail11.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail11.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail12.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail12.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail12.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail12.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail13.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail13.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail13.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail13.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail14.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail14.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail14.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail14.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail18.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail18.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail18.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail18.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail19.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail19.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail19.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail19.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail2.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail2.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail2.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail2.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail20.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail20.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail20.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail20.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail21.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail21.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail21.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail21.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail22.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail22.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail22.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail22.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail23.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail23.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail23.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail23.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail24.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail24.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail24.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail24.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail25.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail25.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail25.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail25.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail27.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail27.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail27.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail27.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail28.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail28.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail28.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail28.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail3.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail3.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail3.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail3.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail4.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail4.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail4.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail4.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail5.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail5.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail5.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail5.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail6.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail6.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail6.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail6.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail7.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail7.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail7.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail7.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail8.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail8.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail8.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail8.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail9.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail9.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/fail9.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/fail9.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass1.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass1.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass1.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass1.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass15.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass15.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass15.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass15.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass16.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass16.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass16.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass16.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass17.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass17.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass17.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass17.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass2.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass2.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass2.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass2.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass26.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass26.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass26.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass26.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass3.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass3.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/fixtures/pass3.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/fixtures/pass3.json diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_addition.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_addition.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_addition.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_addition.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_encoding.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_encoding.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_encoding.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_encoding.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_fixtures.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_fixtures.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_fixtures.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_fixtures.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_generate.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_generate.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_generate.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_generate.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_rails.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_rails.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_unicode.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_unicode.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tests/test_json_unicode.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tests/test_json_unicode.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tools/fuzz.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tools/fuzz.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tools/fuzz.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tools/fuzz.rb diff --git a/lib/middleman/vendor/gems/gems/json-1.2.0/tools/server.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tools/server.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json-1.2.0/tools/server.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json-1.2.0/tools/server.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/CHANGES b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/CHANGES similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/CHANGES rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/CHANGES diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/COPYING b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/COPYING similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/COPYING rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/COPYING diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/GPL b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/GPL similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/GPL rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/GPL diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/README b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/README similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/README diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/Rakefile diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/TODO new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/TODO @@ -0,0 +1 @@ + diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/VERSION similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/VERSION rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/VERSION diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/generator_benchmark.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/benchmarks/parser_benchmark.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/bin/edit_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/bin/edit_json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/bin/edit_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/bin/edit_json.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/bin/prettify_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/bin/prettify_json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/bin/prettify_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/bin/prettify_json.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/example.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/example.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/example.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/example.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/index.html b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/index.html similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/index.html rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/index.html diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/prototype.js b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/prototype.js similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/data/prototype.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/data/prototype.js diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/extconf.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/extconf.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/extconf.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/extconf.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/generator.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/generator.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/generator.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/generator.c diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.c diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.h b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.h similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.h rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/generator/unicode.h diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/extconf.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/extconf.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/extconf.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/extconf.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/parser.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/parser.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/parser.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/parser.c diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/parser.rl b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/parser.rl similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/parser.rl rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/parser.rl diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.c b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.c similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.c diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.h b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.h similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.h rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/ext/json/ext/parser/unicode.h diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/install.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/install.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/install.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/install.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Array.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Array.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Array.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Array.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/FalseClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/FalseClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/FalseClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/FalseClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Hash.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Hash.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Hash.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Hash.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Key.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Key.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Key.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Key.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/NilClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/NilClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/NilClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/NilClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Numeric.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Numeric.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/Numeric.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/Numeric.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/String.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/String.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/String.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/String.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/TrueClass.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/TrueClass.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/TrueClass.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/TrueClass.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/add/core.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/add/core.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/add/core.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/add/core.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/add/rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/add/rails.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/add/rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/add/rails.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/common.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/common.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/common.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/common.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/editor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/editor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/editor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/editor.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/ext.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/ext.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/ext.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/ext.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/json.xpm b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/json.xpm similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/json.xpm rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/json.xpm diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure/generator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure/generator.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure/generator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure/generator.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure/parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure/parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/pure/parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/pure/parser.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/lib/json/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/lib/json/version.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail1.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail1.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail1.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail1.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail10.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail10.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail10.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail10.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail11.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail11.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail11.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail11.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail12.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail12.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail12.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail12.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail13.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail13.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail13.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail13.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail14.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail14.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail14.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail14.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail18.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail18.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail18.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail18.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail19.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail19.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail19.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail19.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail2.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail2.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail2.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail2.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail20.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail20.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail20.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail20.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail21.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail21.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail21.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail21.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail22.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail22.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail22.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail22.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail23.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail23.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail23.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail23.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail24.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail24.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail24.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail24.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail25.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail25.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail25.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail25.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail27.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail27.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail27.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail27.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail28.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail28.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail28.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail28.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail3.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail3.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail3.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail3.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail4.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail4.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail4.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail4.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail5.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail5.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail5.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail5.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail6.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail6.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail6.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail6.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail7.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail7.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail7.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail7.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail8.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail8.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail8.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail8.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail9.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail9.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/fail9.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/fail9.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass1.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass1.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass1.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass1.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass15.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass15.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass15.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass15.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass16.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass16.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass16.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass16.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass17.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass17.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass17.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass17.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass2.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass2.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass2.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass2.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass26.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass26.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass26.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass26.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass3.json b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass3.json similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/fixtures/pass3.json rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/fixtures/pass3.json diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_addition.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_addition.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_addition.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_addition.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_encoding.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_encoding.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_encoding.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_encoding.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_fixtures.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_fixtures.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_fixtures.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_fixtures.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_generate.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_generate.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_generate.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_generate.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_rails.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_rails.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_rails.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_rails.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_unicode.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_unicode.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tests/test_json_unicode.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tests/test_json_unicode.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/fuzz.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tools/fuzz.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/fuzz.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tools/fuzz.rb diff --git a/lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/server.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tools/server.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/json_pure-1.2.0/tools/server.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/json_pure-1.2.0/tools/server.rb diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/HISTORY b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/HISTORY similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/HISTORY rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/HISTORY diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/LICENSE similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/LICENSE diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/README b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/README similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/README diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/Rakefile diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/bin/launchy b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/bin/launchy similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/bin/launchy rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/bin/launchy diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/gemspec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/gemspec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/gemspec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/gemspec.rb diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/application.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/application.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/browser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/browser.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/command_line.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/command_line.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/paths.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/paths.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/lib/launchy/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/lib/launchy/version.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/application_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/application_spec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/browser_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/browser_spec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/launchy_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/launchy_spec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/paths_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/paths_spec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/spec_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/spec_helper.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/tattle-host-os.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/tattle-host-os.yml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/spec/version_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/spec/version_spec.rb diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/announce.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/announce.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/announce.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/announce.rake diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/config.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/config.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/config.rb diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/distribution.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/distribution.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/distribution.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/distribution.rake diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/documentation.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/documentation.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/documentation.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/documentation.rake diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rspec.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rspec.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rspec.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rspec.rake diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rubyforge.rake b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rubyforge.rake similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/rubyforge.rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/rubyforge.rake diff --git a/lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/utils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/utils.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/launchy-0.3.5/tasks/utils.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/launchy-0.3.5/tasks/utils.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/COPYING b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/COPYING old mode 100755 new mode 100644 similarity index 92% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/COPYING rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/COPYING index 11b4c6e0..83b390bc --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/COPYING +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2007, 2008, 2009 Christian Neukirchen +Copyright (c) 2007, 2008, 2009, 2010 Christian Neukirchen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/KNOWN-ISSUES b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/KNOWN-ISSUES old mode 100755 new mode 100644 similarity index 83% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/KNOWN-ISSUES rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/KNOWN-ISSUES index 790199bd..a1af5dc1 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/KNOWN-ISSUES +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/KNOWN-ISSUES @@ -16,3 +16,6 @@ end Of course, use this only when your app runs at "/". + + Since lighttpd 1.4.23, you also can use the "fix-root-scriptname" flag + in fastcgi.server. diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/empty/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/RDOX similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/empty/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/RDOX diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/README b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/README old mode 100755 new mode 100644 similarity index 80% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/README index c58009ff..777b12d3 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/README +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/README @@ -11,21 +11,13 @@ which all Rack applications should conform to. == Specification changes in this release -With Rack 1.0, the Rack specification (found in SPEC) changed in the -following backward-incompatible ways. This was done to properly -support Ruby 1.9 and to deprecate some problematic techniques: +With Rack 1.1, the Rack specification (found in SPEC) changed in the +following backward-incompatible ways. -* Rack::VERSION has been pushed to [1,0]. -* Header values must be Strings now, split on "\n". -* rack.input must be rewindable and support reading into a buffer, - wrap with Rack::RewindableInput if it isn't. -* Content-Length can be missing, in this case chunked transfer - encoding is used. -* Bodies can now additionally respond to #to_path with a filename to - be served. -* String bodies are deprecated and will not work with Ruby 1.9, use an - Array with a single String instead. -* rack.session is now specified. +* Rack::VERSION has been pushed to [1,1]. +* rack.logger is now specified. +* The SPEC now allows subclasses of the required types. +* rack.input has to be opened in binary mode. == Supported web servers @@ -43,8 +35,11 @@ The included *handlers* connect all kinds of web servers to Rack: These web servers include Rack handlers in their distributions: * Ebb * Fuzed +* Glassfish v3 * Phusion Passenger (which is mod_rack for Apache and for nginx) +* Rainbows! * Unicorn +* Zbatery Any valid Rack app will run the same on all these handlers, without changing anything. @@ -70,6 +65,7 @@ These frameworks include Rack adapters in their distributions: * Vintage * Waves * Wee +* ... and many others. Current links to these projects can be found at http://wiki.ramaze.net/Home#other-frameworks @@ -130,13 +126,13 @@ Either with the embedded WEBrick starter: Or with rackup: - bin/rackup -Ilib example/lobster.ru + bin/rackup -Ilib example/lobster.ru By default, the lobster is found at http://localhost:9292. == Installing with RubyGems -A Gem of Rack is available. You can install it with: +A Gem of Rack is available at gemcutter.org. You can install it with: gem install rack @@ -165,7 +161,6 @@ To run the test suite completely, you need: * fcgi * memcache-client * mongrel - * ruby-openid * thin The full set of tests test FCGI access with lighttpd (on port @@ -283,16 +278,49 @@ run on port 11211) and memcache-client installed. * Make sure WEBrick respects the :Host option * Many Ruby 1.9 fixes. +* January 3rd, 2009: Ninth public release 1.1.0. + * Moved Auth::OpenID to rack-contrib. + * SPEC change that relaxes Lint slightly to allow subclasses of the + required types + * SPEC change to document rack.input binary mode in greator detail + * SPEC define optional rack.logger specification + * File servers support X-Cascade header + * Imported Config middleware + * Imported ETag middleware + * Imported Runtime middleware + * Imported Sendfile middleware + * New Logger and NullLogger middlewares + * Added mime type for .ogv and .manifest. + * Don't squeeze PATH_INFO slashes + * Use Content-Type to determine POST params parsing + * Update Rack::Utils::HTTP_STATUS_CODES hash + * Add status code lookup utility + * Response should call #to_i on the status + * Add Request#user_agent + * Request#host knows about forwared host + * Return an empty string for Request#host if HTTP_HOST and + SERVER_NAME are both missing + * Allow MockRequest to accept hash params + * Optimizations to HeaderHash + * Refactored rackup into Rack::Server + * Added Utils.build_nested_query to complement Utils.parse_nested_query + * Added Utils::Multipart.build_multipart to complement + Utils::Multipart.parse_multipart + * Extracted set and delete cookie helpers into Utils so they can be + used outside Response + * Extract parse_query and parse_multipart in Request so subclasses + can change their behavior + * Enforce binary encoding in RewindableInput + * Set correct external_encoding for handlers that don't use RewindableInput + == Contact -Please mail bugs, suggestions and patches to -. +Please post bugs, suggestions and patches to +the bug tracker at . Mailing list archives are available at . -There is a bug tracker at . - Git repository (send Git patches to the mailing list): * http://github.com/rack/rack * http://git.vuxu.org/cgi-bin/gitweb.cgi?p=rack.git @@ -318,8 +346,14 @@ would like to thank: * Luc Heinrich for the Cookie sessions, the static file handler and bugfixes. * Armin Ronacher, for the logo and racktools. * Aredridel, Ben Alpert, Dan Kubb, Daniel Roethlisberger, Matt Todd, - Tom Robinson, Phil Hagelberg, and S. Brent Faulkner for bug fixing - and other improvements. + Tom Robinson, Phil Hagelberg, S. Brent Faulkner, Bosko Milekic, + Daniel Rodríguez Troitiño, Genki Takiuchi, Geoffrey Grosenbach, + Julien Sanchez, Kamal Fariz Mahyuddin, Masayoshi Takahashi, Patrick + Aljordm, Mig, and Kazuhiro Nishiyama for bug fixing and other + improvements. +* Eric Wong, Hongli Lai, Jeremy Kemper for their continuous support + and API improvements. +* Yehuda Katz and Carl Lerche for refactoring rackup. * Brian Candler, for Rack::ContentType. * Graham Batty, for improved handler loading. * Stephen Bannasch, for bug reports and documentation. @@ -334,7 +368,7 @@ would like to thank: == Copyright -Copyright (C) 2007, 2008, 2009 Christian Neukirchen +Copyright (C) 2007, 2008, 2009, 2010 Christian Neukirchen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to @@ -349,7 +383,7 @@ all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -358,6 +392,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Rack:: Rack's Rubyforge project:: Official Rack repositories:: +Rack Lighthouse Bug Tracking:: rack-devel mailing list:: Christian Neukirchen:: diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/SPEC b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/SPEC old mode 100755 new mode 100644 similarity index 95% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/SPEC rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/SPEC index e4d252ec..d2260cbe --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/SPEC +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/SPEC @@ -52,7 +52,7 @@ below. request. In addition to this, the Rack environment must include these Rack-specific variables: -rack.version:: The Array [1,0], representing this version of Rack. +rack.version:: The Array [1,1], representing this version of Rack. rack.url_scheme:: +http+ or +https+, depending on the request URL. rack.input:: See below, the input stream. rack.errors:: See below, the error stream. @@ -68,6 +68,13 @@ be implemented by the server. fetch(key, default = nil) (aliased as []); delete(key); clear; +rack.logger:: A common object interface for logging messages. + The object must implement: + info(message, &block) + debug(message, &block) + warn(message, &block) + error(message, &block) + fatal(message, &block) The server or the application can store their own data in the environment, too. The keys must contain at least one dot, and should be prefixed uniquely. The prefix rack. diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/bin/rackup b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/bin/rackup new file mode 100755 index 00000000..ad94af4b --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/bin/rackup @@ -0,0 +1,4 @@ +#!/usr/bin/env ruby + +require "rack" +Rack::Server.start diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/contrib/rack_logo.svg b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/contrib/rack_logo.svg similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/contrib/rack_logo.svg rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/contrib/rack_logo.svg diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/example/lobster.ru b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/lobster.ru old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/example/lobster.ru rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/lobster.ru diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/example/protectedlobster.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/protectedlobster.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/example/protectedlobster.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/protectedlobster.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/example/protectedlobster.ru b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/protectedlobster.ru similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/example/protectedlobster.ru rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/example/protectedlobster.ru diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack.rb old mode 100755 new mode 100644 similarity index 87% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack.rb index 371d0156..c118fc07 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack.rb @@ -1,12 +1,8 @@ -# Copyright (C) 2007, 2008, 2009 Christian Neukirchen +# Copyright (C) 2007, 2008, 2009, 2010 Christian Neukirchen # # Rack is freely distributable under the terms of an MIT-style license. # See COPYING or http://www.opensource.org/licenses/mit-license.php. -path = File.expand_path(File.dirname(__FILE__)) -$:.unshift(path) unless $:.include?(path) - - # The Rack main module, serving as a namespace for all core Rack # modules and classes. # @@ -15,7 +11,7 @@ $:.unshift(path) unless $:.include?(path) module Rack # The Rack protocol version number implemented. - VERSION = [1,0] + VERSION = [1,1] # Return the Rack protocol version as a dotted string. def self.version @@ -24,7 +20,7 @@ module Rack # Return the Rack release as a dotted string. def self.release - "1.0" + "1.1" end autoload :Builder, "rack/builder" @@ -32,8 +28,10 @@ module Rack autoload :Chunked, "rack/chunked" autoload :CommonLogger, "rack/commonlogger" autoload :ConditionalGet, "rack/conditionalget" + autoload :Config, "rack/config" autoload :ContentLength, "rack/content_length" autoload :ContentType, "rack/content_type" + autoload :ETag, "rack/etag" autoload :File, "rack/file" autoload :Deflater, "rack/deflater" autoload :Directory, "rack/directory" @@ -42,10 +40,15 @@ module Rack autoload :Head, "rack/head" autoload :Lint, "rack/lint" autoload :Lock, "rack/lock" + autoload :Logger, "rack/logger" autoload :MethodOverride, "rack/methodoverride" autoload :Mime, "rack/mime" + autoload :NullLogger, "rack/nulllogger" autoload :Recursive, "rack/recursive" autoload :Reloader, "rack/reloader" + autoload :Runtime, "rack/runtime" + autoload :Sendfile, "rack/sendfile" + autoload :Server, "rack/server" autoload :ShowExceptions, "rack/showexceptions" autoload :ShowStatus, "rack/showstatus" autoload :Static, "rack/static" @@ -62,7 +65,6 @@ module Rack autoload :Basic, "rack/auth/basic" autoload :AbstractRequest, "rack/auth/abstract/request" autoload :AbstractHandler, "rack/auth/abstract/handler" - autoload :OpenID, "rack/auth/openid" module Digest autoload :MD5, "rack/auth/digest/md5" autoload :Nonce, "rack/auth/digest/nonce" diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/adapter/camping.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/adapter/camping.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/adapter/camping.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/adapter/camping.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/abstract/handler.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/abstract/handler.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/abstract/handler.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/abstract/handler.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/abstract/request.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/abstract/request.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/abstract/request.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/abstract/request.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/basic.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/basic.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/basic.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/basic.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/md5.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/md5.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/md5.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/md5.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/nonce.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/nonce.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/nonce.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/nonce.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/params.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/params.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/params.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/params.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/request.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/request.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/auth/digest/request.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/auth/digest/request.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/builder.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/builder.rb old mode 100755 new mode 100644 similarity index 72% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/builder.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/builder.rb index 295235e5..530f0aaf --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/builder.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/builder.rb @@ -24,6 +24,23 @@ module Rack # You can use +map+ to construct a Rack::URLMap in a convenient way. class Builder + def self.parse_file(config, opts = Server::Options.new) + options = {} + if config =~ /\.ru$/ + cfgfile = ::File.read(config) + if cfgfile[/^#\\(.*)/] && opts + options = opts.parse! $1.split(/\s+/) + end + cfgfile.sub!(/^__END__\n.*/, '') + app = eval "Rack::Builder.new {( " + cfgfile + "\n )}.to_app", + TOPLEVEL_BINDING, config + else + require config + app = Object.const_get(::File.basename(config, '.rb').capitalize) + end + return app, options + end + def initialize(&block) @ins = [] instance_eval(&block) if block_given? diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/cascade.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/cascade.rb old mode 100755 new mode 100644 similarity index 50% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/cascade.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/cascade.rb index a038aa11..14c3e54d --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/cascade.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/cascade.rb @@ -4,31 +4,36 @@ module Rack # status codes). class Cascade + NotFound = [404, {}, []] + attr_reader :apps def initialize(apps, catch=404) - @apps = apps - @catch = [*catch] + @apps = []; @has_app = {} + apps.each { |app| add app } + + @catch = {} + [*catch].each { |status| @catch[status] = true } end def call(env) - status = headers = body = nil - raise ArgumentError, "empty cascade" if @apps.empty? - @apps.each { |app| - begin - status, headers, body = app.call(env) - break unless @catch.include?(status.to_i) - end - } - [status, headers, body] + result = NotFound + + @apps.each do |app| + result = app.call(env) + break unless @catch.include?(result[0].to_i) + end + + result end def add app + @has_app[app] = true @apps << app end def include? app - @apps.include? app + @has_app.include? app end alias_method :<<, :add diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/chunked.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/chunked.rb old mode 100755 new mode 100644 similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/chunked.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/chunked.rb index 280d89dd..dddf9694 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/chunked.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/chunked.rb @@ -19,7 +19,7 @@ module Rack STATUS_WITH_NO_ENTITY_BODY.include?(status) || headers['Content-Length'] || headers['Transfer-Encoding'] - [status, headers.to_hash, body] + [status, headers, body] else dup.chunk(status, headers, body) end @@ -29,7 +29,7 @@ module Rack @body = body headers.delete('Content-Length') headers['Transfer-Encoding'] = 'chunked' - [status, headers.to_hash, self] + [status, headers, self] end def each diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/commonlogger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/commonlogger.rb new file mode 100644 index 00000000..1edc9b83 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/commonlogger.rb @@ -0,0 +1,49 @@ +module Rack + # Rack::CommonLogger forwards every request to an +app+ given, and + # logs a line in the Apache common log format to the +logger+, or + # rack.errors by default. + class CommonLogger + # Common Log Format: http://httpd.apache.org/docs/1.3/logs.html#common + # lilith.local - - [07/Aug/2006 23:58:02] "GET / HTTP/1.1" 500 - + # %{%s - %s [%s] "%s %s%s %s" %d %s\n} % + FORMAT = %{%s - %s [%s] "%s %s%s %s" %d %s %0.4f\n} + + def initialize(app, logger=nil) + @app = app + @logger = logger + end + + def call(env) + began_at = Time.now + status, header, body = @app.call(env) + header = Utils::HeaderHash.new(header) + log(env, status, header, began_at) + [status, header, body] + end + + private + + def log(env, status, header, began_at) + now = Time.now + length = extract_content_length(header) + + logger = @logger || env['rack.errors'] + logger.write FORMAT % [ + env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-", + env["REMOTE_USER"] || "-", + now.strftime("%d/%b/%Y %H:%M:%S"), + env["REQUEST_METHOD"], + env["PATH_INFO"], + env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"], + env["HTTP_VERSION"], + status.to_s[0..3], + length, + now - began_at ] + end + + def extract_content_length(headers) + value = headers['Content-Length'] or return '-' + value.to_s == '0' ? '-' : value + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/conditionalget.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/conditionalget.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/conditionalget.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/conditionalget.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/config.rb new file mode 100644 index 00000000..c6d446c0 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/config.rb @@ -0,0 +1,15 @@ +module Rack + # Rack::Config modifies the environment using the block given during + # initialization. + class Config + def initialize(app, &block) + @app = app + @block = block + end + + def call(env) + @block.call(env) + @app.call(env) + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/content_length.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/content_length.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/content_length.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/content_length.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/content_type.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/content_type.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/content_type.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/content_type.rb index 0c1e1ca3..874c28cd 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/content_type.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/content_type.rb @@ -17,7 +17,7 @@ module Rack status, headers, body = @app.call(env) headers = Utils::HeaderHash.new(headers) headers['Content-Type'] ||= @content_type - [status, headers.to_hash, body] + [status, headers, body] end end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/deflater.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/deflater.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/deflater.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/deflater.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/directory.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/directory.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/directory.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/directory.rb index acdd3029..927ac0c9 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/directory.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/directory.rb @@ -71,7 +71,9 @@ table { width:100%%; } body = "Forbidden\n" size = Rack::Utils.bytesize(body) - return [403, {"Content-Type" => "text/plain","Content-Length" => size.to_s}, [body]] + return [403, {"Content-Type" => "text/plain", + "Content-Length" => size.to_s, + "X-Cascade" => "pass"}, [body]] end def list_directory @@ -123,7 +125,9 @@ table { width:100%%; } def entity_not_found body = "Entity not found: #{@path_info}\n" size = Rack::Utils.bytesize(body) - return [404, {"Content-Type" => "text/plain", "Content-Length" => size.to_s}, [body]] + return [404, {"Content-Type" => "text/plain", + "Content-Length" => size.to_s, + "X-Cascade" => "pass"}, [body]] end def each diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/etag.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/etag.rb new file mode 100644 index 00000000..06dbc6aa --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/etag.rb @@ -0,0 +1,23 @@ +require 'digest/md5' + +module Rack + # Automatically sets the ETag header on all String bodies + class ETag + def initialize(app) + @app = app + end + + def call(env) + status, headers, body = @app.call(env) + + if !headers.has_key?('ETag') + parts = [] + body.each { |part| parts << part.to_s } + headers['ETag'] = %("#{Digest::MD5.hexdigest(parts.join(""))}") + [status, headers, parts] + else + [status, headers, body] + end + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/file.rb old mode 100755 new mode 100644 similarity index 91% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/file.rb index fe62bd6b..14af7b3b --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/file.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/file.rb @@ -45,7 +45,8 @@ module Rack def forbidden body = "Forbidden\n" [403, {"Content-Type" => "text/plain", - "Content-Length" => body.size.to_s}, + "Content-Length" => body.size.to_s, + "X-Cascade" => "pass"}, [body]] end @@ -73,7 +74,8 @@ module Rack def not_found body = "File not found: #{@path_info}\n" [404, {"Content-Type" => "text/plain", - "Content-Length" => body.size.to_s}, + "Content-Length" => body.size.to_s, + "X-Cascade" => "pass"}, [body]] end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler.rb old mode 100755 new mode 100644 similarity index 83% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler.rb index 5624a1e7..3c09883e --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler.rb @@ -22,6 +22,25 @@ module Rack end end + def self.default(options = {}) + # Guess. + if ENV.include?("PHP_FCGI_CHILDREN") + # We already speak FastCGI + options.delete :File + options.delete :Port + + Rack::Handler::FastCGI + elsif ENV.include?("REQUEST_METHOD") + Rack::Handler::CGI + else + begin + Rack::Handler::Mongrel + rescue LoadError => e + Rack::Handler::WEBrick + end + end + end + # Transforms server-name constants to their canonical form as filenames, # then tries to require them but silences the LoadError if not found # diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/cgi.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/cgi.rb similarity index 97% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/cgi.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/cgi.rb index f45f3d73..c6903f15 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/cgi.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/cgi.rb @@ -15,7 +15,7 @@ module Rack env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => $stdin, "rack.errors" => $stderr, diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/evented_mongrel.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/evented_mongrel.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/evented_mongrel.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/evented_mongrel.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/fastcgi.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/fastcgi.rb index 1739d659..b992a5f4 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/fastcgi.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/fastcgi.rb @@ -33,10 +33,10 @@ module Rack env.delete "HTTP_CONTENT_LENGTH" env["SCRIPT_NAME"] = "" if env["SCRIPT_NAME"] == "/" - + rack_input = RewindableInput.new(request.in) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => request.err, @@ -50,7 +50,6 @@ module Rack env["QUERY_STRING"] ||= "" env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"] env["REQUEST_PATH"] ||= "/" - env.delete "PATH_INFO" if env["PATH_INFO"] == "" env.delete "CONTENT_TYPE" if env["CONTENT_TYPE"] == "" env.delete "CONTENT_LENGTH" if env["CONTENT_LENGTH"] == "" diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/lsws.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/lsws.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/lsws.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/lsws.rb index b4ddf4bb..eabc0bc9 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/lsws.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/lsws.rb @@ -1,5 +1,6 @@ require 'lsapi' require 'rack/content_length' +require 'rack/rewindable_input' module Rack module Handler @@ -19,7 +20,7 @@ module Rack rack_input = RewindableInput.new($stdin.read.to_s) env.update( - "rack.version" => [1,0], + "rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, "rack.multithread" => false, @@ -38,6 +39,8 @@ module Rack ensure body.close if body.respond_to? :close end + ensure + rack_input.close end def self.send_headers(status, headers) print "Status: #{status}\r\n" diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/mongrel.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/mongrel.rb similarity index 88% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/mongrel.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/mongrel.rb index 7b448261..b6b775ea 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/mongrel.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/mongrel.rb @@ -7,10 +7,14 @@ module Rack module Handler class Mongrel < ::Mongrel::HttpHandler def self.run(app, options={}) - server = ::Mongrel::HttpServer.new(options[:Host] || '0.0.0.0', - options[:Port] || 8080) + server = ::Mongrel::HttpServer.new( + options[:Host] || '0.0.0.0', + options[:Port] || 8080, + options[:num_processors] || 950, + options[:throttle] || 0, + options[:timeout] || 60) # Acts like Rack::URLMap, utilizing Mongrel's own path finding methods. - # Use is similar to #run, replacing the app argument with a hash of + # Use is similar to #run, replacing the app argument with a hash of # { path=>app, ... } or an instance of Rack::URLMap. if options[:map] if app.is_a? Hash @@ -48,7 +52,7 @@ module Rack rack_input = request.body || StringIO.new('') rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, @@ -59,7 +63,6 @@ module Rack "rack.url_scheme" => "http", }) env["QUERY_STRING"] ||= "" - env.delete "PATH_INFO" if env["PATH_INFO"] == "" status, headers, body = @app.call(env) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/scgi.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/scgi.rb similarity index 96% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/scgi.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/scgi.rb index bd860a5d..79a6b2bd 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/scgi.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/scgi.rb @@ -7,14 +7,14 @@ module Rack module Handler class SCGI < ::SCGI::Processor attr_accessor :app - + def self.run(app, options=nil) new(options.merge(:app=>app, :host=>options[:Host], :port=>options[:Port], :socket=>options[:Socket])).listen end - + def initialize(settings = {}) @app = Rack::Chunked.new(Rack::ContentLength.new(settings[:app])) @log = Object.new @@ -22,7 +22,7 @@ module Rack def @log.error(*args); end super(settings) end - + def process_request(request, input_body, socket) env = {}.replace(request) env.delete "HTTP_CONTENT_TYPE" @@ -36,7 +36,7 @@ module Rack rack_input = StringIO.new(input_body) rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, "rack.multithread" => true, diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/swiftiplied_mongrel.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/swiftiplied_mongrel.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/swiftiplied_mongrel.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/swiftiplied_mongrel.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/thin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/thin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/thin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/thin.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/webrick.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/webrick.rb similarity index 94% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/webrick.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/webrick.rb index 5b9ae740..8d7f5724 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/handler/webrick.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/handler/webrick.rb @@ -26,7 +26,7 @@ module Rack rack_input = StringIO.new(req.body.to_s) rack_input.set_encoding(Encoding::BINARY) if rack_input.respond_to?(:set_encoding) - env.update({"rack.version" => [1,0], + env.update({"rack.version" => [1,1], "rack.input" => rack_input, "rack.errors" => $stderr, @@ -40,9 +40,7 @@ module Rack env["HTTP_VERSION"] ||= env["SERVER_PROTOCOL"] env["QUERY_STRING"] ||= "" env["REQUEST_PATH"] ||= "/" - if env["PATH_INFO"] == "" - env.delete "PATH_INFO" - else + unless env["PATH_INFO"] == "" path, n = req.request_uri.path, env["SCRIPT_NAME"].length env["PATH_INFO"] = path[n, path.length-n] end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/head.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/head.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/head.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/head.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lint.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lint.rb old mode 100755 new mode 100644 similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lint.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lint.rb index 796807a0..534375b9 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lint.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lint.rb @@ -61,7 +61,7 @@ module Rack ## subclassing allowed) that includes CGI-like headers. ## The application is free to modify the environment. assert("env #{env.inspect} is not a Hash, but #{env.class}") { - env.instance_of? Hash + env.kind_of? Hash } ## @@ -111,7 +111,7 @@ module Rack ## In addition to this, the Rack environment must include these ## Rack-specific variables: - ## rack.version:: The Array [1,0], representing this version of Rack. + ## rack.version:: The Array [1,1], representing this version of Rack. ## rack.url_scheme:: +http+ or +https+, depending on the request URL. ## rack.input:: See below, the input stream. ## rack.errors:: See below, the error stream. @@ -148,6 +148,35 @@ module Rack } end + ## rack.logger:: A common object interface for logging messages. + ## The object must implement: + if logger = env['rack.logger'] + ## info(message, &block) + assert("logger #{logger.inspect} must respond to info") { + logger.respond_to?(:info) + } + + ## debug(message, &block) + assert("logger #{logger.inspect} must respond to debug") { + logger.respond_to?(:debug) + } + + ## warn(message, &block) + assert("logger #{logger.inspect} must respond to warn") { + logger.respond_to?(:warn) + } + + ## error(message, &block) + assert("logger #{logger.inspect} must respond to error") { + logger.respond_to?(:error) + } + + ## fatal(message, &block) + assert("logger #{logger.inspect} must respond to fatal") { + logger.respond_to?(:fatal) + } + end + ## The server or the application can store their own data in the ## environment, too. The keys must contain at least one dot, ## and should be prefixed uniquely. The prefix rack. @@ -175,7 +204,7 @@ module Rack env.each { |key, value| next if key.include? "." # Skip extensions assert("env variable #{key} has non-string value #{value.inspect}") { - value.instance_of? String + value.kind_of? String } } @@ -184,7 +213,7 @@ module Rack ## * rack.version must be an array of Integers. assert("rack.version must be an Array, was #{env["rack.version"].class}") { - env["rack.version"].instance_of? Array + env["rack.version"].kind_of? Array } ## * rack.url_scheme must either be +http+ or +https+. assert("rack.url_scheme unknown: #{env["rack.url_scheme"].inspect}") { @@ -243,7 +272,7 @@ module Rack assert("rack.input #{input} is not opened in binary mode") { input.binmode? } if input.respond_to?(:binmode?) - + ## The input stream must respond to +gets+, +each+, +read+ and +rewind+. [:gets, :each, :read, :rewind].each { |method| assert("rack.input #{input} does not respond to ##{method}") { @@ -269,7 +298,7 @@ module Rack assert("rack.input#gets called with arguments") { args.size == 0 } v = @input.gets assert("rack.input#gets didn't return a String") { - v.nil? or v.instance_of? String + v.nil? or v.kind_of? String } v end @@ -300,18 +329,18 @@ module Rack args[1].kind_of?(String) } end - + v = @input.read(*args) - + assert("rack.input#read didn't return nil or a String") { - v.nil? or v.instance_of? String + v.nil? or v.kind_of? String } if args[0].nil? assert("rack.input#read(nil) returned nil on EOF") { !v.nil? } end - + v end @@ -320,12 +349,12 @@ module Rack assert("rack.input#each called with arguments") { args.size == 0 } @input.each { |line| assert("rack.input#each didn't yield a String") { - line.instance_of? String + line.kind_of? String } yield line } end - + ## * +rewind+ must be called without arguments. It rewinds the input ## stream back to the beginning. It must not raise Errno::ESPIPE: ## that is, it may not be a pipe or a socket. Therefore, handler @@ -373,7 +402,7 @@ module Rack ## * +write+ must be called with a single argument that is a String. def write(str) - assert("rack.errors#write not called with a String") { str.instance_of? String } + assert("rack.errors#write not called with a String") { str.kind_of? String } @error.write str end @@ -407,7 +436,7 @@ module Rack header.each { |key, value| ## The header keys must be Strings. assert("header key must be a string, was #{key.class}") { - key.instance_of? String + key.kind_of? String } ## The header must not contain a +Status+ key, assert("header must not contain Status") { key.downcase != "status" } @@ -499,7 +528,7 @@ module Rack @body.each { |part| ## and must only yield String values. assert("Body yielded non-string value #{part.inspect}") { - part.instance_of? String + part.kind_of? String } yield part } diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lobster.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lobster.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lobster.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lobster.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lock.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lock.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/lock.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/lock.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/logger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/logger.rb new file mode 100644 index 00000000..d67d8ce2 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/logger.rb @@ -0,0 +1,20 @@ +require 'logger' + +module Rack + # Sets up rack.logger to write to rack.errors stream + class Logger + def initialize(app, level = ::Logger::INFO) + @app, @level = app, level + end + + def call(env) + logger = ::Logger.new(env['rack.errors']) + logger.level = @level + + env['rack.logger'] = logger + @app.call(env) + ensure + logger.close + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/methodoverride.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/methodoverride.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/methodoverride.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/methodoverride.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mime.rb old mode 100755 new mode 100644 similarity index 98% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mime.rb index 5a6a73a9..1414d19a --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mime.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mime.rb @@ -14,7 +14,7 @@ module Rack # Rack::Mime::MIME_TYPES.fetch('.foo', 'application/octet-stream') def mime_type(ext, fallback='application/octet-stream') - MIME_TYPES.fetch(ext, fallback) + MIME_TYPES.fetch(ext.to_s.downcase, fallback) end module_function :mime_type @@ -105,6 +105,7 @@ module Rack ".m3u" => "audio/x-mpegurl", ".m4v" => "video/mp4", ".man" => "text/troff", + ".manifest"=> "text/cache-manifest", ".mathml" => "application/mathml+xml", ".mbox" => "application/mbox", ".mdoc" => "text/troff", @@ -126,6 +127,7 @@ module Rack ".ods" => "application/vnd.oasis.opendocument.spreadsheet", ".odt" => "application/vnd.oasis.opendocument.text", ".ogg" => "application/ogg", + ".ogv" => "video/ogg", ".p" => "text/x-pascal", ".pas" => "text/x-pascal", ".pbm" => "image/x-portable-bitmap", diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mock.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mock.rb old mode 100755 new mode 100644 similarity index 74% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mock.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mock.rb index c34a2d7a..23ecba17 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/mock.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/mock.rb @@ -40,7 +40,7 @@ module Rack end DEFAULT_ENV = { - "rack.version" => [1,0], + "rack.version" => [1,1], "rack.input" => StringIO.new, "rack.errors" => StringIO.new, "rack.multithread" => true, @@ -73,14 +73,17 @@ module Rack # Return the Rack environment used for a request to +uri+. def self.env_for(uri="", opts={}) uri = URI(uri) + uri.path = "/#{uri.path}" unless uri.path[0] == ?/ + env = DEFAULT_ENV.dup - env["REQUEST_METHOD"] = opts[:method] || "GET" + env["REQUEST_METHOD"] = opts[:method] ? opts[:method].to_s.upcase : "GET" env["SERVER_NAME"] = uri.host || "example.org" env["SERVER_PORT"] = uri.port ? uri.port.to_s : "80" env["QUERY_STRING"] = uri.query.to_s env["PATH_INFO"] = (!uri.path || uri.path.empty?) ? "/" : uri.path env["rack.url_scheme"] = uri.scheme || "http" + env["HTTPS"] = env["rack.url_scheme"] == "https" ? "on" : "off" env["SCRIPT_NAME"] = opts[:script_name] || "" @@ -90,7 +93,30 @@ module Rack env["rack.errors"] = StringIO.new end - opts[:input] ||= "" + if params = opts[:params] + if env["REQUEST_METHOD"] == "GET" + params = Utils.parse_nested_query(params) if params.is_a?(String) + params.update(Utils.parse_nested_query(env["QUERY_STRING"])) + env["QUERY_STRING"] = Utils.build_nested_query(params) + elsif !opts.has_key?(:input) + opts["CONTENT_TYPE"] = "application/x-www-form-urlencoded" + if params.is_a?(Hash) + if data = Utils::Multipart.build_multipart(params) + opts[:input] = data + opts["CONTENT_LENGTH"] ||= data.length.to_s + opts["CONTENT_TYPE"] = "multipart/form-data; boundary=#{Utils::Multipart::MULTIPART_BOUNDARY}" + else + opts[:input] = Utils.build_nested_query(params) + end + else + opts[:input] = params + end + end + end + + empty_str = "" + empty_str.force_encoding("ASCII-8BIT") if empty_str.respond_to? :force_encoding + opts[:input] ||= empty_str if String === opts[:input] rack_input = StringIO.new(opts[:input]) else @@ -128,7 +154,7 @@ module Rack @body = "" body.each { |part| @body << part } - @errors = errors.string + @errors = errors.string if errors.respond_to?(:string) end # Status diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/nulllogger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/nulllogger.rb new file mode 100644 index 00000000..77fb637d --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/nulllogger.rb @@ -0,0 +1,18 @@ +module Rack + class NullLogger + def initialize(app) + @app = app + end + + def call(env) + env['rack.logger'] = self + @app.call(env) + end + + def info(progname = nil, &block); end + def debug(progname = nil, &block); end + def warn(progname = nil, &block); end + def error(progname = nil, &block); end + def fatal(progname = nil, &block); end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/recursive.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/recursive.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/recursive.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/recursive.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/reloader.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/reloader.rb similarity index 94% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/reloader.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/reloader.rb index a9c566f7..a06de23a 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/reloader.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/reloader.rb @@ -1,5 +1,6 @@ # Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com -# All files in this distribution are subject to the terms of the Ruby license. +# Rack::Reloader is subject to the terms of an MIT-style license. +# See COPYING or http://www.opensource.org/licenses/mit-license.php. require 'pathname' @@ -92,6 +93,8 @@ module Rack found, stat = safe_stat(path) return ::File.expand_path(found), stat if found end + + return false, false end def safe_stat(file) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/request.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/request.rb old mode 100755 new mode 100644 similarity index 83% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/request.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/request.rb index 2f64bd6c..b3de1ce4 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/request.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/request.rb @@ -32,6 +32,7 @@ module Rack def content_type; @env['CONTENT_TYPE'] end def session; @env['rack.session'] ||= {} end def session_options; @env['rack.session.options'] ||= {} end + def logger; @env['rack.logger'] end # The media type (type/subtype) portion of the CONTENT_TYPE header # without any media type parameters. e.g., when CONTENT_TYPE is @@ -63,9 +64,17 @@ module Rack media_type_params['charset'] end + def host_with_port + if forwarded = @env["HTTP_X_FORWARDED_HOST"] + forwarded.split(/,\s?/).last + else + @env['HTTP_HOST'] || "#{@env['SERVER_NAME'] || @env['SERVER_ADDR']}:#{@env['SERVER_PORT']}" + end + end + def host # Remove port number. - (@env["HTTP_HOST"] || @env["SERVER_NAME"]).to_s.gsub(/:\d+\z/, '') + host_with_port.to_s.gsub(/:\d+\z/, '') end def script_name=(s); @env["SCRIPT_NAME"] = s.to_s end @@ -81,7 +90,6 @@ module Rack # one of the media types presents in this list will not be eligible # for form-data / param parsing. FORM_DATA_MEDIA_TYPES = [ - nil, 'application/x-www-form-urlencoded', 'multipart/form-data' ] @@ -92,15 +100,20 @@ module Rack PARSEABLE_DATA_MEDIA_TYPES = [ 'multipart/related', 'multipart/mixed' - ] + ] # Determine whether the request body contains form-data by checking - # the request media_type against registered form-data media-types: - # "application/x-www-form-urlencoded" and "multipart/form-data". The + # the request Content-Type for one of the media-types: + # "application/x-www-form-urlencoded" or "multipart/form-data". The # list of form-data media types can be modified through the # +FORM_DATA_MEDIA_TYPES+ array. + # + # A request body is also assumed to contain form-data when no + # Content-Type header is provided and the request_method is POST. def form_data? - FORM_DATA_MEDIA_TYPES.include?(media_type) + type = media_type + meth = env["rack.methodoverride.original_method"] || env['REQUEST_METHOD'] + (meth == 'POST' && type.nil?) || FORM_DATA_MEDIA_TYPES.include?(type) end # Determine whether the request body contains data by checking @@ -115,8 +128,7 @@ module Rack @env["rack.request.query_hash"] else @env["rack.request.query_string"] = query_string - @env["rack.request.query_hash"] = - Utils.parse_nested_query(query_string) + @env["rack.request.query_hash"] = parse_query(query_string) end end @@ -125,19 +137,20 @@ module Rack # This method support both application/x-www-form-urlencoded and # multipart/form-data. def POST - if @env["rack.request.form_input"].eql? @env["rack.input"] + if @env["rack.input"].nil? + raise "Missing rack.input" + elsif @env["rack.request.form_input"].eql? @env["rack.input"] @env["rack.request.form_hash"] elsif form_data? || parseable_data? @env["rack.request.form_input"] = @env["rack.input"] - unless @env["rack.request.form_hash"] = - Utils::Multipart.parse_multipart(env) + unless @env["rack.request.form_hash"] = parse_multipart(env) form_vars = @env["rack.input"].read # Fix for Safari Ajax postings that always append \0 form_vars.sub!(/\0\z/, '') @env["rack.request.form_vars"] = form_vars - @env["rack.request.form_hash"] = Utils.parse_nested_query(form_vars) + @env["rack.request.form_hash"] = parse_query(form_vars) @env["rack.input"].rewind end @@ -149,7 +162,7 @@ module Rack # The union of GET and POST data. def params - self.put? ? self.GET : self.GET.update(self.POST) + self.GET.update(self.POST) rescue EOFError => e self.GET end @@ -175,6 +188,9 @@ module Rack end alias referrer referer + def user_agent + @env['HTTP_USER_AGENT'] + end def cookies return {} unless @env["HTTP_COOKIE"] @@ -214,11 +230,11 @@ module Rack url end - + def path script_name + path_info end - + def fullpath query_string.empty? ? path : "#{path}?#{query_string}" end @@ -242,5 +258,14 @@ module Rack @env['REMOTE_ADDR'] end end + + protected + def parse_query(qs) + Utils.parse_nested_query(qs) + end + + def parse_multipart(env) + Utils::Multipart.parse_multipart(env) + end end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/response.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/response.rb similarity index 71% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/response.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/response.rb index 28b4d830..a7f9bf2b 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/response.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/response.rb @@ -19,7 +19,7 @@ module Rack attr_accessor :length def initialize(body=[], status=200, header={}, &block) - @status = status + @status = status.to_i @header = Utils::HeaderHash.new({"Content-Type" => "text/html"}. merge(header)) @@ -54,45 +54,11 @@ module Rack end def set_cookie(key, value) - case value - when Hash - domain = "; domain=" + value[:domain] if value[:domain] - path = "; path=" + value[:path] if value[:path] - # According to RFC 2109, we need dashes here. - # N.B.: cgi.rb uses spaces... - expires = "; expires=" + value[:expires].clone.gmtime. - strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires] - secure = "; secure" if value[:secure] - httponly = "; HttpOnly" if value[:httponly] - value = value[:value] - end - value = [value] unless Array === value - cookie = Utils.escape(key) + "=" + - value.map { |v| Utils.escape v }.join("&") + - "#{domain}#{path}#{expires}#{secure}#{httponly}" - - case self["Set-Cookie"] - when Array - self["Set-Cookie"] << cookie - when String - self["Set-Cookie"] = [self["Set-Cookie"], cookie] - when nil - self["Set-Cookie"] = cookie - end + Utils.set_cookie_header!(header, key, value) end def delete_cookie(key, value={}) - unless Array === self["Set-Cookie"] - self["Set-Cookie"] = [self["Set-Cookie"]].compact - end - - self["Set-Cookie"].reject! { |cookie| - cookie =~ /\A#{Utils.escape(key)}=/ - } - - set_cookie(key, - {:value => '', :path => nil, :domain => nil, - :expires => Time.at(0) }.merge(value)) + Utils.delete_cookie_header!(header, key, value) end def redirect(target, status=302) @@ -105,9 +71,9 @@ module Rack if [204, 304].include?(status.to_i) header.delete "Content-Type" - [status.to_i, header.to_hash, []] + [status.to_i, header, []] else - [status.to_i, header.to_hash, self] + [status.to_i, header, self] end end alias to_a finish # For *response diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/rewindable_input.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/rewindable_input.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/rewindable_input.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/rewindable_input.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/runtime.rb new file mode 100644 index 00000000..1bd411fd --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/runtime.rb @@ -0,0 +1,27 @@ +module Rack + # Sets an "X-Runtime" response header, indicating the response + # time of the request, in seconds + # + # You can put it right before the application to see the processing + # time, or before all the other middlewares to include time for them, + # too. + class Runtime + def initialize(app, name = nil) + @app = app + @header_name = "X-Runtime" + @header_name << "-#{name}" if name + end + + def call(env) + start_time = Time.now + status, headers, body = @app.call(env) + request_time = Time.now - start_time + + if !headers.has_key?(@header_name) + headers[@header_name] = "%0.6f" % request_time + end + + [status, headers, body] + end + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/sendfile.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/sendfile.rb new file mode 100644 index 00000000..4fa82946 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/sendfile.rb @@ -0,0 +1,142 @@ +require 'rack/file' + +module Rack + class File #:nodoc: + alias :to_path :path + end + + # = Sendfile + # + # The Sendfile middleware intercepts responses whose body is being + # served from a file and replaces it with a server specific X-Sendfile + # header. The web server is then responsible for writing the file contents + # to the client. This can dramatically reduce the amount of work required + # by the Ruby backend and takes advantage of the web servers optimized file + # delivery code. + # + # In order to take advantage of this middleware, the response body must + # respond to +to_path+ and the request must include an X-Sendfile-Type + # header. Rack::File and other components implement +to_path+ so there's + # rarely anything you need to do in your application. The X-Sendfile-Type + # header is typically set in your web servers configuration. The following + # sections attempt to document + # + # === Nginx + # + # Nginx supports the X-Accel-Redirect header. This is similar to X-Sendfile + # but requires parts of the filesystem to be mapped into a private URL + # hierarachy. + # + # The following example shows the Nginx configuration required to create + # a private "/files/" area, enable X-Accel-Redirect, and pass the special + # X-Sendfile-Type and X-Accel-Mapping headers to the backend: + # + # location /files/ { + # internal; + # alias /var/www/; + # } + # + # location / { + # proxy_redirect false; + # + # proxy_set_header Host $host; + # proxy_set_header X-Real-IP $remote_addr; + # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # + # proxy_set_header X-Sendfile-Type X-Accel-Redirect + # proxy_set_header X-Accel-Mapping /files/=/var/www/; + # + # proxy_pass http://127.0.0.1:8080/; + # } + # + # Note that the X-Sendfile-Type header must be set exactly as shown above. The + # X-Accel-Mapping header should specify the name of the private URL pattern, + # followed by an equals sign (=), followed by the location on the file system + # that it maps to. The middleware performs a simple substitution on the + # resulting path. + # + # See Also: http://wiki.codemongers.com/NginxXSendfile + # + # === lighttpd + # + # Lighttpd has supported some variation of the X-Sendfile header for some + # time, although only recent version support X-Sendfile in a reverse proxy + # configuration. + # + # $HTTP["host"] == "example.com" { + # proxy-core.protocol = "http" + # proxy-core.balancer = "round-robin" + # proxy-core.backends = ( + # "127.0.0.1:8000", + # "127.0.0.1:8001", + # ... + # ) + # + # proxy-core.allow-x-sendfile = "enable" + # proxy-core.rewrite-request = ( + # "X-Sendfile-Type" => (".*" => "X-Sendfile") + # ) + # } + # + # See Also: http://redmine.lighttpd.net/wiki/lighttpd/Docs:ModProxyCore + # + # === Apache + # + # X-Sendfile is supported under Apache 2.x using a separate module: + # + # http://tn123.ath.cx/mod_xsendfile/ + # + # Once the module is compiled and installed, you can enable it using + # XSendFile config directive: + # + # RequestHeader Set X-Sendfile-Type X-Sendfile + # ProxyPassReverse / http://localhost:8001/ + # XSendFile on + + class Sendfile + F = ::File + + def initialize(app, variation=nil) + @app = app + @variation = variation + end + + def call(env) + status, headers, body = @app.call(env) + if body.respond_to?(:to_path) + case type = variation(env) + when 'X-Accel-Redirect' + path = F.expand_path(body.to_path) + if url = map_accel_path(env, path) + headers[type] = url + body = [] + else + env['rack.errors'] << "X-Accel-Mapping header missing" + end + when 'X-Sendfile', 'X-Lighttpd-Send-File' + path = F.expand_path(body.to_path) + headers[type] = path + body = [] + when '', nil + else + env['rack.errors'] << "Unknown x-sendfile variation: '#{variation}'.\n" + end + end + [status, headers, body] + end + + private + def variation(env) + @variation || + env['sendfile.type'] || + env['HTTP_X_SENDFILE_TYPE'] + end + + def map_accel_path(env, file) + if mapping = env['HTTP_X_ACCEL_MAPPING'] + internal, external = mapping.split('=', 2).map{ |p| p.strip } + file.sub(/^#{internal}/i, external) + end + end + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/server.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/server.rb new file mode 100644 index 00000000..2bb20aae --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/server.rb @@ -0,0 +1,212 @@ +require 'optparse' + +module Rack + class Server + class Options + def parse!(args) + options = {} + opt_parser = OptionParser.new("", 24, ' ') do |opts| + opts.banner = "Usage: rackup [ruby options] [rack options] [rackup config]" + + opts.separator "" + opts.separator "Ruby options:" + + lineno = 1 + opts.on("-e", "--eval LINE", "evaluate a LINE of code") { |line| + eval line, TOPLEVEL_BINDING, "-e", lineno + lineno += 1 + } + + opts.on("-d", "--debug", "set debugging flags (set $DEBUG to true)") { + options[:debug] = true + } + opts.on("-w", "--warn", "turn warnings on for your script") { + options[:warn] = true + } + + opts.on("-I", "--include PATH", + "specify $LOAD_PATH (may be used more than once)") { |path| + options[:include] = path.split(":") + } + + opts.on("-r", "--require LIBRARY", + "require the library, before executing your script") { |library| + options[:require] = library + } + + opts.separator "" + opts.separator "Rack options:" + opts.on("-s", "--server SERVER", "serve using SERVER (webrick/mongrel)") { |s| + options[:server] = s + } + + opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") { |host| + options[:Host] = host + } + + opts.on("-p", "--port PORT", "use PORT (default: 9292)") { |port| + options[:Port] = port + } + + opts.on("-E", "--env ENVIRONMENT", "use ENVIRONMENT for defaults (default: development)") { |e| + options[:environment] = e + } + + opts.on("-D", "--daemonize", "run daemonized in the background") { |d| + options[:daemonize] = d ? true : false + } + + opts.on("-P", "--pid FILE", "file to store PID (default: rack.pid)") { |f| + options[:pid] = f + } + + opts.separator "" + opts.separator "Common options:" + + opts.on_tail("-h", "--help", "Show this message") do + puts opts + exit + end + + opts.on_tail("--version", "Show version") do + puts "Rack #{Rack.version}" + exit + end + end + opt_parser.parse! args + options[:config] = args.last if args.last + options + end + end + + def self.start + new.start + end + + attr_accessor :options + + def initialize(options = nil) + @options = options + end + + def options + @options ||= parse_options(ARGV) + end + + def default_options + { + :environment => "development", + :pid => nil, + :Port => 9292, + :Host => "0.0.0.0", + :AccessLog => [], + :config => "config.ru" + } + end + + def app + @app ||= begin + if !::File.exist? options[:config] + abort "configuration #{options[:config]} not found" + end + + app, options = Rack::Builder.parse_file(self.options[:config], opt_parser) + self.options.merge! options + app + end + end + + def self.middleware + @middleware ||= begin + m = Hash.new {|h,k| h[k] = []} + m["deployment"].concat [lambda {|server| server.server =~ /CGI/ ? nil : [Rack::CommonLogger, $stderr] }] + m["development"].concat m["deployment"] + [[Rack::ShowExceptions], [Rack::Lint]] + m + end + end + + def middleware + self.class.middleware + end + + def start + if options[:debug] + $DEBUG = true + require 'pp' + p options[:server] + pp wrapped_app + pp app + end + + if options[:warn] + $-w = true + end + + if includes = options[:include] + $LOAD_PATH.unshift *includes + end + + if library = options[:require] + require library + end + + daemonize_app if options[:daemonize] + write_pid if options[:pid] + server.run wrapped_app, options + end + + def server + @_server ||= Rack::Handler.get(options[:server]) || Rack::Handler.default + end + + private + def parse_options(args) + options = default_options + + # Don't evaluate CGI ISINDEX parameters. + # http://hoohoo.ncsa.uiuc.edu/cgi/cl.html + args.clear if ENV.include?("REQUEST_METHOD") + + options.merge! opt_parser.parse! args + options + end + + def opt_parser + Options.new + end + + def build_app(app) + middleware[options[:environment]].reverse_each do |middleware| + middleware = middleware.call(self) if middleware.respond_to?(:call) + next unless middleware + klass = middleware.shift + app = klass.new(app, *middleware) + end + app + end + + def wrapped_app + @wrapped_app ||= build_app app + end + + def daemonize_app + if RUBY_VERSION < "1.9" + exit if fork + Process.setsid + exit if fork + Dir.chdir "/" + ::File.umask 0000 + STDIN.reopen "/dev/null" + STDOUT.reopen "/dev/null", "a" + STDERR.reopen "/dev/null", "a" + else + Process.daemon + end + end + + def write_pid + ::File.open(options[:pid], 'w'){ |f| f.write("#{Process.pid}") } + at_exit { ::File.delete(options[:pid]) if ::File.exist?(options[:pid]) } + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/abstract/id.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/abstract/id.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/abstract/id.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/abstract/id.rb index 218144c1..98746705 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/abstract/id.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/abstract/id.rb @@ -107,18 +107,16 @@ module Rack if not session_id = set_session(env, session_id, session, options) env["rack.errors"].puts("Warning! #{self.class.name} failed to save session. Content dropped.") - [status, headers, body] elsif options[:defer] and not options[:renew] env["rack.errors"].puts("Defering cookie for #{session_id}") if $VERBOSE - [status, headers, body] else cookie = Hash.new cookie[:value] = session_id cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil? - response = Rack::Response.new(body, status, headers) - response.set_cookie(@key, cookie.merge(options)) - response.to_a + Utils.set_cookie_header!(headers, @key, cookie.merge(options)) end + + [status, headers, body] end # All thread safety and session retrival proceedures should occur here. diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/cookie.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/cookie.rb similarity index 93% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/cookie.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/cookie.rb index eace9bd0..240e6c8d 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/cookie.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/cookie.rb @@ -70,16 +70,15 @@ module Rack if session_data.size > (4096 - @key.size) env["rack.errors"].puts("Warning! Rack::Session::Cookie data size exceeds 4K. Content dropped.") - [status, headers, body] else options = env["rack.session.options"] cookie = Hash.new cookie[:value] = session_data cookie[:expires] = Time.now + options[:expire_after] unless options[:expire_after].nil? - response = Rack::Response.new(body, status, headers) - response.set_cookie(@key, cookie.merge(options)) - response.to_a + Utils.set_cookie_header!(headers, @key, cookie.merge(options)) end + + [status, headers, body] end def generate_hmac(data) diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/memcache.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/memcache.rb new file mode 100644 index 00000000..44629da3 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/memcache.rb @@ -0,0 +1,119 @@ +# AUTHOR: blink ; blink#ruby-lang@irc.freenode.net + +require 'rack/session/abstract/id' +require 'memcache' + +module Rack + module Session + # Rack::Session::Memcache provides simple cookie based session management. + # Session data is stored in memcached. The corresponding session key is + # maintained in the cookie. + # You may treat Session::Memcache as you would Session::Pool with the + # following caveats. + # + # * Setting :expire_after to 0 would note to the Memcache server to hang + # onto the session data until it would drop it according to it's own + # specifications. However, the cookie sent to the client would expire + # immediately. + # + # Note that memcache does drop data before it may be listed to expire. For + # a full description of behaviour, please see memcache's documentation. + + class Memcache < Abstract::ID + attr_reader :mutex, :pool + DEFAULT_OPTIONS = Abstract::ID::DEFAULT_OPTIONS.merge \ + :namespace => 'rack:session', + :memcache_server => 'localhost:11211' + + def initialize(app, options={}) + super + + @mutex = Mutex.new + mserv = @default_options[:memcache_server] + mopts = @default_options. + reject{|k,v| MemCache::DEFAULT_OPTIONS.include? k } + @pool = MemCache.new mserv, mopts + unless @pool.active? and @pool.servers.any?{|c| c.alive? } + raise 'No memcache servers' + end + end + + def generate_sid + loop do + sid = super + break sid unless @pool.get(sid, true) + end + end + + def get_session(env, session_id) + @mutex.lock if env['rack.multithread'] + unless session_id and session = @pool.get(session_id) + session_id, session = generate_sid, {} + unless /^STORED/ =~ @pool.add(session_id, session) + raise "Session collision on '#{session_id.inspect}'" + end + end + session.instance_variable_set '@old', @pool.get(session_id, true) + return [session_id, session] + rescue MemCache::MemCacheError, Errno::ECONNREFUSED + # MemCache server cannot be contacted + warn "#{self} is unable to find memcached server." + warn $!.inspect + return [ nil, {} ] + ensure + @mutex.unlock if @mutex.locked? + end + + def set_session(env, session_id, new_session, options) + expiry = options[:expire_after] + expiry = expiry.nil? ? 0 : expiry + 1 + + @mutex.lock if env['rack.multithread'] + if options[:renew] or options[:drop] + @pool.delete session_id + return false if options[:drop] + session_id = generate_sid + @pool.add session_id, {} # so we don't worry about cache miss on #set + end + + session = @pool.get(session_id) || {} + old_session = new_session.instance_variable_get '@old' + old_session = old_session ? Marshal.load(old_session) : {} + + unless Hash === old_session and Hash === new_session + env['rack.errors']. + puts 'Bad old_session or new_session sessions provided.' + else # merge sessions + # alterations are either update or delete, making as few changes as + # possible to prevent possible issues. + + # removed keys + delete = old_session.keys - new_session.keys + if $VERBOSE and not delete.empty? + env['rack.errors']. + puts "//@#{session_id}: delete #{delete*','}" + end + delete.each{|k| session.delete k } + + # added or altered keys + update = new_session.keys. + select{|k| new_session[k] != old_session[k] } + if $VERBOSE and not update.empty? + env['rack.errors'].puts "//@#{session_id}: update #{update*','}" + end + update.each{|k| session[k] = new_session[k] } + end + + @pool.set session_id, session, expiry + return session_id + rescue MemCache::MemCacheError, Errno::ECONNREFUSED + # MemCache server cannot be contacted + warn "#{self} is unable to find memcached server." + warn $!.inspect + return false + ensure + @mutex.unlock if @mutex.locked? + end + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/pool.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/pool.rb similarity index 99% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/pool.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/pool.rb index f6f87408..b3f8bd72 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/session/pool.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/session/pool.rb @@ -13,7 +13,7 @@ module Rack # In the context of a multithreaded environment, sessions being # committed to the pool is done in a merging manner. # - # The :drop option is available in rack.session.options if you with to + # The :drop option is available in rack.session.options if you wish to # explicitly remove the session from the session cache. # # Example: diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/showexceptions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/showexceptions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/showexceptions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/showexceptions.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/showstatus.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/showstatus.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/showstatus.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/showstatus.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/static.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/static.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/static.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/static.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/urlmap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/urlmap.rb old mode 100755 new mode 100644 similarity index 72% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/urlmap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/urlmap.rb index fcf6616c..b699d35b --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/urlmap.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/urlmap.rb @@ -28,27 +28,28 @@ module Rack raise ArgumentError, "paths need to start with /" end location = location.chomp('/') + match = Regexp.new("^#{Regexp.quote(location).gsub('/', '/+')}(.*)", nil, 'n') - [host, location, app] - }.sort_by { |(h, l, a)| [h ? -h.size : (-1.0 / 0.0), -l.size] } # Longest path first + [host, location, match, app] + }.sort_by { |(h, l, m, a)| [h ? -h.size : (-1.0 / 0.0), -l.size] } # Longest path first end def call(env) - path = env["PATH_INFO"].to_s.squeeze("/") + path = env["PATH_INFO"].to_s script_name = env['SCRIPT_NAME'] hHost, sName, sPort = env.values_at('HTTP_HOST','SERVER_NAME','SERVER_PORT') - @mapping.each { |host, location, app| + @mapping.each { |host, location, match, app| next unless (hHost == host || sName == host \ || (host.nil? && (hHost == sName || hHost == sName+':'+sPort))) - next unless location == path[0, location.size] - next unless path[location.size] == nil || path[location.size] == ?/ + next unless path =~ match && rest = $1 + next unless rest.empty? || rest[0] == ?/ return app.call( env.merge( 'SCRIPT_NAME' => (script_name + location), - 'PATH_INFO' => path[location.size..-1])) + 'PATH_INFO' => rest)) } - [404, {"Content-Type" => "text/plain"}, ["Not Found: #{path}"]] + [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found: #{path}"]] end end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/utils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/utils.rb old mode 100755 new mode 100644 similarity index 62% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/utils.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/utils.rb index d54c928c..68fd6ace --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/lib/rack/utils.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/lib/rack/utils.rb @@ -27,7 +27,7 @@ module Rack module_function :unescape DEFAULT_SEP = /[&;] */n - + # Stolen from Mongrel, with some small modifications: # Parses a query string by breaking it up at the '&' # and ';' characters. You can also use this to parse @@ -38,7 +38,9 @@ module Rack (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p| k, v = p.split('=', 2).map { |x| unescape(x) } - + if v =~ /^("|')(.*)\1$/ + v = $2.gsub('\\'+$1, $1) + end if cur = params[k] if cur.class == Array params[k] << v @@ -67,6 +69,9 @@ module Rack module_function :parse_nested_query def normalize_params(params, name, v = nil) + if v and v =~ /^("|')(.*)\1$/ + v = $2.gsub('\\'+$1, $1) + end name =~ %r(\A[\[\]]*([^\[\]]+)\]*) k = $1 || '' after = $' || '' @@ -109,6 +114,25 @@ module Rack end module_function :build_query + def build_nested_query(value, prefix = nil) + case value + when Array + value.map { |v| + build_nested_query(v, "#{prefix}[]") + }.join("&") + when Hash + value.map { |k, v| + build_nested_query(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k)) + }.join("&") + when String + raise ArgumentError, "value must be a Hash" if prefix.nil? + "#{prefix}=#{escape(value)}" + else + prefix + end + end + module_function :build_nested_query + # Escape ampersands, brackets and quotes to their HTML/XML entities. def escape_html(string) string.to_s.gsub("&", "&"). @@ -149,6 +173,54 @@ module Rack end module_function :select_best_encoding + def set_cookie_header!(header, key, value) + case value + when Hash + domain = "; domain=" + value[:domain] if value[:domain] + path = "; path=" + value[:path] if value[:path] + # According to RFC 2109, we need dashes here. + # N.B.: cgi.rb uses spaces... + expires = "; expires=" + value[:expires].clone.gmtime. + strftime("%a, %d-%b-%Y %H:%M:%S GMT") if value[:expires] + secure = "; secure" if value[:secure] + httponly = "; HttpOnly" if value[:httponly] + value = value[:value] + end + value = [value] unless Array === value + cookie = escape(key) + "=" + + value.map { |v| escape v }.join("&") + + "#{domain}#{path}#{expires}#{secure}#{httponly}" + + case header["Set-Cookie"] + when Array + header["Set-Cookie"] << cookie + when String + header["Set-Cookie"] = [header["Set-Cookie"], cookie] + when nil + header["Set-Cookie"] = cookie + end + + nil + end + module_function :set_cookie_header! + + def delete_cookie_header!(header, key, value = {}) + unless Array === header["Set-Cookie"] + header["Set-Cookie"] = [header["Set-Cookie"]].compact + end + + header["Set-Cookie"].reject! { |cookie| + cookie =~ /\A#{escape(key)}=/ + } + + set_cookie_header!(header, key, + {:value => '', :path => nil, :domain => nil, + :expires => Time.at(0) }.merge(value)) + + nil + end + module_function :delete_cookie_header! + # Return the bytesize of String; uses String#length under Ruby 1.8 and # String#bytesize under 1.9. if ''.respond_to?(:bytesize) @@ -191,11 +263,22 @@ module Rack # A case-insensitive Hash that preserves the original case of a # header when set. class HeaderHash < Hash + def self.new(hash={}) + HeaderHash === hash ? hash : super(hash) + end + def initialize(hash={}) + super() @names = {} hash.each { |k, v| self[k] = v } end + def each + super do |k, v| + yield(k, v.respond_to?(:to_ary) ? v.to_ary.join("\n") : v) + end + end + def to_hash inject({}) do |hash, (k,v)| if v.respond_to? :to_ary @@ -208,21 +291,24 @@ module Rack end def [](k) - super @names[k.downcase] + super(@names[k] ||= @names[k.downcase]) end def []=(k, v) delete k - @names[k.downcase] = k + @names[k] = @names[k.downcase] = k super k, v end def delete(k) - super @names.delete(k.downcase) + canonical = k.downcase + result = super @names.delete(canonical) + @names.delete_if { |name,| name.downcase == canonical } + result end def include?(k) - @names.has_key? k.downcase + @names.include?(k) || @names.include?(k.downcase) end alias_method :has_key?, :include? @@ -238,13 +324,23 @@ module Rack hash = dup hash.merge! other end + + def replace(other) + clear + other.each { |k, v| self[k] = v } + self + end end # Every standard HTTP code mapped to the appropriate message. - # Stolen from Mongrel. + # Generated with: + # curl -s http://www.iana.org/assignments/http-status-codes | \ + # ruby -ane 'm = /^(\d{3}) +(\S[^\[(]+)/.match($_) and + # puts " #{m[1]} => \x27#{m[2].strip}x27,"' HTTP_STATUS_CODES = { 100 => 'Continue', 101 => 'Switching Protocols', + 102 => 'Processing', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', @@ -252,12 +348,15 @@ module Rack 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', + 207 => 'Multi-Status', + 226 => 'IM Used', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', + 306 => 'Reserved', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', @@ -273,27 +372,76 @@ module Rack 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', - 414 => 'Request-URI Too Large', + 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', + 422 => 'Unprocessable Entity', + 423 => 'Locked', + 424 => 'Failed Dependency', + 426 => 'Upgrade Required', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', - 505 => 'HTTP Version Not Supported' + 505 => 'HTTP Version Not Supported', + 506 => 'Variant Also Negotiates', + 507 => 'Insufficient Storage', + 510 => 'Not Extended', } # Responses with HTTP status codes that should not have an entity body STATUS_WITH_NO_ENTITY_BODY = Set.new((100..199).to_a << 204 << 304) + SYMBOL_TO_STATUS_CODE = HTTP_STATUS_CODES.inject({}) { |hash, (code, message)| + hash[message.downcase.gsub(/\s|-/, '_').to_sym] = code + hash + } + + def status_code(status) + if status.is_a?(Symbol) + SYMBOL_TO_STATUS_CODE[status] || 500 + else + status.to_i + end + end + module_function :status_code + # A multipart form data parser, adapted from IOWA. # # Usually, Rack::Request#POST takes care of calling this. module Multipart + class UploadedFile + # The filename, *not* including the path, of the "uploaded" file + attr_reader :original_filename + + # The content type of the "uploaded" file + attr_accessor :content_type + + def initialize(path, content_type = "text/plain", binary = false) + raise "#{path} file does not exist" unless ::File.exist?(path) + @content_type = content_type + @original_filename = ::File.basename(path) + @tempfile = Tempfile.new(@original_filename) + @tempfile.set_encoding(Encoding::BINARY) if @tempfile.respond_to?(:set_encoding) + @tempfile.binmode if binary + FileUtils.copy_file(path, @tempfile.path) + end + + def path + @tempfile.path + end + alias_method :local_path, :path + + def method_missing(method_name, *args, &block) #:nodoc: + @tempfile.__send__(method_name, *args, &block) + end + end + EOL = "\r\n" + MULTIPART_BOUNDARY = "AaB03x" def self.parse_multipart(env) unless env['CONTENT_TYPE'] =~ @@ -378,7 +526,7 @@ module Rack :name => name, :tempfile => body, :head => head} elsif !filename && content_type body.rewind - + # Generic multipart cases, not coming from a form data = {:type => content_type, :name => name, :tempfile => body, :head => head} @@ -388,7 +536,8 @@ module Rack Utils.normalize_params(params, name, data) unless data.nil? - break if buf.empty? || content_length == -1 + # break if we're at the end of a buffer, but not if it is the end of a field + break if (buf.empty? && $1 != EOL) || content_length == -1 } input.rewind @@ -396,6 +545,76 @@ module Rack params end end + + def self.build_multipart(params, first = true) + if first + unless params.is_a?(Hash) + raise ArgumentError, "value must be a Hash" + end + + multipart = false + query = lambda { |value| + case value + when Array + value.each(&query) + when Hash + value.values.each(&query) + when UploadedFile + multipart = true + end + } + params.values.each(&query) + return nil unless multipart + end + + flattened_params = Hash.new + + params.each do |key, value| + k = first ? key.to_s : "[#{key}]" + + case value + when Array + value.map { |v| + build_multipart(v, false).each { |subkey, subvalue| + flattened_params["#{k}[]#{subkey}"] = subvalue + } + } + when Hash + build_multipart(value, false).each { |subkey, subvalue| + flattened_params[k + subkey] = subvalue + } + else + flattened_params[k] = value + end + end + + if first + flattened_params.map { |name, file| + if file.respond_to?(:original_filename) + ::File.open(file.path, "rb") do |f| + f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding) +<<-EOF +--#{MULTIPART_BOUNDARY}\r +Content-Disposition: form-data; name="#{name}"; filename="#{Utils.escape(file.original_filename)}"\r +Content-Type: #{file.content_type}\r +Content-Length: #{::File.stat(file.path).size}\r +\r +#{f.read}\r +EOF + end + else +<<-EOF +--#{MULTIPART_BOUNDARY}\r +Content-Disposition: form-data; name="#{name}"\r +\r +#{file}\r +EOF + end + }.join + "--#{MULTIPART_BOUNDARY}--\r" + else + flattened_params + end + end end end end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/rack.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/rack.gemspec new file mode 100644 index 00000000..e28b9bb2 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/rack.gemspec @@ -0,0 +1,38 @@ +Gem::Specification.new do |s| + s.name = "rack" + s.version = "1.1.0" + s.platform = Gem::Platform::RUBY + s.summary = "a modular Ruby webserver interface" + + s.description = <<-EOF +Rack provides minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.rubyforge.org. +EOF + + s.files = Dir['{bin/*,contrib/*,example/*,lib/**/*}'] + + %w(COPYING KNOWN-ISSUES rack.gemspec RDOX README SPEC) + s.bindir = 'bin' + s.executables << 'rackup' + s.require_path = 'lib' + s.has_rdoc = true + s.extra_rdoc_files = ['README', 'SPEC', 'KNOWN-ISSUES'] + s.test_files = Dir['test/{test,spec}_*.rb'] + + s.author = 'Christian Neukirchen' + s.email = 'chneukirchen@gmail.com' + s.homepage = 'http://rack.rubyforge.org' + s.rubyforge_project = 'rack' + + s.add_development_dependency 'test-spec' + + s.add_development_dependency 'camping' + s.add_development_dependency 'fcgi' + s.add_development_dependency 'memcache-client' + s.add_development_dependency 'mongrel' + s.add_development_dependency 'thin' +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_basic.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_auth_basic.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_basic.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_auth_basic.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_digest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_auth_digest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_auth_digest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_auth_digest.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_builder.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_builder.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_builder.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_builder.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_camping.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_camping.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_camping.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_camping.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cascade.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cascade.rb similarity index 86% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cascade.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cascade.rb index 3c0f3be3..cf3c29b4 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cascade.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cascade.rb @@ -28,15 +28,13 @@ context "Rack::Cascade" do Rack::MockRequest.new(cascade).get("/cgi/../bla").should.be.not_found end - specify "should fail if empty" do - lambda { Rack::MockRequest.new(Rack::Cascade.new([])).get("/") }. - should.raise(ArgumentError) + specify "should return 404 if empty" do + Rack::MockRequest.new(Rack::Cascade.new([])).get('/').should.be.not_found end specify "should append new app" do cascade = Rack::Cascade.new([], [404, 403]) - lambda { Rack::MockRequest.new(cascade).get('/cgi/test') }. - should.raise(ArgumentError) + Rack::MockRequest.new(cascade).get('/').should.be.not_found cascade << app2 Rack::MockRequest.new(cascade).get('/cgi/test').should.be.not_found Rack::MockRequest.new(cascade).get('/cgi/../bla').should.be.not_found diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cgi.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cgi.rb similarity index 96% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cgi.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cgi.rb index 818fabdf..59500cd7 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_cgi.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_cgi.rb @@ -3,7 +3,7 @@ require 'testrequest' context "Rack::Handler::CGI" do include TestRequest::Helpers - + setup do @host = '0.0.0.0' @port = 9203 @@ -36,7 +36,7 @@ context "Rack::Handler::CGI" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be false response["rack.multiprocess"].should.be true response["rack.run_once"].should.be true @@ -47,7 +47,7 @@ context "Rack::Handler::CGI" do response["REQUEST_METHOD"].should.equal "GET" response["SCRIPT_NAME"].should.equal "/test" response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil + response["PATH_INFO"].should.equal "" response["QUERY_STRING"].should.equal "" response["test.postdata"].should.equal "" diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_chunked.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_chunked.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_chunked.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_chunked.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_commonlogger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_commonlogger.rb new file mode 100644 index 00000000..46a72e86 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_commonlogger.rb @@ -0,0 +1,61 @@ +require 'test/spec' +require 'stringio' + +require 'rack/commonlogger' +require 'rack/lobster' +require 'rack/mock' + +context "Rack::CommonLogger" do + app = lambda { |env| + [200, + {"Content-Type" => "text/html", "Content-Length" => length.to_s}, + [obj]]} + app_without_length = lambda { |env| + [200, + {"Content-Type" => "text/html"}, + []]} + app_with_zero_length = lambda { |env| + [200, + {"Content-Type" => "text/html", "Content-Length" => "0"}, + []]} + + specify "should log to rack.errors by default" do + res = Rack::MockRequest.new(Rack::CommonLogger.new(app)).get("/") + + res.errors.should.not.be.empty + res.errors.should =~ /"GET \/ " 200 #{length} / + end + + specify "should log to anything with +write+" do + log = StringIO.new + res = Rack::MockRequest.new(Rack::CommonLogger.new(app, log)).get("/") + + log.string.should =~ /"GET \/ " 200 #{length} / + end + + specify "should log - content length if header is missing" do + res = Rack::MockRequest.new(Rack::CommonLogger.new(app_without_length)).get("/") + + res.errors.should.not.be.empty + res.errors.should =~ /"GET \/ " 200 - / + end + + specify "should log - content length if header is zero" do + res = Rack::MockRequest.new(Rack::CommonLogger.new(app_with_zero_length)).get("/") + + res.errors.should.not.be.empty + res.errors.should =~ /"GET \/ " 200 - / + end + + def length + self.class.length + end + + def self.length + 123 + end + + def self.obj + "hello world" + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_conditionalget.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_conditionalget.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_conditionalget.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_conditionalget.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_config.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_config.rb new file mode 100644 index 00000000..a508ea4b --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_config.rb @@ -0,0 +1,24 @@ +require 'test/spec' +require 'rack/mock' +require 'rack/builder' +require 'rack/content_length' +require 'rack/config' + +context "Rack::Config" do + + specify "should accept a block that modifies the environment" do + app = Rack::Builder.new do + use Rack::Lint + use Rack::ContentLength + use Rack::Config do |env| + env['greeting'] = 'hello' + end + run lambda { |env| + [200, {'Content-Type' => 'text/plain'}, [env['greeting'] || '']] + } + end + response = Rack::MockRequest.new(app).get('/') + response.body.should.equal('hello') + end + +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_content_length.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_content_length.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_content_length.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_content_length.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_content_type.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_content_type.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_content_type.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_content_type.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_deflater.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_deflater.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_deflater.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_deflater.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_directory.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_directory.rb similarity index 94% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_directory.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_directory.rb index 540c728d..d255c91d 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_directory.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_directory.rb @@ -6,7 +6,7 @@ require 'rack/lint' require 'rack/mock' context "Rack::Directory" do - DOCROOT = File.expand_path(File.dirname(__FILE__)) + DOCROOT = File.expand_path(File.dirname(__FILE__)) unless defined? DOCROOT FILE_CATCH = proc{|env| [200, {'Content-Type'=>'text/plain', "Content-Length" => "7"}, ['passed!']] } app = Rack::Directory.new DOCROOT, FILE_CATCH diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_etag.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_etag.rb new file mode 100644 index 00000000..73cd31ac --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_etag.rb @@ -0,0 +1,17 @@ +require 'test/spec' +require 'rack/mock' +require 'rack/etag' + +context "Rack::ETag" do + specify "sets ETag if none is set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] } + response = Rack::ETag.new(app).call({}) + response[1]['ETag'].should.equal "\"65a8e27d8879283831b664bd8b7f0ad4\"" + end + + specify "does not change ETag if it is already set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain', 'ETag' => '"abc"'}, ["Hello, World!"]] } + response = Rack::ETag.new(app).call({}) + response[1]['ETag'].should.equal "\"abc\"" + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_fastcgi.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_fastcgi.rb similarity index 96% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_fastcgi.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_fastcgi.rb index 69478de5..1ae55ace 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_fastcgi.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_fastcgi.rb @@ -36,7 +36,7 @@ context "Rack::Handler::FastCGI" do specify "should have rack headers" do GET("/test.fcgi") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be false response["rack.multiprocess"].should.be true response["rack.run_once"].should.be false @@ -47,7 +47,7 @@ context "Rack::Handler::FastCGI" do response["REQUEST_METHOD"].should.equal "GET" response["SCRIPT_NAME"].should.equal "/test.fcgi" response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil + response["PATH_INFO"].should.equal "" response["QUERY_STRING"].should.equal "" response["test.postdata"].should.equal "" diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_file.rb similarity index 96% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_file.rb index 1e6771ab..0a2f8ee8 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_file.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_file.rb @@ -6,7 +6,7 @@ require 'rack/lint' require 'rack/mock' context "Rack::File" do - DOCROOT = File.expand_path(File.dirname(__FILE__)) + DOCROOT = File.expand_path(File.dirname(__FILE__)) unless defined? DOCROOT specify "serves files" do res = Rack::MockRequest.new(Rack::Lint.new(Rack::File.new(DOCROOT))). diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_handler.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_handler.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_handler.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_handler.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_head.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_head.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_head.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_head.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lint.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lint.rb similarity index 95% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lint.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lint.rb index 880a07ee..bbf75c17 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lint.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lint.rb @@ -71,6 +71,11 @@ context "Rack::Lint" do }.should.raise(Rack::Lint::LintError). message.should.equal("session [] must respond to store and []=") + lambda { + Rack::Lint.new(nil).call(env("rack.logger" => [])) + }.should.raise(Rack::Lint::LintError). + message.should.equal("logger [] must respond to info") + lambda { Rack::Lint.new(nil).call(env("REQUEST_METHOD" => "FUCKUP?")) }.should.raise(Rack::Lint::LintError). @@ -110,7 +115,7 @@ context "Rack::Lint" do Rack::Lint.new(nil).call(env("rack.input" => "")) }.should.raise(Rack::Lint::LintError). message.should.match(/does not respond to #gets/) - + lambda { input = Object.new def input.binmode? @@ -119,7 +124,7 @@ context "Rack::Lint" do Rack::Lint.new(nil).call(env("rack.input" => input)) }.should.raise(Rack::Lint::LintError). message.should.match(/is not opened in binary mode/) - + lambda { input = Object.new def input.external_encoding @@ -347,25 +352,25 @@ context "Rack::Lint" do yield 23 yield 42 end - + def rewind raise Errno::ESPIPE, "Errno::ESPIPE" end end - + eof_weirdio = Object.new class << eof_weirdio def gets nil end - + def read(*args) nil end - + def each end - + def rewind end end @@ -452,48 +457,50 @@ context "Rack::Lint" do }.should.raise(Rack::Lint::LintError). message.should.match(/body was given for HEAD/) end - + specify "passes valid read calls" do + hello_str = "hello world" + hello_str.force_encoding("ASCII-8BIT") if hello_str.respond_to? :force_encoding lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) - + lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read(0) [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) - + lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read(1) [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) - + lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read(nil) [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) - + lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read(nil, '') [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) - + lambda { Rack::Lint.new(lambda { |env| env["rack.input"].read(1, '') [201, {"Content-type" => "text/plain", "Content-length" => "0"}, []] - }).call(env({"rack.input" => StringIO.new("hello world")})) + }).call(env({"rack.input" => StringIO.new(hello_str)})) }.should.not.raise(Rack::Lint::LintError) end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lobster.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lobster.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lobster.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lobster.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lock.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lock.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_lock.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_lock.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_logger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_logger.rb new file mode 100644 index 00000000..d55b9c77 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_logger.rb @@ -0,0 +1,21 @@ +require 'rack/logger' +require 'rack/lint' +require 'stringio' + +context "Rack::Logger" do + specify "logs to rack.errors" do + app = lambda { |env| + log = env['rack.logger'] + log.debug("Created logger") + log.info("Program started") + log.warn("Nothing to do!") + + [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] + } + + errors = StringIO.new + Rack::Logger.new(app).call({'rack.errors' => errors}) + errors.string.should.match "INFO -- : Program started" + errors.string.should.match "WARN -- : Nothing to do" + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_methodoverride.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_methodoverride.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_methodoverride.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_methodoverride.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mock.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mock.rb similarity index 57% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mock.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mock.rb index 9c392a28..a03bedc2 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mock.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mock.rb @@ -93,6 +93,92 @@ context "Rack::MockRequest" do env["rack.url_scheme"].should.equal "https" end + specify "should set SSL port and HTTP flag on when using https" do + res = Rack::MockRequest.new(app). + get("https://example.org/foo") + res.should.be.kind_of Rack::MockResponse + + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "GET" + env["SERVER_NAME"].should.equal "example.org" + env["SERVER_PORT"].should.equal "443" + env["QUERY_STRING"].should.equal "" + env["PATH_INFO"].should.equal "/foo" + env["rack.url_scheme"].should.equal "https" + env["HTTPS"].should.equal "on" + end + + specify "should prepend slash to uri path" do + res = Rack::MockRequest.new(app). + get("foo") + res.should.be.kind_of Rack::MockResponse + + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "GET" + env["SERVER_NAME"].should.equal "example.org" + env["SERVER_PORT"].should.equal "80" + env["QUERY_STRING"].should.equal "" + env["PATH_INFO"].should.equal "/foo" + env["rack.url_scheme"].should.equal "http" + end + + specify "should properly convert method name to an uppercase string" do + res = Rack::MockRequest.new(app).request(:get) + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "GET" + end + + specify "should accept params and build query string for GET requests" do + res = Rack::MockRequest.new(app).get("/foo?baz=2", :params => {:foo => {:bar => "1"}}) + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "GET" + env["QUERY_STRING"].should.match "baz=2" + env["QUERY_STRING"].should.match "foo[bar]=1" + env["PATH_INFO"].should.equal "/foo" + env["mock.postdata"].should.equal "" + end + + specify "should accept raw input in params for GET requests" do + res = Rack::MockRequest.new(app).get("/foo?baz=2", :params => "foo[bar]=1") + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "GET" + env["QUERY_STRING"].should.match "baz=2" + env["QUERY_STRING"].should.match "foo[bar]=1" + env["PATH_INFO"].should.equal "/foo" + env["mock.postdata"].should.equal "" + end + + specify "should accept params and build url encoded params for POST requests" do + res = Rack::MockRequest.new(app).post("/foo", :params => {:foo => {:bar => "1"}}) + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "POST" + env["QUERY_STRING"].should.equal "" + env["PATH_INFO"].should.equal "/foo" + env["CONTENT_TYPE"].should.equal "application/x-www-form-urlencoded" + env["mock.postdata"].should.equal "foo[bar]=1" + end + + specify "should accept raw input in params for POST requests" do + res = Rack::MockRequest.new(app).post("/foo", :params => "foo[bar]=1") + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "POST" + env["QUERY_STRING"].should.equal "" + env["PATH_INFO"].should.equal "/foo" + env["CONTENT_TYPE"].should.equal "application/x-www-form-urlencoded" + env["mock.postdata"].should.equal "foo[bar]=1" + end + + specify "should accept params and build multipart encoded params for POST requests" do + files = Rack::Utils::Multipart::UploadedFile.new(File.join(File.dirname(__FILE__), "multipart", "file1.txt")) + res = Rack::MockRequest.new(app).post("/foo", :params => { "submit-name" => "Larry", "files" => files }) + env = YAML.load(res.body) + env["REQUEST_METHOD"].should.equal "POST" + env["QUERY_STRING"].should.equal "" + env["PATH_INFO"].should.equal "/foo" + env["CONTENT_TYPE"].should.equal "multipart/form-data; boundary=AaB03x" + env["mock.postdata"].length.should.equal 206 + end + specify "should behave valid according to the Rack spec" do lambda { res = Rack::MockRequest.new(app). @@ -130,7 +216,7 @@ context "Rack::MockResponse" do res.original_headers["Content-Type"].should.equal "text/yaml" res["Content-Type"].should.equal "text/yaml" res.content_type.should.equal "text/yaml" - res.content_length.should.be 401 # needs change often. + res.content_length.should.be 414 # needs change often. res.location.should.be.nil end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mongrel.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mongrel.rb similarity index 98% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mongrel.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mongrel.rb index d73e884c..4b386891 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_mongrel.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_mongrel.rb @@ -6,14 +6,14 @@ require 'rack/urlmap' require 'rack/lint' require 'testrequest' require 'timeout' - + Thread.abort_on_exception = true $tcp_defer_accept_opts = nil $tcp_cork_opts = nil context "Rack::Handler::Mongrel" do include TestRequest::Helpers - + setup do server = Mongrel::HttpServer.new(@host='0.0.0.0', @port=9201) server.register('/test', @@ -41,7 +41,7 @@ context "Rack::Handler::Mongrel" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be true response["rack.multiprocess"].should.be false response["rack.run_once"].should.be false @@ -52,7 +52,7 @@ context "Rack::Handler::Mongrel" do response["REQUEST_METHOD"].should.equal "GET" response["SCRIPT_NAME"].should.equal "/test" response["REQUEST_PATH"].should.equal "/test" - response["PATH_INFO"].should.be.nil + response["PATH_INFO"].should.be.equal "" response["QUERY_STRING"].should.equal "" response["test.postdata"].should.equal "" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_nulllogger.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_nulllogger.rb new file mode 100644 index 00000000..b3c2bc9c --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_nulllogger.rb @@ -0,0 +1,13 @@ +require 'rack/nulllogger' +require 'rack/lint' +require 'rack/mock' + +context "Rack::NullLogger" do + specify "acks as a nop logger" do + app = lambda { |env| + env['rack.logger'].warn "b00m" + [200, {'Content-Type' => 'text/plain'}, ["Hello, World!"]] + } + Rack::NullLogger.new(app).call({}) + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_recursive.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_recursive.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_recursive.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_recursive.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_request.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_request.rb similarity index 89% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_request.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_request.rb index 74e2f00a..fcdeb484 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_request.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_request.rb @@ -35,9 +35,18 @@ context "Rack::Request" do req.host.should.equal "www2.example.org" req = Rack::Request.new \ - Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org:9292") + Rack::MockRequest.env_for("/", "SERVER_NAME" => "example.org", "SERVER_PORT" => "9292") req.host.should.equal "example.org" + req = Rack::Request.new \ + Rack::MockRequest.env_for("/", "HTTP_HOST" => "localhost:81", "HTTP_X_FORWARDED_HOST" => "example.org:9292") + req.host.should.equal "example.org" + + env = Rack::MockRequest.env_for("/", "SERVER_ADDR" => "192.168.1.1", "SERVER_PORT" => "9292") + env.delete("SERVER_NAME") + req = Rack::Request.new(env) + req.host.should.equal "192.168.1.1" + env = Rack::MockRequest.env_for("/") env.delete("SERVER_NAME") req = Rack::Request.new(env) @@ -52,9 +61,16 @@ context "Rack::Request" do req.params.should.equal "foo" => "bar", "quux" => "bla" end - specify "can parse POST data" do + specify "raises if rack.input is missing" do + req = Rack::Request.new({}) + lambda { req.POST }.should.raise(RuntimeError) + end + + specify "can parse POST data when method is POST and no Content-Type given" do req = Rack::Request.new \ - Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla") + Rack::MockRequest.env_for("/?foo=quux", + "REQUEST_METHOD" => 'POST', + :input => "foo=bar&quux=bla") req.content_type.should.be.nil req.media_type.should.be.nil req.query_string.should.equal "foo=quux" @@ -63,7 +79,7 @@ context "Rack::Request" do req.params.should.equal "foo" => "bar", "quux" => "bla" end - specify "can parse POST data with explicit content type" do + specify "can parse POST data with explicit content type regardless of method" do req = Rack::Request.new \ Rack::MockRequest.env_for("/", "CONTENT_TYPE" => 'application/x-www-form-urlencoded;foo=bar', @@ -78,6 +94,7 @@ context "Rack::Request" do specify "does not parse POST data when media type is not form-data" do req = Rack::Request.new \ Rack::MockRequest.env_for("/?foo=quux", + "REQUEST_METHOD" => 'POST', "CONTENT_TYPE" => 'text/plain;charset=utf-8', :input => "foo=bar&quux=bla") req.content_type.should.equal 'text/plain;charset=utf-8' @@ -88,6 +105,16 @@ context "Rack::Request" do req.body.read.should.equal "foo=bar&quux=bla" end + specify "can parse POST data on PUT when media type is form-data" do + req = Rack::Request.new \ + Rack::MockRequest.env_for("/?foo=quux", + "REQUEST_METHOD" => 'PUT', + "CONTENT_TYPE" => 'application/x-www-form-urlencoded', + :input => "foo=bar&quux=bla") + req.POST.should.equal "foo" => "bar", "quux" => "bla" + req.body.read.should.equal "foo=bar&quux=bla" + end + specify "rewinds input after parsing POST data" do input = StringIO.new("foo=bar&quux=bla") req = Rack::Request.new \ @@ -100,7 +127,8 @@ context "Rack::Request" do specify "cleans up Safari's ajax POST body" do req = Rack::Request.new \ - Rack::MockRequest.env_for("/", :input => "foo=bar&quux=bla\0") + Rack::MockRequest.env_for("/", + 'REQUEST_METHOD' => 'POST', :input => "foo=bar&quux=bla\0") req.POST.should.equal "foo" => "bar", "quux" => "bla" end @@ -147,9 +175,21 @@ context "Rack::Request" do req.referer.should.equal "/" end + specify "user agent should be extracted correct" do + req = Rack::Request.new \ + Rack::MockRequest.env_for("/", "HTTP_USER_AGENT" => "Mozilla/4.0 (compatible)") + req.user_agent.should.equal "Mozilla/4.0 (compatible)" + + req = Rack::Request.new \ + Rack::MockRequest.env_for("/") + req.user_agent.should.equal nil + end + specify "can cache, but invalidates the cache" do req = Rack::Request.new \ - Rack::MockRequest.env_for("/?foo=quux", :input => "foo=bar&quux=bla") + Rack::MockRequest.env_for("/?foo=quux", + "CONTENT_TYPE" => "application/x-www-form-urlencoded", + :input => "foo=bar&quux=bla") req.GET.should.equal "foo" => "quux" req.GET.should.equal "foo" => "quux" req.env["QUERY_STRING"] = "bla=foo" @@ -424,6 +464,7 @@ Content-Transfer-Encoding: base64\r /9j/4AAQSkZJRgABAQAAAQABAAD//gA+Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcg\r --AaB03x--\r EOF + input.force_encoding("ASCII-8BIT") if input.respond_to? :force_encoding res = Rack::MockRequest.new(Rack::Lint.new(app)).get "/", "CONTENT_TYPE" => "multipart/form-data, boundary=AaB03x", "CONTENT_LENGTH" => input.size.to_s, "rack.input" => StringIO.new(input) diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_response.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_response.rb similarity index 98% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_response.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_response.rb index eb59b5c2..7989013d 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_response.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_response.rb @@ -118,6 +118,9 @@ context "Rack::Response" do r = Rack::Response.new([], 500) r.status.should.equal 500 + + r = Rack::Response.new([], "200 OK") + r.status.should.equal 200 end specify "has a constructor that can take a block" do diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_rewindable_input.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_rewindable_input.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_rewindable_input.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_rewindable_input.rb diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_runtime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_runtime.rb new file mode 100644 index 00000000..62d80956 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_runtime.rb @@ -0,0 +1,35 @@ +require 'test/spec' +require 'rack/mock' +require 'rack/runtime' + +context "Rack::Runtime" do + specify "sets X-Runtime is none is set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] } + response = Rack::Runtime.new(app).call({}) + response[1]['X-Runtime'].should =~ /[\d\.]+/ + end + + specify "does not set the X-Runtime if it is already set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain', "X-Runtime" => "foobar"}, "Hello, World!"] } + response = Rack::Runtime.new(app).call({}) + response[1]['X-Runtime'].should == "foobar" + end + + specify "should allow a suffix to be set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] } + response = Rack::Runtime.new(app, "Test").call({}) + response[1]['X-Runtime-Test'].should =~ /[\d\.]+/ + end + + specify "should allow multiple timers to be set" do + app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, "Hello, World!"] } + runtime1 = Rack::Runtime.new(app, "App") + runtime2 = Rack::Runtime.new(runtime1, "All") + response = runtime2.call({}) + + response[1]['X-Runtime-App'].should =~ /[\d\.]+/ + response[1]['X-Runtime-All'].should =~ /[\d\.]+/ + + Float(response[1]['X-Runtime-All']).should > Float(response[1]['X-Runtime-App']) + end +end diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_sendfile.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_sendfile.rb new file mode 100644 index 00000000..8cfe2017 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_sendfile.rb @@ -0,0 +1,86 @@ +require 'test/spec' +require 'rack/mock' +require 'rack/sendfile' + +context "Rack::File" do + specify "should respond to #to_path" do + Rack::File.new(Dir.pwd).should.respond_to :to_path + end +end + +context "Rack::Sendfile" do + def sendfile_body + res = ['Hello World'] + def res.to_path ; "/tmp/hello.txt" ; end + res + end + + def simple_app(body=sendfile_body) + lambda { |env| [200, {'Content-Type' => 'text/plain'}, body] } + end + + def sendfile_app(body=sendfile_body) + Rack::Sendfile.new(simple_app(body)) + end + + setup do + @request = Rack::MockRequest.new(sendfile_app) + end + + def request(headers={}) + yield @request.get('/', headers) + end + + specify "does nothing when no X-Sendfile-Type header present" do + request do |response| + response.should.be.ok + response.body.should.equal 'Hello World' + response.headers.should.not.include 'X-Sendfile' + end + end + + specify "sets X-Sendfile response header and discards body" do + request 'HTTP_X_SENDFILE_TYPE' => 'X-Sendfile' do |response| + response.should.be.ok + response.body.should.be.empty + response.headers['X-Sendfile'].should.equal '/tmp/hello.txt' + end + end + + specify "sets X-Lighttpd-Send-File response header and discards body" do + request 'HTTP_X_SENDFILE_TYPE' => 'X-Lighttpd-Send-File' do |response| + response.should.be.ok + response.body.should.be.empty + response.headers['X-Lighttpd-Send-File'].should.equal '/tmp/hello.txt' + end + end + + specify "sets X-Accel-Redirect response header and discards body" do + headers = { + 'HTTP_X_SENDFILE_TYPE' => 'X-Accel-Redirect', + 'HTTP_X_ACCEL_MAPPING' => '/tmp/=/foo/bar/' + } + request headers do |response| + response.should.be.ok + response.body.should.be.empty + response.headers['X-Accel-Redirect'].should.equal '/foo/bar/hello.txt' + end + end + + specify 'writes to rack.error when no X-Accel-Mapping is specified' do + request 'HTTP_X_SENDFILE_TYPE' => 'X-Accel-Redirect' do |response| + response.should.be.ok + response.body.should.equal 'Hello World' + response.headers.should.not.include 'X-Accel-Redirect' + response.errors.should.include 'X-Accel-Mapping' + end + end + + specify 'does nothing when body does not respond to #to_path' do + @request = Rack::MockRequest.new(sendfile_app(['Not a file...'])) + request 'HTTP_X_SENDFILE_TYPE' => 'X-Sendfile' do |response| + response.body.should.equal 'Not a file...' + response.headers.should.not.include 'X-Sendfile' + end + end +end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_cookie.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_cookie.rb similarity index 84% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_cookie.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_cookie.rb index 3be88b43..fba3f83b 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_cookie.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_cookie.rb @@ -46,16 +46,7 @@ context "Rack::Session::Cookie" do get("/", :fatal => true) }.should.raise(Rack::MockRequest::FatalWarning) end - - specify "creates a new cookie with integrity hash" do - res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/") - if RUBY_VERSION < "1.9" - res["Set-Cookie"].should.match("rack.session=BAh7BiIMY291bnRlcmkG%0A--1439b4d37b9d4b04c603848382f712d6fcd31088") - else - res["Set-Cookie"].should.match("rack.session=BAh7BkkiDGNvdW50ZXIGOg1lbmNvZGluZyINVVMtQVNDSUlpBg%3D%3D%0A--d7a6637b94d2728194a96c18484e1f7ed9074a83") - end - end - + specify "loads from a cookie wih integrity hash" do res = Rack::MockRequest.new(Rack::Session::Cookie.new(incrementor, :secret => 'test')).get("/") cookie = res["Set-Cookie"] diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_memcache.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_memcache.rb similarity index 80% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_memcache.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_memcache.rb index 37c3d895..faac796e 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_memcache.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_memcache.rb @@ -8,7 +8,7 @@ begin context "Rack::Session::Memcache" do session_key = Rack::Session::Memcache::DEFAULT_OPTIONS[:key] - session_match = /#{session_key}=[0-9a-fA-F]+;/ + session_match = /#{session_key}=([0-9a-fA-F]+);/ incrementor = lambda do |env| env["rack.session"]["counter"] ||= 0 env["rack.session"]["counter"] += 1 @@ -27,14 +27,20 @@ begin incrementor.call(env) end - specify "MemCache can connect to existing server" do - test_pool = MemCache.new :namespace => 'test:rack:session' + specify "faults on no connection" do + if RUBY_VERSION < "1.9" + lambda do + Rack::Session::Memcache.new incrementor, :memcache_server => 'nosuchserver' + end.should.raise + else + lambda do + Rack::Session::Memcache.new incrementor, :memcache_server => 'nosuchserver' + end.should.raise ArgumentError + end end - specify "faults on no connection" do - lambda do - Rack::Session::Memcache.new(incrementor, :memcache_server => '') - end.should.raise + specify "connect to existing server" do + test_pool = MemCache.new incrementor, :namespace => 'test:rack:session' end specify "creates a new cookie" do @@ -151,6 +157,31 @@ begin res3.body.should.equal '{"counter"=>4}' end + specify "deep hashes are correctly updated" do + store = nil + hash_check = proc do |env| + session = env['rack.session'] + unless session.include? 'test' + session.update :a => :b, :c => { :d => :e }, + :f => { :g => { :h => :i} }, 'test' => true + else + session[:f][:g][:h] = :j + end + [200, {}, session.inspect] + end + pool = Rack::Session::Memcache.new(hash_check) + req = Rack::MockRequest.new(pool) + + res0 = req.get("/") + session_id = (cookie = res0["Set-Cookie"])[session_match, 1] + ses0 = pool.pool.get(session_id, true) + + res1 = req.get("/", "HTTP_COOKIE" => cookie) + ses1 = pool.pool.get(session_id, true) + + ses1.should.not.equal ses0 + end + # anyone know how to do this better? specify "multithread: should cleanly merge sessions" do next unless $DEBUG @@ -161,7 +192,7 @@ begin res = req.get('/') res.body.should.equal '{"counter"=>1}' cookie = res["Set-Cookie"] - sess_id = cookie[/#{pool.key}=([^,;]+)/,1] + session_id = cookie[session_match, 1] delta_incrementor = lambda do |env| # emulate disconjoinment of threading @@ -178,12 +209,12 @@ begin run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true) end end.reverse.map{|t| t.run.join.value } - r.each do |res| - res['Set-Cookie'].should.equal cookie - res.body.should.include '"counter"=>2' + r.each do |request| + request['Set-Cookie'].should.equal cookie + request.body.should.include '"counter"=>2' end - session = pool.pool.get(sess_id) + session = pool.pool.get(session_id) session.size.should.be tnum+1 # counter session['counter'].should.be 2 # meeeh @@ -202,12 +233,12 @@ begin run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true) end end.reverse.map{|t| t.run.join.value } - r.each do |res| - res['Set-Cookie'].should.equal cookie - res.body.should.include '"counter"=>3' + r.each do |request| + request['Set-Cookie'].should.equal cookie + request.body.should.include '"counter"=>3' end - session = pool.pool.get(sess_id) + session = pool.pool.get(session_id) session.size.should.be tnum+1 session['counter'].should.be 3 @@ -224,17 +255,19 @@ begin run.get('/', "HTTP_COOKIE" => cookie, 'rack.multithread' => true) end end.reverse.map{|t| t.run.join.value } - r.each do |res| - res['Set-Cookie'].should.equal cookie - res.body.should.include '"foo"=>"bar"' + r.each do |request| + request['Set-Cookie'].should.equal cookie + request.body.should.include '"foo"=>"bar"' end - session = pool.pool.get(sess_id) + session = pool.pool.get(session_id) session.size.should.be r.size+1 session['counter'].should.be.nil? session['foo'].should.equal 'bar' end end +rescue RuntimeError + $stderr.puts "Skipping Rack::Session::Memcache tests. Start memcached and try again." rescue LoadError $stderr.puts "Skipping Rack::Session::Memcache tests (Memcache is required). `gem install memcache-client` and try again." end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_pool.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_pool.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_session_pool.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_session_pool.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_showexceptions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_showexceptions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_showexceptions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_showexceptions.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_showstatus.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_showstatus.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_showstatus.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_showstatus.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_static.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_static.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_static.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_static.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_thin.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_thin.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_thin.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_thin.rb diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_urlmap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_urlmap.rb similarity index 84% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_urlmap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_urlmap.rb index 6c4d72ac..3d8fe605 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_urlmap.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_urlmap.rb @@ -44,6 +44,12 @@ context "Rack::URLMap" do res["X-ScriptName"].should.equal "/foo/bar" res["X-PathInfo"].should.equal "/" + res = Rack::MockRequest.new(map).get("/foo///bar//quux") + res.status.should.equal 200 + res.should.be.ok + res["X-ScriptName"].should.equal "/foo/bar" + res["X-PathInfo"].should.equal "//quux" + res = Rack::MockRequest.new(map).get("/foo/quux", "SCRIPT_NAME" => "/bleh") res.should.be.ok res["X-ScriptName"].should.equal "/bleh/foo" @@ -182,4 +188,28 @@ context "Rack::URLMap" do res["X-PathInfo"].should.equal "/" res["X-ScriptName"].should.equal "" end + + specify "should not squeeze slashes" do + map = Rack::URLMap.new("/" => lambda { |env| + [200, + { "Content-Type" => "text/plain", + "X-Position" => "root", + "X-PathInfo" => env["PATH_INFO"], + "X-ScriptName" => env["SCRIPT_NAME"] + }, [""]]}, + "/foo" => lambda { |env| + [200, + { "Content-Type" => "text/plain", + "X-Position" => "foo", + "X-PathInfo" => env["PATH_INFO"], + "X-ScriptName" => env["SCRIPT_NAME"] + }, [""]]} + ) + + res = Rack::MockRequest.new(map).get("/http://example.org/bar") + res.should.be.ok + res["X-Position"].should.equal "root" + res["X-PathInfo"].should.equal "/http://example.org/bar" + res["X-ScriptName"].should.equal "" + end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_utils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_utils.rb similarity index 70% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_utils.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_utils.rb index f270e87e..269a52bd 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_utils.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_utils.rb @@ -30,7 +30,10 @@ context "Rack::Utils" do end specify "should parse query strings correctly" do - Rack::Utils.parse_query("foo=bar").should.equal "foo" => "bar" + Rack::Utils.parse_query("foo=bar"). + should.equal "foo" => "bar" + Rack::Utils.parse_query("foo=\"bar\""). + should.equal "foo" => "bar" Rack::Utils.parse_query("foo=bar&foo=quux"). should.equal "foo" => ["bar", "quux"] Rack::Utils.parse_query("foo=1&bar=2"). @@ -47,6 +50,8 @@ context "Rack::Utils" do should.equal "foo" => "" Rack::Utils.parse_nested_query("foo=bar"). should.equal "foo" => "bar" + Rack::Utils.parse_nested_query("foo=\"bar\""). + should.equal "foo" => "bar" Rack::Utils.parse_nested_query("foo=bar&foo=quux"). should.equal "foo" => "quux" @@ -126,6 +131,53 @@ context "Rack::Utils" do should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F" end + specify "should build nested query strings correctly" do + Rack::Utils.build_nested_query("foo" => nil).should.equal "foo" + Rack::Utils.build_nested_query("foo" => "").should.equal "foo=" + Rack::Utils.build_nested_query("foo" => "bar").should.equal "foo=bar" + + Rack::Utils.build_nested_query("foo" => "1", "bar" => "2"). + should.equal "foo=1&bar=2" + Rack::Utils.build_nested_query("my weird field" => "q1!2\"'w$5&7/z8)?"). + should.equal "my+weird+field=q1%212%22%27w%245%267%2Fz8%29%3F" + + Rack::Utils.build_nested_query("foo" => [nil]). + should.equal "foo[]" + Rack::Utils.build_nested_query("foo" => [""]). + should.equal "foo[]=" + Rack::Utils.build_nested_query("foo" => ["bar"]). + should.equal "foo[]=bar" + + # The ordering of the output query string is unpredictable with 1.8's + # unordered hash. Test that build_nested_query performs the inverse + # function of parse_nested_query. + [{"foo" => nil, "bar" => ""}, + {"foo" => "bar", "baz" => ""}, + {"foo" => ["1", "2"]}, + {"foo" => "bar", "baz" => ["1", "2", "3"]}, + {"foo" => ["bar"], "baz" => ["1", "2", "3"]}, + {"foo" => ["1", "2"]}, + {"foo" => "bar", "baz" => ["1", "2", "3"]}, + {"x" => {"y" => {"z" => "1"}}}, + {"x" => {"y" => {"z" => ["1"]}}}, + {"x" => {"y" => {"z" => ["1", "2"]}}}, + {"x" => {"y" => [{"z" => "1"}]}}, + {"x" => {"y" => [{"z" => ["1"]}]}}, + {"x" => {"y" => [{"z" => "1", "w" => "2"}]}}, + {"x" => {"y" => [{"v" => {"w" => "1"}}]}}, + {"x" => {"y" => [{"z" => "1", "v" => {"w" => "2"}}]}}, + {"x" => {"y" => [{"z" => "1"}, {"z" => "2"}]}}, + {"x" => {"y" => [{"z" => "1", "w" => "a"}, {"z" => "2", "w" => "3"}]}} + ].each { |params| + qs = Rack::Utils.build_nested_query(params) + Rack::Utils.parse_nested_query(qs).should.equal params + } + + lambda { Rack::Utils.build_nested_query("foo=bar") }. + should.raise(ArgumentError). + message.should.equal "value must be a Hash" + end + specify "should figure out which encodings are acceptable" do helper = lambda do |a, b| request = Rack::Request.new(Rack::MockRequest.env_for("", "HTTP_ACCEPT_ENCODING" => a)) @@ -152,6 +204,18 @@ context "Rack::Utils" do specify "should return the bytesize of String" do Rack::Utils.bytesize("FOO\xE2\x82\xAC").should.equal 6 end + + specify "should return status code for integer" do + Rack::Utils.status_code(200).should.equal 200 + end + + specify "should return status code for string" do + Rack::Utils.status_code("200").should.equal 200 + end + + specify "should return status code for symbol" do + Rack::Utils.status_code(:ok).should.equal 200 + end end context "Rack::Utils::HeaderHash" do @@ -190,30 +254,53 @@ context "Rack::Utils::HeaderHash" do h = Rack::Utils::HeaderHash.new("foo" => ["bar", "baz"]) h.to_hash.should.equal({ "foo" => "bar\nbaz" }) end - + + specify "should replace hashes correctly" do + h = Rack::Utils::HeaderHash.new("Foo-Bar" => "baz") + j = {"foo" => "bar"} + h.replace(j) + h["foo"].should.equal "bar" + end + specify "should be able to delete the given key case-sensitively" do h = Rack::Utils::HeaderHash.new("foo" => "bar") h.delete("foo") h["foo"].should.be.nil h["FOO"].should.be.nil end - + specify "should be able to delete the given key case-insensitively" do h = Rack::Utils::HeaderHash.new("foo" => "bar") h.delete("FOO") h["foo"].should.be.nil h["FOO"].should.be.nil end - + specify "should return the deleted value when #delete is called on an existing key" do h = Rack::Utils::HeaderHash.new("foo" => "bar") h.delete("Foo").should.equal("bar") end - + specify "should return nil when #delete is called on a non-existant key" do h = Rack::Utils::HeaderHash.new("foo" => "bar") h.delete("Hello").should.be.nil end + + specify "should avoid unnecessary object creation if possible" do + a = Rack::Utils::HeaderHash.new("foo" => "bar") + b = Rack::Utils::HeaderHash.new(a) + b.object_id.should.equal(a.object_id) + b.should.equal(a) + end + + specify "should convert Array values to Strings when responding to #each" do + h = Rack::Utils::HeaderHash.new("foo" => ["bar", "baz"]) + h.each do |k,v| + k.should.equal("foo") + v.should.equal("bar\nbaz") + end + end + end context "Rack::Utils::Context" do @@ -372,9 +459,83 @@ context "Rack::Utils::Multipart" do input.read.length.should.equal 197 end + specify "builds multipart body" do + files = Rack::Utils::Multipart::UploadedFile.new(multipart_file("file1.txt")) + data = Rack::Utils::Multipart.build_multipart("submit-name" => "Larry", "files" => files) + + options = { + "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x", + "CONTENT_LENGTH" => data.length.to_s, + :input => StringIO.new(data) + } + env = Rack::MockRequest.env_for("/", options) + params = Rack::Utils::Multipart.parse_multipart(env) + params["submit-name"].should.equal "Larry" + params["files"][:filename].should.equal "file1.txt" + params["files"][:tempfile].read.should.equal "contents" + end + + specify "builds nested multipart body" do + files = Rack::Utils::Multipart::UploadedFile.new(multipart_file("file1.txt")) + data = Rack::Utils::Multipart.build_multipart("people" => [{"submit-name" => "Larry", "files" => files}]) + + options = { + "CONTENT_TYPE" => "multipart/form-data; boundary=AaB03x", + "CONTENT_LENGTH" => data.length.to_s, + :input => StringIO.new(data) + } + env = Rack::MockRequest.env_for("/", options) + params = Rack::Utils::Multipart.parse_multipart(env) + params["people"][0]["submit-name"].should.equal "Larry" + params["people"][0]["files"][:filename].should.equal "file1.txt" + params["people"][0]["files"][:tempfile].read.should.equal "contents" + end + + specify "can parse fields that end at the end of the buffer" do + input = File.read(multipart_file("bad_robots")) + + req = Rack::Request.new Rack::MockRequest.env_for("/", + "CONTENT_TYPE" => "multipart/form-data, boundary=1yy3laWhgX31qpiHinh67wJXqKalukEUTvqTzmon", + "CONTENT_LENGTH" => input.size, + :input => input) + + req.POST['file.path'].should.equal "/var/tmp/uploads/4/0001728414" + req.POST['addresses'].should.not.equal nil + end + + specify "builds complete params with the chunk size of 16384 slicing exactly on boundary" do + data = File.open(multipart_file("fail_16384_nofile")) { |f| f.read }.gsub(/\n/, "\r\n") + options = { + "CONTENT_TYPE" => "multipart/form-data; boundary=----WebKitFormBoundaryWsY0GnpbI5U7ztzo", + "CONTENT_LENGTH" => data.length.to_s, + :input => StringIO.new(data) + } + env = Rack::MockRequest.env_for("/", options) + params = Rack::Utils::Multipart.parse_multipart(env) + + params.should.not.equal nil + params.keys.should.include "AAAAAAAAAAAAAAAAAAA" + params["AAAAAAAAAAAAAAAAAAA"].keys.should.include "PLAPLAPLA_MEMMEMMEMM_ATTRATTRER" + params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"].keys.should.include "new" + params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"].keys.should.include "-2" + params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"].keys.should.include "ba_unit_id" + params["AAAAAAAAAAAAAAAAAAA"]["PLAPLAPLA_MEMMEMMEMM_ATTRATTRER"]["new"]["-2"]["ba_unit_id"].should.equal "1017" + end + + specify "should return nil if no UploadedFiles were used" do + data = Rack::Utils::Multipart.build_multipart("people" => [{"submit-name" => "Larry", "files" => "contents"}]) + data.should.equal nil + end + + specify "should raise ArgumentError if params is not a Hash" do + lambda { Rack::Utils::Multipart.build_multipart("foo=bar") }. + should.raise(ArgumentError). + message.should.equal "value must be a Hash" + end + private def multipart_fixture(name) - file = File.join(File.dirname(__FILE__), "multipart", name.to_s) + file = multipart_file(name) data = File.open(file, 'rb') { |io| io.read } type = "multipart/form-data; boundary=AaB03x" @@ -384,4 +545,8 @@ context "Rack::Utils::Multipart" do "CONTENT_LENGTH" => length.to_s, :input => StringIO.new(data) } end + + def multipart_file(name) + File.join(File.dirname(__FILE__), "multipart", name.to_s) + end end diff --git a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_webrick.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_webrick.rb similarity index 97% rename from lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_webrick.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_webrick.rb index 3e63ea63..599425c4 100644 --- a/lib/middleman/vendor/gems/gems/rack-1.0.1/test/spec_rack_webrick.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rack_webrick.rb @@ -9,7 +9,7 @@ Thread.abort_on_exception = true context "Rack::Handler::WEBrick" do include TestRequest::Helpers - + setup do @server = WEBrick::HTTPServer.new(:Host => @host='0.0.0.0', :Port => @port=9202, @@ -39,7 +39,7 @@ context "Rack::Handler::WEBrick" do specify "should have rack headers" do GET("/test") - response["rack.version"].should.equal [1,0] + response["rack.version"].should.equal [1,1] response["rack.multithread"].should.be true response["rack.multiprocess"].should.be false response["rack.run_once"].should.be false @@ -50,7 +50,7 @@ context "Rack::Handler::WEBrick" do response["REQUEST_METHOD"].should.equal "GET" response["SCRIPT_NAME"].should.equal "/test" response["REQUEST_PATH"].should.equal "/" - response["PATH_INFO"].should.be.nil + response["PATH_INFO"].should.be.equal "" response["QUERY_STRING"].should.equal "" response["test.postdata"].should.equal "" @@ -60,7 +60,7 @@ context "Rack::Handler::WEBrick" do response["REQUEST_PATH"].should.equal "/" response["PATH_INFO"].should.equal "/foo" response["QUERY_STRING"].should.equal "quux=1" - + GET("/test/foo%25encoding?quux=1") response["REQUEST_METHOD"].should.equal "GET" response["SCRIPT_NAME"].should.equal "/test" diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rackup.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rackup.rb new file mode 100644 index 00000000..d9926fda --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-1.1.0/test/spec_rackup.rb @@ -0,0 +1,154 @@ +require 'test/spec' +require 'testrequest' +require 'rack/server' +require 'open3' + +begin +require "mongrel" + +context "rackup" do + include TestRequest::Helpers + + def run_rackup(*args) + options = args.last.is_a?(Hash) ? args.pop : {} + flags = args.first + @host = options[:host] || "0.0.0.0" + @port = options[:port] || 9292 + + Dir.chdir("#{root}/test/rackup") do + @in, @rackup, @err = Open3.popen3("#{Gem.ruby} -S #{rackup} #{flags}") + end + + return if options[:port] == false + + # Wait until the server is available + begin + GET("/") + rescue + sleep 0.05 + retry + end + end + + def output + @rackup.read + end + + after do + # This doesn't actually return a response, so we rescue + GET "/die" rescue nil + + Dir["#{root}/**/*.pid"].each do |file| + File.delete(file) + end + + File.delete("#{root}/log_output") if File.exist?("#{root}/log_output") + end + + specify "rackup" do + run_rackup + response["PATH_INFO"].should.equal '/' + response["test.$DEBUG"].should.be false + response["test.$EVAL"].should.be nil + response["test.$VERBOSE"].should.be false + response["test.Ping"].should.be nil + response["SERVER_SOFTWARE"].should.not =~ /webrick/ + end + + specify "rackup --help" do + run_rackup "--help", :port => false + output.should.match /--port/ + end + + specify "rackup --port" do + run_rackup "--port 9000", :port => 9000 + response["SERVER_PORT"].should.equal "9000" + end + + specify "rackup --debug" do + run_rackup "--debug" + response["test.$DEBUG"].should.be true + end + + specify "rackup --eval" do + run_rackup %{--eval "BUKKIT = 'BUKKIT'"} + response["test.$EVAL"].should.equal "BUKKIT" + end + + specify "rackup --warn" do + run_rackup %{--warn} + response["test.$VERBOSE"].should.be true + end + + specify "rackup --include" do + run_rackup %{--include /foo/bar} + response["test.$LOAD_PATH"].should.include "/foo/bar" + end + + specify "rackup --require" do + run_rackup %{--require ping} + response["test.Ping"].should.equal "constant" + end + + specify "rackup --server" do + run_rackup %{--server webrick} + response["SERVER_SOFTWARE"].should =~ /webrick/i + end + + specify "rackup --host" do + run_rackup %{--host 127.0.0.1}, :host => "127.0.0.1" + response["REMOTE_ADDR"].should.equal "127.0.0.1" + end + + specify "rackup --daemonize --pid" do + run_rackup %{--daemonize --pid testing.pid} + status.should.be 200 + @rackup.should.be.eof? + Dir["#{root}/**/testing.pid"].should.not.be.empty? + end + + specify "rackup --pid" do + run_rackup %{--pid testing.pid} + status.should.be 200 + Dir["#{root}/**/testing.pid"].should.not.be.empty? + end + + specify "rackup --version" do + run_rackup %{--version}, :port => false + output.should =~ /1.0/ + end + + specify "rackup --env development includes lint" do + run_rackup + GET("/broken_lint") + status.should.be 500 + end + + specify "rackup --env deployment does not include lint" do + run_rackup %{--env deployment} + GET("/broken_lint") + status.should.be 200 + end + + specify "rackup --env none does not include lint" do + run_rackup %{--env none} + GET("/broken_lint") + status.should.be 200 + end + + specify "rackup --env deployment does log" do + run_rackup %{--env deployment} + log = File.read(response["test.stderr"]) + log.should.be.empty? + end + + specify "rackup --env none does not log" do + run_rackup %{--env none} + GET("/") + log = File.read(response["test.stderr"]) + log.should.be.empty? + end +end +rescue LoadError + $stderr.puts "Skipping rackup --server tests (mongrel is required). `gem install thin` and try again." +end \ No newline at end of file diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/.document b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/.document similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/.document rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/.document diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/.gitignore similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/.gitignore diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/History.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/History.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/History.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/History.txt diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/MIT-LICENSE.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/MIT-LICENSE.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/MIT-LICENSE.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/MIT-LICENSE.txt diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/README.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/README.rdoc diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/Thorfile b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/Thorfile similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/Thorfile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/Thorfile diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/mock_session.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/mock_session.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/mock_session.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/mock_session.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/cookie_jar.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/cookie_jar.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/cookie_jar.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/cookie_jar.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/methods.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/methods.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/methods.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/methods.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/mock_digest_request.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/mock_digest_request.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/mock_digest_request.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/mock_digest_request.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/uploaded_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/uploaded_file.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/uploaded_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/uploaded_file.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/utils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/utils.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/lib/rack/test/utils.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/lib/rack/test/utils.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/rack-test.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/rack-test.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/rack-test.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/rack-test.gemspec diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/config.ru b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/config.ru similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/config.ru rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/config.ru diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/fake_app.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/fake_app.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/fake_app.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/fake_app.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/foo.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/foo.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/fixtures/foo.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/fixtures/foo.txt diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/cookie_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/cookie_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/cookie_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/cookie_spec.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/digest_auth_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/digest_auth_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/digest_auth_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/digest_auth_spec.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/multipart_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/multipart_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/multipart_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/multipart_spec.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/utils_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/utils_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test/utils_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test/utils_spec.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/rack/test_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/rack/test_spec.rb diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/spec.opts b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/spec.opts similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/spec.opts rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/spec.opts diff --git a/lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/spec_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/spec_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rack-test-0.5.3/spec/spec_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rack-test-0.5.3/spec/spec_helper.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/CHANGES b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/CHANGES old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/CHANGES rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/CHANGES diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/MIT-LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/MIT-LICENSE old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/MIT-LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/MIT-LICENSE diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/README b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/README old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/README diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/Rakefile old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/TODO b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/TODO old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/TODO rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/TODO diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/bin/rake b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/bin/rake similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/bin/rake rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/bin/rake diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/command_line_usage.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/command_line_usage.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/command_line_usage.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/command_line_usage.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/Rakefile1 b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/Rakefile1 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/Rakefile1 rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/Rakefile1 diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/Rakefile2 b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/Rakefile2 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/Rakefile2 rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/Rakefile2 diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/a.c b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/a.c old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/a.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/a.c diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/b.c b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/b.c old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/b.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/b.c diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/main.c b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/main.c old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/example/main.c rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/example/main.c diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/glossary.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/glossary.rdoc old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/glossary.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/glossary.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/jamis.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/jamis.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/jamis.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/jamis.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/proto_rake.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/proto_rake.rdoc old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/proto_rake.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/proto_rake.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rake.1.gz b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rake.1.gz old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rake.1.gz rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rake.1.gz diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rakefile.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rakefile.rdoc old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rakefile.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rakefile.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rational.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rational.rdoc old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/rational.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/rational.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.4.14.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.4.14.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.4.14.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.4.14.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.4.15.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.4.15.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.4.15.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.4.15.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.0.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.0.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.0.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.0.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.3.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.3.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.3.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.3.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.4.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.4.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.5.4.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.5.4.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.6.0.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.6.0.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.6.0.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.6.0.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.0.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.0.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.0.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.0.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.1.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.1.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.1.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.1.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.2.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.2.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.2.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.2.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.7.3.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.0.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.0.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.0.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.0.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.2.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.2.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.2.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.2.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.3.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.3.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.3.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.3.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.4.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.4.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.4.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.4.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.5.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.5.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.5.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.5.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.6.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.6.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.6.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.6.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.7.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.7.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/doc/release_notes/rake-0.8.7.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/doc/release_notes/rake-0.8.7.rdoc diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/install.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/install.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/install.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/install.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/alt_system.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/alt_system.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/alt_system.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/alt_system.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/classic_namespace.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/classic_namespace.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/classic_namespace.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/classic_namespace.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/clean.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/clean.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/clean.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/clean.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/compositepublisher.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/compositepublisher.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/compositepublisher.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/compositepublisher.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/ftptools.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/ftptools.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/ftptools.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/ftptools.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/publisher.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/publisher.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/publisher.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/publisher.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/rubyforgepublisher.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/rubyforgepublisher.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/rubyforgepublisher.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/rubyforgepublisher.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/sshpublisher.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/sshpublisher.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/sshpublisher.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/sshpublisher.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/sys.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/sys.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/contrib/sys.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/contrib/sys.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/gempackagetask.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/gempackagetask.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/gempackagetask.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/gempackagetask.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/loaders/makefile.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/loaders/makefile.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/loaders/makefile.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/loaders/makefile.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/packagetask.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/packagetask.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/packagetask.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/packagetask.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/rake_test_loader.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/rake_test_loader.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/rake_test_loader.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/rdoctask.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/rdoctask.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/rdoctask.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/rdoctask.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/ruby182_test_unit_fix.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/runtest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/runtest.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/runtest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/runtest.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/tasklib.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/tasklib.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/tasklib.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/tasklib.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/testtask.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/testtask.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/testtask.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/testtask.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/win32.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/win32.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/lib/rake/win32.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/lib/rake/win32.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/capture_stdout.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/capture_stdout.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/capture_stdout.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/capture_stdout.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/check_expansion.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/check_expansion.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/check_expansion.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/check_expansion.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/check_no_expansion.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/check_no_expansion.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/check_no_expansion.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/check_no_expansion.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/contrib/test_sys.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/contrib/test_sys.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/contrib/test_sys.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/contrib/test_sys.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/chains/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/chains/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/chains/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/chains/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/default/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/default/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/default/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/default/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/dryrun/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/dryrun/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/dryrun/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/dryrun/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/file_creation_task/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/file_creation_task/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/file_creation_task/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/file_creation_task/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/imports/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/imports/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/imports/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/imports/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/imports/deps.mf b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/imports/deps.mf similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/imports/deps.mf rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/imports/deps.mf diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/multidesc/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/multidesc/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/multidesc/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/multidesc/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/namespace/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/namespace/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/namespace/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/namespace/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/rakelib/test1.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/rakelib/test1.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/rakelib/test1.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/rakelib/test1.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/rbext/rakefile.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/rbext/rakefile.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/rbext/rakefile.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/rbext/rakefile.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/sample.mf b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/sample.mf old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/sample.mf rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/sample.mf diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/statusreturn/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/statusreturn/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/statusreturn/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/statusreturn/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/unittest/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/unittest/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/data/unittest/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/data/unittest/Rakefile diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/filecreation.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/filecreation.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/filecreation.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/filecreation.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/functional.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/functional.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/functional.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/functional.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/in_environment.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/in_environment.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/in_environment.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/in_environment.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/rake_test_setup.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/rake_test_setup.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/rake_test_setup.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/rake_test_setup.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/reqfile.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/reqfile.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile2.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/reqfile2.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/reqfile2.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/reqfile2.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/session_functional.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/session_functional.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/session_functional.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/session_functional.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/shellcommand.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/shellcommand.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/shellcommand.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/shellcommand.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_application.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_application.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_application.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_application.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_clean.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_clean.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_clean.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_clean.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_definitions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_definitions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_definitions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_definitions.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_earlytime.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_earlytime.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_earlytime.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_earlytime.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_extension.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_extension.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_extension.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_extension.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_file_creation_task.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_file_creation_task.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_file_creation_task.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_file_creation_task.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_file_task.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_file_task.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_file_task.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_file_task.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_filelist.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_filelist.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_filelist.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_filelist.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_fileutils.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_fileutils.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_fileutils.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_fileutils.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_ftp.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_ftp.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_ftp.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_ftp.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_invocation_chain.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_invocation_chain.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_invocation_chain.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_invocation_chain.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_makefile_loader.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_makefile_loader.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_makefile_loader.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_makefile_loader.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_multitask.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_multitask.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_multitask.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_multitask.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_namespace.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_namespace.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_namespace.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_namespace.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_package_task.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_package_task.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_package_task.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_package_task.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_pathmap.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_pathmap.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_pathmap.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_pathmap.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_pseudo_status.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_pseudo_status.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_pseudo_status.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_pseudo_status.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rake.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rake.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rake.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rake.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rdoc_task.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rdoc_task.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rdoc_task.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rdoc_task.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_require.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_require.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_require.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_require.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rules.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rules.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_rules.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_rules.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_task_arguments.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_task_arguments.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_task_arguments.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_task_arguments.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_task_manager.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_task_manager.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_task_manager.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_task_manager.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasklib.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_tasklib.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasklib.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_tasklib.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasks.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_tasks.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_tasks.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_tasks.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_test_task.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_test_task.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_test_task.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_test_task.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_top_level_functions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_top_level_functions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_top_level_functions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_top_level_functions.rb diff --git a/lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_win32.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_win32.rb old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/rake-0.8.7/test/test_win32.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/rake-0.8.7/test/test_win32.rb diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/COPYING b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/COPYING old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/COPYING rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/COPYING diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/README b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/README old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/README diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile old mode 100755 new mode 100644 similarity index 64% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile index 9d67a10a..1221147f --- a/lib/middleman/vendor/gems/gems/shotgun-0.4/Rakefile +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/Rakefile @@ -9,14 +9,8 @@ Rake::TestTask.new(:test) do |t| t.ruby_opts = ['-rubygems'] if defined? Gem end -$spec = - begin - require 'rubygems/specification' - data = File.read('shotgun.gemspec') - spec = nil - Thread.new { spec = eval("$SAFE = 3\n#{data}") }.join - spec - end +require 'rubygems' +$spec = eval(File.read('shotgun.gemspec')) def package(ext='') "pkg/#{$spec.name}-#{$spec.version}" + ext @@ -46,11 +40,3 @@ file package('.tar.gz') => %w[pkg/] + $spec.files do |f| HEAD | gzip > #{f.name} SH end - -desc 'Publish gem and tarball to rubyforge' -task 'release' => [package('.gem'), package('.tar.gz')] do |t| - sh <<-end - rubyforge add_release wink #{$spec.name} #{$spec.version} #{package('.gem')} && - rubyforge add_file wink #{$spec.name} #{$spec.version} #{package('.tar.gz')} - end -end diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/bin/shotgun b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun similarity index 89% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/bin/shotgun rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun index e952ceb5..d618d297 100755 --- a/lib/middleman/vendor/gems/gems/shotgun-0.4/bin/shotgun +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/bin/shotgun @@ -1,14 +1,17 @@ #!/usr/bin/env ruby -libdir = "#{File.dirname(File.dirname(__FILE__))}/lib" -$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir) - require 'optparse' -server = nil +begin + require 'thin' + server = 'thin' +rescue LoadError + server = nil +end + env = ENV['RACK_ENV'] || 'development' browse = false -options = {:Port => 9393, :Host => 'localhost', :AccessLog => []} +options = {:Port => 9393, :Host => 'localhost', :AccessLog => [], :Path => '/'} opts = OptionParser.new("", 24, ' ') { |opts| opts.banner = "Usage: shotgun [ruby options] [rack options] [rackup config]" @@ -60,6 +63,10 @@ opts = OptionParser.new("", 24, ' ') { |opts| opts.separator "" opts.separator "Shotgun options:" + opts.on("-u", "--url URL", "specify url path (default: /)") { |url| + options[:Path] = url + } + opts.on("-O", "--browse", "open browser immediately after starting") { |browse| browse = true } @@ -127,10 +134,10 @@ require 'shotgun' app = Shotgun.new(config, app_wrapper) server.run app, options do |inst| - puts "== Shotgun starting #{server.to_s} on #{options[:Host]}:#{options[:Port]}" + puts "== Shotgun starting #{server.to_s} on http://#{options[:Host]}:#{options[:Port]}" if browse require 'launchy' - Launchy.open("http://#{options[:Host]}:#{options[:Port]}/") + Launchy.open("http://#{options[:Host]}:#{options[:Port]}#{options[:Path]}") end end diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/lib/shotgun.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/lib/shotgun.rb old mode 100755 new mode 100644 similarity index 90% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/lib/shotgun.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/lib/shotgun.rb index f585da16..6239b77e --- a/lib/middleman/vendor/gems/gems/shotgun-0.4/lib/shotgun.rb +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/lib/shotgun.rb @@ -9,6 +9,7 @@ class Shotgun def initialize(rackup_file, wrapper=nil) @rackup_file = rackup_file @wrapper = wrapper || lambda { |inner_app| inner_app } + enable_copy_on_write end def call(env) @@ -19,27 +20,21 @@ class Shotgun @env = env @reader, @writer = IO.pipe - # Disable GC before forking in an attempt to get some advantage - # out of COW. - GC.disable - - if fork + if @child = fork proceed_as_parent else proceed_as_child end - - ensure - GC.enable end # ==== Stuff that happens in the parent process def proceed_as_parent + rand # Reseeds @writer.close result = Marshal.load(@reader) @reader.close - Process.wait + Process.wait(@child) if result.length == 3 result else @@ -96,4 +91,8 @@ class Shotgun body.each { |part| buf << part } buf end + + def enable_copy_on_write + GC.copy_on_write_friendly = true if GC.respond_to?(:copy_on_write_friendly=) + end end diff --git a/lib/middleman/vendor/gems/gems/shotgun-0.4/shotgun.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/shotgun.gemspec old mode 100755 new mode 100644 similarity index 91% rename from lib/middleman/vendor/gems/gems/shotgun-0.4/shotgun.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/shotgun.gemspec index 1662cb30..cfc6400c --- a/lib/middleman/vendor/gems/gems/shotgun-0.4/shotgun.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/gems/shotgun-0.5/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.4' - s.date = '2009-03-22' + s.version = '0.5' + s.date = '2010-01-16' s.description = "Because reloading sucks." s.summary = s.description @@ -29,6 +29,5 @@ Gem::Specification.new do |s| s.homepage = "http://github.com/rtomayko/shotgun/" s.require_paths = %w[lib] - s.rubyforge_project = 'wink' s.rubygems_version = '1.1.1' end diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/AUTHORS b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/AUTHORS old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/AUTHORS rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/AUTHORS diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/CHANGES b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/CHANGES old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/CHANGES rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/CHANGES diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/LICENSE old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/LICENSE diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/README.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/README.rdoc diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/Rakefile old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/Rakefile diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/app_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/app_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/application_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/application_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/builder_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/builder_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/compat_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/compat_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/custom_error_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/custom_error_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/erb_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/erb_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/events_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/events_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/filter_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/filter_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/haml_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/haml_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/helper.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/mapped_error_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/mapped_error_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/pipeline_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/pipeline_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/public/foo.xml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/public/foo.xml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/sass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sass_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/sessions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sessions_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/streaming_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/streaming_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/sym_params_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/sym_params_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/template_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/template_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/use_in_file_templates_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/use_in_file_templates_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.builder diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.erb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.haml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo.sass diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo_layout.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.erb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/foo_layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/foo_layout.haml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/foo.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.builder diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/foo.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.erb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/foo.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.haml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/foo.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/foo.sass diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/layout.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.builder diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/layout.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.erb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.haml diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/layout_test/layout.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/layout_test/layout.sass diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.builder diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/compat/views/no_layout/no_layout.haml diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/base.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/base.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/base.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/base.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/compat.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/compat.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/images/404.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/404.png similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/images/404.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/404.png diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/images/500.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/500.png similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/images/500.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/images/500.png diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/main.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/main.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/main.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/main.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/showexceptions.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/test/bacon.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/bacon.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/test/rspec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/rspec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/test/spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/spec.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/lib/sinatra/test/unit.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/lib/sinatra/test/unit.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/sinatra.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/sinatra.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/sinatra.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/sinatra.gemspec diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/base_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/base_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/base_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/base_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/builder_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/builder_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/builder_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/builder_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/contest.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/contest.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/contest.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/contest.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/data/reload_app_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/data/reload_app_file.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/erb_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/erb_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/erb_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/erb_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/extensions_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/extensions_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/extensions_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/extensions_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/filter_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/filter_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/haml_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/haml_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/haml_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/haml_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helper.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/helpers_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helpers_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/helpers_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/helpers_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/mapped_error_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/mapped_error_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/mapped_error_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/mapped_error_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/middleware_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/middleware_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/middleware_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/middleware_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/options_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/options_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/options_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/options_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/render_backtrace_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/render_backtrace_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/request_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/request_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/request_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/request_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/response_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/response_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/response_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/response_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/result_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/result_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/result_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/result_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/route_added_hook_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/route_added_hook_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/route_added_hook_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/route_added_hook_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/routing_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/routing_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/routing_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/routing_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/sass_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sass_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/sass_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sass_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/server_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/server_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/server_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/server_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/sinatra_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sinatra_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/sinatra_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/sinatra_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/static_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/static_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/static_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/static_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/templates_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/templates_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/templates_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/templates_test.rb diff --git a/lib/middleman/vendor/gems/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 similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/test_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/test_test.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.builder similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.builder diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.erb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.erb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.haml diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/error.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/error.sass diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/foo/hello.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/foo/hello.test similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/foo/hello.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/foo/hello.test diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.builder similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.builder diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.erb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.erb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.haml diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.sass b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.sass similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.sass rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.sass diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.test similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/hello.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/hello.test diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.builder b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.builder similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.builder rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.builder diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.erb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.erb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.erb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.erb diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.haml b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.haml similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.haml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.haml diff --git a/lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.test b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.test similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-0.9.4/test/views/layout2.test rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-0.9.4/test/views/layout2.test diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/.gitignore similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/.gitignore diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/LICENSE b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/LICENSE similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/LICENSE rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/LICENSE diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/README.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/README.rdoc diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/lib/sinatra/content_for.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/lib/sinatra/content_for.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/lib/sinatra/content_for.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/lib/sinatra/content_for.rb diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/sinatra-content-for.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/sinatra-content-for.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/sinatra-content-for.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/sinatra-content-for.gemspec diff --git a/lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/test/content_for_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/test/content_for_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sinatra-content-for-0.2/test/content_for_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sinatra-content-for-0.2/test/content_for_test.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/.gitignore similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/.gitignore rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/.gitignore diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/README.markdown b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/README.markdown similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/README.markdown rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/README.markdown diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/Rakefile diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/VERSION b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/VERSION similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/VERSION rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/VERSION diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/bin/smusher b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/bin/smusher similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/bin/smusher rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/bin/smusher diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher/puny_png.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher/puny_png.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher/puny_png.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher/puny_png.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher/smush_it.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher/smush_it.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/lib/smusher/smush_it.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/lib/smusher/smush_it.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/smusher.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/smusher.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/smusher.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/smusher.gemspec diff --git a/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/empty/.gitignore b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/empty/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/ad.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/ad.gif similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/ad.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/ad.gif diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/add.png b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/add.png similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/add.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/add.png diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/drink_empty.png b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/drink_empty.png similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/drink_empty.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/drink_empty.png diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/logo.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/logo.gif similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/logo.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/logo.gif diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/people.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/people.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/people.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/people.jpg diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/water.JPG b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/water.JPG similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/water.JPG rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/water.JPG diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/woman.jpeg b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/woman.jpeg similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/images/woman.jpeg rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/images/woman.jpeg diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/out/ad.gif b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/out/ad.gif similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/out/ad.gif rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/out/ad.gif diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/out/people.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/out/people.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/out/people.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/out/people.jpg diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/add.png b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/add.png similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/add.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/add.png diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/add_puny.png b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/add_puny.png similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/add_puny.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/add_puny.png diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/fam.png b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/fam.png similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/reduced/fam.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/reduced/fam.png diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher/puny_png_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher/puny_png_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher/puny_png_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher/puny_png_spec.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher/smush_it_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher/smush_it_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher/smush_it_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher/smush_it_spec.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/smusher_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/smusher_spec.rb diff --git a/lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/spec_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/spec_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/smusher-0.4.2/spec/spec_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/smusher-0.4.2/spec/spec_helper.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/Rakefile diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/bin/sprocketize b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/bin/sprocketize similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/bin/sprocketize rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/bin/sprocketize diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/ext/nph-sprockets.cgi b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/ext/nph-sprockets.cgi old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/ext/nph-sprockets.cgi rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/ext/nph-sprockets.cgi diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/concatenation.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/concatenation.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/concatenation.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/concatenation.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/environment.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/environment.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/environment.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/environment.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/error.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/error.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/error.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/error.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/pathname.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/pathname.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/pathname.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/pathname.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/preprocessor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/preprocessor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/preprocessor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/preprocessor.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/secretary.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/secretary.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/secretary.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/secretary.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/source_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/source_file.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/source_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/source_file.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/source_line.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/source_line.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/source_line.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/source_line.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/version.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/version.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/lib/sprockets/version.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/lib/sprockets/version.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/one.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/one.png similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/one.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/one.png diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/two.png b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/two.png similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/two.png rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/images/script_with_assets/two.png diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/stylesheets/script_with_assets.css b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/stylesheets/script_with_assets.css similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/assets/stylesheets/script_with_assets.css rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/assets/stylesheets/script_with_assets.css diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/constants.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/constants.yml similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/constants.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/constants.yml diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/multiline_comments_should_be_removed_by_default.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/multiline_comments_should_be_removed_by_default.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/multiline_comments_should_be_removed_by_default.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/multiline_comments_should_be_removed_by_default.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_the_current_file_should_do_nothing.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_the_current_file_should_do_nothing.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/requiring_the_current_file_should_do_nothing.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/requiring_the_current_file_should_do_nothing.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/constants.yml b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/constants.yml similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/constants.yml rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/constants.yml diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo/bar.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo/bar.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo/bar.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo/bar.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo/foo.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo/foo.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/foo/foo.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/foo/foo.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/script_with_assets.js b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/script_with_assets.js similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/fixtures/src/script_with_assets.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/fixtures/src/script_with_assets.js diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_concatenation.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_concatenation.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_concatenation.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_concatenation.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_environment.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_environment.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_environment.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_environment.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_helper.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_pathname.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_pathname.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_pathname.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_pathname.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_preprocessor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_preprocessor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_preprocessor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_preprocessor.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_secretary.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_secretary.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_secretary.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_secretary.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_source_file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_source_file.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_source_file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_source_file.rb diff --git a/lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_source_line.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_source_line.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/sprockets-1.0.2/test/test_source_line.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/sprockets-1.0.2/test/test_source_line.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/History.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/History.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/History.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/History.txt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/Manifest.txt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/Manifest.txt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/Manifest.txt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/Manifest.txt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/README.rdoc b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/README.rdoc similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/README.rdoc rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/README.rdoc diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/Rakefile diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/action.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/action.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/action.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/action.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/directory.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/directory.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/directory.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/directory.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/empty_directory.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/empty_directory.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/empty_directory.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/empty_directory.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/file.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/file.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/file.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/file.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/template.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/template.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/actions/template.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/actions/template.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/capture_helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/capture_helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/capture_helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/capture_helpers.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/generator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/generator.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/generator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/generator.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/manifold.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/manifold.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/manifold.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/manifold.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/parser.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/parser.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/cli/parser.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/cli/parser.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/core_ext/kernel.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/core_ext/kernel.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/core_ext/kernel.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/core_ext/kernel.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/core_ext/string.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/core_ext/string.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/core_ext/string.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/core_ext/string.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/description.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/description.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/description.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/description.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/discovery.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/discovery.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/discovery.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/discovery.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/generator.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/generator.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/generator.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/generator.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/manifold.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/manifold.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/manifold.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/manifold.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/spec/helpers.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/spec/helpers.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/lib/templater/spec/helpers.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/lib/templater/spec/helpers.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/console b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/console old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/script/console rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/console diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/destroy b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/destroy old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/script/destroy rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/destroy diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/script/generate b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/generate old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/script/generate rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/script/generate diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/directory_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/directory_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/directory_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/directory_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/empty_directory_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/empty_directory_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/empty_directory_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/empty_directory_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/file_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/file_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/file_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/file_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/template_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/template_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/actions/template_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/actions/template_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/core_ext/string_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/core_ext/string_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/core_ext/string_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/core_ext/string_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/actions_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/actions_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/actions_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/actions_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/arguments_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/arguments_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/arguments_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/arguments_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/desc_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/desc_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/desc_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/desc_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/destination_root_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/destination_root_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/destination_root_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/destination_root_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/empty_directories_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/empty_directories_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/empty_directories_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/empty_directories_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/files_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/files_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/files_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/files_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/generators_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/generators_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/generators_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/generators_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/glob_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/glob_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/glob_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/glob_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/invocations_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/invocations_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/invocations_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/invocations_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/invoke_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/invoke_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/invoke_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/invoke_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/options_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/options_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/options_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/options_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/render_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/render_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/render_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/render_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/source_root_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/source_root_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/source_root_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/source_root_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/templates_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/templates_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/generator/templates_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/generator/templates_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/manifold_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/manifold_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/manifold_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/manifold_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/options_parser_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/options_parser_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/options_parser_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/options_parser_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/erb.rbs b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/erb.rbs similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/erb.rbs rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/erb.rbs diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/file.rbs b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/file.rbs similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/file.rbs rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/file.rbs diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/random.rbs b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/random.rbs similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/random.rbs rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/random.rbs diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/simple_erb.rbs b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/simple_erb.rbs similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/results/simple_erb.rbs rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/results/simple_erb.rbs diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/spec_helper.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/spec_helper.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/spec_helper.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/spec_helper.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/spec_helpers_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/spec_helpers_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/spec_helpers_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/spec_helpers_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templater_spec.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templater_spec.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templater_spec.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templater_spec.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/erb.rbt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/erb.rbt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/erb.rbt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/erb.rbt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/README b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/README similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/README rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/README diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/arg.js b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/arg.js similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/arg.js rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/arg.js diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/hellothar.%feh% b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/hellothar.%feh% similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/hellothar.%feh% rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/hellothar.%feh% diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/hellothar.html.%feh% b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/hellothar.html.%feh% similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/hellothar.html.%feh% rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/hellothar.html.%feh% diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/subfolder/jessica_alba.jpg b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/subfolder/jessica_alba.jpg similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/subfolder/jessica_alba.jpg rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/subfolder/jessica_alba.jpg diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/subfolder/monkey.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/subfolder/monkey.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/subfolder/monkey.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/subfolder/monkey.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/glob/test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/glob/test.rb diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/literals_erb.rbt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/literals_erb.rbt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/literals_erb.rbt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/literals_erb.rbt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/simple.rbt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/simple.rbt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/simple.rbt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/simple.rbt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/simple_erb.rbt b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/simple_erb.rbt similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/spec/templates/simple_erb.rbt rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/spec/templates/simple_erb.rbt diff --git a/lib/middleman/vendor/gems/gems/templater-1.0.0/templater.gemspec b/lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/templater.gemspec similarity index 100% rename from lib/middleman/vendor/gems/gems/templater-1.0.0/templater.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/gems/templater-1.0.0/templater.gemspec diff --git a/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/Rakefile b/lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/Rakefile similarity index 100% rename from lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/Rakefile rename to lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/Rakefile diff --git a/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/lib/yui/compressor.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/lib/yui/compressor.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/lib/yui/compressor.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/lib/yui/compressor.rb diff --git a/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/test/compressor_test.rb b/lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/test/compressor_test.rb similarity index 100% rename from lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/test/compressor_test.rb rename to lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/test/compressor_test.rb diff --git a/lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar b/lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar old mode 100644 new mode 100755 similarity index 100% rename from lib/middleman/vendor/gems/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar rename to lib/middleman/vendor/gems/ruby/1.8/gems/yui-compressor-0.9.1/vendor/yuicompressor-2.4.2.jar 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 new file mode 100644 index 00000000..46000957 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-0.10.0.pre4.gemspec @@ -0,0 +1,36 @@ +# -*- 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/specifications/compass-colors-0.3.1.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-colors-0.3.1.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/compass-colors-0.3.1.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/compass-colors-0.3.1.gemspec diff --git a/lib/middleman/vendor/gems/specifications/compass-slickmap-0.2.3.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/compass-slickmap-0.2.3.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/compass-slickmap-0.2.3.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/compass-slickmap-0.2.3.gemspec diff --git a/lib/middleman/vendor/gems/specifications/configuration-1.1.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/configuration-1.1.0.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/configuration-1.1.0.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/configuration-1.1.0.gemspec diff --git a/lib/middleman/vendor/gems/specifications/diff-lcs-1.1.2.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/diff-lcs-1.1.2.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/diff-lcs-1.1.2.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/diff-lcs-1.1.2.gemspec diff --git a/lib/middleman/vendor/gems/specifications/extlib-0.9.14.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/extlib-0.9.14.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/extlib-0.9.14.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/extlib-0.9.14.gemspec diff --git a/lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.7.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.7.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/fancy-buttons-0.3.7.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/fancy-buttons-0.3.7.gemspec diff --git a/lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/haml-2.2.17.gemspec similarity index 99% rename from lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/haml-2.2.17.gemspec index 791f6a33..acc0295e 100644 --- a/lib/middleman/vendor/gems/specifications/haml-2.2.16.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/haml-2.2.17.gemspec @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{haml} - s.version = "2.2.16" + s.version = "2.2.17" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Nathan Weizenbaum", "Hampton Catlin"] - s.date = %q{2009-12-16} + s.date = %q{2010-01-11} s.description = %q{ Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML that's designed to express the structure of XHTML or XML documents in a non-repetitive, elegant, easy way, diff --git a/lib/middleman/vendor/gems/specifications/highline-1.5.1.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/highline-1.5.1.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/highline-1.5.1.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/highline-1.5.1.gemspec diff --git a/lib/middleman/vendor/gems/specifications/httpclient-2.1.5.2.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/httpclient-2.1.5.2.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/httpclient-2.1.5.2.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/httpclient-2.1.5.2.gemspec diff --git a/lib/middleman/vendor/gems/specifications/json-1.2.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/json-1.2.0.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/json-1.2.0.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/json-1.2.0.gemspec diff --git a/lib/middleman/vendor/gems/specifications/json_pure-1.2.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/json_pure-1.2.0.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/json_pure-1.2.0.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/json_pure-1.2.0.gemspec diff --git a/lib/middleman/vendor/gems/specifications/launchy-0.3.5.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/launchy-0.3.5.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/launchy-0.3.5.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/launchy-0.3.5.gemspec diff --git a/lib/middleman/vendor/gems/ruby/1.8/specifications/rack-1.1.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/rack-1.1.0.gemspec new file mode 100644 index 00000000..dd8bf744 --- /dev/null +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/rack-1.1.0.gemspec @@ -0,0 +1,57 @@ +# -*- encoding: utf-8 -*- + +Gem::Specification.new do |s| + s.name = %q{rack} + s.version = "1.1.0" + + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Christian Neukirchen"] + s.date = %q{2010-01-03} + s.default_executable = %q{rackup} + s.description = %q{Rack provides minimal, modular and adaptable interface for developing +web applications in Ruby. By wrapping HTTP requests and responses in +the simplest way possible, it unifies and distills the API for web +servers, web frameworks, and software in between (the so-called +middleware) into a single method call. + +Also see http://rack.rubyforge.org. +} + s.email = %q{chneukirchen@gmail.com} + s.executables = ["rackup"] + s.extra_rdoc_files = ["README", "SPEC", "KNOWN-ISSUES"] + s.files = ["bin/rackup", "contrib/rack_logo.svg", "example/lobster.ru", "example/protectedlobster.rb", "example/protectedlobster.ru", "lib/rack/adapter/camping.rb", "lib/rack/auth/abstract/handler.rb", "lib/rack/auth/abstract/request.rb", "lib/rack/auth/basic.rb", "lib/rack/auth/digest/md5.rb", "lib/rack/auth/digest/nonce.rb", "lib/rack/auth/digest/params.rb", "lib/rack/auth/digest/request.rb", "lib/rack/builder.rb", "lib/rack/cascade.rb", "lib/rack/chunked.rb", "lib/rack/commonlogger.rb", "lib/rack/conditionalget.rb", "lib/rack/config.rb", "lib/rack/content_length.rb", "lib/rack/content_type.rb", "lib/rack/deflater.rb", "lib/rack/directory.rb", "lib/rack/etag.rb", "lib/rack/file.rb", "lib/rack/handler/cgi.rb", "lib/rack/handler/evented_mongrel.rb", "lib/rack/handler/fastcgi.rb", "lib/rack/handler/lsws.rb", "lib/rack/handler/mongrel.rb", "lib/rack/handler/scgi.rb", "lib/rack/handler/swiftiplied_mongrel.rb", "lib/rack/handler/thin.rb", "lib/rack/handler/webrick.rb", "lib/rack/handler.rb", "lib/rack/head.rb", "lib/rack/lint.rb", "lib/rack/lobster.rb", "lib/rack/lock.rb", "lib/rack/logger.rb", "lib/rack/methodoverride.rb", "lib/rack/mime.rb", "lib/rack/mock.rb", "lib/rack/nulllogger.rb", "lib/rack/recursive.rb", "lib/rack/reloader.rb", "lib/rack/request.rb", "lib/rack/response.rb", "lib/rack/rewindable_input.rb", "lib/rack/runtime.rb", "lib/rack/sendfile.rb", "lib/rack/server.rb", "lib/rack/session/abstract/id.rb", "lib/rack/session/cookie.rb", "lib/rack/session/memcache.rb", "lib/rack/session/pool.rb", "lib/rack/showexceptions.rb", "lib/rack/showstatus.rb", "lib/rack/static.rb", "lib/rack/urlmap.rb", "lib/rack/utils.rb", "lib/rack.rb", "COPYING", "KNOWN-ISSUES", "rack.gemspec", "RDOX", "README", "SPEC", "test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_config.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_etag.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_logger.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_nulllogger.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_runtime.rb", "test/spec_rack_sendfile.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/spec_rackup.rb"] + s.homepage = %q{http://rack.rubyforge.org} + s.require_paths = ["lib"] + s.rubyforge_project = %q{rack} + s.rubygems_version = %q{1.3.5} + s.summary = %q{a modular Ruby webserver interface} + s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_config.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_etag.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_logger.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_nulllogger.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_runtime.rb", "test/spec_rack_sendfile.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/spec_rackup.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_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + s.add_development_dependency(%q, [">= 0"]) + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end + else + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + s.add_dependency(%q, [">= 0"]) + end +end diff --git a/lib/middleman/vendor/gems/specifications/rack-test-0.5.3.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/rack-test-0.5.3.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/rack-test-0.5.3.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/rack-test-0.5.3.gemspec diff --git a/lib/middleman/vendor/gems/specifications/rake-0.8.7.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/rake-0.8.7.gemspec old mode 100755 new mode 100644 similarity index 100% rename from lib/middleman/vendor/gems/specifications/rake-0.8.7.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/rake-0.8.7.gemspec diff --git a/lib/middleman/vendor/gems/specifications/shotgun-0.4.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec old mode 100755 new mode 100644 similarity index 94% rename from lib/middleman/vendor/gems/specifications/shotgun-0.4.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec index 85abd25d..65bb8ac7 --- a/lib/middleman/vendor/gems/specifications/shotgun-0.4.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/shotgun-0.5.gemspec @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{shotgun} - s.version = "0.4" + s.version = "0.5" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Ryan Tomayko"] - s.date = %q{2009-03-22} + s.date = %q{2010-01-16} s.default_executable = %q{shotgun} s.description = %q{Because reloading sucks.} s.email = %q{r@tomayko.com} @@ -15,7 +15,6 @@ Gem::Specification.new do |s| s.files = ["README", "COPYING", "Rakefile", "shotgun.gemspec", "lib/shotgun.rb", "bin/shotgun"] s.homepage = %q{http://github.com/rtomayko/shotgun/} s.require_paths = ["lib"] - s.rubyforge_project = %q{wink} s.rubygems_version = %q{1.3.5} s.summary = %q{Because reloading sucks.} diff --git a/lib/middleman/vendor/gems/specifications/sinatra-0.9.4.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-0.9.4.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/sinatra-0.9.4.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-0.9.4.gemspec diff --git a/lib/middleman/vendor/gems/specifications/sinatra-content-for-0.2.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-content-for-0.2.gemspec similarity index 97% rename from lib/middleman/vendor/gems/specifications/sinatra-content-for-0.2.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-content-for-0.2.gemspec index 78fb0e78..342d29e8 100644 --- a/lib/middleman/vendor/gems/specifications/sinatra-content-for-0.2.gemspec +++ b/lib/middleman/vendor/gems/ruby/1.8/specifications/sinatra-content-for-0.2.gemspec @@ -5,7 +5,7 @@ Gem::Specification.new do |s| s.version = "0.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Nicolás Sanguinetti"] + s.authors = ["Nicol\303\241s Sanguinetti"] s.date = %q{2009-05-08} s.description = %q{Small Sinatra extension to add a content_for helper similar to Rails'} s.email = %q{contacto@nicolassanguinetti.info} diff --git a/lib/middleman/vendor/gems/specifications/smusher-0.4.2.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/smusher-0.4.2.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/smusher-0.4.2.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/smusher-0.4.2.gemspec diff --git a/lib/middleman/vendor/gems/specifications/sprockets-1.0.2.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/sprockets-1.0.2.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/sprockets-1.0.2.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/sprockets-1.0.2.gemspec diff --git a/lib/middleman/vendor/gems/specifications/templater-1.0.0.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/templater-1.0.0.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/templater-1.0.0.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/templater-1.0.0.gemspec diff --git a/lib/middleman/vendor/gems/specifications/yui-compressor-0.9.1.gemspec b/lib/middleman/vendor/gems/ruby/1.8/specifications/yui-compressor-0.9.1.gemspec similarity index 100% rename from lib/middleman/vendor/gems/specifications/yui-compressor-0.9.1.gemspec rename to lib/middleman/vendor/gems/ruby/1.8/specifications/yui-compressor-0.9.1.gemspec diff --git a/lib/middleman/vendor/gems/specifications/compass-0.10.0.pre2.gemspec b/lib/middleman/vendor/gems/specifications/compass-0.10.0.pre2.gemspec deleted file mode 100644 index e1bce485..00000000 --- a/lib/middleman/vendor/gems/specifications/compass-0.10.0.pre2.gemspec +++ /dev/null @@ -1,36 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{compass} - s.version = "0.10.0.pre2" - - s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= - s.authors = ["Chris Eppstein"] - s.date = %q{2009-12-01} - 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/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/_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/polling.rb", "lib/vendor/fssm/cache.rb", "lib/vendor/fssm/ext.rb", "lib/vendor/fssm/fsevents.rb", "lib/vendor/fssm/monitor.rb", "lib/vendor/fssm/path.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_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_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/specifications/rack-1.0.1.gemspec b/lib/middleman/vendor/gems/specifications/rack-1.0.1.gemspec deleted file mode 100755 index 3059c61c..00000000 --- a/lib/middleman/vendor/gems/specifications/rack-1.0.1.gemspec +++ /dev/null @@ -1,53 +0,0 @@ -# -*- encoding: utf-8 -*- - -Gem::Specification.new do |s| - s.name = %q{rack} - s.version = "1.0.1" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Christian Neukirchen"] - s.date = %q{2009-10-17} - s.default_executable = %q{rackup} - s.description = %q{Rack provides minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses in the simplest way possible, it unifies and distills the API for web servers, web frameworks, and software in between (the so-called middleware) into a single method call. Also see http://rack.rubyforge.org.} - s.email = %q{chneukirchen@gmail.com} - s.executables = ["rackup"] - s.extra_rdoc_files = ["README", "SPEC", "RDOX", "KNOWN-ISSUES"] - s.files = ["COPYING", "KNOWN-ISSUES", "README", "Rakefile", "bin/rackup", "contrib/rack_logo.svg", "example/lobster.ru", "example/protectedlobster.rb", "example/protectedlobster.ru", "lib/rack.rb", "lib/rack/adapter/camping.rb", "lib/rack/auth/abstract/handler.rb", "lib/rack/auth/abstract/request.rb", "lib/rack/auth/basic.rb", "lib/rack/auth/digest/md5.rb", "lib/rack/auth/digest/nonce.rb", "lib/rack/auth/digest/params.rb", "lib/rack/auth/digest/request.rb", "lib/rack/auth/openid.rb", "lib/rack/builder.rb", "lib/rack/cascade.rb", "lib/rack/chunked.rb", "lib/rack/commonlogger.rb", "lib/rack/conditionalget.rb", "lib/rack/content_length.rb", "lib/rack/content_type.rb", "lib/rack/deflater.rb", "lib/rack/directory.rb", "lib/rack/file.rb", "lib/rack/handler.rb", "lib/rack/handler/cgi.rb", "lib/rack/handler/evented_mongrel.rb", "lib/rack/handler/fastcgi.rb", "lib/rack/handler/lsws.rb", "lib/rack/handler/mongrel.rb", "lib/rack/handler/scgi.rb", "lib/rack/handler/swiftiplied_mongrel.rb", "lib/rack/handler/thin.rb", "lib/rack/handler/webrick.rb", "lib/rack/head.rb", "lib/rack/lint.rb", "lib/rack/lobster.rb", "lib/rack/lock.rb", "lib/rack/methodoverride.rb", "lib/rack/mime.rb", "lib/rack/mock.rb", "lib/rack/recursive.rb", "lib/rack/reloader.rb", "lib/rack/request.rb", "lib/rack/response.rb", "lib/rack/rewindable_input.rb", "lib/rack/session/abstract/id.rb", "lib/rack/session/cookie.rb", "lib/rack/session/memcache.rb", "lib/rack/session/pool.rb", "lib/rack/showexceptions.rb", "lib/rack/showstatus.rb", "lib/rack/static.rb", "lib/rack/urlmap.rb", "lib/rack/utils.rb", "test/cgi/lighttpd.conf", "test/cgi/test", "test/cgi/test.fcgi", "test/cgi/test.ru", "test/multipart/binary", "test/multipart/empty", "test/multipart/ie", "test/multipart/nested", "test/multipart/none", "test/multipart/semicolon", "test/multipart/text", "test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.rb", "test/testrequest.rb", "test/unregistered_handler/rack/handler/unregistered.rb", "test/unregistered_handler/rack/handler/unregistered_long_one.rb", "SPEC", "RDOX", "rack.gemspec"] - s.homepage = %q{http://rack.rubyforge.org} - s.require_paths = ["lib"] - s.rubyforge_project = %q{rack} - s.rubygems_version = %q{1.3.5} - s.summary = %q{a modular Ruby webserver interface} - s.test_files = ["test/spec_rack_auth_basic.rb", "test/spec_rack_auth_digest.rb", "test/spec_rack_auth_openid.rb", "test/spec_rack_builder.rb", "test/spec_rack_camping.rb", "test/spec_rack_cascade.rb", "test/spec_rack_cgi.rb", "test/spec_rack_chunked.rb", "test/spec_rack_commonlogger.rb", "test/spec_rack_conditionalget.rb", "test/spec_rack_content_length.rb", "test/spec_rack_content_type.rb", "test/spec_rack_deflater.rb", "test/spec_rack_directory.rb", "test/spec_rack_fastcgi.rb", "test/spec_rack_file.rb", "test/spec_rack_handler.rb", "test/spec_rack_head.rb", "test/spec_rack_lint.rb", "test/spec_rack_lobster.rb", "test/spec_rack_lock.rb", "test/spec_rack_methodoverride.rb", "test/spec_rack_mock.rb", "test/spec_rack_mongrel.rb", "test/spec_rack_recursive.rb", "test/spec_rack_request.rb", "test/spec_rack_response.rb", "test/spec_rack_rewindable_input.rb", "test/spec_rack_session_cookie.rb", "test/spec_rack_session_memcache.rb", "test/spec_rack_session_pool.rb", "test/spec_rack_showexceptions.rb", "test/spec_rack_showstatus.rb", "test/spec_rack_static.rb", "test/spec_rack_thin.rb", "test/spec_rack_urlmap.rb", "test/spec_rack_utils.rb", "test/spec_rack_webrick.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_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, ["~> 2.0.0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.0.0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, ["~> 2.0.0"]) - s.add_dependency(%q, [">= 0"]) - end -end