corundum 0.0.10 → 0.0.12

data/lib/corundum/simplecov.rb

@@ -1,27 +1,20 @@
-require 'corundum/tasklib'
+require 'corundum/documentation-task'
 require 'corundum/browser-task'
 
 module Corundum
-  class RSpecReportTask < RSpecTask
-    def command_task
-      @command_task ||= file task_name do
-        decorated(command).must_succeed!
-      end
-    end
-  end
 
-  class SimpleCov < TaskLib
+  class SimpleCov < DocumentationTask
     default_namespace :coverage
 
+    setting(:title, "Coverage report")
+
     setting(:test_lib)
-    setting(:browser)
     setting(:code_files)
     setting(:all_files)
 
-    setting(:report_path, nil)
     setting(:config_path, nil)
 
-    setting(:report_dir, "doc/coverage")
+    setting(:sub_dir, "coverage")
     setting(:config_file, ".simplecov")
     setting(:filters, ["./spec"])
     setting(:threshold, 80)
@@ -31,15 +24,15 @@ module Corundum
     end)
 
     def default_configuration(toolkit, testlib)
+      super(toolkit)
       self.test_lib = testlib
-      self.browser = toolkit.browser
       self.code_files = toolkit.files.code
       self.all_files =  toolkit.file_lists.project + toolkit.file_lists.code + toolkit.file_lists.test
     end
 
     def resolve_configuration
       self.config_path ||= File::expand_path(config_file, Rake::original_dir)
-      self.report_path ||= File::join(report_dir, "index.html")
+      super
     end
 
     def filter_lines
@@ -58,7 +51,7 @@ module Corundum
 
     def config_file_contents
       contents = ["SimpleCov.start do"]
-      contents << "  coverage_dir \"#{report_dir}\""
+      contents << "  coverage_dir \"#{target_dir}\""
       contents += filter_lines.map{|line| "  " + line}
       contents += group_lines.map{|line| "  " + line}
       contents << "end"
@@ -66,9 +59,8 @@ module Corundum
     end
 
     def define
+      super
       in_namespace do
-        file "Rakefile"
-
         task :example_config do
           $stderr.puts "Try this in #{config_path}"
           $stderr.puts "(You can just do #$0 > #{config_path})"
@@ -77,27 +69,21 @@ module Corundum
         end
 
         task :config_exists do
-          File::exists?(File::join(Rake::original_dir, ".simplecov")) or fail "No .simplecov (try: rake #{self[:example_config]})"
+          File::exists?(config_path) or fail "No .simplecov (try: rake #{self[:example_config]})"
+          File::read(config_path) =~ /coverage_dir.*#{target_dir}/ or fail ".simplecov doesn't refer to #{target_dir}"
         end
 
-        directory File::dirname(report_path)
-        RSpecReportTask.new(@test_lib) do |t|
-          t.task_name = report_path
+        RSpecReportTask.new(@test_lib, :report => [:config_exists] + all_files) do |t|
           t.rspec_opts += %w{-r simplecov}
         end
-        file report_path => all_files
+        file entry_path => :report
 
-        task :generate_report => [:preflight, report_path]
-
-        desc "View coverage in browser"
-        BrowserTask.new(self) do |t|
-          t.index_html = report_path
-        end
+        task :generate_report => [:preflight, entry_path]
 
         task :verify_coverage => :generate_report do
           require 'nokogiri'
 
-          doc = Nokogiri::parse(File::read(report_path))
+          doc = Nokogiri::parse(File::read(entry_path))
 
           coverage_total_xpath = "//span[@class='covered_percent']/span"
           percentage = doc.xpath(coverage_total_xpath).first.content.to_f
@@ -109,7 +95,7 @@ module Corundum
         task :find_stragglers => :generate_report do
           require 'nokogiri'
 
-          doc = Nokogiri::parse(File::read(report_path))
+          doc = Nokogiri::parse(File::read(entry_path))
 
           covered_files = doc.xpath(
             "//table[@class='file_list']//td//a[@class='src_link']").map do |link|
@@ -126,8 +112,8 @@ module Corundum
           end
         end
       end
-      task :preflight => in_namespace(:config_exists)
 
+      task :preflight => in_namespace(:config_exists)
       task :qa => in_namespace(:verify_coverage, :find_stragglers)
     end
   end

data/lib/corundum/tasklibs.rb

@@ -7,5 +7,5 @@ require 'corundum/gemcutter'
 require 'corundum/email'
 require 'corundum/version_control/monotone'
 require 'corundum/version_control/git'
-require 'corundum/yardoc'
+require 'corundum/documentation'
 require 'corundum/github-pages'

metadata

@@ -2,7 +2,7 @@
 name: corundum
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors: 
 - Judson Lester
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: corundum
@@ -133,7 +133,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id010
-description: "  A Corundum is a synthetic gemstone - including synthetic rubies.  Ergo: a tool for synthesizing gems.\n"
+description: "  A corundum is a synthetic gemstone - including synthetic rubies.  Ergo: a tool for synthesizing gems.\n\n  Corundum starts with the outlook that gemspecs are relatively easy to work with, and that the opinion of the RubyGems team is that they should be treated as a configuration file, not a code file.  Furthermore, Rake is a powerful, easy to use tool, and does admit the use of Ruby code to get the job done.\n\n  The hard part about publishing gems is getting them into a state you'll be proud of.  There's dozens of fiddly steps to putting together a gem fit for public consumption, and it's very easy to get some of them wrong.\n\n  Corundum is a collection of Rake tasklibs, therefore, that will perform the entire process of releasing gems, including QA steps up front through generating and publishing documentation.\n"
 email: 
 - nyarly@gmail.com
 executables: []
@@ -196,11 +196,15 @@ files:
 - lib/corundum/browser-task.rb
 - lib/corundum/github-pages.rb
 - lib/corundum/rspec.rb
+- lib/corundum/rspec-task.rb
 - lib/corundum/email.rb
 - lib/corundum/gemspec_sanity.rb
 - lib/corundum/gemcutter.rb
 - lib/corundum/tasklib.rb
-- lib/corundum/yardoc.rb
+- lib/corundum/documentation.rb
+- lib/corundum/documentation-task.rb
+- lib/corundum/documentation/yardoc.rb
+- lib/corundum/documentation/assembly.rb
 - lib/corundum/gem_building.rb
 - lib/corundum/tasklibs.rb
 - lib/corundum/simplecov.rb
@@ -210,6 +214,7 @@ files:
 - lib/corundum/version_control/git.rb
 - lib/corundum/configuration_store.rb
 - lib/corundum/default_configuration/preferences.yaml
+- lib/corundum/default_configuration/templates/doc_assembly/index.html.erb
 - lib/corundum.rb
 - README.md
 - spec/smoking_spec.rb
@@ -268,7 +273,7 @@ files:
 - doc/coverage/assets/0.5.3/jquery.timeago.js
 - doc/coverage/assets/0.5.3/loading.gif
 - doc/coverage/assets/0.5.3/jquery-1.6.2.min.js
-homepage: http://corundum.rubyforge.org/
+homepage: http://nyarly.github.com/corundum/
 licenses: 
 - MIT
 post_install_message: Another tidy package brought to you by Judson
@@ -277,7 +282,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- corundum-0.0.10 RDoc
+- corundum-0.0.12 RDoc
 require_paths: 
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -285,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -641191571
+      hash: -129852127
       segments: 
       - 0
       version: "0"
@@ -301,6 +306,6 @@ rubyforge_project: corundum
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Tools for making ruby gems
+summary: Tools for synthesizing rubygems
 test_files: 
 - spec_help/gem_test_suite.rb