dokkit 0.4.4 → 0.5.0

data/tasks/spec.rake

@@ -1,29 +1,46 @@
 # $Id$
 
 if HAVE_SPEC_RAKE_SPECTASK
+require 'spec/rake/verify_rcov'
 
 namespace :spec do
 
   desc 'Run all specs with basic output'
   Spec::Rake::SpecTask.new(:run) do |t|
-    t.spec_opts = PROJ.spec_opts
-    t.spec_files = PROJ.specs
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
   end
 
   desc 'Run all specs with text output'
   Spec::Rake::SpecTask.new(:specdoc) do |t|
-    t.spec_opts = PROJ.spec_opts + ['--format', 'specdoc']
-    t.spec_files = PROJ.specs
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
   end
 
   if HAVE_RCOV
     desc 'Run all specs with RCov'
     Spec::Rake::SpecTask.new(:rcov) do |t|
-      t.spec_opts = PROJ.spec_opts
-      t.spec_files = PROJ.specs
+      t.ruby_opts = PROJ.ruby_opts
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
+      t.libs += PROJ.libs
       t.rcov = true
-      t.rcov_opts = PROJ.rcov_opts + ['--exclude', 'spec']
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
     end
+
+    RCov::VerifyTask.new(:verify) do |t| 
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
+    end
+
+    task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
   end
 
 end  # namespace :spec
@@ -33,8 +50,6 @@ task :spec => 'spec:run'
 
 task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(spec:clobber_rcov)
-
 end  # if HAVE_SPEC_RAKE_SPECTASK
 
 # EOF

data/tasks/svn.rake

@@ -1,32 +1,36 @@
 # $Id$
 
+if HAVE_SVN
 
-if PROJ.svn and system("svn --version 2>&1 > #{DEV_NULL}")
-
-unless PROJ.svn_root
+unless PROJ.svn.root
   info = %x/svn info ./
   m = %r/^Repository Root:\s+(.*)$/.match(info)
-  PROJ.svn_root = (m.nil? ? '' : m[1])
+  PROJ.svn.root = (m.nil? ? '' : m[1])
 end
-PROJ.svn_root = File.join(PROJ.svn_root, PROJ.svn) if String === PROJ.svn
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
 
 namespace :svn do
 
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
   desc 'Show tags from the SVN repository'
-  task :show_tags do |t|
-    tags = %x/svn list #{File.join(PROJ.svn_root, PROJ.svn_tags)}/
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
     tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
     puts tags
   end
 
   desc 'Create a new tag in the SVN repository'
-  task :create_tag do |t|
+  task :create_tag => 'svn:prereqs' do |t|
     v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
     abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
 
-    trunk = File.join(PROJ.svn_root, PROJ.svn_trunk)
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
     tag = "%s-%s" % [PROJ.name, PROJ.version]
-    tag = File.join(PROJ.svn_root, PROJ.svn_tags, tag)
+    tag = File.join(svn.root, svn.tags, tag)
     msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
 
     puts "Creating SVN tag '#{tag}'"
@@ -39,6 +43,6 @@ end  # namespace :svn
 
 task 'gem:release' => 'svn:create_tag'
 
-end  # if PROJ.svn
+end  # if PROJ.svn.path
 
 # EOF

data/tasks/test.rake

@@ -6,23 +6,23 @@ namespace :test do
 
   Rake::TestTask.new(:run) do |t|
     t.libs = PROJ.libs
-    t.test_files = if test ?f, PROJ.test_file then [PROJ.test_file]
-                   else PROJ.tests end
+    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+                   else PROJ.test.files end
     t.ruby_opts += PROJ.ruby_opts
-    t.ruby_opts += PROJ.test_opts
+    t.ruby_opts += PROJ.test.opts
   end
 
   if HAVE_RCOV
     desc 'Run rcov on the unit tests'
     task :rcov => :clobber_rcov do
-      opts = PROJ.rcov_opts.join(' ')
-      files = if test ?f, PROJ.test_file then [PROJ.test_file]
-              else PROJ.tests end
+      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
+      opts = opts.join(' ')
+      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+              else PROJ.test.files end
       files = files.join(' ')
       sh "#{RCOV} #{files} #{opts}"
     end
 
