corundum 0.0.1 → 0.0.2

data/lib/corundum.rb

@@ -7,64 +7,69 @@ module Corundum
   extend Rake::DSL
 
   class Toolkit < TaskLib
-    def default_configuration(namespace)
-      @configuration.marshal_load(
-        :namespace => namespace,
+    def default_configuration
+      settings(
         :finished_dir => "corundum",
-        :finished_files => OpenStruct.new,
+        :finished_files => nested(
+          :build => nil,
+          :qa => nil,
+          :package => nil,
+          :release => nil,
+          :press => nil),
 
         :browser => "chromium",
         :gemspec => nil,
         :gemspec_path => nil,
-        :email => OpenStruct.new(
-          :servers => [ OpenStruct.new({ :server => "ruby-lang.org", :helo => "gmail.com" }) ],
+        :email => nested(
+          :servers => [ nested({ :server => "ruby-lang.org", :helo => "gmail.com" }) ],
           :announce_to_email => "ruby-talk@ruby-lang.org"
       ),
         :package_dir => "pkg",
-        :files => OpenStruct.new(:code => nil, :test => nil, :docs => nil),
-        :file_lists => OpenStruct.new(:code => nil, :test => nil, :docs => nil, :all => nil),
-        :rubyforge => OpenStruct.new(),
+        :files => nested(:code => nil, :test => nil, :docs => nil),
+        :file_lists => nested(:code => nil, :test => nil, :docs => nil, :all => nil),
+        :rubyforge => nested().nil_fields(:group_id, :package_id,
+                                          :release_name, :home_page, :project_page),
         :doc_dir => "rubydoc"
       )
     end
 
     def load_gemspec
-      @configuration.gemspec_path ||= guess_gemspec
-      @configuration.gemspec ||= Gem::Specification::load(@configuration.gemspec_path)
-      return @configuration.gemspec
+      @gemspec_path ||= guess_gemspec
+      @gemspec ||= Gem::Specification::load(gemspec_path)
+      return gemspec
     end
 
     def resolve_configuration
       load_gemspec
 
-      @configuration.finished_files.build ||= File::join(
-        @configuration.finished_dir, "build_#{@configuration.gemspec.version}")
-      @configuration.finished_files.qa ||= File::join(
-        @configuration.finished_dir, "qa_#{@configuration.gemspec.version}")
-      @configuration.finished_files.package ||= File::join(
-        @configuration.finished_dir, "package_#{@configuration.gemspec.version}")
-      @configuration.finished_files.release ||= File::join(
-        @configuration.finished_dir, "release_#{@configuration.gemspec.version}")
-      @configuration.finished_files.press ||= File::join(
-        @configuration.finished_dir, "press_#{@configuration.gemspec.version}")
-
-      @configuration.files.code ||= @configuration.gemspec.files.grep(%r{^lib/})
-      @configuration.files.test ||= @configuration.gemspec.files.grep(%r{^spec/})
-      @configuration.files.docs ||= @configuration.gemspec.files.grep(%r{^doc/})
-
-      @configuration.file_lists.code ||= FileList['lib/**/*.rb']
-      @configuration.file_lists.test ||= FileList['test/**/*.rb','spec/**/*.rb','features/**/*.rb']
-      @configuration.file_lists.docs ||= FileList['doc/**/*.rb']
-      @configuration.file_lists.all  ||=
-        @configuration.file_lists.code +
-        @configuration.file_lists.test +
-        @configuration.file_lists.docs
-
-      @configuration.rubyforge.group_id ||= @configuration.gemspec.rubyforge_project
-      @configuration.rubyforge.package_id ||= @configuration.gemspec.name.downcase
-      @configuration.rubyforge.release_name ||= @configuration.gemspec.full_name
-      @configuration.rubyforge.home_page ||= @configuration.gemspec.homepage
-      @configuration.rubyforge.project_page ||= "http://rubyforge.org/project/#{@configuration.gemspec.rubyforge_project}/"
+      @finished_files.build ||= File::join(
+        finished_dir, "build_#{gemspec.version}")
+      @finished_files.qa ||= File::join(
+        finished_dir, "qa_#{gemspec.version}")
+      @finished_files.package ||= File::join(
+        finished_dir, "package_#{gemspec.version}")
+      @finished_files.release ||= File::join(
+        finished_dir, "release_#{gemspec.version}")
+      @finished_files.press ||= File::join(
+        finished_dir, "press_#{gemspec.version}")
+
+      @files.code ||= gemspec.files.grep(%r{^lib/})
+      @files.test ||= gemspec.files.grep(%r{^spec/})
+      @files.docs ||= gemspec.files.grep(%r{^doc/})
+
+      @file_lists.code ||= FileList['lib/**/*.rb']
+      @file_lists.test ||= FileList['test/**/*.rb','spec/**/*.rb','features/**/*.rb']
+      @file_lists.docs ||= FileList['doc/**/*.rb']
+      @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
@@ -81,50 +86,35 @@ module Corundum
 
     def define
       in_namespace do
-        directory @configuration.finished_dir
+        directory finished_dir
 
         desc "Run preflight checks"
         task :preflight
 
         desc "Run quality assurance tasks"
         task :qa => :preflight
-        file @configuration.finished_files.qa => [:qa, @configuration.finished_dir] do |task|
+        file finished_files.qa => [:qa, finished_dir] do |task|
           touch task.name
         end
 
         desc "Build the package"
-        task :build => @configuration.finished_files.qa
-        file @configuration.finished_files.build => [:build, @configuration.finished_dir] do |task|
+        task :build => finished_files.qa
+        file finished_files.build => [:build, finished_dir] do |task|
           touch task.name
         end
 
         desc "Push package out to the world"
-        task :release => @configuration.finished_files.build
-        file @configuration.finished_files.release => [:release, @configuration.finished_dir] do |task|
+        task :release => finished_files.build
+        file finished_files.release => [:release, finished_dir] do |task|
           touch task.name
         end
 
         desc "Announce publication"
-        task :press => @configuration.finished_files.release
-        file @configuration.finished_files.press => [:press, @configuration.finished_dir] do |task|
+        task :press => finished_files.release
+        file finished_files.press => [:press, finished_dir] do |task|
           touch task.name
         end
       end
     end
-
-    def old_define
-
-      task @publishing.namespace => "#{@gem_building.namespace}:push"
-      task "#{@publishing.namespace}:docs" => "#{@documentation.namespace}:docs"
-      task "#{@publishing.namespace}:rubyforge" => ["#{@quality_assurance.namespace}:sign_off", "#{@gem_building.namespace}:package"]
-
-      require 'corundum/press'
-      Press.new(@press.namespace) do |press|
-        press.rubyforge = @rubyforge
-        press.gemspec = @configuration.gemspec
-        press.announce_to_email = @email.announce_to_email
-        press.email_servers = @email.servers
-      end
-    end
   end
 end

data/lib/corundum/configurable.rb

@@ -0,0 +1,54 @@
+
+
+module Corundum
+  module Configurable
+    def local_attrs
+      @local_attrs ||=
+        begin
+          mod = Module.new
+          extend mod
+          mod
+        end
+    end
+
+    def local_attrs=(mod)
+      extend mod
+      @local_attrs = mod
+    end
+
+    def setting(name, default_value = nil)
+      local_attrs.instance_eval do
+        attr_accessor(name)
+      end
+      instance_variable_set("@#{name}", default_value)
+    end
+
+    def dup
+      result = super
+      result.extend Configurable
+      result.local_attrs = @local_attrs
+      result
+    end
+
+    def settings(hash)
+      hash.each_pair do |name, value|
+        setting(name, value)
+      end
+      return self
+    end
+
+    def nested(hash=nil)
+      obj = Object.new
+      obj.extend Configurable
+      obj.settings(hash || {})
+      return obj
+    end
+
+    def nil_fields(*names)
+      names.each do |name|
+        setting(name, nil)
+      end
+      return self
+    end
+  end
+end

data/lib/corundum/email.rb

@@ -6,26 +6,13 @@ module Corundum
       :email
     end
 
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
-    end
-
-    def default_configuration(namespace, toolkit_config)
-      @configuration.namespace = namespace
-      @configuration.rubyforge = toolkit_config.rubyforge
-      @configuration.email_servers = []
-      @configuration.gemspec = toolkit_config.gemspec
-      @configuration.announce_to_email = nil
-      @configuration.urls = OpenStruct.new
-    end
-
-    def resolve_configuration
-      @configuration.urls.home_page ||=
-        @configuration.gemspec.homepage
-
-      @configuration.urls.project_page ||=
-        @configuration.rubyforge.project_page
-
+    def default_configuration(toolkit)
+      setting(:rubyforge, toolkit.rubyforge)
+      setting(:email_servers, [])
+      setting(:gemspec, toolkit.gemspec)
+      setting(:announce_to_email, nil)
+      setting(:urls, nested(:home_page => toolkit.gemspec.homepage,
+                            :project_page => toolkit.rubyforge.project_page))
     end
 
     def announcement
@@ -38,28 +25,28 @@ module Corundum
       rescue Exception
       end
 
-      urls = "Project: #{@configuration.urls.project_page}\n" +
-      "Homepage: #{@configuration.urls.home_page}"
+      urls = "Project: #{urls.project_page}\n" +
+      "Homepage: #{urls.home_page}"
 
-      subject = "#{@configuration.gemspec.name} #{@configuration.gemspec.version} Released"
-      title = "#{@configuration.gemspec.name} version #{@configuration.gemspec.version} has been released!"
-      body = "#{@configuration.gemspec.description}\n\n#{changes}\n\n#{urls}"
+      subject = "#{gemspec.name} #{gemspec.version} Released"
+      title = "#{gemspec.name} version #{gemspec.version} has been released!"
+      body = "#{gemspec.description}\n\n#{changes}\n\n#{urls}"
 
       return subject, title, body
     end
 
     def define
       desc 'Announce release on email'
-      task @configuration.namespace => ["#{@configuration.namespace.to_s}:rubyforge", "#{@configuration.namespace.to_s}:email"]
-      namespace @configuration.namespace do
+      task root_task => in_namespace("rubyforge", "email")
+      in_namespace do
         file "email.txt" do |t|
           require 'mailfactory'
 
           subject, title, body= announcement
 
           mail = MailFactory.new
-          mail.To = @configuration.announce_to_email
-          mail.From = @configuration.gemspec.email
+          mail.To = announce_to_email
+          mail.From = gemspec.email
           mail.Subject = "[ANN] " + subject
           mail.text = [title, body].join("\n\n")
 
@@ -71,7 +58,7 @@ module Corundum
         task :email => "email.txt" do
           require 'net/smtp'
 
-          @configuration.email_servers.each do |server_config|
+          email_servers.each do |server_config|
             begin
               File::open("email.txt", "r") do |email|
                 Net::SMTP.start(server_config[:server], 25, server_config[:helo], server_config[:username], server_config[:password]) do |smtp|

data/lib/corundum/gem_building.rb

@@ -2,29 +2,24 @@ require 'corundum/tasklib'
 
 module Corundum
   class GemBuilding < TaskLib
-    def receive_tasklibs(toolkit)
-      @toolkit = toolkit
-    end
-
-    def default_configuration(namespace, toolkit_config)
-      @configuration.namespace = namespace || :package
-      @configuration.gemspec = toolkit_config.gemspec
-      @configuration.qa_finished_file = toolkit_config.finished_files.qa
-      @configuration.package_dir = "pkg"
+    def default_configuration(toolkit)
+      setting(:gemspec,  toolkit.gemspec)
+      setting(:qa_finished_file,  toolkit.finished_files.qa)
+      setting(:package_dir,  "pkg")
     end
 
     def define
       require 'rubygems/package_task'
 
       in_namespace do
-        package = Gem::PackageTask.new(@configuration.gemspec) do |t|
+        package = Gem::PackageTask.new(gemspec) do |t|
           t.need_tar_gz = true
           t.need_tar_bz2 = true
-          t.package_dir = @configuration.package_dir
+          t.package_dir = package_dir
         end
 
         task(:package).prerequisites.each do |package_type|
-          file package_type => @configuration.qa_finished_file
+          file package_type => qa_finished_file
         end
       end
 

data/lib/corundum/gemcutter.rb

@@ -2,25 +2,21 @@ require 'corundum/tasklib'
 
 module Corundum
   class GemCutter < TaskLib
-    def receive_tasklibs(toolkit, build)
-      @toolkit = toolkit
-      @build = build
+    def default_namespace
+      :gemcutter
     end
 
-    def default_configuration(namespace, toolkit_config, build_config)
-      @configuration.namespace = namespace || :gemcutter
-      @configuration.gemspec = toolkit_config.gemspec
-      @configuration.build_finished_path = toolkit_config.finished_files.build
-      @configuration.gem_path = nil
-      @configuration.gem_name = nil
-      @configuration.package_dir = build_config.package_dir
+    def default_configuration(toolkit, build)
+      setting(:build, build)
+      setting(:gemspec, toolkit.gemspec)
+      setting(:build_finished_path, toolkit.finished_files.build)
+      setting(:gem_path, nil)
+      setting(:gem_name, toolkit.gemspec.full_name)
+      setting(:package_dir, build.package_dir)
     end
 
     def resolve_configuration
-      @configuration.gem_path ||=
-        File::join(@configuration.package_dir, @configuration.gemspec.file_name)
-
-      @configuration.gem_name ||= @configuration.gemspec.full_name
+      @gem_path ||= File::join(package_dir, gemspec.file_name)
     end
 
     module CommandTweaks
@@ -30,16 +26,16 @@ module Corundum
       end
 
       def gem_list=(list)
-        @configuration.gems = list
+        gems = list
       end
 
       def get_all_gem_names
-        return @configuration.gems if defined?(@configuration.gems)
+        return gems if defined?(gems)
         super
       end
 
       def get_one_gem_name
-        return @configuration.gems.first if defined?(@configuration.gems)
+        return gems.first if defined?(gems)
         super
       end
     end
@@ -54,19 +50,19 @@ module Corundum
     def define
       in_namespace do
         task :uninstall do |t|
-          when_writing("Uninstalling #{@configuration.gem_name}") do
+          when_writing("Uninstalling #{gem_name}") do
             require "rubygems/commands/uninstall_command"
             uninstall = get_command Gem::Commands::UninstallCommand
-            uninstall.options[:args] = [@configuration.gem_path]
+            uninstall.options[:args] = [gem_path]
             uninstall.execute
           end
         end
 
-        task :install => [@configuration.gem_path] do |t|
-          when_writing("Installing #{@configuration.gem_path}") do
+        task :install => [gem_path] do |t|
+          when_writing("Installing #{gem_path}") do
             require "rubygems/commands/install_command"
             install = get_command Gem::Commands::InstallCommand
-            install.options[:args] = [@configuration.gem_path]
+            install.options[:args] = [gem_path]
             install.execute
           end
         end
@@ -75,7 +71,7 @@ module Corundum
 
         task :dependencies_available do
           checker = Gem::SpecFetcher.new
-          @configuration.gemspec.runtime_dependencies.each do |dep|
+          gemspec.runtime_dependencies.each do |dep|
             fulfilling = checker.find_matching(dep,false,false,false)
             if fulfilling.empty?
               fail "Dependency #{dep} is unfulfilled remotely"
@@ -87,10 +83,11 @@ module Corundum
 
         task :is_unpushed do
           checker = Gem::SpecFetcher.new
-          dep = Gem::Dependency.new(@configuration.gemspec.name, "= #{@configuration.gemspec.version}")
-          fulfilling = checker.find_matching(dep,false,false,true)
+          dep = Gem::Dependency.new(gemspec.name, "= #{gemspec.version}")
+          fulfilling = checker.find_matching(dep,false,false,false)
           unless fulfilling.empty?
-            fail "Gem #{@configuration.gemspec.full_name} is already pushed"
+            p fulfilling
+            fail "Gem #{gemspec.full_name} is already pushed"
           end
         end
 
@@ -98,10 +95,10 @@ module Corundum
         task :push => [:dependencies_available, :is_unpushed] do
           require "rubygems/commands/push_command"
           push = get_command(Gem::Commands::PushCommand)
-          push.options[:args] = [@configuration.gem_path]
+          push.options[:args] = [gem_path]
           push.execute
         end
-        task :push => @configuration.build_finished_path
+        task :push => build_finished_path
       end
       task :release => in_namespace(:push)
       task :preflight => in_namespace(:dependencies_available, :is_unpushed)