apache-config-generator 0.2.5.1 → 0.2.6

data/.gitignore

@@ -0,0 +1,15 @@
+.loadpath
+.project
+coverage/*
+docs/*
+pkg/*
+Manifest
+*.gemspec
+tmp/*
+.bundle/*
+.DS_Store
+*.gem
+.yardoc/*
+doc/*
+
+

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.5.2. Make it work as standalone w/o Bundler.
+
 v0.2.5.1. Bad release, forgot to add files.
 
 v0.2.5. New option for default environments.

data/Gemfile

@@ -1,9 +1,4 @@
-gem 'rainbow'
-gem 'echoe'
-gem 'rspec'
-gem 'autotest'
-gem 'mocha'
-gem 'reek'
-gem 'sdoc'
-gem 'sdoc-helpers', :require => 'sdoc_helpers'
-gem 'rdiscount'
+source :rubygems
+
+gemspec
+

data/Gemfile.lock

@@ -1,19 +1,19 @@
+PATH
+  remote: .
+  specs:
+    apache-config-generator (0.2.6)
+      rainbow
+
 GEM
+  remote: http://rubygems.org/
   specs:
-    autotest (4.4.1)
+    autotest (4.4.2)
     diff-lcs (1.1.2)
-    echoe (4.3.1)
-      gemcutter
-      rubyforge
-    gemcutter (0.6.1)
-    json (1.4.6)
-    json_pure (1.4.3)
-    mocha (0.9.8)
+    mocha (0.9.9)
       rake
+    nokogiri (1.4.3.1)
     rainbow (1.1)
     rake (0.8.7)
-    rdiscount (1.6.5)
-    rdoc (2.4.3)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
       ruby_parser (~> 2.0)
@@ -33,25 +33,17 @@ GEM
       sexp_processor (~> 3.0)
     ruby_parser (2.0.4)
       sexp_processor (~> 3.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sdoc (0.2.20)
-      json (>= 1.1.3)
-      rdoc (= 2.4.3)
-    sdoc-helpers (0.1.4)
-      sdoc (~> 0.2)
     sexp_processor (3.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  apache-config-generator!
   autotest
-  echoe
+  bundler (>= 1.0.0)
   mocha
+  nokogiri
   rainbow
-  rdiscount
   reek
-  rspec
-  sdoc
-  sdoc-helpers
+  rspec (~> 2.0.0)

data/README.rdoc

@@ -27,7 +27,7 @@ Configs center around the Apache::Config.build method:
     server_name 'my-cool-website.cool.wow'
     document_root '/var/www/my-cool-website'
 
-		server_admin! "john@coswellproductions.com"
+    server_admin! "john@coswellproductions.com"
 
     directory '/' do
       options :follow_sym_links, :indexes
@@ -42,12 +42,12 @@ Configs center around the Apache::Config.build method:
     end
 
     rewrites "My old content" do
-    	cond "%{HTTP_REFERER}", '!^my-cool-website\.cool\.wow$'
-    	rule %r{\.(gif|jpg|png|pdf)$}, '/lol-image-stealer.html', :last => true, :redirect => true
+      cond "%{HTTP_REFERER}", '!^my-cool-website\.cool\.wow$'
+      rule %r{\.(gif|jpg|png|pdf)$}, '/lol-image-stealer.html', :last => true, :redirect => true
 
-    	rewrite_test '/index.html', '/index.html', :http_referer => 'other.site'
-    	rewrite_test '/index.gif', '/lol-image-stealer.html', :http_referer => 'other.site'
-    	rewrite_test '/index.gif', '/index.gif', :http_referer => 'my-cool-website.cool.wow'
+      rewrite_test '/index.html', '/index.html', :http_referer => 'other.site'
+      rewrite_test '/index.gif', '/lol-image-stealer.html', :http_referer => 'other.site'
+      rewrite_test '/index.gif', '/index.gif', :http_referer => 'my-cool-website.cool.wow'
     end
   end
 
@@ -58,7 +58,7 @@ Notes on how the conversion works:
 * Directives that expect regular expressions take a Regexp object.
 * Passing a String as a parameter, by default, double-quotes it.
 * Passing in a Symbol does not quote the parameter.
-** Some directives NerdCap Symbols, such as Options
+  * Some directives NerdCap Symbols, such as Options
 * Appending an exclamation point to the method turns off quoting.
 * Shortcut methods are defined as modules under the Apache module.
 
@@ -71,23 +71,28 @@ There are also sanity checks that occur when configuration is being generated:
 
 The above config is transformed into the following:
 
-	ServerName "my-cool-website.cool.wow"
-	DocumentRoot "/var/www/my-cool-website"
-	ServerAdmin john@coswellproductions.com
+  ServerName "my-cool-website.cool.wow"
+  DocumentRoot "/var/www/my-cool-website"
+  ServerAdmin john@coswellproductions.com
 
-	<Directory "/">
-		Options FollowSymLinks, Indexes
-		Allow from all
-	</Directory>
+  <Directory "/">
+    Options FollowSymLinks, Indexes
+    Allow from all
+  </Directory>
 
-	<LocationMatch "^/secret">
-		Deny from all
+  <LocationMatch "^/secret">
+    Deny from all
 
-		AuthType Basic
-		AuthName "My secret"
-		AuthUserFile "/etc/apache2/users/global.users"
-		Require user john
-	</LocationMatch>
+    AuthType Basic
+    AuthName "My secret"
+    AuthUserFile "/etc/apache2/users/global.users"
+    Require user john
+  </LocationMatch>
 
-	RewriteCond "%{HTTP_REFERER}" "^!my-cool-website\.cool\.wow"
-	RewriteRule "\.(gif|jpg|png|pdf)$" "/lol-image-stealer.html" [L,R]
+  RewriteCond "%{HTTP_REFERER}" "^!my-cool-website\.cool\.wow"
+  RewriteRule "\.(gif|jpg|png|pdf)$" "/lol-image-stealer.html" [L,R]
+
+== Using Apache::Config separately
+
+Include the gem and access the methods on Apache::Config directly. See test/example_standalone.rb
+for an example.

data/Rakefile

@@ -6,10 +6,7 @@ Bundler.require(:default)
 $LOAD_PATH << 'lib'
 
 require 'yaml'
-
-require 'apache'
-require 'rspec/core/rake_task'
-require 'sdoc_helpers/markdown'
+require 'apache/config'
 
 namespace :apache do
   desc "Generate the configs"
@@ -20,31 +17,6 @@ namespace :apache do
   end
 end
 
-Echoe.new('apache-config-generator') do |p|
-  p.author = "John Bintz"
-  p.summary = "A Ruby DSL for programmatically generating Apache configs"
-  p.ignore_pattern = [ 'spec/**/*', 'test/**/*', 'docs/**/*' ]
-  p.executable_pattern = [ 'bin/**/*' ]
-  p.runtime_dependencies = [ 'rainbow' ]
-end
-
-namespace :spec do
-  desc "Run RCov tests"
-  RSpec::Core::RakeTask.new(:rcov) do |t|
-    t.pattern = 'spec/*.rb'
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems']
-    t.rspec_opts = ['-b']
-  end
-end
-
-Rake::RDocTask.new do |rdoc|
-  rdoc.template = 'direct'
-  rdoc.rdoc_files.add('lib', 'README.rdoc')
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_dir = 'docs'
-end
-
 task :reek do
   system('reek -c config/config.reek lib/*')
 end

