corundum 0.3.9 → 0.4.0

data/lib/corundum/simplecov.rb

@@ -14,7 +14,6 @@ module Corundum
 
     setting(:config_path, nil)
 
-    setting(:sub_dir, "coverage")
     setting(:config_file, ".simplecov")
     setting(:filters, ["./spec"])
     setting(:threshold, 80)
@@ -23,12 +22,16 @@ module Corundum
       /\.rb$/ =~ path
     end)
 
+    dir(:target_dir,
+        path(:coverage_json, "coverage.json"))
+
     setting(:test_options, [])
 
     setting :qa_rejections, nil
 
     def default_configuration(toolkit, testlib)
       super(toolkit)
+      target_dir.relative_path = "coverage"
       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
@@ -73,31 +76,48 @@ module Corundum
           puts config_file_contents
         end
 
-        task :config_exists do
-          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}"
+        config_exists = task :config_exists do
+          problems = []
+          File::exists?(config_path) or problems << "No .simplecov (try: rake #{self[:example_config]})"
+          config_string = File.read(config_path)
+          unless config_string =~ /coverage_dir.*#{target_dir.pathname.relative_path_from(Pathname.pwd)}/
+            problems << ".simplecov doesn't refer to #{target_dir}"
+          end
+          unless config_string =~ /SimpleCov::Formatter::JSONFormatter/
+            problems << ".simplecov doesn't refer to SimpleCov::Formatter::JSONFormatter"
+          end
+          fail problems.join("\n") unless problems.empty?
         end
 
-        @test_lib.doc_task(:report => [:config_exists] + all_files) do |t|
-          t.rspec_opts = %w{-r simplecov -f progress} + test_options + t.rspec_opts
+        class << config_exists
+          attr_accessor :config_path
+
+          def timestamp
+            if File.exist?(config_path)
+              File.mtime(config_path.to_s)
+            else
+              Rake::EARLY
+            end
+          end
         end
-        file entry_path => :report
+        config_exists.config_path = config_path
 
-        task :generate_report => [:config_exists, entry_path]
+        @test_lib.report_task.rspec_opts << "-r simplecov"
+        file entry_point => @test_lib.report_task.name
+        file coverage_json => @test_lib.report_task.name
 
-        task :verify_coverage => :generate_report do
-          require 'nokogiri'
+        task :verify_coverage => coverage_json do
+          require 'json'
           require 'corundum/qa-report'
 
-          doc = Nokogiri::parse(File::read(entry_path))
+          doc = JSON::parse(File::read(coverage_json.to_s))
 
-          coverage_total_xpath = "//span[@class='covered_percent']/span"
-          percentage = doc.xpath(coverage_total_xpath).first.content.to_f
+          percentage = doc["metrics"]["covered_percent"]
 
           report = QA::Report.new("Coverage")
           report.summary_counts = false
-          report.add("percentage", entry_path, nil, percentage)
-          report.add("threshold", entry_path, nil, threshold)
+          report.add("percentage", entry_point, nil, percentage.round(2))
+          report.add("threshold", entry_point, nil, threshold)
           qa_rejections << report
 
           if percentage < threshold
@@ -105,16 +125,14 @@ module Corundum
           end
         end
 
-        task :find_stragglers => :generate_report do
-          require 'nokogiri'
+        task :find_stragglers => coverage_json do
+          require 'json'
           require 'corundum/qa-report'
 
-          doc = Nokogiri::parse(File::read(entry_path))
+          doc = JSON::parse(File::read(coverage_json.to_s))
 
-          covered_files = doc.xpath(
-            "//table[@class='file_list']//td//a[@class='src_link']").map do |link|
-            link.content
-            end
+          pwd = Pathname.pwd
+          covered_files = doc["files"].map{|f| Pathname.new(f["filename"]).relative_path_from(pwd).to_s}
           need_coverage = code_files.find_all(&coverage_filter)
 
           report = QA::Report.new("Stragglers")
@@ -133,6 +151,9 @@ module Corundum
         end
       end
 
