diff --git a/.gitignore b/.gitignore index 382bb496..62c23c1b 100755 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ rdoc pkg .sass-cache .sassc -.tmp \ No newline at end of file +.tmp +Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..2520b275 --- /dev/null +++ b/Gemfile @@ -0,0 +1,3 @@ +source "http://www.rubygems.org" + +gemspec \ No newline at end of file diff --git a/Rakefile b/Rakefile index 14ab7960..684dde17 100644 --- a/Rakefile +++ b/Rakefile @@ -1,42 +1,7 @@ -require 'lib/middleman' -require 'rake' -require 'cucumber/rake/task' +require 'bundler' +Bundler::GemHelper.install_tasks -begin - require 'jeweler' - Jeweler::Tasks.new do |gem| - gem.name = "middleman" - gem.summary = %Q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting} - gem.email = "tdreyno@gmail.com" - gem.homepage = "http://wiki.github.com/tdreyno/middleman" - gem.authors = ["Thomas Reynolds"] - gem.rubyforge_project = "middleman" - gem.executables = %w(mm-init mm-build mm-server) - gem.add_dependency("rack", "~>1.0") - gem.add_dependency("thin", "~>1.2.0") - gem.add_dependency("shotgun", "~>0.8.0") - gem.add_dependency("templater", "~>1.0.0") - gem.add_dependency("tilt", "~>1.1") - gem.add_dependency("sinatra", "~>1.0") - gem.add_dependency("padrino-core", "~>0.9.0") - gem.add_dependency("padrino-helpers", "~>0.9.0") - gem.add_dependency("rack-test", "~>0.5.0") - gem.add_dependency("yui-compressor", "~>0.9.0") - gem.add_dependency("haml", "~>3.0") - gem.add_dependency("compass", "~>0.10.0") - gem.add_dependency("json_pure", "~>1.4.0") - gem.add_dependency("smusher", "~>0.4.5") - gem.add_dependency("compass-slickmap", "~>0.4.0") - # gem.add_dependency("livereload", "~>1.4.0") - - gem.add_development_dependency("cucumber") - gem.add_development_dependency("jeweler") - end - - Jeweler::GemcutterTasks.new -rescue LoadError - puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler" -end +require 'cucumber/rake/task' Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t| t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}" diff --git a/VERSION b/VERSION deleted file mode 100644 index 7dea76ed..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.0.1 diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb new file mode 100644 index 00000000..848806ae --- /dev/null +++ b/lib/middleman/version.rb @@ -0,0 +1,3 @@ +module Middleman + VERSION = "1.0.2" +end diff --git a/middleman.gemspec b/middleman.gemspec index d851d6fd..1319c646 100644 --- a/middleman.gemspec +++ b/middleman.gemspec @@ -1,175 +1,39 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command # -*- encoding: utf-8 -*- +$:.push File.expand_path("../lib", __FILE__) +require "middleman/version" Gem::Specification.new do |s| - s.name = %q{middleman} - s.version = "1.0.1" - - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Thomas Reynolds"] - s.date = %q{2010-10-31} - s.email = %q{tdreyno@gmail.com} - s.executables = ["mm-init", "mm-build", "mm-server"] - s.extra_rdoc_files = [ - "LICENSE", - "README.rdoc" - ] - s.files = [ - ".document", - ".gitignore", - "LICENSE", - "README.rdoc", - "Rakefile", - "VERSION", - "bin/mm-build", - "bin/mm-init", - "bin/mm-server", - "features/builder.feature", - "features/coffee-script.feature", - "features/generator.feature", - "features/helpers_auto_stylesheet_link_tag.feature", - "features/helpers_page_classes.feature", - "features/less-css.feature", - "features/minify_css.feature", - "features/minify_javascript.feature", - "features/padrino_helpers.feature", - "features/page_alias_and_layouts.feature", - "features/scss-support.feature", - "features/step_definitions/asset_host_steps.rb", - "features/step_definitions/builder_steps.rb", - "features/step_definitions/env.rb", - "features/step_definitions/generator_steps.rb", - "features/step_definitions/middleman_steps.rb", - "features/step_definitions/page_layout_steps.rb", - "features/w_asset_host.feature", - "features/x_automatic_image_sizes.feature", - "features/y_cache_buster.feature", - "features/z_relative_assets.feature", - "fixtures/test-app/config.rb", - "fixtures/test-app/public/images/blank.gif", - "fixtures/test-app/public/static.html", - "fixtures/test-app/public/stylesheets/auto-css.css", - "fixtures/test-app/public/stylesheets/static.css", - "fixtures/test-app/public/stylesheets/sub1/auto-css.css", - "fixtures/test-app/public/stylesheets/sub1/sub2/auto-css.css", - "fixtures/test-app/views/_partial.haml", - "fixtures/test-app/views/asset_host.html.haml", - "fixtures/test-app/views/auto-css.html.haml", - "fixtures/test-app/views/auto-image-sizes.html.haml", - "fixtures/test-app/views/cache-buster.html.haml", - "fixtures/test-app/views/custom-layout.html.haml", - "fixtures/test-app/views/index.html.haml", - "fixtures/test-app/views/inline-css.html.haml", - "fixtures/test-app/views/inline-js.html.haml", - "fixtures/test-app/views/javascripts/coffee_test.js.coffee", - "fixtures/test-app/views/layout.haml", - "fixtures/test-app/views/layouts/custom.haml", - "fixtures/test-app/views/padrino_test.html.haml", - "fixtures/test-app/views/page-classes.html.haml", - "fixtures/test-app/views/services/index.html.haml", - "fixtures/test-app/views/stylesheets/asset_host.css.sass", - "fixtures/test-app/views/stylesheets/relative_assets.css.sass", - "fixtures/test-app/views/stylesheets/site.css.sass", - "fixtures/test-app/views/stylesheets/site_scss.css.scss", - "fixtures/test-app/views/stylesheets/test_less.css.less", - "lib/middleman.rb", - "lib/middleman/assets.rb", - "lib/middleman/builder.rb", - "lib/middleman/config.ru", - "lib/middleman/features.rb", - "lib/middleman/features/asset_host.rb", - "lib/middleman/features/automatic_image_sizes.rb", - "lib/middleman/features/automatic_image_sizes/fastimage.rb", - "lib/middleman/features/cache_buster.rb", - "lib/middleman/features/code_ray.rb", - "lib/middleman/features/default_helpers.rb", - "lib/middleman/features/live_reload.rb", - "lib/middleman/features/minify_css.rb", - "lib/middleman/features/minify_javascript.rb", - "lib/middleman/features/minify_javascript/rack.rb", - "lib/middleman/features/relative_assets.rb", - "lib/middleman/features/slickmap.rb", - "lib/middleman/features/slickmap/template.html.haml", - "lib/middleman/features/smush_pngs.rb", - "lib/middleman/features/ugly_haml.rb", - "lib/middleman/renderers/haml.rb", - "lib/middleman/renderers/sass.rb", - "lib/middleman/server.rb", - "lib/middleman/template/config.rbt", - "lib/middleman/template/views/index.html.haml", - "lib/middleman/template/views/layout.haml", - "lib/middleman/template/views/stylesheets/site.css.sass", - "lib/middleman/templater+dynamic_renderer.rb", - "middleman.gemspec" - ] - s.homepage = %q{http://wiki.github.com/tdreyno/middleman} - s.rdoc_options = ["--charset=UTF-8"] + s.name = "middleman" + s.version = Middleman::VERSION + s.platform = Gem::Platform::RUBY + s.authors = ["Thomas Reynolds"] + s.email = ["tdreyno@gmail.com"] + s.homepage = "http://wiki.github.com/tdreyno/middleman" + s.summary = "A static site generator utilizing Haml, Sass and providing YUI compression and cache busting" + + s.rubyforge_project = "middleman" + + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {fixtures,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } s.require_paths = ["lib"] - s.rubyforge_project = %q{middleman} - s.rubygems_version = %q{1.3.7} - s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting} - - if s.respond_to? :specification_version then - current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 3 - - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, ["~> 1.0"]) - s.add_runtime_dependency(%q, ["~> 1.2.0"]) - s.add_runtime_dependency(%q, ["~> 0.8.0"]) - s.add_runtime_dependency(%q, ["~> 1.0.0"]) - s.add_runtime_dependency(%q, ["~> 1.1"]) - s.add_runtime_dependency(%q, ["~> 1.0"]) - s.add_runtime_dependency(%q, ["~> 0.9.0"]) - s.add_runtime_dependency(%q, ["~> 0.9.0"]) - s.add_runtime_dependency(%q, ["~> 0.5.0"]) - s.add_runtime_dependency(%q, ["~> 0.9.0"]) - s.add_runtime_dependency(%q, ["~> 3.0"]) - s.add_runtime_dependency(%q, ["~> 0.10.0"]) - s.add_runtime_dependency(%q, ["~> 1.4.0"]) - s.add_runtime_dependency(%q, ["~> 0.4.5"]) - s.add_runtime_dependency(%q, ["~> 0.4.0"]) - s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 1.2.0"]) - s.add_dependency(%q, ["~> 0.8.0"]) - s.add_dependency(%q, ["~> 1.0.0"]) - s.add_dependency(%q, ["~> 1.1"]) - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 0.5.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 3.0"]) - s.add_dependency(%q, ["~> 0.10.0"]) - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.4.5"]) - s.add_dependency(%q, ["~> 0.4.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 1.2.0"]) - s.add_dependency(%q, ["~> 0.8.0"]) - s.add_dependency(%q, ["~> 1.0.0"]) - s.add_dependency(%q, ["~> 1.1"]) - s.add_dependency(%q, ["~> 1.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 0.5.0"]) - s.add_dependency(%q, ["~> 0.9.0"]) - s.add_dependency(%q, ["~> 3.0"]) - s.add_dependency(%q, ["~> 0.10.0"]) - s.add_dependency(%q, ["~> 1.4.0"]) - s.add_dependency(%q, ["~> 0.4.5"]) - s.add_dependency(%q, ["~> 0.4.0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end + + s.add_runtime_dependency("rack", ["~> 1.0"]) + s.add_runtime_dependency("thin", ["~> 1.2.0"]) + s.add_runtime_dependency("shotgun", ["~> 0.8.0"]) + s.add_runtime_dependency("templater", ["~> 1.0.0"]) + s.add_runtime_dependency("tilt", ["~> 1.1"]) + s.add_runtime_dependency("sinatra", ["~> 1.0"]) + s.add_runtime_dependency("padrino-core", ["~> 0.9.0"]) + s.add_runtime_dependency("padrino-helpers", ["~> 0.9.0"]) + s.add_runtime_dependency("rack-test", ["~> 0.5.0"]) + s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"]) + s.add_runtime_dependency("haml", ["~> 3.0"]) + s.add_runtime_dependency("compass", ["~> 0.10.0"]) + s.add_runtime_dependency("json_pure", ["~> 1.4.0"]) + s.add_runtime_dependency("smusher", ["~> 0.4.5"]) + s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"]) + s.add_development_dependency("cucumber", [">= 0"]) + s.add_development_dependency("rspec", [">= 0"]) end