more updates, starting code coverage

.gitignore

@@ -1,2 +1,4 @@
 .loadpath
 .project
+coverage/*
+

Rakefile

@@ -1,6 +1,7 @@
 $LOAD_PATH << 'lib'
 
 require 'apache'
+require 'spec/rake/spectask'
 
 namespace :apache do
   desc "Generate the configs"
@@ -10,3 +11,12 @@ namespace :apache do
     end
   end
 end
+
+namespace :spec do
+  desc "Run RCov tests"
+  Spec::Rake::SpecTask.new('rcov') do |t|
+    t.spec_files = FileList['spec/*.rb']
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec']
+  end
+end

lib/apache.rb

@@ -1,3 +1 @@
-Dir[File.join(File.dirname(__FILE__), '**', '*.rb')].each do |file|
+require 'apache/config'
-  require file
-end

lib/apache/config.rb

@@ -1,31 +1,87 @@
-require 'apache/master'
+Dir[File.join(File.dirname(__FILE__), '*.rb')].each { |f| require f }
-require 'apache/permissions'
 
 module Apache
   class Config
     class << self
+      attr_accessor :line_indent, :config
+
       include Apache::Master
       include Apache::Quoteize
       include Apache::Permissions
 
       def build(target, &block)
-        @config = []
+        reset!
-        @indent = 0
 
         self.instance_eval(&block)
 
         puts @config * "\n"
-
-        #File.open(target, 'w') { |f| f.puts @config * "\n" }
       end
 
+      # Reset the current settings
+      def reset!
+        @config = []
+        @line_indent = 0
+      end
+
+      # Indent the string by the current @line_indent level
       def indent(string)
-        " " * (@indent * 2) + string
+        " " * (@line_indent * 2) + string
       end
 
+      # Add the string to the current config
       def <<(string)
         @config << indent(string)
       end
+
+      # Apachify a string
+      #
+      # Split the provided name on underscores and capitalize the individual parts
+      def apachify(name)
+        name.to_s.split("_").collect(&:capitalize).join
+      end
+
+      # Handle options that aren't specially handled
+      def method_missing(method, *args)
+        if method.to_s[-1..-1] == "!"
+          method = method.to_s[0..-2].to_sym
+        else
+          args = *quoteize(*args)
+        end
+
+        self << [ apachify(method), *args ] * ' '
+      end
+
+      # Handle creating block methods
+      def block_methods(*methods)
+        methods.each do |method|
+          self.class.class_eval <<-EOT
+            def #{method}(*name, &block)
+              blockify(apachify("#{method}"), name, &block)
+            end
+          EOT
+        end
+      end
+
+      # Handle the blockification of a provided block
+      def blockify(tag_name, name, &block)
+        start = [ tag_name ]
+
+        case name
+          when String
+            start << quoteize(name).first if name
+          when Array
+            start << (quoteize(*name) * " ") if name
+        end
+
+        start = start.join(' ')
+
+        self << "" if (@indent == 0)
+        self << "<#{start}>"
+        @line_indent += 1
+        self.instance_eval(&block)
+        @line_indent -= 1
+        self << "</#{tag_name}>"
+      end
     end
 
     block_methods :if_module, :directory, :virtual_host

lib/apache/master.rb

@@ -1,69 +1,18 @@
 module Apache
-  module Quoteize
-    def quoteize(*args)
-      args.collect do |arg|
-        case arg
-          when Symbol
-            arg.to_s.gsub('_', ' ')
-          else
-            %{"#{arg}"}
-        end
-      end
-    end
-  end
-
   module Master
     def modules(*modules, &block)
       @config << Modules.build(*modules, &block)
     end
 
-    def block_methods(*methods)
-      methods.each do |method|
-        self.class.class_eval <<-EOT
-          def #{method}(*name, &block)
-            blockify(apachify("#{method}"), name, &block)
-          end
-        EOT
-      end
-    end
-
-    def blockify(tag_name, name, &block)
-      start = [ tag_name ]
-
-      case name
-        when String
-          start << quoteize(name).first if name
-        when Array
-          start << (quoteize(*name) * " ") if name
-      end
-
-      start = start.uniq.join(' ')
-
-      self << "" if (@indent == 0)
-      self << "<" + start + ">"
-      @indent += 1
-      self.instance_eval(&block)
-      @indent -= 1
-      self << "</" + tag_name + ">"
-    end
-
-    def method_missing(method, *args)
-      if method.to_s[-1..-1] == "!"
-        method = method.to_s[0..-2].to_sym
-      else
-        args = *quoteize(*args)
-      end
-
-      self << [ apachify(method), *args ] * ' '
-    end
-
     def runner(user, group = nil)
       user! user
       group! group if group
     end
 
     def passenger(ruby_root, ruby_version, passenger_version)
-
+      load_module 'passenger_module', "#{ruby_root}/lib/ruby/gems/#{ruby_version}/gems/passenger-#{passenger_version}/ext/apache2/mod_passenger.so"
+      passenger_root "#{ruby_root}/lib/ruby/gems/#{ruby_version}/gems/passenger-#{passenger_version}"
+      passenger_ruby "#{ruby_root}/bin/ruby"
     end
 
     def order(*args)
@@ -71,36 +20,5 @@ module Apache
     end
 
     alias :order! :order
-
-    private
-      def apachify(name)
-        name = name.to_s
-        case name
-          when true
-          else
-            name.split("_").collect(&:capitalize).join
-        end
-      end
-  end
-
-  class Modules
-    class << self
-      include Apache::Quoteize
-
-      def build(*modules, &block)
-        @modules = []
-
-        modules.each { |m| self.send(m) }
-        self.instance_eval(&block) if block
-
-        @modules
-      end
-
-      def method_missing(method, *args)
-        module_name = "#{method}_module"
-        module_path = args[0] || "modules/mod_#{method}.so"
-        @modules << [ 'LoadModule', *quoteize(module_name, module_path) ] * " "
-      end
-    end
   end
 end

lib/apache/modules.rb

@@ -0,0 +1,24 @@
+require 'apache/quoteize'
+
+module Apache
+  class Modules
+    class << self
+      include Apache::Quoteize
+
+      def build(*modules, &block)
+        @modules = []
+
+        modules.each { |m| self.send(m) }
+        self.instance_eval(&block) if block
+
+        @modules
+      end
+
+      def method_missing(method, *args)
+        module_name = "#{method}_module"
+        module_path = args[0] || "modules/mod_#{method}.so"
+        @modules << [ 'LoadModule', *quoteize(module_name, module_path) ] * " "
+      end
+    end
+  end
+end

lib/apache/quoteize.rb

@@ -0,0 +1,14 @@
+module Apache
+  module Quoteize
+    def quoteize(*args)
+      args.collect do |arg|
+        case arg
+          when Symbol
+            arg.to_s.gsub('_', ' ')
+          else
+            %{"#{arg}"}
+        end
+      end
+    end
+  end
+end

spec/config_spec.rb

@@ -0,0 +1,44 @@
+require 'apache/config'
+
+describe Apache::Config, "should handle the basics of Apache config" do
+  before do
+    Apache::Config.reset!
+  end
+
+  it "should handle indent" do
+    Apache::Config.line_indent = 1
+
+    Apache::Config.indent("hello").should == "  hello"
+  end
+
+  it "should add a line to the config" do
+    Apache::Config << "hello"
+    Apache::Config.config.should == [ 'hello' ]
+  end
+
+  it "should handle method_missing" do
+    Apache::Config.test "test2", "test3"
+    Apache::Config.test_again! "test2", "test3"
+
+    Apache::Config.config.should == [
+      'Test "test2" "test3"',
+      'TestAgain test2 test3'
+    ]
+  end
+
+  it "should Apachify the name" do
+    Apache::Config.apachify("test").should == "Test"
+    Apache::Config.apachify("test_full_name").should == "TestFullName"
+  end
+
+  it "should quoteize properly" do
+    Apache::Config.quoteize("test", "test2").should == %w{"test" "test2"}
+    Apache::Config.quoteize(:test, :test2).should == %w{test test2}
+  end
+
+  it "should blockify a block" do
+    Apache::Config.blockify("Tag", [ 'part', 'part2' ]) do
+      something "goes here"
+    end.should == ['<Tag "part" "part2">', '  Something "goes here"', '</Tag>']
+  end
+end

spec/master_spec.rb

@@ -1,3 +0,0 @@
-if __FILE__ == $0
-  # TODO Generated stub
-end

test/config/httpd.rb

@@ -23,5 +23,7 @@ Apache::Config.build('httpd.conf') do
     directory '/' do
       allow_from_all
     end
+    
+    
   end
 end