corundum 0.0.1 → 0.0.2

data/lib/corundum/gemspec_sanity.rb

@@ -6,19 +6,14 @@ module Corundum
       :gemspec_sanity
     end
 
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
-    end
-
-    def default_configuration(namespace, toolkit_config)
-      @configuration.namespace = namespace
-      @configuration.gemspec = toolkit_config.gemspec
+    def default_configuration(toolkit)
+      setting(:gemspec, toolkit.gemspec)
     end
 
     def define
       in_namespace do
         task :files_exist do
-          missing = @configuration.gemspec.files.find_all do |path|
+          missing = gemspec.files.find_all do |path|
             not File::exists?(path)
           end
 

data/lib/corundum/rspec.rb

@@ -7,36 +7,35 @@ module Corundum
   #collaboration of those two.
   #
   class RSpec < TaskLib
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
+    def default_namespace
+      :rspec
     end
 
-    def default_configuration(namespace, toolkit_config)
-      @configuration.task_options = OpenStruct.new(
-        :pattern => nil,
+    def default_configuration(toolkit)
+      setting(:task_options, nested(
+        :pattern => './spec{,/*/**}/*_spec.rb',
         :ruby_opts => nil,
+        :rspec_configs => nil,
         :rspec_opts => nil,
         :warning => false,
         :verbose => true,
         :fail_on_error => true,
         :ruby_opts => [],
+        :rspec_path => 'rspec',
         :rspec_opts => %w{--format documentation --out last_run --color --format documentation},
         :failure_message => "Spec examples failed.",
-        :files_to_run => nil
-      )
+        :files_to_run => "spec"
+      ))
 
-      @configuration.namespace = namespace || :rspec
-      @configuration.gemspec_path = toolkit_config.gemspec_path
-      @configuration.qa_finished_path = toolkit_config.qa_finished_path
+      setting(:gemspec_path, toolkit.gemspec_path)
+      setting(:qa_finished_path, toolkit.finished_files.qa)
     end
 
     def resolve_configuration
-      @configuration.task_options.rspec_configs = @configuration.task_options.rspec_opts
-      @configuration.task_options.rspec_opts = []
-      @configuration.task_options.rspec_path ||= 'rspec'
-      @configuration.task_options.rspec_path = %x"which #{@configuration.task_options.rspec_path}".chomp
-      @configuration.task_options.pattern    ||= './spec{,/*/**}/*_spec.rb'
-      @configuration.task_options.files_to_run ||= "spec"
+      #XXX Que?
+      @task_options.rspec_configs = task_options.rspec_opts
+      @task_options.rspec_opts = []
+      @task_options.rspec_path = %x"which #{task_options.rspec_path}".chomp
     end
 
     #XXX some point in the future, there needs to be a composible command
@@ -45,7 +44,7 @@ module Corundum
       cmd_parts = []
       cmd_parts << RUBY
       cmd_parts << options.ruby_opts
-      cmd_parts << "-w" if options.warning?
+      cmd_parts << "-w" if options.warning
       if /^1\.8/ =~ RUBY_VERSION
         cmd_parts << "-S"
       end
@@ -66,7 +65,7 @@ module Corundum
     end
 
     def custom_options
-      options = @configuration.task_options.dup
+      options = task_options.dup
       yield(options)
       return options
     end
@@ -75,7 +74,7 @@ module Corundum
       options = if block_given?
                   custom_options{|options| yield(options) if block_given?}
                 else
-                  @configuration.task_options
+                  task_options
                 end
       task name do
         RakeFileUtils.send(:verbose, verbose) do
@@ -86,7 +85,8 @@ module Corundum
               cmd = full_command(options)
               puts cmd if options.verbose
               success = system(cmd)
-            rescue
+            rescue Object => ex
+              p ex
               puts options.failure_message if options.failure_message
             end
             raise("ruby #{cmd} failed") if options.fail_on_error unless success
@@ -96,9 +96,6 @@ module Corundum
     end
 
     def define