data/lib/apache/config.rb

@@ -1,12 +1,9 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.require(:default)
-
 require 'fileutils'
 require 'rainbow'
 
-Dir[File.join(File.dirname(__FILE__), '*.rb')].each { |f| require f }
+%w{apachify directory logging master modules mpm_prefork performance permissions rewrites ssl}.each do |file|
+  require "apache/#{file}"
+end
 
 module Apache
   # The core class of Apache Config Generator.
@@ -71,7 +68,7 @@ module Apache
 
       # Build the provided configuration only if the current environment matches one of the conditions
       def build_if(target, *conditions, &block)
-        build(target, &block) if conditions.include? APACHE_ENV
+        build(target, &block) if environment_ok?(*conditions)
       end
 
       # Build the provided configuration
@@ -84,7 +81,12 @@ module Apache
       end
 
       def build_and_return_if(*conditions, &block)
-        build_and_return(&block) if conditions.include? APACHE_ENV
+        build_and_return(&block) if environment_ok?(*conditions)
+      end
+
+      def environment_ok?(*environments)
+        return true if APACHE_ENV == true
+        environments.include?(APACHE_ENV)
       end
 
       def build(target, &block)

data/lib/apache/rake.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+require 'bundler/setup'
+Bundler.require(:default)
+
+require 'apache/rake/apache/create'

data/lib/apache/rake/apache/create.rb

