corundum 0.3.9 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjMxMDhiMDI0ZTVkNDdlMTA3ODA1NTY5MDNlYWMwODk2MDFmYWNmNg==
+    NTc0ZDU1MjUxZGYyMGE5YThlYzBkMTRhMmIwNzBjMDA1NjViMmJhMg==
   data.tar.gz: !binary |-
-    NDNiMzU0NzFlOTljY2QzYjI4Y2Q5ZmRkODM0MGEwYzEyZmQ5ZWJmNQ==
+    ZDE0NzFhN2ZlODViMjNhZjc1NWEwNzdlNmU2MmRjMWFkYTgxMzVjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2NiOWVmZDUyMTA5ODgxNDg2ZTJhMWQwYmMyODU0YjU4NmUzMTJmMTZkYzYw
-    ZTAyY2E4MWMzZDJlNzk2ZjZlZWM2NzE3MmIzM2QyN2ExZTMyOTM4OGJjZjEz
-    NWZhYzg1Y2JlZjIxOTcyZGJjZmYzYjBlMDk5NDU3ZGI1NDNlMWQ=
+    NDkwYmUwNGMzYmQxMzQxMTgzMWI2NWY5NTQ3NDgwZGVjMjMxMGQ1MzNkNTll
+    N2JlYzg1ZDk2YzY3M2ViN2VkNzA2YmQ3ZTY5ZDQyNzI5NWMxOTM0YWM4ZTlj
+    YWM0YjA4ZGJjYmEwNzEzY2ZjNzMxMWI4ZDlhNjNiYjYzYWRlMjg=
   data.tar.gz: !binary |-
-    ZWRiMmFlZGUwNTM5ZWFiMzQ5ZThkZDJiNzM5MGIxODRhMjhmYzM3YzI4MzFh
-    OTlhNjY1ODJkMDFlYjA1ZWU5NzcwMmVjZjA1ODc5MTViNDk3YTY0MzAzMTQx
-    YzU0YTFkZGNmMzEzZTBmM2Y5OWEyMmE5YmE0ZWZjODc4ZTY3MjA=
+    NmNlMTE0MDY2ZTFlNjJlZmI5OWU3YWFmOGJjODU4YWEyZjc0ODYxMjY1Mjk5
+    Mjk5MmFhMDQyMzkzMWU2MjkwM2I0MjY0MTJiMzlkYjA3MjY5OTI2ZDBiMDFl
+    YmFiNDExMDk1ZWMwNDdhYzc1ZGY1MGNkYjdlY2MyNDk4NmVhNmE=

data/lib/corundum/core.rb

@@ -16,18 +16,19 @@ module Corundum
   # [release] push the gem out to the world
   # [press] send out notifications that the gem has been published
   class Core < Mattock::TaskLib
