diff --git a/History.txt b/History.txt index e1d15ec4..0981a6c9 100644 --- a/History.txt +++ b/History.txt @@ -1,4 +1,6 @@ == + * Major Enhancements + * Switch to Jeweler for packaging tasks * Minor Enhancements * Type importer [github.com/codeslinger] * site.topics accessor [github.com/baz] diff --git a/Manifest.txt b/Manifest.txt deleted file mode 100644 index 178dc344..00000000 --- a/Manifest.txt +++ /dev/null @@ -1,43 +0,0 @@ -History.txt -Manifest.txt -README.textile -Rakefile -bin/jekyll -jekyll.gemspec -lib/jekyll.rb -lib/jekyll/albino.rb -lib/jekyll/converters/csv.rb -lib/jekyll/converters/mephisto.rb -lib/jekyll/converters/mt.rb -lib/jekyll/converters/textpattern.rb -lib/jekyll/converters/typo.rb -lib/jekyll/converters/wordpress.rb -lib/jekyll/convertible.rb -lib/jekyll/core_ext.rb -lib/jekyll/filters.rb -lib/jekyll/layout.rb -lib/jekyll/page.rb -lib/jekyll/post.rb -lib/jekyll/site.rb -lib/jekyll/tags/highlight.rb -lib/jekyll/tags/include.rb -test/helper.rb -test/source/_includes/sig.markdown -test/source/_layouts/default.html -test/source/_layouts/simple.html -test/source/_posts/2008-10-18-foo-bar.textile -test/source/_posts/2008-11-21-complex.textile -test/source/_posts/2008-12-03-permalinked-post.textile -test/source/_posts/2008-12-13-include.markdown -test/source/category/_posts/2008-9-23-categories.textile -test/source/css/screen.css -test/source/foo/_posts/bar/2008-12-12-topical-post.textile -test/source/index.html -test/source/z_category/_posts/2008-9-23-categories.textile -test/suite.rb -test/test_filters.rb -test/test_generated_site.rb -test/test_jekyll.rb -test/test_post.rb -test/test_site.rb -test/test_tags.rb diff --git a/Rakefile b/Rakefile index 3f301a77..c178316f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,18 +1,63 @@ -require 'rubygems' -require 'hoe' -require 'lib/jekyll' +require 'rake' +require 'rake/testtask' +require 'rake/rdoctask' -Hoe.new('jekyll', Jekyll::VERSION) do |p| - p.developer('Tom Preston-Werner', 'tom@mojombo.com') - p.summary = "Jekyll is a simple, blog aware, static site generator." - p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'maruku', 'directory_watcher', 'open4'] +begin + require 'jeweler' + Jeweler::Tasks.new do |s| + s.name = "jekyll" + s.summary = %Q{Jekyll is a simple, blog aware, static site generator.} + s.email = "tom@mojombo.com" + s.homepage = "http://github.com/mojombo/jekyll" + s.description = "Jekyll is a simple, blog aware, static site generator." + s.authors = ["Tom Preston-Werner"] + s.rubyforge_project = "jekyll" + s.add_dependency('RedCloth', '>= 4.0.4') + s.add_dependency('liquid', '>= 1.9.0') + s.add_dependency('classifier', '>= 1.3.1') + s.add_dependency('maruku', '>= 0.5.9') + s.add_dependency('directory_watcher', '>= 1.1.1') + s.add_dependency('open4', '>= 0.9.6') + end +rescue LoadError + puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" end +Rake::TestTask.new do |t| + t.libs << 'lib' + t.pattern = 'test/**/test_*.rb' + t.verbose = false +end + +Rake::RDocTask.new do |rdoc| + rdoc.rdoc_dir = 'rdoc' + rdoc.title = 'jekyll' + rdoc.options << '--line-numbers' << '--inline-source' + rdoc.rdoc_files.include('README*') + rdoc.rdoc_files.include('lib/**/*.rb') +end + +begin + require 'rcov/rcovtask' + Rcov::RcovTask.new do |t| + t.libs << 'test' + t.test_files = FileList['test/**/test_*.rb'] + t.verbose = true + end +rescue LoadError +end + +task :default => :test + +# console + desc "Open an irb session preloaded with this library" task :console do sh "irb -rubygems -r ./lib/jekyll.rb" end +# converters + namespace :convert do desc "Migrate from mephisto in the current directory" task :mephisto do diff --git a/VERSION.yml b/VERSION.yml new file mode 100644 index 00000000..3075864f --- /dev/null +++ b/VERSION.yml @@ -0,0 +1,4 @@ +--- +:minor: 3 +:patch: 0 +:major: 0 diff --git a/jekyll.gemspec b/jekyll.gemspec index f9992c73..38673fe5 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -1,51 +1,48 @@ +# -*- encoding: utf-8 -*- + Gem::Specification.new do |s| s.name = %q{jekyll} s.version = "0.3.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Tom Preston-Werner"] - s.date = %q{2009-01-23} - s.default_executable = %q{jekyll} - s.email = ["tom@mojombo.com"] - s.executables = ["jekyll"] - s.extra_rdoc_files = ["History.txt", "Manifest.txt"] - s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/converters/mt.rb", "lib/jekyll/converters/textpattern.rb", "lib/jekyll/converters/typo.rb", "lib/jekyll/converters/wordpress.rb", "lib/jekyll/convertible.rb", "lib/jekyll/core_ext.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.markdown", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-03-permalinked-post.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css/screen.css", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"] + s.date = %q{2009-02-03} + s.description = %q{Jekyll is a simple, blog aware, static site generator.} + s.email = %q{tom@mojombo.com} + s.files = ["History.txt", "Manifest.txt", "README.textile", "VERSION.yml", "bin/jekyll", "lib/jekyll", "lib/jekyll/albino.rb", "lib/jekyll/converters", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/converters/mt.rb", "lib/jekyll/converters/textpattern.rb", "lib/jekyll/converters/typo.rb", "lib/jekyll/converters/wordpress.rb", "lib/jekyll/convertible.rb", "lib/jekyll/core_ext.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "lib/jekyll.rb", "test/dest", "test/dest/2008", "test/dest/2008/10", "test/dest/2008/10/18", "test/dest/2008/10/18/foo-bar.html", "test/dest/2008/11", "test/dest/2008/11/21", "test/dest/2008/11/21/complex.html", "test/dest/2008/12", "test/dest/2008/12/13", "test/dest/2008/12/13/include.html", "test/dest/_posts", "test/dest/_posts/2008-10-18-foo-bar.html", "test/dest/_posts/2008-11-21-complex.html", "test/dest/_posts/2008-12-03-permalinked-post.html", "test/dest/_posts/2008-12-13-include.html", "test/dest/category", "test/dest/category/2008", "test/dest/category/2008/09", "test/dest/category/2008/09/23", "test/dest/category/2008/09/23/categories.html", "test/dest/category/_posts", "test/dest/category/_posts/2008-9-23-categories.html", "test/dest/css", "test/dest/css/screen.css", "test/dest/foo", "test/dest/foo/2008", "test/dest/foo/2008/12", "test/dest/foo/2008/12/12", "test/dest/foo/2008/12/12/topical-post.html", "test/dest/foo/_posts", "test/dest/foo/_posts/bar", "test/dest/foo/_posts/bar/2008-12-12-topical-post.html", "test/dest/index.html", "test/dest/my_category", "test/dest/my_category/permalinked-post", "test/dest/z_category", "test/dest/z_category/2008", "test/dest/z_category/2008/09", "test/dest/z_category/2008/09/23", "test/dest/z_category/2008/09/23/categories.html", "test/dest/z_category/_posts", "test/dest/z_category/_posts/2008-9-23-categories.html", "test/helper.rb", "test/source", "test/source/_includes", "test/source/_includes/sig.markdown", "test/source/_layouts", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-03-permalinked-post.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/category", "test/source/category/_posts", "test/source/category/_posts/2008-9-23-categories.textile", "test/source/css", "test/source/css/screen.css", "test/source/foo", "test/source/foo/_posts", "test/source/foo/_posts/bar", "test/source/foo/_posts/bar/2008-12-12-topical-post.textile", "test/source/index.html", "test/source/z_category", "test/source/z_category/_posts", "test/source/z_category/_posts/2008-9-23-categories.textile", "test/suite.rb", "test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"] s.has_rdoc = true - s.rdoc_options = ["--main", "README.txt"] + s.homepage = %q{http://github.com/mojombo/jekyll} + s.rdoc_options = ["--inline-source", "--charset=UTF-8"] s.require_paths = ["lib"] s.rubyforge_project = %q{jekyll} s.rubygems_version = %q{1.3.0} s.summary = %q{Jekyll is a simple, blog aware, static site generator.} - s.test_files = ["test/test_filters.rb", "test/test_generated_site.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb", "test/test_tags.rb"] if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION s.specification_version = 2 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, [">= 1.8.0"]) + s.add_runtime_dependency(%q, [">= 4.0.4"]) + s.add_runtime_dependency(%q, [">= 1.9.0"]) + s.add_runtime_dependency(%q, [">= 1.3.1"]) + s.add_runtime_dependency(%q, [">= 0.5.9"]) + s.add_runtime_dependency(%q, [">= 1.1.1"]) + s.add_runtime_dependency(%q, [">= 0.9.6"]) 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"]) - s.add_dependency(%q, [">= 1.8.0"]) + s.add_dependency(%q, [">= 4.0.4"]) + s.add_dependency(%q, [">= 1.9.0"]) + s.add_dependency(%q, [">= 1.3.1"]) + s.add_dependency(%q, [">= 0.5.9"]) + s.add_dependency(%q, [">= 1.1.1"]) + s.add_dependency(%q, [">= 0.9.6"]) 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"]) - s.add_dependency(%q, [">= 1.8.0"]) + s.add_dependency(%q, [">= 4.0.4"]) + s.add_dependency(%q, [">= 1.9.0"]) + s.add_dependency(%q, [">= 1.3.1"]) + s.add_dependency(%q, [">= 0.5.9"]) + s.add_dependency(%q, [">= 1.1.1"]) + s.add_dependency(%q, [">= 0.9.6"]) end end