@@ -0,0 +1,53 @@
+require 'apache/config'
+require 'apache/rake/support'
+
+include Apache::Rake::Support
+
+task :default => 'apache:create'
+
+namespace :apache do
+  desc "Create all defined configs for the specified environment"
+  task :create, :environment do |t, args|
+    if get_environments.empty?
+      APACHE_ENV = true
+    else
+      need_environment if !args[:environment] && !get_default_environment
+
+      APACHE_ENV = (args[:environment] || get_default_environment).to_sym
+    end
+
+    config[:source_path] = File.expand_path(config[:source])
+    config[:dest_path] = File.expand_path(config[:destination])
+
+    Apache::Config.rotate_logs_path = config[:rotate_logs_path]
+
+    FileUtils.mkdir_p config[:dest_path]
+    Dir.chdir config[:dest_path]
+
+    # using CONFIG is deprecated
+    CONFIG = config
+
+    Dir[File.join(config[:source_path], '**', '*.rb')].each do |file|
+      puts file.foreground(:green)
+      require file
+    end
+  end
+
+  desc "List all possible environments"
+  task :environments do
+    puts get_environments * "\n"
+  end
+
+  desc "Set the default environment (currently #{get_default_environment || 'nil'})"
+  task :default, :environment do |t, args|
+    need_environment if !args[:environment]
+
+    if get_environments.include?(args[:environment])
+      File.open('.environment', 'w') { |fh| fh.puts args[:environment] }
+      puts "Calls to apache:create will now use #{args[:environment]} when you don't specify the environment."
+    else
+      puts "You need to specify a valid default environment. Here are the possibilities:"
+      Rake::Task['apache:environments'].invoke
+    end
+  end
+end

data/lib/apache/rake/support.rb

@@ -0,0 +1,35 @@
+require 'yaml'
+require 'fileutils'
+
+module Apache
+  module Rake
+    module Support
+      def config
+        @config ||= Hash[YAML.load_file('config.yml').collect { |k,v| [ k.to_sym, v ] }]
+      end
+
+      def get_environments
+        config[:source_path] = File.expand_path(config[:source])
+
+        Dir[File.join(config[:source_path], '**', '*.rb')].collect { |file|
+          File.readlines(file).find_all { |line| line[%r{(if_environment|build_if)}] }.collect { |line| line.scan(%r{:[a-z_]+}) }
+        }.flatten.uniq.sort.collect { |name| name[1..-1] }
+      end
+
+      def get_default_environment
+        File.read('.environment').strip rescue nil
+      end
+
+      def need_environment
+        puts "You need to specify an environment. Available environments:"
+        puts
+        puts get_environments.collect { |env| "rake apache:create[#{env}]" } * "\n"
+        puts
+        puts "Additionally, you can set a default environment for this server:"
+        puts
+        puts "rake apache:default[#{get_environments.first}]"
+        exit 1
+      end
+    end
+  end
+end

data/lib/apache/version.rb

@@ -0,0 +1,3 @@
+module Apache
+  VERSION = '0.2.6'
+end

data/spec/apache/apachify_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'apache/apachify'
+
+describe Apache::Apachify, "extends objects to apachify themselves" do
+  it "should Apachify the name" do
+    [
+      %w{test Test},
+      %w{test_full_name TestFullName},
+      %w{ssl_option SSLOption},
+      %w{exec_cgi ExecCGI},
+      %w{authz_ldap_authoritative AuthzLDAPAuthoritative},
+      %w{authz_ldap_url AuthzLDAPURL},
+      [ ["name", "other_name"], [ 'Name', 'OtherName' ] ]
+    ].each do |input, output|
+      input.apachify.should == output
+    end
+  end
+
+  it "should optionify the symbol" do
+    [
+      [ :not_multiviews, '-Multiviews' ]
+    ].each do |symbol, output|
+      symbol.optionify.should == output
+    end
+  end
+end

data/spec/apache/config_spec.rb

