move vendor into lib

bin/mm-build

@@ -5,7 +5,7 @@ require 'templater'
 
 MIDDLEMAN_BUILDER = true
 require File.join(File.dirname(__FILE__), '..', 'lib', 'middleman')
-require File.join(File.dirname(__FILE__), '..', 'vendor', 'rack-test', 'lib', 'rack', 'test')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'vendor', 'rack-test', 'lib', 'rack', 'test')
 
 module Generators
   extend Templater::Manifold

deps.rip

@@ -0,0 +1,6 @@
+git://github.com/jnicklas/templater.git
+git://github.com/sstephenson/ruby-yui-compressor.git
+git://github.com/sstephenson/sprockets.git
+git://github.com/sinatra/sinatra.git
+git://github.com/nex3/haml.git
+git://github.com/chriseppstein/compass.git

lib/middleman.rb

@@ -9,7 +9,7 @@
 require "yui/compressor"
 
 # Include content_for support
-require File.join(File.dirname(__FILE__), '..', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'vendor', 'sinatra-content-for', 'lib', 'sinatra', 'content_for')
 
 class Middleman < Sinatra::Base
   set :app_file, __FILE__
@@ -80,8 +80,10 @@ module Javascript
         include ::Haml::Filters::Base
         def render_with_options(text, options)
           compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
-          data = compressor.compress(text.rstrip.gsub("\n", "\n    "))
-          %Q{<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>}
+          data = compressor.compress(text)
+          <<END
+<script type=#{options[:attr_wrapper]}text/javascript#{options[:attr_wrapper]}>#{data.chomp}</script>
+END
         end
       end
     end

lib/middleman/helpers.rb

@@ -67,6 +67,14 @@ def haml_partial(name, options = {})
   end
 end
 
+# def cache_buster
+#   if File.readable?(real_path)
+#     File.mtime(real_path).strftime("%s") 
+#   else
+#     $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+#   end
+# end
+
 def asset_url(path)
   path.include?("://") ? path : "/#{path}"
 end

lib/middleman/markaby.rb

@@ -1,4 +1,4 @@
 # Include markaby support
-require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'sinatra-markaby', 'lib', 'sinatra', 'markaby')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'vendor', 'sinatra-markaby', 'lib', 'sinatra', 'markaby')
 Middleman.helpers Sinatra::Markaby
 Middleman.supported_formats << "mab"

lib/middleman/maruku.rb

@@ -1,4 +1,4 @@
 # Include maruku support
-require File.join(File.dirname(__FILE__), '..', '..', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku')
+require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'vendor', 'sinatra-maruku', 'lib', 'sinatra', 'maruku')
 Middleman.helpers Sinatra::Maruku
 Middleman.supported_formats << "maruku"

middleman.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-24}
   s.email = %q{tdreyno@gmail.com}
   s.executables = ["mm-init", "mm-build", "mm-server"]
   s.extra_rdoc_files = [
@@ -49,71 +49,14 @@ Gem::Specification.new do |s|
      "spec/fixtures/sample/views/services/index.haml",
      "spec/fixtures/sample/views/stylesheets/site.sass",
      "spec/generator_spec.rb",
-     "spec/spec_helper.rb",
-     "vendor/rack-test/History.txt",
-     "vendor/rack-test/MIT-LICENSE.txt",
-     "vendor/rack-test/README.rdoc",
-     "vendor/rack-test/Rakefile",
-     "vendor/rack-test/lib/rack/mock_session.rb",
-     "vendor/rack-test/lib/rack/test.rb",
-     "vendor/rack-test/lib/rack/test/cookie_jar.rb",
-     "vendor/rack-test/lib/rack/test/methods.rb",
-     "vendor/rack-test/lib/rack/test/mock_digest_request.rb",
-     "vendor/rack-test/lib/rack/test/uploaded_file.rb",
-     "vendor/rack-test/lib/rack/test/utils.rb",
-     "vendor/rack-test/spec/fixtures/config.ru",
-     "vendor/rack-test/spec/fixtures/fake_app.rb",
-     "vendor/rack-test/spec/fixtures/foo.txt",
-     "vendor/rack-test/spec/rack/test/cookie_spec.rb",
-     "vendor/rack-test/spec/rack/test/digest_auth_spec.rb",
-     "vendor/rack-test/spec/rack/test/multipart_spec.rb",
-     "vendor/rack-test/spec/rack/test/utils_spec.rb",
-     "vendor/rack-test/spec/rack/test_spec.rb",
-     "vendor/rack-test/spec/rcov.opts",
-     "vendor/rack-test/spec/spec.opts",
-     "vendor/rack-test/spec/spec_helper.rb",
-     "vendor/sinatra-content-for/LICENSE",
-     "vendor/sinatra-content-for/README.rdoc",
-     "vendor/sinatra-content-for/Rakefile",
-     "vendor/sinatra-content-for/lib/sinatra/content_for.rb",
-     "vendor/sinatra-content-for/sinatra-content-for.gemspec",
-     "vendor/sinatra-content-for/test/content_for_test.rb",
-     "vendor/sinatra-markaby/CHANGES",
-     "vendor/sinatra-markaby/LICENSE",
-     "vendor/sinatra-markaby/README.rdoc",
-     "vendor/sinatra-markaby/Rakefile",
-     "vendor/sinatra-markaby/TODO",
-     "vendor/sinatra-markaby/VERSION.yml",
-     "vendor/sinatra-markaby/lib/sinatra/markaby.rb",
-     "vendor/sinatra-markaby/sinatra-markaby.gemspec",
-     "vendor/sinatra-markaby/test/sinatra_markaby_test.rb",
-     "vendor/sinatra-markaby/test/test_helper.rb",
-     "vendor/sinatra-markaby/test/views/hello.mab",
-     "vendor/sinatra-markaby/test/views/html.mab",
-     "vendor/sinatra-maruku/LICENSE",
-     "vendor/sinatra-maruku/README.markdown",
-     "vendor/sinatra-maruku/Rakefile",
-     "vendor/sinatra-maruku/VERSION.yml",
-     "vendor/sinatra-maruku/examples/app.rb",
-     "vendor/sinatra-maruku/examples/config.ru",
-     "vendor/sinatra-maruku/examples/mapp.rb",
-     "vendor/sinatra-maruku/examples/public/javascripts/application.js",
-     "vendor/sinatra-maruku/examples/public/stylesheets/application.css",
-     "vendor/sinatra-maruku/examples/public/stylesheets/print.css",
-     "vendor/sinatra-maruku/examples/views/index.maruku",
-     "vendor/sinatra-maruku/examples/views/layout.maruku",
-     "vendor/sinatra-maruku/lib/sinatra/maruku.rb",
-     "vendor/sinatra-maruku/sinatra-maruku.gemspec",
-     "vendor/sinatra-maruku/test/sinatra_maruku_test.rb",
-     "vendor/sinatra-maruku/test/test_helper.rb",
-     "vendor/sinatra-maruku/test/views/hello.maruku",
-     "vendor/sinatra-maruku/test/views/layout2.maruku"
+     "spec/spec_helper.rb"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/tdreyno/middleman}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{middleman}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{A static site generator utilizing Haml and Sass}
   s.test_files = [
     "spec/builder_spec.rb",
@@ -124,7 +67,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<templater>, [">= 0"])