+      task @test_lib.report_task.name => in_namespace(:config_exists)
+      task @test_lib.report_task.name => all_files
+
       task :preflight => in_namespace(:config_exists)
       task :run_quality_assurance => in_namespace(:verify_coverage, :find_stragglers)
       task :run_continuous_integration => in_namespace(:verify_coverage, :find_stragglers)

data/lib/corundum/tasklibs.rb

@@ -4,9 +4,6 @@ require 'corundum/simplecov'
 require 'corundum/gemspec_files'
 require 'corundum/gem_building'
 require 'corundum/gemcutter'
-require 'corundum/email'
 require 'corundum/version_control/monotone'
 require 'corundum/version_control/git'
-require 'corundum/documentation'
-require 'corundum/github-pages'
 require 'corundum/questionable-content'

data/lib/corundum/version_control.rb

@@ -9,7 +9,7 @@ module Corundum
     def default_configuration(toolkit)
       super
       self.gemspec =  toolkit.gemspec
-      self.build_finished_file =  toolkit.finished_files.build
+      self.build_finished_file =  toolkit.build_file.abspath
       self.gemspec_files = toolkit.files.code + toolkit.files.test
       self.tag =  toolkit.gemspec.version.to_s
     end

data/lib/corundum/version_control/git.rb

@@ -7,7 +7,7 @@ module Corundum
 
     def default_configuration(toolkit)
       super
-      self.build_finished_task = toolkit.finished_files.build
+      self.build_finished_task = toolkit.build_file.abspath
     end
 
     def resolve_configuration
@@ -101,7 +101,7 @@ module Corundum
 
         task :check_in => [:push]
       end
-      task build_finished_task => in_namespace("is_checked_in")
+      file build_finished_task => in_namespace("is_checked_in")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corundum
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -52,34 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mailfactory
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: simplecov-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: caliph
   requirement: !ruby/object:Gem::Requirement
@@ -156,39 +114,25 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: compass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: '0.9'
 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"
+  \ Ergo: a\n  tool for synthesizing gems.\n\n  Corundum starts with the outlook that
+  gemspecs are relatively easy to work\n  with, and that the opinion of the RubyGems
+  team is that they should be\n  treated as a configuration file, not a code file.
+  \ Furthermore, Rake is a\n  powerful, easy to use tool, and does admit the use of
+  Ruby code to get the\n  job done.\n\n  The hard part about publishing gems is getting
+  them into a state you'll be\n  proud of.  There's dozens of fiddly steps to putting
+  together a gem fit for\n  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\n  entire process of releasing gems, including QA steps up front through\n
+  \ packaging and releasing the gem\n"
 email:
 - nyarly@gmail.com
 executables:
@@ -254,16 +198,11 @@ files:
 - lib/corundum/core.rb
 - lib/corundum/qa-report.rb
 - 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_files.rb
 - lib/corundum/gemcutter.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
@@ -277,13 +216,6 @@ files:
 - lib/corundum/default_configuration/skel-files/gemfile
 - lib/corundum/default_configuration/skel-files/travis
 - lib/corundum/default_configuration/skel-files/simplecov
-- lib/corundum/default_configuration/templates/doc_assembly/index.html.erb
-- lib/corundum/default_configuration/templates/doc_assembly/theme/sass/styles.scss
-- lib/corundum/default_configuration/templates/doc_assembly/stylesheet.scss
-- lib/corundum/default_configuration/templates/doc_assembly/theme/stylesheets/pygment_trac.css
-- lib/corundum/default_configuration/templates/doc_assembly/theme/stylesheets/styles.css
-- lib/corundum/default_configuration/templates/doc_assembly/theme/javascripts/scale.fix.js
-- lib/corundum/default_configuration/templates/doc_assembly/theme/images/checker.png
 - README.md
 - spec/smoking_spec.rb
 - spec_help/spec_helper.rb
@@ -349,7 +281,7 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
-- corundum-0.3.9 RDoc
+- corundum-0.4.0 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/corundum/default_configuration/templates/doc_assembly/index.html.erb