@@ -0,0 +1,140 @@
+require 'apache/config'
+require 'fileutils'
+
+describe Apache::Config, "builds configurations" do
+  let(:apache) { Apache::Config }
+
+  before { apache.reset! }
+
+  def set_apache_env(env)
+    Object.send(:remove_const, :APACHE_ENV) if Object.const_defined? :APACHE_ENV
+    Object.send(:const_set, :APACHE_ENV, env)
+  end
+
+  describe '.environment_ok?' do
+    subject { Apache::Config.environment_ok?(:good) }
+
+    context 'empty environment' do
+      before { set_apache_env(true) }
+
+      it { should be_true }
+    end
+
+    context 'bad environment' do
+      before { set_apache_env(:bad) }
+
+      it { should be_false }
+    end
+
+    context 'good environment' do
+      before { set_apache_env(:good) }
+
+      it { should be_true }
+    end
+  end
+
+  it "should handle indent" do
+    apache.line_indent = 1
+
+    [
+      [ 'hello', '  hello' ],
+      [ [ 'hello', 'goodbye' ], [ '  hello', '  goodbye' ] ]
+    ].each do |input, output|
+      apache.indent(input).should == output
+    end
+  end
+
+  it "should add a line to the config" do
+    apache << "hello"
+    apache.to_a.should == [ 'hello' ]
+
+    apache + [ 'goodbye' ]
+    apache.to_a.should == [ 'hello', 'goodbye' ]
+  end
+
+  it "should handle method_missing" do
+    apache.test "test2", "test3"
+    apache.test_again! "test2", "test3"
+
+    apache.to_a.should == [
+      'Test "test2" "test3"',
+      'TestAgain test2 test3'
+    ]
+  end
+
+  it "should quoteize properly" do
+    ["test", "test2"].quoteize.should == %w{"test" "test2"}
+    [:test, :test2].quoteize.should == %w{test test2}
+  end
+
+  it "should blockify a block" do
+    apache.blockify("Tag", [ 'part', 'part2' ]) do
+      something "goes here"
+    end.should == ['', '<Tag "part" "part2">', '  Something "goes here"', '</Tag>', '']
+  end
+
+  it "should blockify the name of a block" do
+    [
+      [ 'part', '"part"' ],
+      [ :part, 'part' ],
+      [ [ 'part', 'part2' ], '"part" "part2"' ]
+    ].each do |name, attribute|
+      name.blockify.should == attribute
+    end
+  end
+
+  it "should handle a build" do
+    FileUtils.mkdir_p 'test'
+    apache.build('test/fake.conf') { my_test "this" }.should == [ 'MyTest "this"' ]
+    FileUtils.rm 'test/fake.conf'
+  end
+
+  it "should handle building if the environment is correct" do
+    set_apache_env(:test)
+
+    apache.build_and_return_if(:other) { my_test 'this' }.should == nil
+    apache.build_and_return_if(:test) { my_test 'this' }.should == [ 'MyTest "this"' ]
+  end
+
+  it "should only execute a block if the environment is correct" do
+    set_apache_env(:test)
+
+    test = 0
+    apache.if_environment(:other) { test = 1 }
+    test.should == 0
+
+    test = 0
+    apache.if_environment(:test) { test = 1 }
+    test.should == 1
+  end
+
+  it "should create an IfModule block" do
+    apache.if_module("test") { my_test }
+    apache.to_a.should == [ '', '<IfModule test_module>', '  MyTest', '</IfModule>', '' ]
+  end
+
+  it "should create a Directory block" do
+    dir = File.dirname(__FILE__)
+
+    apache.directory(dir) { my_test }
+    apache.to_a.should == [ '', %{<Directory "#{dir}">}, '  MyTest', '</Directory>', '' ]
+
+    apache.reset!
+
+    apache.directory('/does/not/exist') { my_test }
+    apache.to_a.should == [ '', %{<Directory "/does/not/exist">}, '  MyTest', '</Directory>', '' ]
+  end
+
+  it "should create a LocationMatch block" do
+    apache.location_match(%r{^/$}) { my_test }
+    apache.to_a.should == [ '', '<LocationMatch "^/$">', '  MyTest', '</LocationMatch>', '' ]
+  end
+end
+
+describe "Apache::Config used separately" do
+  context "it works" do
+    subject { Apache::Config.build_and_return { this_works }.first }
+
+    it { should == "ThisWorks" }
+  end
+end

data/spec/apache/directory_spec.rb

@@ -0,0 +1,15 @@
+require 'apache/config'
+
+describe Apache::Master, "should provide basic helpers for configuration" do
+  let(:apache) { Apache::Config }
+
+  before { apache.reset! }
+
+  it "should create the list of options" do
+    { :options => 'Options', :index_options => 'IndexOptions' }.each do |method, tag|
+      apache.reset!
+      apache.send(method, :test, 'test2')
+      apache.to_a.should == [ "#{tag} Test Test2" ]
+    end
+  end
+end

