corundum 0.0.26 → 0.0.27

data/bin/corundum-skel

@@ -1,3 +1,4 @@
+#! /bin/env ruby
 # vi: set ft=ruby:
 require 'optparse'
 require 'corundum/configuration-store'

data/lib/corundum/core.rb

@@ -23,6 +23,7 @@ module 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),
@@ -55,6 +56,8 @@ module Corundum
       @finished_files.release ||= File::join( finished_dir, "release_#{gemspec.version}")
       @finished_files.press ||= File::join( finished_dir, "press_#{gemspec.version}")
 
+      @qa_rejections ||= []
+
       @files.code ||= gemspec.files.grep(%r{^lib/})
       @files.test ||= gemspec.files.grep(%r{^spec/})
       @files.docs ||= gemspec.files.grep(%r{^doc/})
@@ -92,10 +95,18 @@ module Corundum
         task :preflight
 
         desc "Run quality assurance tasks"
-        task :qa => [:preflight, finished_files.qa]
+        task :qa => [:preflight, finished_files.qa] do
+          require 'corundum/qa-report'
+          puts QA::ReportFormatter.new(qa_rejections).to_s
+
+          unless qa_rejections.all?(&:passed)
+            fail "There are QA tests that failed"
+          end
+        end
+
         file finished_files.qa =>
         [finished_dir] + file_lists.project + file_lists.code + file_lists.test do |task|
-          Rake::Task[:qa].invoke #because I don't want this to be needed if it's not
+          Rake::Task[:qa].invoke
           touch task.name
         end
 

data/lib/corundum/gemcutter.rb

@@ -75,10 +75,10 @@ module Corundum
 
         task :reinstall => [:uninstall, :install]
 
-        task :dependencies_available do
+        task :dependencies_available => :is_unpushed do
           checker = Gem::SpecFetcher.new
           gemspec.runtime_dependencies.each do |dep|
-            fulfilling = checker.find_matching(dep,false,false,false)
+            fulfilling = checker.find_matching(dep,true,false,false)
             if fulfilling.empty?
               fail "Dependency #{dep} is unfulfilled remotely"
             else

data/lib/corundum/questionable-content.rb

@@ -8,49 +8,48 @@ module Corundum
     setting :comments, false
     setting :accept_token, /#ok/
     setting :files
+    setting :qa_rejections
 
     def default_configuration(core)
       super
+      core.copy_settings_to(self)
       self.files = core.file_lists.code
     end
 
     def define
       in_namespace do
