corundum 0.0.3 → 0.0.5

data/lib/corundum/simplecov.rb

@@ -15,6 +15,10 @@ module Corundum
       setting(:config_path, nil)
       setting(:filters, ["./spec"])
 
+      setting(:coverage_filter, proc do |path|
+        /\.rb$/ =~ path
+      end)
+
       setting(:threshold, 80)
       setting(:groups, {})
       setting(:code_files, toolkit.files.code)
@@ -26,23 +30,25 @@ module Corundum
       @report_path ||= File::join(report_dir, "index.html")
     end
 
-    def filters
-      filters.map do |pattern|
+    def filter_lines
+      return filters.map do |pattern|
         "add_filter \"#{pattern}\""
       end
     end
 
-    def groups
+    def group_lines
+      lines = []
       groups.each_pair do |group, pattern|
-        "add_group \"#{group}\", \"#{pattern}\""
+        lines << "add_group \"#{group}\", \"#{pattern}\""
       end
+      lines
     end
 
     def config_file_contents
       contents = ["SimpleCov.start do"]
       contents << "  coverage_dir \"#{report_dir}\""
-      contents += filters.map{|line| "  " + line}
-      contents += groups.map{|line| "  " + line}
+      contents += filter_lines.map{|line| "  " + line}
+      contents += group_lines.map{|line| "  " + line}
       contents << "end"
       return contents.join("\n")
     end
@@ -97,9 +103,10 @@ module Corundum
             "//table[@class='file_list']//td//a[@class='src_link']").map do |link|
             link.content
             end
+          need_coverage = @code_files.find_all(&coverage_filter)
 
-          not_listed = covered_files - @code_files
-          not_covered = @code_files - covered_files
+          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}",

data/lib/corundum/tasklibs.rb

@@ -5,4 +5,5 @@ require 'corundum/gem_building'
 require 'corundum/gemcutter'
 require 'corundum/email'
 require 'corundum/version_control/monotone'
+require 'corundum/version_control/git'
 require 'corundum/yardoc'

data/lib/corundum/version_control.rb

@@ -9,13 +9,16 @@ module Corundum
     def default_configuration(toolkit)
       setting(:gemspec,  toolkit.gemspec)
       setting(:build_finished_file,  toolkit.finished_files.build)
+      setting(:gemspec_files, toolkit.files.code + toolkit.files.test)
       setting(:tag,  toolkit.gemspec.version.to_s)
     end
 
     def define
       in_namespace do
         task :not_tagged
-        task :is_checked_in
+        task :gemspec_files_added
+        task :workspace_committed
+        task :is_checked_in => %w{gemspec_files_added workspace_committed}
         task :tag
         task :check_in => :tag
       end

data/lib/corundum/version_control/git.rb

@@ -0,0 +1,105 @@
+require 'corundum/version_control'
+
+module Corundum
+  class Git < VersionControl
+    def default_configuration(*args)
+      super
+      setting(:branch, nil)
+    end
+
+    def resolve_configuration
+      @branch ||= guess_branch
+    end
+
+
+    def git_command(*args)
+      result = ""
+      pid = nil
+      command = "git --no-pager #{args.join(" ")}"
+      puts command if verbose
+      pipe = IO.popen(command)
+      pid = pipe.pid
+      Process::wait(pid)
+      result = pipe.read
+      pipe.close
+      unless $?.exitstatus == 0
+        fail "Git exited with status #{$?.exitstatus}: \n#{result}"
+      end
+      return result.split("\n")
+    end
+
+    def guess_branch
+      puts "Guessing branch - configure Git > branch"
+      branch = git_command("branch").grep(/^\*/).sub(/\*\s*/,"").chomp
+      puts "  Guessed: #{branch}"
+      return branch
+    end
+
+    def define
+      super
+
+      in_namespace do
+        task :on_branch do
+          current_branch = git_command("branch").grep(/^\*/).first.sub(/\*\s*/,"").chomp
+          unless current_branch == branch
+            fail "Current branch \"#{current_branch}\" is not #{branch}"
+          end
+        end
+
+        task :not_tagged => :on_branch do
+          tags = git_command("tag", "-l", tag)
+          unless tags.empty?
+            fail "Tag #{tag} already exists in branch #{branch}"
+          end
+        end
+
+        task :workspace_committed => :on_branch do
+          diffs = git_command("diff", "--stat", "HEAD")
+          unless diffs.empty?
+            fail "Workspace not committed:\n  #{diffs.join("  \n")}"
+          end
+        end
+
+        task :gemspec_files_added => :on_branch do
+          list = git_command(%w{ls-tree -r HEAD})
+          list.map! do |line|
+            line.split(/\s+/)[3]
+          end
+
+          missing = gemspec_files - list
+          unless missing.empty?
+            fail "Gemspec files not in version control: #{missing.join(", ")}"
+          end
+        end
+
+        task :is_pulled do
+          fetch = git_command("fetch", "--dry-run")
+          unless fetch.empty?
+            fail "Remote branch has unpulled changes"
+          end
+
+          remote = git_command("config", "--get", "branch.#{branch}.remote").first
+          merge = git_command("config", "--get", "branch.#{branch}.merge").first.split("/").last
+
+          ancestor = git_command("merge-base", branch, "#{remote}/#{merge}").first
+          remote_rev = File::read(".git/refs/remotes/#{remote}/#{merge}").chomp
+
+          unless ancestor == remote_rev
+            fail "Unmerged changes with remote branch #{remote}/#{merge}"
+          end
+        end
+        task :is_checked_in => :is_pulled
+
+        task :tag => :on_branch do
+          git_command("tag", tag)
+        end
+
+        task :push => :on_branch do
+          git_command("push")
+        end
+
+        task :check_in => [:push]
+      end
+    end
+  end
+end