-      desc "Run failing examples if any exist, otherwise, run the whole suite"
-      task @configuration.namespace => "#{@configuration.namespace}:quick"
-
       in_namespace do
         desc "Always run every spec"
         define_spec_task(:all)
@@ -129,6 +126,9 @@ module Corundum
         end
       end
 
+      desc "Run failing examples if any exist, otherwise, run the whole suite"
+      task root_task => in_namespace(:quick)
+
       task :qa => in_namespace(:doc)
     end
   end

data/lib/corundum/rubyforge.rb

@@ -7,32 +7,21 @@ require 'corundum/tasklib'
 module Corundum
   class Publishing < TaskLib
     def default_namespace
-      :email
+      :rubyforge
     end
 
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
+    def default_configuration(toolkit)
+      setting(:ns,  ns)
+      setting(:rubyforge,  nested(:package_id => nil, :group_id => nil, :release_name => nil))
+      setting(:package_dir,  nil)
+      setting(:gemspec,  nil)
     end
 
-    def default_configuration(namespace, toolkit_config)
-    end
-
-    def initialize(ns = :publish)
-      @ns = ns
-      @rubyforge = OpenStruct.new(:package_id => nil, :group_id => nil, :release_name => nil)
-      @package_dir = nil
-      @gemspec = nil
-      yield self if block_given?
-      define
-    end
-
-    attr_accessor :ns, :rubyforge, :package_dir, :gemspec
-
     def define
       desc "Publish the gem and its documentation to Rubyforge and Gemcutter"
-      task @ns => ["#{@ns.to_s}:docs", "#{@ns.to_s}:rubyforge"]
+      task root_task => in_namespace(:docs, :rubyforge)
 
-      namespace @ns do
+      in_namespace do
         desc 'Publish RDoc to RubyForge'
         task :docs do
           config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
@@ -70,26 +59,3 @@ module Corundum
     end
   end
 end
-
-
-
-module Corundum
-  class Email < TaskLib
-    def define
-      desc 'Announce release on RubyForge and email'
-      task @configuration.namespace => ["#{@configuration.namespace.to_s}:rubyforge", "#{@configuration.namespace.to_s}:email"]
-      namespace @configuration.namespace do
-        desc 'Post announcement to rubyforge.'
-        task :rubyforge do
-          require 'rubyforge'
-          subject, title, body = announcement
-
-          forge = RubyForge.new
-          forge.configure
-          forge.post_news(@configuration.rubyforge[:group_id], subject, "#{title}\n\n#{body}")
-          puts "Posted to rubyforge"
-        end
-      end
-    end
-  end
-end

data/lib/corundum/simplecov.rb

@@ -6,49 +6,41 @@ module Corundum
       :coverage
     end
 
-    def default_configuration(namespace, toolkit_config, testlib_config)
-      @configuration.namespace = namespace
-      @configuration.test_lib = nil
-      @configuration.browser = toolkit_config.browser
-      @configuration.report_dir = "doc/coverage"
-      @configuration.report_path = nil
-      @configuration.config_file = ".simplecov"
-      @configuration.config_path = nil
-      @configuration.filters = ["./spec"]
-
-      @configuration.threshold = 80
-      @configuration.files = OpenStruct.new(
-        :code => toolkit_config.files.code
-      )
-      @configuration.groups = {}
-
-      @configuration.all_files = toolkit_config.file_lists.code + toolkit_config.file_lists.test
+    def default_configuration(toolkit, testlib)
+      setting(:test_lib, testlib)
+      setting(:browser, toolkit.browser)
+      setting(:report_dir, "doc/coverage")
+      setting(:report_path, nil)
+      setting(:config_file, ".simplecov")
+      setting(:config_path, nil)
+      setting(:filters, ["./spec"])
+
+      setting(:threshold, 80)
+      setting(:groups, {})
+      setting(:code_files, toolkit.files.code)
+      setting(:all_files,  toolkit.file_lists.code + toolkit.file_lists.test)
     end
 
     def resolve_configuration