-        task type do
+        task type do |task|
+          require 'corundum/qa-report'
+
           word_regexp = %r{#{words.map{|word| "\\b#{word}\\b"}.join("|")}}
-          line_regexp = comments ? %r{\A\s*#.*#{word_regexp}} : word_regexp
+          line_regexp = case comments
+                        when true, :only
+                          %r{\A\s*#.*#{word_regexp}}
+                        when false, :both
+                          word_regexp
+                        when :ignore
+                          %r{\A\s*[^#]*#{word_regexp}} #this will fail like "Stuff #{interp}" <word>
+                        end
+
           unless accept_token.nil?
             line_regexp = /#{line_regexp}(?:.(?!#{accept_token}))*\s*\Z/
-
-          end
-
-          found_words = Hash.new do |h,k|
-            h[k] = 0
           end
 
-          files_with_words = Hash.new do |h,k|
-            h[k] = {}
-          end
-
-
+          rejections = QA::Report.new("Content: #{type}")
+          qa_rejections << rejections
           files.each do |filename|
-
             File::open(filename) do |file|
-              file.grep(line_regexp) do |line|
+              file.each_line.with_index do |line, line_number|
+                next unless line_regexp =~ line
                 line.scan(word_regexp) do |word|
-                  files_with_words[filename][word] = true
-                  found_words[word] += 1
+                  rejections << QA::Rejection.new(word, file, line_number+1)
                 end
               end
             end
           end
 
-          total = found_words.values.inject{|acc, num| acc + num} || 0
-
-          if total > limit
-            require 'pp'
-            report = PP::pp([files_with_words, found_words], "")
-            fail "Exceeded limits on words: #{words.join(",")}.  Full report:\n#{report}"
+          if rejections.length > limit
+            rejections.fail "Maximum allowed uses: #{limit}"
           end
         end
       end

data/lib/corundum/rspec.rb

@@ -7,6 +7,7 @@ module Corundum
     title "RSpec run output"
 
     settings(
+      :qa_rejections => nil,
       :sub_dir => "rspec",
       :pattern => './spec{,/*/**}/*_spec.rb',
       :rspec_opts => nil,
@@ -24,6 +25,7 @@ module Corundum
     def default_configuration(toolkit)
       super
       self.qa_finished_path = toolkit.finished_files.qa
+      self.qa_rejections = toolkit.qa_rejections
     end
 
     def resolve_configuration
@@ -53,11 +55,38 @@ module Corundum
 
         desc "Generate specifications documentation"
         doc_task(:doc) do |t|
-          t.rspec_opts = %w{-o /dev/null -f h -o} + [t.doc_path]
-          t.failure_message = "Failed generating specification docs"
+          t.rspec_opts = %w{-o /dev/null --failure-exit-code 0 -f h -o} + [t.doc_path]
         end
         file entry_path => :doc
 
+        task :verify => :doc do |task|
+          require 'nokogiri'
+          require 'corundum/qa-report'
+
+          doc = Nokogiri::parse(File::read(entry_path))
+
+          rejections = QA::Report.new("RSpec")
+          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")}]").contents.split("\n").last
+            file,line,_ = backtrace_line.split(":")
+            label = "fail"
+            value = node.xpath(".//[#{class_xpath("message")}]").contents.gsub(/\s+/m, " ")
+
+            rejections.add(label, file, line, value)
+          end
+
+          unless rejections.empty?
+            rejections.fail "Spec fails, none allowed"
+          end
+        end
+
         desc "Run only failing examples listed in last_run"
         test_task(:quick) do |t|
           examples = []
@@ -80,7 +109,7 @@ module Corundum
       desc "Run failing examples if any exist, otherwise, run the whole suite"
       task root_task => in_namespace(:quick)
 
-      task :qa => in_namespace(:doc)
+      task :qa => in_namespace(:verify)
     end
   end
 end

data/lib/corundum/simplecov.rb

@@ -25,11 +25,14 @@ module Corundum
 
     setting(:test_options, [])
 
+    setting :qa_rejections, nil
+
     def default_configuration(toolkit, testlib)
       super(toolkit)
       self.test_lib = testlib
       self.code_files = toolkit.files.code
       self.all_files =  toolkit.file_lists.project + toolkit.file_lists.code + toolkit.file_lists.test
+      self.qa_rejections = toolkit.qa_rejections
     end
 
     def resolve_configuration
@@ -84,18 +87,26 @@ module Corundum
 
         task :verify_coverage => :generate_report do
           require 'nokogiri'
+          require 'corundum/qa-report'
 
           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
 
-          raise "Coverage must be at least #{threshold} but was #{percentage}" if percentage < threshold
-          puts "Coverage is #{percentage}% (required: #{threshold}%)"
+          report = QA::Report.new("Coverage")
+          report.add("percentage", entry_path, nil, percentage)
+          report.add("threshold", entry_path, nil, threshold)
+          qa_rejections << report
+
+          if percentage < threshold
+            report.fail "Coverage below threshold"
+          end
         end
 
         task :find_stragglers => :generate_report do
           require 'nokogiri'
+          require 'corundum/qa-report'
 
           doc = Nokogiri::parse(File::read(entry_path))
 
@@ -105,12 +116,17 @@ module Corundum
             end
           need_coverage = @code_files.find_all(&coverage_filter)
 
-          not_listed = covered_files - need_coverage
-          not_covered = need_coverage - covered_files
-          unless not_listed.empty? and not_covered.empty?
-            raise ["Covered files and gemspec manifest don't match:",
-              "Not in gemspec: #{not_listed.inspect}",
-            "Not covered: #{not_covered.inspect}"].join("\n")
+          report = QA::Report.new("Stragglers")
+          (covered_files - need_coverage).each do |file|
+            report.add("Not in gemspec", file)
+          end
+
+          (need_coverage - covered_files).each do |file|
+            report.add("Not covered", file)
+          end
+
+          unless report.empty?
+            report.fail "Covered files and gemspec manifest don't match"
           end
         end
       end

metadata

@@ -1,244 +1,252 @@
 --- !ruby/object:Gem::Specification
 name: corundum
 version: !ruby/object:Gem::Version
-  version: 0.0.26
   prerelease: 
+  version: 0.0.27
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: corundum
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rake-rubygems
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: true
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: true
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: true
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: true
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: true
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: true
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: mailfactory
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
         segments:
         - 1
         - 4
         - 0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.4.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
         segments:
         - 1
         - 4
         - 0
+        version: 1.4.0
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
         segments:
         - 2
         - 0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '2.0'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
         segments:
         - 2
         - 0
+        version: '2.0'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
         segments:
         - 0
         - 5
         - 4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 0.5.4
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.4
         segments:
         - 0
         - 5
         - 4
+        version: 0.5.4
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: true
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: true
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: true
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: true
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: true
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: true
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: mattock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
+        segments:
+        - 0
+        - 4
+        - 0
         version: 0.4.0
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
         segments:
         - 3
         - 1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '3.1'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.1'
         segments:
         - 3
         - 1
+        version: '3.1'
+    none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: compass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
         segments:
         - 0
         - 12
         - 1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 0.12.1
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
         segments:
         - 0
         - 12
         - 1
+        version: 0.12.1
+    none: false
 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
@@ -406,24 +414,24 @@ licenses:
 post_install_message: 
 rdoc_options:
 - --title
-- corundum-0.0.26 RDoc
+- corundum-0.0.27 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -761370339
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -169787983
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: corundum
 rubygems_version: 1.8.24