+    dir(:package, "pkg",
+        path(:build_file))
+
+    dir(:corundum_dir, "corundum",
+        dir(:finished_dir, "finished",
+            path(:qa_file), path(:release_file)))
+
     settings(
       :gemspec => nil,
       :gemspec_path => nil,
-      :corundum_dir => "corundum",
-      :finished_dir => nil,
-      :package_dir => "pkg",
-      :doc_dir => "rubydoc",
       :qa_rejections => nil,
       :browser => Corundum.user_preferences["browser"],
-      :finished_files => nested.nil_fields(:build, :qa, :package, :release, :press),
       :files => nested.nil_fields(:code, :test, :docs),
-      :rubyforge => nested.nil_fields(:group_id, :package_id, :release_name, :home_page, :project_page),
       :email => nested(
         :servers => [ nested({ :server => "ruby-lang.org", :helo => "gmail.com" }) ],
         :announce_to_email => "ruby-talk@ruby-lang.org"
@@ -40,40 +41,29 @@ module Corundum
       :file_patterns => nested( :code => [%r{^lib/}], :test => [%r{^spec/}, %r{^test/}], :docs => [%r{^doc/}])
     )
 
-    def load_gemspec
-      @gemspec_path ||= guess_gemspec
-      @gemspec ||= Gem::Specification::load(gemspec_path)
-      return gemspec
-    end
-
     def resolve_configuration
       super
-      load_gemspec
 
-      self.finished_dir ||= File::join(corundum_dir, "finished")
-      @finished_files.build ||= File::join( package_dir, "#{gemspec.full_name}.gem")
+      self.gemspec_path ||= guess_gemspec
+      self.gemspec ||= Gem::Specification::load(gemspec_path)
+
+      self.qa_rejections ||= []
 
-      @finished_files.qa ||= File::join( finished_dir, "qa_#{gemspec.version}")
-      @finished_files.release ||= File::join( finished_dir, "release_#{gemspec.version}")
-      @finished_files.press ||= File::join( finished_dir, "press_#{gemspec.version}")
+      build_file.relative_path ||= gemspec.full_name + ".gem"
+      qa_file.relative_path ||= "qa-" + gemspec.full_name.to_s
+      release_file.relative_path ||= "release-" + gemspec.full_name.to_s
 
-      @qa_rejections ||= []
+      resolve_paths
 
-      @files.code ||= file_patterns.code.map{ |pattern| gemspec.files.grep(pattern) }.flatten
-      @files.test ||= file_patterns.test.map{ |pattern| gemspec.files.grep(pattern) }.flatten
-      @files.docs ||= file_patterns.docs.map{ |pattern| gemspec.files.grep(pattern) }.flatten
+      self.files.code ||= file_patterns.code.map{ |pattern| gemspec.files.grep(pattern) }.flatten
+      self.files.test ||= file_patterns.test.map{ |pattern| gemspec.files.grep(pattern) }.flatten
+      self.files.docs ||= file_patterns.docs.map{ |pattern| gemspec.files.grep(pattern) }.flatten
 
-      @file_lists.project << gemspec_path
-      @file_lists.all  ||=
+      self.file_lists.project << gemspec_path
+      self.file_lists.all  ||=
         file_lists.code +
         file_lists.test +
         file_lists.docs
-
-      @rubyforge.group_id ||= gemspec.rubyforge_project
-      @rubyforge.package_id ||= gemspec.name.downcase
-      @rubyforge.release_name ||= gemspec.full_name
-      @rubyforge.home_page ||= gemspec.homepage
-      @rubyforge.project_page ||= "http://rubyforge.org/project/#{gemspec.rubyforge_project}/"
     end
 
     def guess_gemspec
@@ -90,17 +80,17 @@ module Corundum
 
     def define
       in_namespace do
-        directory finished_dir
+        directory finished_dir.abspath
 
         desc "Run preflight checks"
         task :preflight
 
-        task :run_quality_assurance => [:preflight, finished_files.qa]
+        task :run_quality_assurance => [ :preflight, qa_file.abspath ]
 
         task :run_continuous_integration
 
         desc "Run quality assurance tasks"
-        task :qa => :run_quality_assurance do
+        qa_task = task :qa => :run_quality_assurance do
           require 'corundum/qa-report'
           puts QA::ReportFormatter.new(qa_rejections).to_s
           unless qa_rejections.all?(&:passed)
@@ -119,32 +109,26 @@ module Corundum
           end
         end
 
-
-        file finished_files.qa =>
-        [finished_dir] + file_lists.project + file_lists.code + file_lists.test do |task|
-          Rake::Task[:qa].invoke
+        file qa_file.abspath =>
+        [finished_dir.abspath] + file_lists.project + file_lists.code + file_lists.test do |task|
+          qa_task.invoke
           touch task.name
         end
 
         desc "Build the package"
-        task :build => [finished_files.qa, :preflight, finished_files.build]
-        file finished_files.build =>
-        [finished_dir] + file_lists.code + file_lists.project do |task|
-          Rake::Task[:build].invoke
+        build_task = task :build => [qa_file.abspath, :preflight, build_file.abspath]
+        file build_file.abspath.tap{|value| puts "#{__FILE__}:#{__LINE__} => #{value.inspect}"} =>
+        [finished_dir.abspath] + file_lists.code + file_lists.project do |task|
+          puts "\n#{__FILE__}:#{__LINE__} => #{task.name.inspect}"
+          build_task.invoke
+          puts "\n#{__FILE__}:#{__LINE__} => #{task.name.inspect}"
           touch task.name
         end
 
         desc "Push package out to the world"
-        task :release => [finished_files.build, :preflight, finished_files.release]
-        file finished_files.release => [finished_dir] do |task|
-          Rake::Task[:release].invoke
-          touch task.name
-        end
-
-        desc "Announce publication"
-        task :press => [finished_files.release, finished_files.press]
-        file finished_files.press => [finished_dir] do |task|
-          Rake::Task[:press].invoke
+        release_task = task(:release => [ build_file.abspath, :preflight, release_file.abspath ])
+        file release_file.abspath => [ build_file, finished_dir] do |task|
+          release_task.invoke
           touch task.name
         end
       end

data/lib/corundum/documentation-task.rb

@@ -6,24 +6,15 @@ module Corundum
     setting :browser
     setting :gemspec
 
-    #TODO update to use new paths DSL
-    setting :corundum_dir
-    setting :docs_root
-
-    setting :target_dir
-    setting :sub_dir
-
-    setting :entry_file, "index.html"
-
-    #The path from the project root to the entry file
-    #Resolves if unset to target_dir + entry_file
-    setting :entry_path
+    dir(:corundum_dir,
+        dir(:docs_root, "docs",
+            dir(:target_dir,
+               path(:entry_path, "index.html"))))
 
     #The URL path from this documentation root
     #Resolves if unset to sub_dir + entry_file
     setting :entry_link
 
-
     def self.title(name)
       setting :title, name
     end
@@ -35,31 +26,20 @@ module Corundum
 
     def resolve_configuration
       super
-      if field_unset?(:docs_root)
-        self.docs_root = File::join(corundum_dir, "docs")
-      end
-
-      if field_unset?(:target_dir)
-        self.target_dir = File::join(docs_root, sub_dir)
-      else
-        self.sub_dir = target_dir.sub(/^#{docs_root}\//,"")
-      end
-
-      if field_unset?(:entry_path)
-        self.entry_path = File::join(target_dir, entry_file)
-      end
 
       if field_unset?(:entry_link)
-        self.entry_link = File::join(sub_dir, entry_file)
+        self.entry_link = File::join(target_dir.relpath, entry_path.relpath)
       end
+
+      resolve_paths
     end
 
-    def entry_point(under = nil)
-      File::join(under || target_dir, entry_file)
+    def entry_point
+      entry_path.abspath
     end
 
     def define
-      directory target_dir
+      directory target_dir.abspath
 
       in_namespace do
         desc "Open up a browser to view your documentation"

data/lib/corundum/gem_building.rb

@@ -3,27 +3,26 @@ require 'mattock/tasklib'
 module Corundum
   class GemBuilding < Mattock::TaskLib
     setting(:gemspec)
-    setting(:qa_finished_file)
-    setting(:package_dir, "pkg")
+    setting(:package)
+    setting(:qa_file)
 
     def default_configuration(toolkit)
       super
-      self.gemspec =  toolkit.gemspec
-      self.qa_finished_file =  toolkit.finished_files.qa
+      toolkit.copy_settings_to(self)
     end
 
     def define
       require 'rubygems/package_task'
 
       in_namespace do
-        package = Gem::PackageTask.new(gemspec) do |t|
+        Gem::PackageTask.new(gemspec) do |t|
           t.need_tar_gz = true
           t.need_tar_bz2 = true
-          t.package_dir = package_dir
+          t.package_dir = package.abspath
         end
 
         task(:package).prerequisites.each do |package_type|
-          file package_type => qa_finished_file
+          file package_type => qa_file
         end
       end
 

data/lib/corundum/gemcutter.rb

@@ -8,24 +8,22 @@ module Corundum
     setting(:gem_path, nil)
     setting(:build)
     setting(:gemspec)
-    setting(:build_finished_path)
-    setting(:gem_name)
-    setting(:package_dir)
     setting(:qa_rejections)
 
+    dir(:package,
+        path(:gem_path),
+        path(:build_file))
+
     def default_configuration(toolkit, build)
       super
+      toolkit.copy_settings_to(self)
       self.build = build
-      self.gemspec = toolkit.gemspec
-      self.build_finished_path = toolkit.finished_files.build
-      self.gem_name = toolkit.gemspec.full_name
-      self.package_dir = build.package_dir
-      self.qa_rejections = toolkit.qa_rejections
     end
 
     def resolve_configuration
       super
-      self.gem_path ||= File::join(package_dir, gemspec.file_name)
+      gem_path.relative_path = gemspec.file_name
+      resolve_paths
     end
 
     module CommandTweaks
@@ -90,7 +88,7 @@ module Corundum
     def define
       in_namespace do
         task :uninstall do |t|
-          when_writing("Uninstalling #{gem_name}") do
+          when_writing("Uninstalling #{gemfile.full_name}") do
             require "rubygems/commands/uninstall_command"
             uninstall = get_command Gem::Commands::UninstallCommand
             uninstall.options[:args] = [gem_path]
@@ -157,10 +155,10 @@ module Corundum
         task :push => [:dependencies_available, :is_unpushed] do
           require "rubygems/commands/push_command"
           push = get_command(Gem::Commands::PushCommand)
-          push.options[:args] = [gem_path]
+          push.options[:args] = [gem_path.abspath]
           push.execute
         end
-        task :push => build_finished_path
+        task :push => build_file.abspath.tap{|value| puts "#{__FILE__}:#{__LINE__} => #{value.inspect}"}
       end
       task :release => in_namespace(:push)
       task :preflight => in_namespace(:is_unpushed)

data/lib/corundum/questionable-content.rb

@@ -13,6 +13,7 @@ module Corundum
       "gender" => ["bitch", "cocksucker", "cunt", "dyke", "faggot", "tranny"], #ok
       "issues" => ["XXX", "TODO"], #ok
     }
+    CANONICAL_WORD_SETS = WORD_SETS.keys
     [
       ["debug", "debugging"],
       ["profanity", "swearing"],
@@ -24,6 +25,14 @@ module Corundum
       WORD_SETS[other] = WORD_SETS[name]
     end
 
+    def self.all_sets(core)
+      CANONICAL_WORD_SETS.each do |word_set|
+        self.new(core) do |qc|
+          qc.type = word_set
+        end
+      end
+    end
+
     default_namespace :content
     setting :type, :debugging
     setting :words

data/lib/corundum/rspec-task.rb

@@ -9,9 +9,7 @@ module Corundum
       end
     end
 
-    setting :runner_command
-
-    required_fields :pattern, :ruby_opts,
+    runtime_required_fields :runner_command, :pattern, :ruby_opts,
       :warning, :rspec_path, :rspec_opts, :failure_message, :files_to_run,
       :file_dependencies
 
@@ -20,20 +18,28 @@ module Corundum
       rspec.copy_settings_to(self)
     end
 
-    def resolve_configuration
+    def resolve_runtime_configuration
       self.rspec_path = %x"which #{rspec_path}".chomp
 
       ruby_command.options << ruby_opts if ruby_opts
       ruby_command.options << "-w" if warning
 
       self.runner_command = cmd(rspec_path) do |cmd|
-        cmd.options << rspec_opts
+        cmd.options << all_rspec_options
         cmd.options << files_to_run
       end
 
       self.command = ruby_command - runner_command
 
       super
+    end
+
+    def all_rspec_options
+      rspec_opts
+    end
+
+    def resolve_configuration
+      super
 
       if task_args.last.is_a? Hash
         key = task_args.last.keys.first
@@ -46,16 +52,19 @@ module Corundum
   end
 
   class RSpecReportTask < RSpecTask
-    setting :target_dir
-    setting :doc_file, "index.html"
-    setting :doc_path
+    dir(:target_dir, path(:doc_path, "index.html"))
+
+    setting(:formats, {})
 
     def timestamp
-      if File.exist?(doc_path)
-        File.mtime(doc_path.to_s)
-      else
-        Rake::EARLY
-      end
+      return Rake::EARLY if formats.empty?
+      formats.values.map do |path|
+        if File.exist?(path.to_s)
+          File.mtime(path.to_s)
+        else
+          Rake::EARLY
+        end
+      end.min
     end
 
     def out_of_date?(stamp)
@@ -63,12 +72,22 @@ module Corundum
     end
 
     def needed?
-      ! File.exist?(doc_path) || out_of_date?(timestamp)
+      ! File.exist?(doc_path.abspath) || out_of_date?(timestamp)
     end
 
     def default_configuration(rspec)
       super
-      self.doc_path = File::join(target_dir, doc_file)
+    end
+
+    def all_rspec_options
+      super + formats.inject([]) do |list, (format, target)|
+        list + ["--format", format, "--out", target]
+      end
+    end
+
+    def resolve_configuration
+      super
+      resolve_paths
     end
   end
 end

data/lib/corundum/rspec.rb

@@ -8,7 +8,6 @@ module Corundum
 
     settings(
       :qa_rejections => nil,
-      :sub_dir => "rspec",
       :pattern => './spec{,/*/**}/*_spec.rb',
       :warning => false,
       :verbose => true,
@@ -19,19 +18,27 @@ module Corundum
       :files_to_run => "spec"
     )
 
+    dir(:target_dir,
+        path(:json_report, "rspec.json"),
+        path(:doc_path, "index.html"))
+
     setting :rspec_path
 
     required_fields :gemspec_path, :qa_finished_path, :file_lists, :file_dependencies
 
+    attr_reader :report_task
+
     def default_configuration(toolkit)
       super
-      self.qa_finished_path = toolkit.finished_files.qa
+      target_dir.relative_path = "rspec"
+      self.qa_finished_path = toolkit.qa_file.abspath
       self.qa_rejections = toolkit.qa_rejections
       self.file_dependencies = file_lists.code + file_lists.test + file_lists.project
     end
 
     def resolve_configuration
       self.rspec_path ||= %x"which #{rspec_program}".chomp
+      resolve_paths
       super
     end
 
@@ -54,33 +61,29 @@ module Corundum
         test_task(:all)
 
         desc "Generate specifications documentation"
-        docn = doc_task(:doc => file_dependencies) do |t|
-          t.rspec_opts = %w{-o /dev/null --failure-exit-code 0 -f h -o} + [t.doc_path]
+        @report_task = doc_task(:doc => file_dependencies) do |t|
+          t.rspec_opts += %w{-o /dev/null --failure-exit-code 0}
+          t.formats["html"] = doc_path
+          t.formats["json"] = json_report
         end
-        file entry_path => :doc
+        file entry_point => :doc
+        file json_report => :doc
 
-        task :verify => entry_path do |task|
-          require 'nokogiri'
+        task :verify => json_report do |task|
+          require 'json'
           require 'corundum/qa-report'
 
-          doc = Nokogiri::parse(File::read(entry_path))
+          doc = JSON::parse(File::read(json_report.to_s))
 
-          rejections = QA::Report.new("RSpec[#{entry_path}]")
+          rejections = QA::Report.new("RSpec[#{json_report}]")
           qa_rejections << rejections
 
-          def class_xpath(name)
-            "contains(concat(' ', normalize-space(@class), ' '), '#{name}')"
-          end
-
-          fails_path = "//*[" + %w{example failed}.map{|kind| class_xpath(kind)}.join(" and ") + "]"
-          doc.xpath(fails_path).each do |node|
-            backtrace_line =
-              node.xpath(".//*[#{class_xpath("backtrace")}]").first.content.split("\n").first
-            file,line,_ = backtrace_line.split(":")
-            label = "fail"
-            value = node.xpath(".//*[#{class_xpath("message")}]").first.content.gsub(/\s+/m, " ")
-
-            rejections.add(label, file, line, value)
+          doc["examples"].find_all do |example|
+            example["status"] == "failed"
+          end.each do |failed|
+            file,line,_ = failed["exception"]["backtrace"].first.split(":", 3)
+            value = failed["exception"]["message"]
+            rejections.add("fail", file, line, value)
           end
 
           unless rejections.empty?