data/spec/apache/logging_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'apache/config'
+
+describe Apache::Config, "logging directives" do
+  let(:apache) { Apache::Config }
+  before { apache.reset! }
+
+  it "should handle a defined log type" do
+    apache.rotate_logs_path = '/path/to/rotatelogs'
+
+    [ :custom, :error, :script, :rewrite ].each do |type|
+      apache.reset!
+      apache.send("#{type}_log".to_sym, 'test', 'test2')
+      apache.to_a.should == [ %{#{type.to_s.capitalize}Log "test" test2} ]
+
+      apache.reset!
+      apache.send("rotate_#{type}_log".to_sym, 'test', 86400, 'test2')
+      apache.to_a.should == [ %{#{type.to_s.capitalize}Log "|/path/to/rotatelogs test 86400" test2} ]
+    end
+  end
+
+  it "should give log formats" do
+    apache.combined_log_format
+    apache.common_log_format
+  end
+end

data/spec/apache/master_spec.rb

@@ -0,0 +1,84 @@
+require 'apache/config'
+
+describe Apache::Master, "should provide basic helpers for configuration" do
+  let(:apache) { Apache::Config }
+
+  before { apache.reset! }
+
+  it "should build the modules with the provided block" do
+    apache.modules(:this, :that) do
+      my "is here"
+    end.should == [
+      '',
+      'LoadModule "this_module" "modules/mod_this.so"',
+      'LoadModule "that_module" "modules/mod_that.so"',
+      'LoadModule "my_module" "is here"',
+      ''
+    ]
+  end
+
+  it "should set up the runner" do
+    apache.runner('test', 'test2')
+    apache.to_a.should == [ 'User test', 'Group test2' ]
+  end
+
+
+  it "should handle miscellaneous Apache directives" do
+    [
+      [ [ :apache_include, 'test' ], [ 'Include test' ] ],
+      [ [ :apache_alias, 'test', 'test2' ], [ 'Alias "test" "test2"' ] ],
+      [ [ :timeout, 300 ], [ 'Timeout 300' ] ]
+    ].each do |call, config|
+      apache.reset!
+      apache.send(*call)
+      apache.to_a.should == config
+    end
+  end
+
+  it "should handle rotate logs" do
+    apache.rotate_logs_path = "/my/path"
+    apache.rotatelogs('/log/path', 12345).should == "|/my/path /log/path 12345"
+  end
+
+  it "should create Passenger directives" do
+    apache.passenger '/opt/local/ruby', '1.8', '2.2.11'
+    apache.to_a.should == [
+      'LoadModule "passenger_module" "/opt/local/ruby/lib/ruby/gems/1.8/gems/passenger-2.2.11/ext/apache2/mod_passenger.so"',
+      'PassengerRoot "/opt/local/ruby/lib/ruby/gems/1.8/gems/passenger-2.2.11"',
+      'PassengerRuby "/opt/local/ruby/bin/ruby"'
+    ]
+  end
+
+  # not testing this big blob for output correctness...
+  it "should enable gzip server-wide" do
+    apache.enable_gzip!
+  end
+
+  it "should create Apache comments" do
+    apache.comment("This is a comment")
+    apache.to_a.should == [ '#', '# This is a comment', '#' ]
+
+    apache.reset!
+
+    apache.comment(["This is", "a comment"])
+    apache.to_a.should == [ '#', '# This is', '# a comment', '#' ]
+  end
+
+  it "should create & check a script alias" do
+    dir = File.dirname(__FILE__)
+
+    apache.script_alias '/script/', dir
+    apache.to_a.should == [ %{ScriptAlias "/script/" "#{dir}"} ]
+  end
+
+  it "should add a type with some other options" do
+    apache.add_type! 'text/html', '.html', :handler => 'html-handler'
+    apache.to_a.should == [ 'AddType text/html .html', 'AddHandler html-handler .html' ]
+  end
+
+  it "should create headers" do
+    apache.set_header :test => :test2
+    apache.set_header 'test3' => [ 'test4', "test5=test6" ]
+    apache.to_a.should == [ 'Header set test test2', 'Header set "test3" "test4" test5=test6' ]
+  end
+end

data/spec/apache/modules_spec.rb

@@ -0,0 +1,25 @@
+require 'apache/modules'
+
+describe Apache::Modules, "should build a list of modules" do
+  before do
+    Apache::Modules.reset!
+  end
+
+  it "should handle method_missing" do
+    Apache::Modules.mine
+
+    Apache::Modules.modules.should == [ 'LoadModule "mine_module" "modules/mod_mine.so"' ]
+  end
+
+  it "should build a set of modules" do
+    Apache::Modules.build(:this, :that) do
+      mine "my_path"
+    end.should == [
+      '',
+      'LoadModule "this_module" "modules/mod_this.so"',
+      'LoadModule "that_module" "modules/mod_that.so"',
+      'LoadModule "mine_module" "my_path"',
+      ''
+    ]
+  end
+end

data/spec/apache/mpm_prefork_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Apache::Config, "prefork MPM" do
+  let(:apache) { Apache::Config }
+  before { apache.reset! }
+
+  it "should build the prefork options" do
+    apache.prefork_config do
+      start 10
+      spares 10, 30
+      limit 20
+      clients 100
+      max_requests 1000
+    end
+
+    apache.to_a.should == [
+      '',
+      '# Prefork config',
+      '',
+      'StartServers 10',
+      'MinSpareServers 10',
+      'MaxSpareServers 30',
+      'ServerLimit 20',
+      'MaxClients 100',
+      'MaxRequestsPerChild 1000'
+    ]
+  end
+end

data/spec/apache/performance_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Apache::Config, "performance settings" do
+  let(:apache) { Apache::Config }
+  before { apache.reset! }
+
+  it "should set keepalive" do
+    apache.activate_keepalive({ :timeout => 10, :requests => 100 })
+
+    apache.to_a.sort.should == [
+      'KeepAlive On',
+      'KeepAliveTimeout 10',
+      'MaxKeepAliveRequests 100'
+    ]
+  end
+end

data/spec/apache/permissions_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Apache::Config, "permissions" do
+  let(:apache) { Apache::Config }
+  before { apache.reset! }
+
+  it "should set up allow and deny groups" do
+    apache.deny_from_all!
+    apache.to_a.should == [ 'Order deny,allow', 'Deny from all' ]
+
+    apache.reset!
+    apache.allow_from_all!
+    apache.to_a.should == [ 'Order allow,deny', 'Allow from all' ]
+  end
+
+  it "should allow from somewhere" do
+    apache.allow_from '1.2.3.4'
+    apache.to_a.should == [ 'Allow from "1.2.3.4"' ]
+  end
+
+  # Verify the blob output in apache itself, just make sure the method doesn't bomb
+  it "should verify some blob functions don't fail" do
+    apache.default_restrictive!
+    apache.no_htfiles!
+
+    apache.basic_authentication("My site", '/path/to/users/file', :user => :john)
+    apache.ldap_authentication("My site", 'ldap url', 'ldap-path' => 'path')
+  end
+
+  it "should add an auth require" do
+    apache.apache_require 'user', :john, :scott
+    apache.to_a.should == [ 'Require user john scott' ]
+  end
+end

data/spec/apache/rewrites_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe Apache::Config, "rewrites" do
+  let(:apache) { Apache::Config }
+  before { apache.reset! }
+
+  it "should enable the rewrite engine" do
+    apache.enable_rewrite_engine :log_level => 1
+    apache.to_a.should == [
+      '',
+      'RewriteEngine on',
+      'RewriteLogLevel 1',
+      ''
+    ]
+  end
+
+  it "should add a simple redirect permanent" do
+    apache.r301 '/here', '/there'
+    apache.to_a.should == [
+      'Redirect permanent "/here" "/there"'
+    ]
+  end
+
+  it "should build rewrites" do
+    apache.rewrites do
+      rule %r{^/$}, '/test'
+    end
+    apache.to_a[1..-1].should == [
+      '', 'RewriteRule "^/$" "/test"', ''
+    ]
+  end
+end
+
+describe Apache::RewriteManager, "specific rewrite rules" do
+  let(:rewrite) { Apache::RewriteManager }
+  before { rewrite.reset! }
+
+  it "should create a rewrite" do
+    rewrite.build do
+      cond '%{REQUEST_FILENAME}', 'test'
+      rule %r{^/$}, '/test'
+
+      r301 %r{^/success$}, '/test'
+
+      rewrite_test '/', '/test'
+      rewrite_test '/fail', '/test'
+      rewrite_test '/%{REQUEST_FILENAME}', '/test', :request_filename => 'success'
+    end[1..-1].should == [
+      '',
+      'RewriteCond "%{REQUEST_FILENAME}" "test"',
+      'RewriteRule "^/$" "/test"',
+      'RedirectMatch permanent "^/success$" "/test"'
+    ]
+  end
+end
+
+describe Apache::MatchableThing, "something that can be matched" do
+  subject do
+    thing = Apache::MatchableThing.new
+    thing.rule('here', 'there')
+
+    class << thing
+      def tag; "RSpec"; end
+    end
+
+    thing
+  end
+
+  its(:to_s) { should == 'RSpec "here" "there"' }
+  its(:to_a) { should == [ 'RSpec "here" "there"' ] }
+end
+
+describe Apache::RewriteRule, "a RewriteRule" do
+  subject do
+    rule = Apache::RewriteRule.new
+    rule.cond('/%{REQUEST_FILENAME}', '^/test$')
+    rule.rule(%r{^/test$}, '/test2', :last => true, :preserve_query_string => true)
+    rule
+  end
+
+  its(:to_s) { should == 'RewriteRule "^/test$" "/test2" [L,QSA]' }
+  its(:to_a) { should == [
+    '',
+    'RewriteCond "/%{REQUEST_FILENAME}" "^/test$"',
+    'RewriteRule "^/test$" "/test2" [L,QSA]'
+  ] }
+
+  it "should not the test" do
+    subject.test('/test', :request_filename => 'test').should == '/test2'
+  end
+
+  it "should fail if opts is not provided" do
+    lambda { subject.match?('test', nil) }.should raise_error
+  end
+end
+
+describe Apache::RewriteCondition, "a RewriteCond" do
+  subject do
+    cond = Apache::RewriteCondition.new
+    cond.cond('%{REQUEST_FILENAME}', '^/test$', :or, :case_insensitive, :no_vary)
+    cond
+  end
+
+  its(:to_s) { should == 'RewriteCond "%{REQUEST_FILENAME}" "^/test$" [OR,NC,NV]' }
+end

data/test/config/httpd.rb

@@ -0,0 +1,29 @@
+IPS = [ '127.0.0.1:80', '127.0.0.1:81' ]
+
+Apache::Config.build('httpd.conf') do
+  server_root '/var/html/apache'
+
+  modules :expires, :headers
+  modules :usertrack, :rewrite
+  load_module "php5_module", "modules/libphp5.so"
+
+  passenger '/var/html/ree', '1.8', '2.2.11'
+
+  if_module "!mpm_netware" do
+    runner 'webby', 'opoadm'
+  end
+
+  directory '/' do
+    options! 'FollowSymLinks'
+    allow_override! 'None'
+    deny_from_all
+  end
+
+  virtual_host *IPS do
+    directory '/' do
+      allow_from_all
+    end
+    
+    
+  end
+end

data/test/example_standalone.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/ruby
+
+require 'rubygems'
+gem 'apache-config-generator'
+require 'apache/config'
+
+puts Apache::Config.build_and_return { this_works }

data/tools.watchr

@@ -0,0 +1,22 @@
+def growl(title, message)
+	system %{growlnotify -m "#{message}" "#{title}"}
+end
+
+def reek(file)
+	output = %x{reek #{file}}
+
+	puts output
+
+	file, warnings = output.split("\n").first.split(" -- ")
+
+	growl "REEK: #{file}", warnings
+end
+
+def yard
+	system %{yard doc {app,lib}/**/*.rb}
+end
+
+watch('(app|lib)/(.*)\.rb') { |match|
+	reek(match[0])
+	yard
+}

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apache-config-generator
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 2
-  - 5
-  - 1
-  version: 0.2.5.1
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - John Bintz
@@ -16,14 +15,101 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: reek
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rainbow
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,31 +118,18 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  type: :runtime
+  version_requirements: *id007
 description: A Ruby DSL for programmatically generating Apache configs
-email: ""
+email: john@coswellproductions.com
 executables: 
 - apache-configurator
 extensions: []
 
-extra_rdoc_files: 
-- CHANGELOG
-- README.rdoc
-- bin/apache-configurator
-- lib/apache.rb
-- lib/apache/apachify.rb
-- lib/apache/config.rb
-- lib/apache/directory.rb
-- lib/apache/logging.rb
-- lib/apache/master.rb
-- lib/apache/modules.rb
-- lib/apache/mpm_prefork.rb
-- lib/apache/performance.rb
-- lib/apache/permissions.rb
-- lib/apache/rake/create.rb
-- lib/apache/rewrites.rb
-- lib/apache/ssl.rb
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -75,26 +148,36 @@ files:
 - lib/apache/mpm_prefork.rb
 - lib/apache/performance.rb
 - lib/apache/permissions.rb
-- lib/apache/rake/create.rb
+- lib/apache/rake.rb
+- lib/apache/rake/apache/create.rb
+- lib/apache/rake/support.rb
 - lib/apache/rewrites.rb
 - lib/apache/ssl.rb
+- lib/apache/version.rb
 - skel/Gemfile
 - skel/Rakefile
 - skel/config.yml
-- Manifest
-- apache-config-generator.gemspec
+- spec/apache/apachify_spec.rb
+- spec/apache/config_spec.rb
+- spec/apache/directory_spec.rb
+- spec/apache/logging_spec.rb
+- spec/apache/master_spec.rb
+- spec/apache/modules_spec.rb
+- spec/apache/mpm_prefork_spec.rb
+- spec/apache/performance_spec.rb
+- spec/apache/permissions_spec.rb
+- spec/apache/rewrites_spec.rb
+- spec/spec_helper.rb
+- test/config/httpd.rb
+- test/example_standalone.rb
+- tools.watchr
 has_rdoc: true
-homepage: ""
+homepage: http://johnbintz.com/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Apache-config-generator
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -111,14 +194,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
+      hash: 23
       segments: 
       - 1
-      - 2
-      version: "1.2"
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: apache-config-generator
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/Manifest

@@ -1,25 +0,0 @@
-CHANGELOG
-Gemfile
-Gemfile.lock
-README.rdoc
-Rakefile
-autotest/discover.rb
-bin/apache-configurator
-config/config.reek
-lib/apache.rb
-lib/apache/apachify.rb
-lib/apache/config.rb
-lib/apache/directory.rb
-lib/apache/logging.rb
-lib/apache/master.rb
-lib/apache/modules.rb
-lib/apache/mpm_prefork.rb
-lib/apache/performance.rb
-lib/apache/permissions.rb
-lib/apache/rake/create.rb
-lib/apache/rewrites.rb
-lib/apache/ssl.rb
-skel/Gemfile
-skel/Rakefile
-skel/config.yml
-Manifest

data/apache-config-generator.gemspec

@@ -1,35 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{apache-config-generator}
-  s.version = "0.2.5.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Bintz"]
-  s.date = %q{2010-10-26}
-  s.default_executable = %q{apache-configurator}
-  s.description = %q{A Ruby DSL for programmatically generating Apache configs}
-  s.email = %q{}
-  s.executables = ["apache-configurator"]
-  s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "bin/apache-configurator", "lib/apache.rb", "lib/apache/apachify.rb", "lib/apache/config.rb", "lib/apache/directory.rb", "lib/apache/logging.rb", "lib/apache/master.rb", "lib/apache/modules.rb", "lib/apache/mpm_prefork.rb", "lib/apache/performance.rb", "lib/apache/permissions.rb", "lib/apache/rake/create.rb", "lib/apache/rewrites.rb", "lib/apache/ssl.rb"]
-  s.files = ["CHANGELOG", "Gemfile", "Gemfile.lock", "README.rdoc", "Rakefile", "autotest/discover.rb", "bin/apache-configurator", "config/config.reek", "lib/apache.rb", "lib/apache/apachify.rb", "lib/apache/config.rb", "lib/apache/directory.rb", "lib/apache/logging.rb", "lib/apache/master.rb", "lib/apache/modules.rb", "lib/apache/mpm_prefork.rb", "lib/apache/performance.rb", "lib/apache/permissions.rb", "lib/apache/rake/create.rb", "lib/apache/rewrites.rb", "lib/apache/ssl.rb", "skel/Gemfile", "skel/Rakefile", "skel/config.yml", "Manifest", "apache-config-generator.gemspec"]
-  s.homepage = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Apache-config-generator", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{apache-config-generator}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Ruby DSL for programmatically generating Apache configs}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rainbow>, [">= 0"])
-    else
-      s.add_dependency(%q<rainbow>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rainbow>, [">= 0"])
-  end
-end

data/lib/apache/rake/create.rb

@@ -1,73 +0,0 @@
-Bundler.require(:default)
-
-require 'fileutils'
-require 'yaml'
-require 'apache/config'
-require 'apache/rake/create'
-
-CONFIG = Hash[YAML.load_file('config.yml').collect { |k,v| [ k.to_sym, v ] }]
-
-def get_environments
-  CONFIG[:source_path] = File.expand_path(CONFIG[:source])
-
-  Dir[File.join(CONFIG[:source_path], '**', '*.rb')].collect { |file|
-    File.readlines(file).find_all { |line| line[%r{(if_environment|build_if)}] }.collect { |line| line.scan(%r{:[a-z_]+}) }
-  }.flatten.uniq.sort.collect { |name| name[1..-1] }
-end
-
-def get_default_environment
-  File.read('.environment').strip rescue nil
-end
-
-def need_environment
-  puts "You need to specify an environment. Available environments:"
-  puts
-  puts get_environments.collect { |env| "rake apache:create[#{env}]" } * "\n"
-  puts
-  puts "Additionally, you can set a default environment for this server:"
-  puts
-  puts "rake apache:default[#{get_environments.first}]"
-  exit 1
-end
-
-task :default => 'apache:create'
-
-namespace :apache do
-  desc "Create all defined configs for the specified environment"
-  task :create, :environment do |t, args|
-    need_environment if !args[:environment] && !get_default_environment
-
-    APACHE_ENV = (args[:environment] || get_default_environment).to_sym
-
-    CONFIG[:source_path] = File.expand_path(CONFIG[:source])
-    CONFIG[:dest_path] = File.expand_path(CONFIG[:destination])
-
-    Apache::Config.rotate_logs_path = CONFIG[:rotate_logs_path]
-
-    FileUtils.mkdir_p CONFIG[:dest_path]
-    Dir.chdir CONFIG[:dest_path]
-
-    Dir[File.join(CONFIG[:source_path], '**', '*.rb')].each do |file|
-      puts file.foreground(:green)
-      require file
-    end
-  end
-
-  desc "List all possible environments"
-  task :environments do
-    puts get_environments * "\n"
-  end
-
-  desc "Set the default environment (currently #{get_default_environment || 'nil'})"
-  task :default, :environment do |t, args|
-    need_environment if !args[:environment]
-
-    if get_environments.include?(args[:environment])
-      File.open('.environment', 'w') { |fh| fh.puts args[:environment] }
-      puts "Calls to apache:create will now use #{args[:environment]} when you don't specify the environment."
-    else
-      puts "You need to specify a valid default environment. Here are the possibilities:"
-      Rake::Task['apache:environments'].invoke
-    end
-  end
-end