-      @configuration.config_path ||= File::expand_path(@configuration.config_file, Rake::original_dir)
-      @configuration.report_path ||= File::join(@configuration.report_dir, "index.html")
-    end
-
-    def receive_tasklibs(toolkit, test_lib)
-      @toolkit,@test_lib = toolkit, test_lib
+      @config_path ||= File::expand_path(config_file, Rake::original_dir)
+      @report_path ||= File::join(report_dir, "index.html")
     end
 
     def filters
-      @configuration.filters.map do |pattern|
+      filters.map do |pattern|
         "add_filter \"#{pattern}\""
       end
     end
 
     def groups
-      @configuration.groups.each_pair do |group, pattern|
+      groups.each_pair do |group, pattern|
         "add_group \"#{group}\", \"#{pattern}\""
       end
     end
 
     def config_file_contents
       contents = ["SimpleCov.start do"]
-      contents << "  coverage_dir \"#{@configuration.report_dir}\""
+      contents << "  coverage_dir \"#{report_dir}\""
       contents += filters.map{|line| "  " + line}
       contents += groups.map{|line| "  " + line}
       contents << "end"
@@ -60,7 +52,7 @@ module Corundum
         file "Rakefile"
 
         task :example_config do
-          $stderr.puts "Try this in #{@configuration.config_path}"
+          $stderr.puts "Try this in #{config_path}"
           $stderr.puts
           puts config_file_contents
         end
@@ -69,45 +61,45 @@ module Corundum
           File::exists?(File::join(Rake::original_dir, ".simplecov")) or fail "No .simplecov"
         end
 
-        directory File::dirname(@configuration.report_path)
-        file @configuration.report_path => @configuration.all_files do
+        directory File::dirname(report_path)
+        file report_path => all_files do
           options = @test_lib.custom_options do |options|
             options.rspec_opts += %w{-r simplecov}
           end
           sh @test_lib.full_command(options)
         end
 
-        task :generate_report => [:preflight, @configuration.report_path]
+        task :generate_report => [:preflight, report_path]
 
         desc "View coverage in browser"
         task :view => :generate_report do
-          sh "#{@configuration.browser} #{@configuration.report_path}"
+          sh "#{browser} #{report_path}"
         end
 
         task :verify_coverage => :generate_report do
           require 'nokogiri'
 