@@ -1,40 +0,0 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="stylesheet.css" type="text/css" />
-    <title><%= gemspec.name.sub(/./){|ch| ch.upcase} %> <%=gemspec.version %></title>
-  </head>
-  <body>
-    <div class="wrapper">
-      <header>
-        <div class="headers">
-          <h1><%= gemspec.name.sub(/./){|ch| ch.upcase} %></h1>
-          <h2><%= gemspec.summary %></h2>
-          <h2>(current version: <%= gemspec.version %>)</h2>
-        </div>
-      </header>
-      <section>
-        <p><%= gemspec.description.gsub(/\n\s*\n/, "</p><p>") %></p>
-      </section>
-      <section class="documentation-list">
-        <p>Documentation is in a few sections:</p>
-        <ul>
-          <% documenters.each_pair do |path, doccer| %>
-            <li><a href="<%= doccer.entry_link %>"><%= doccer.title%></a></li>
-          <% end %>
-          <% external_docs.each_pair do |name, link| %>
-            <li><a href="<%= link %>"><%= name %></a></li>
-          <% end %>
-        </ul>
-      </section>
-      <section class="credits">
-        <h2>Authors</h2>
-        <dl>
-          <% gemspec.authors.zip(gemspec.email).each do |author, email| %>
-            <dt><%= author %></dt>
-            <dd><%= email %></dd>
-          <% end %>
-        </dl>
-      </section>
-    </div>
-  </body>
-</html>

data/lib/corundum/default_configuration/templates/doc_assembly/stylesheet.scss