data/lib/corundum/version_control/monotone.rb

@@ -3,10 +3,6 @@ require 'strscan'
 
 module Corundum
   class Monotone < VersionControl
-    def default_namespace
-      :monotone
-    end
-
     def default_configuration(*args)
       super
       setting(:branch, nil)
@@ -17,13 +13,17 @@ module Corundum
     end
 
     def mtn_automate(cmd, *args)
-      result = ""
       command = "mtn automate #{cmd} #{args.join(" ")}"
       puts command if verbose
-      IO.popen(command) do |pipe|
-        result = pipe.read
+      pipe = IO.popen(command)
+      pid = pipe.pid
+      Process.wait(pid)
+      result = pipe.read
+      pipe.close
+      unless $?.exitstatus == 0
+        fail "Monotone failed with exit status #{$?.exitstatus}: \n#{result}"
       end
-      result
+      return result
     end
 
     def parse_basic_io(string)
@@ -87,10 +87,30 @@ module Corundum
       certs["branch"].first
     end
 
+    def stanzas(first_item, items)
+      stanzas = []
+      current_stanza = {}
+      items.each do |name, value|
+        if name == first_item
+          current_stanza = {}
+          stanzas << current_stanza
+        end
+        current_stanza[name] = value
+      end
+      return stanzas
+    end
+
     def define
       super
 
       in_namespace do
+        task :on_branch do
+          branches = parse_certs(mtn_automate("certs", base_revision))["branch"] || []
+          unless branches.include?(branch)
+            fail "Not on branch #{branch}"
+          end
+        end
+
         task :not_tagged do
           items = parse_basic_io(mtn_automate("tags", branch))
           tags = items.find{|pair| pair[0] == "tag" && pair[1] == tag}
@@ -99,7 +119,7 @@ module Corundum
           end
         end
 
-        task :is_committed do
+        task :workspace_committed => :on_branch do
           items = parse_basic_io(mtn_automate("inventory"))
           changed = items.find{|pair| pair[0] == "changes"}
           unless changed.nil?
@@ -107,7 +127,21 @@ module Corundum
           end
         end
 
-        task :tag do
+        task :gemspec_files_added => :on_branch do
+          items = stanzas("path", parse_basic_io(mtn_automate("inventory")))
+          items.delete_if{|item| item["status"] == "unknown"}
+          known_paths = items.each_with_object({}) do |item, hash|
+            hash[item["path"]] = true
+          end
+
+          files = gemspec_files.dup
+          files.delete_if{|path| known_paths[path]}
+          unless files.empty?
+            fail "Gemspec files not in version control: #{files.join(" ")}"
+          end
+        end
+
+        task :tag => :on_branch do
           mtn_automate("cert", base_revision, "tag", tag)
         end
 
@@ -115,9 +149,7 @@ module Corundum
           mtn_automate("sync")
         end
 
-        task :check_in => %w{commit sync}
-
-        task :is_checked_in => [:is_committed]
+        task :check_in => [:sync]
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: corundum
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Judson Lester
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-11 00:00:00 Z
+date: 2011-12-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: corundum
@@ -196,6 +196,7 @@ files:
 - lib/corundum/rubyforge.rb
 - lib/corundum/version_control.rb
 - lib/corundum/version_control/monotone.rb
+- lib/corundum/version_control/git.rb
 - lib/corundum.rb
 - doc/README
 - doc/Specifications
@@ -264,7 +265,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- corundum-0.0.3 RDoc
+- corundum-0.0.5 RDoc
 require_paths: 
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -272,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 298532273
+      hash: 4506387
       segments: 
       - 0
       version: "0"