-          doc = Nokogiri::parse(File::read(@configuration.report_path))
+          doc = Nokogiri::parse(File::read(report_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 #{@configuration.threshold} but was #{percentage}" if percentage < @configuration.threshold
-          puts "Coverage is #{percentage}% (required: #{@configuration.threshold}%)"
+          raise "Coverage must be at least #{threshold} but was #{percentage}" if percentage < threshold
+          puts "Coverage is #{percentage}% (required: #{threshold}%)"
         end
 
         task :find_stragglers => :generate_report do
           require 'nokogiri'
 
-          doc = Nokogiri::parse(File::read(@configuration.report_path))
+          doc = Nokogiri::parse(File::read(report_path))
 
           covered_files = doc.xpath(
             "//table[@class='file_list']//td//a[@class='src_link']").map do |link|
             link.content
             end
 
-          not_listed = covered_files - @configuration.files.code
-          not_covered = @configuration.files.code - covered_files
+          not_listed = covered_files - @code_files
+          not_covered = @code_files - 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/tasklib.rb

@@ -1,14 +1,12 @@
 require 'ostruct'
 require 'rake/tasklib'
+require 'corundum/configurable'
 
 module Corundum
   class TaskLib < Rake::TaskLib
-    attr_accessor :configuration
+    include Configurable
 
-    def receive_tasklibs(*tasklibs)
-    end
-
-    def default_configuration(namespace, *tasklib_configs)
+    def default_configuration(*tasklibs)
     end
 
     def resolve_configuration
@@ -17,37 +15,39 @@ module Corundum
     def in_namespace(*tasknames)
       if tasknames.empty?
         if block_given?
-          if @configuration.namespace.nil?
+          if @namespace_name.nil?
             yield
           else
-            namespace @configuration.namespace do
+            namespace @namespace_name do
               yield
             end
           end
         end
       else
         tasknames.map do |taskname|
-          [@configuration.namespace, taskname].compact.join(":")
+          [@namespace_name, taskname].compact.join(":")
         end
       end
     end
 
+    def root_task
+      @namespace_name || :default
+    end
+
     def default_namespace
       nil
     end
 
-    def initialize(*tasklibs)
-      @configuration = OpenStruct.new(:namespace => default_namespace)
-
-      receive_tasklibs(*tasklibs)
+    def [](taskname)
+      in_namespace(taskname).first
+    end
 
-      configs = tasklibs.map do |tl|
-        tl.configuration
-      end
-      default_configuration(default_namespace, *configs)
+    def initialize(*tasklibs)
+      setting(:namespace_name, default_namespace)
 
+      default_configuration(*tasklibs)
 
-      yield @configuration if block_given?
+      yield self if block_given?
 
       resolve_configuration
 

data/lib/corundum/version_control.rb

@@ -6,15 +6,10 @@ module Corundum
       :version_control
     end
 
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
-    end
-
-    def default_configuration(namespace, toolkit_config)
-      @configuration.namespace = namespace
-      @configuration.gemspec = toolkit_config.gemspec
-      @configuration.build_finished_file = toolkit_config.finished_files.build
-      @configuration.tag = toolkit_config.gemspec.version
+    def default_configuration(toolkit)
+      setting(:gemspec,  toolkit.gemspec)
+      setting(:build_finished_file,  toolkit.finished_files.build)
+      setting(:tag,  toolkit.gemspec.version.to_s)
     end
 
     def define
@@ -28,7 +23,7 @@ module Corundum
       task :preflight => in_namespace(:not_tagged)
       task :build => in_namespace(:is_checked_in)
       in_namespace(:tag, :check_in).each do |taskname|
-        task taskname => @configuration.build_finished_file
+        task taskname => build_finished_file
       end
       task :release => in_namespace(:tag, :check_in)
     end

data/lib/corundum/version_control/monotone.rb

@@ -9,16 +9,18 @@ module Corundum
 
     def default_configuration(*args)
       super
-      @configuration.branch = nil
+      setting(:branch, nil)
     end
 
     def resolve_configuration
-      @configuration.branch ||= guess_branch
+      @branch ||= guess_branch
     end
 
     def mtn_automate(cmd, *args)
       result = ""
-      IO.popen("mtn automate #{cmd} #{args.join(" ")}") do |pipe|
+      command = "mtn automate #{cmd} #{args.join(" ")}"
+      puts command if verbose
+      IO.popen(command) do |pipe|
         result = pipe.read
       end
       result
@@ -75,7 +77,7 @@ module Corundum
     end
 
     def base_revision
-      mtn_automate("get_base_revision_id")
+      mtn_automate("get_base_revision_id").chomp
     end
 
     def guess_branch
@@ -90,10 +92,10 @@ module Corundum
 
       in_namespace do
         task :not_tagged do
-          items = parse_basic_io(mtn_automate("tags", @configuration.branch))
-          tags = items.find{|pair| pair[0] == "tag" && pair[1] == @configuration.tag}
+          items = parse_basic_io(mtn_automate("tags", branch))
+          tags = items.find{|pair| pair[0] == "tag" && pair[1] == tag}
           unless tags.nil?
-            fail "Tag #{@configuration.tag} already exists in branch #{@configuration.branch}"
+            fail "Tag #{tag} already exists in branch #{branch}"
           end
         end
 
@@ -106,11 +108,11 @@ module Corundum
         end
 
         task :tag do
-          mtn_automate("cert", base_revision, "tag", @configuration.tag)
+          mtn_automate("cert", base_revision, "tag", tag)
         end
 
         task :commit do
-          run "mtn commit --branch #{@configuration.branch} --message \"Automatic commit: gem built at version #{@configuration.gemspec.version}\""
+          sh "mtn commit --branch #{branch} --message \"Automatic commit: gem built at version #{gemspec.version}\""
         end
 
         task :sync do