@@ -1,326 +0,0 @@
-@import url(https://fonts.googleapis.com/css?family=Lato:300italic,700italic,300,700);
-@import 'compass';
-
-
-html {
-  background:#6C7989;
-  @include background(#6C7989 linear_gradient(#6C7989, #434B55) fixed);
-}
-
-body {
-  padding:50px 0;
-  margin:0;
-  font:14px/1.5 Lato, "Helvetica Neue", Helvetica, Arial, sans-serif;
-  color:#555;
-  font-weight:300;
-  background:inline-image('checker.png') fixed;
-}
-
-.wrapper {
-  width:640px;
-  margin:0 auto;
-  background:#DEDEDE;
-  @include border-radius(8px);
-  @include box-shadow(rgba(#000, 0.2) 0 0 0 1px, rgba(#000, 0.45) 0 3px 10px);
-}
-
-header, section, footer {
-  display:block;
-}
-
-a {
-  color:#069;
-  text-decoration:none;
-}
-
-p {
-  margin:0 0 20px;
-  padding:0;
-}
-
-strong {
-  color:#222;
-  font-weight:700;
-}
-
-header {
-  @include border-radius(8px 8px 0 0);
-  background:#C6EAFA;
-  @include background(linear_gradient(#DDFBFC, #C6EAFA));
-  position:relative;
-  padding:15px 20px;
-  border-bottom:1px solid #B2D2E1;
-
-  h1 {
-    margin:0;
-    padding:0;
-    font-size:24px;
-    line-height:1.2;
-    color:#069;
-    text-shadow:rgba(#fff, 0.9) 0 1px 0;
-  }
-
-  &.without-description h1 {
-    margin:10px 0;
-  }
-
-  p {
-    margin:0;
-    color:#61778B;
-    width:300px;
-    font-size:13px;
-
-    &.view {
-      display:none;
-      font-weight:700;
-      text-shadow:rgba(#fff, 0.9) 0 1px 0;
-      -webkit-font-smoothing:antialiased;
-
-      a {
-        color:#06c;
-      }
-
-      small {
-        font-weight:400;
-      }
-    }
-  }
-
-  ul {
-    margin:0;
-    padding:0;
-    list-style:none;
-    position:absolute;
-    z-index:1;
-    right:20px;
-    top:20px;
-    height:38px;
-    padding:1px 0;
-    background:#5198DF;
-    @include background(linear_gradient(#77B9FB, #3782CD));
-    border-radius:5px;
-    @include box-shadow(inset rgba(#fff, 0.45) 0 1px 0, inset rgba(#000, 0.2) 0 -1px 0);
-    width:240px;
-
-    &:before {
-      content:'';
-      position:absolute;
-      z-index:-1;
-      left:-5px;
-      top:-4px;
-      right:-5px;
-      bottom:-6px;
-      background:rgba(#000, 0.1);
-      @include border-radius(8px);
-      @include box-shadow(rgba(#000, 0.2) 0 -1px 0, inset rgba(#fff, 0.7) 0 -1px 0);
-    }
-
-    li {
-      width:79px;
-      float:left;
-      border-right:1px solid #3A7CBE;
-      height:38px;
-    }
-
-    li + li {
-      width:78px;
-      border-left:1px solid #8BBEF3;
-    }
-
-    li + li + li {
-      border-right:none;
-      width:79px;
-    }
-
-    a {
-      line-height:1;
-      font-size:11px;
-      color:#fff;
-      color:rgba(#fff, 0.8);
-      display:block;
-      text-align:center;
-      font-weight:400;
-      padding-top:6px;
-      height:40px;
-      text-shadow:rgba(#000, 0.4) 0 -1px 0;
-
-      strong {
-        font-size:14px;
-        display:block;
-        color:#fff;
-        -webkit-font-smoothing:antialiased;
-      }
-    }
-  }
-}
-
-section {
-  padding:15px 20px;
-  font-size:15px;
-  border-top:1px solid #fff;
-  @include background(linear_gradient(#fafafa, #DEDEDE 700px));
-  @include border-radius(0 0 8px 8px);
-  position:relative;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  color:#222;
-  padding:0;
-  margin:0 0 20px;
-  line-height:1.2;
-}
-
-p, ul, ol, table, pre, dl {
-  margin:0 0 20px;
-}
-
-h1, h2, h3 {
-  line-height:1.1;
-}
-
-h1 {
-  font-size:28px;
-}
-
-h2 {
-  color:#393939;
-}
-
-h3, h4, h5, h6 {
-  color:#494949;
-}
-
-blockquote {
-  margin:0 -20px 20px;
-  padding:15px 20px 1px 40px;
-  font-style:italic;
-  background:#ccc;
-  background:rgba(#000, 0.06);
-  color:#222;
-}
-
-img {
-  max-width:100%;
-}
-
-code, pre {
-  font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal;
-  color:#333;
-  font-size:12px;
-  overflow-x:auto;
-}
-
-pre {
-  padding:20px;
-  background: #3A3C42;
-  color:#f8f8f2;
-  margin:0 -20px 20px;
-
-  code {
-    color:#f8f8f2;
-  }
-
-  li & {
-    margin-left:-60px;
-    padding-left:60px;
-  }
-}
-
-table {
-  width:100%;
-  border-collapse:collapse;
-}
-
-th, td {
-  text-align:left;
-  padding:5px 10px;
-  border-bottom:1px solid #aaa;
-}
-
-dt {
-  color:#222;
-  font-weight:700;
-}
-
-th {
-  color:#222;
-}
-
-small {
-  font-size:11px;
-}
-
-hr {
-  border:0;
-  background:#aaa;
-  height:1px;
-  margin:0 0 20px;
-}
-
-footer {
-  width:640px;
-  margin:0 auto;
-  padding:20px 0 0;
-  color:#ccc;
-  overflow:hidden;
-
-  a {
-    color:#fff;
-    font-weight:bold;
-  }
-
-  p {
-    float:left;
-  }
-
-  p + p {
-    float:right;
-  }
-}
-
-@media print, screen and (max-width: 740px) {
-  body {
-    padding:0;
-  }
-
-  .wrapper {
-    @include border-radius(0);
-    @include box-shadow(none);
-    width:100%;
-  }
-
-  footer {
-    @include border-radius(0);
-    padding:20px;
-    width:auto;
-
-    p {
-      float:none;
-      margin:0;
-    }
-
-    p + p {
-      float:none;
-    }
-  }
-}
-
-@media print, screen and (max-width:580px) {
-  header ul {
-    display:none;
-  }
-
-  header p.view {
-    display:block;
-  }
-
-  header p {
-    width:100%;
-  }
-}
-
-@media print {
-  header p.view a small:before {
-    content:'at http://github.com/';
-  }
-}