-    desc 'Remove rcov products'
     task :clobber_rcov do
       rm_r 'coverage' rescue nil
     end
@@ -35,6 +35,4 @@ task :test => 'test:run'
 
 task :clobber => 'test:clobber_rcov' if HAVE_RCOV
 
-remove_desc_for_task %w(test:clobber_rcov)
-
 # EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dokkit
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors: 
 - Andrea Fazzi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-10 00:00:00 +00:00
+date: 2008-08-22 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.8.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: maruku
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "== DESCRIPTION:  dokkit is a document generator. It was inspired by rote but now it is completely independent from it. dokkit uses filters like deplate and maruku to generate output in a large variety of formats (tex, html, docbook, plain text, ...)."
+description: "With dokkit you can:  * generate static websites  * generate many types of documents in many formats  * write your documents using a simple wiki syntax and obtain high quality output (with pdflatex)  * generate different output formats from the same source document   * use models to quickly generate the documents you want (technical report, howto, guides, presentation, website, etc.)  * simply derive new documentation models from the existing ones  * simply modify existing models to fit your needs  For more information about dokkit visit the website[http://dokkit.rubyforge.org/]"
 email: andrea.fazzi@alca.le.it
 executables: 
 - dokkit
@@ -61,6 +61,7 @@ files:
 - lib/dokkit/cache/cache.rb
 - lib/dokkit/environment.rb
 - lib/dokkit/environment/basic.rb
+- lib/dokkit/environment/container.rb
 - lib/dokkit/environment/helpers.rb
 - lib/dokkit/environment/helpers/extmap.rb
 - lib/dokkit/environment/helpers/fileselection.rb
@@ -73,6 +74,7 @@ files:
 - lib/dokkit/filters/maruku.rb
 - lib/dokkit/filters/nil.rb
 - lib/dokkit/filters/tidy.rb
+- lib/dokkit/filters/yaml.rb
 - lib/dokkit/hash.rb
 - lib/dokkit/logging.rb
 - lib/dokkit/logging/logger.rb
@@ -87,6 +89,7 @@ files:
 - lib/dokkit/resource/extensions/url.rb
 - lib/dokkit/resource/filenamehelper.rb
 - lib/dokkit/tasklib.rb
+- lib/dokkit/tasklib/base.rb
 - lib/dokkit/tasklib/clean.rb
 - lib/dokkit/tasklib/render.rb
 - lib/models/simple/Rakefile
@@ -98,10 +101,14 @@ files:
 - lib/models/simple/doc/layouts/simple.text
 - lib/models/simple/doc/pages/simple.deplate
 - lib/models/simple/setup/setup.rb
-- tasks/annotations.rake
-- tasks/doc.rake
+- tasks/ann.rake
+- tasks/bones.rake
 - tasks/gem.rake
+- tasks/git.rake
 - tasks/manifest.rake
+- tasks/notes.rake
+- tasks/post_load.rake
+- tasks/rdoc.rake
 - tasks/rubyforge.rake
 - tasks/setup.rb
 - tasks/spec.rake
@@ -133,6 +140,6 @@ rubyforge_project: dokkit
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: dokkit is an open source document generator
+summary: dokkit is an open source document generator that is suitable for static website generation too.
 test_files: []
 

data/tasks/annotations.rake

@@ -1,30 +0,0 @@
-# $Id$
-
-if HAVE_BONES
-
-desc "Enumerate all annotations"
-task :notes do
-  Bones::AnnotationExtractor.enumerate(
-      PROJ, "OPTIMIZE|FIXME|TODO", :tag => true)
-end
-
-namespace :notes do
-  desc "Enumerate all OPTIMIZE annotations"
-  task :optimize do
-    Bones::AnnotationExtractor.enumerate(PROJ, "OPTIMIZE")
-  end
-
-  desc "Enumerate all FIXME annotations"
-  task :fixme do
-    Bones::AnnotationExtractor.enumerate(PROJ, "FIXME")
-  end
-
-  desc "Enumerate all TODO annotations"
-  task :todo do
-    Bones::AnnotationExtractor.enumerate(PROJ, "TODO")
-  end
-end
-
-end  # if HAVE_BONES
-
-# EOF