From c81cec28336c3a687d56bc52616446c4ec048c43 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 24 Nov 2010 13:05:20 -0500
Subject: [PATCH] start making bundler support work more properly

---
 .gitignore                |  1 +
 Gemfile                   | 13 ++++---------
 Gemfile.lock              | 38 +++++++++++++++-----------------------
 Rakefile                  | 16 ----------------
 lib/apache/config.rb      |  4 ----
 lib/apache/rake/create.rb |  3 +++
 lib/apache/version.rb     |  3 +++
 7 files changed, 26 insertions(+), 52 deletions(-)
 create mode 100644 lib/apache/version.rb

diff --git a/.gitignore b/.gitignore
index 025d19c..17f3de0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,6 @@ Manifest
 *.gemspec
 tmp/*
 .bundle/*
+.DS_Store
 
 
diff --git a/Gemfile b/Gemfile
index ad339a8..9d54627 100644
--- a/Gemfile
+++ b/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
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 0cb9a6e..88ca75c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,19 +1,19 @@
-GEM
+PATH
+  remote: .
   specs:
-    autotest (4.4.1)
+    apache-config-generator (0.2.5.2)
+      rainbow
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    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)
diff --git a/Rakefile b/Rakefile
index 95869e8..60f8771 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,6 @@ require 'yaml'
 
 require 'apache'
 require 'rspec/core/rake_task'
-require 'sdoc_helpers/markdown'
 
 namespace :apache do
   desc "Generate the configs"
@@ -20,14 +19,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|
@@ -38,13 +29,6 @@ namespace :spec do
   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
diff --git a/lib/apache/config.rb b/lib/apache/config.rb
index 658bb3a..136f0fb 100644
--- a/lib/apache/config.rb
+++ b/lib/apache/config.rb
@@ -1,8 +1,4 @@
 require 'rubygems'
-require 'bundler'
-
-Bundler.require(:default)
-
 require 'fileutils'
 require 'rainbow'
 
diff --git a/lib/apache/rake/create.rb b/lib/apache/rake/create.rb
index df5b567..72307f7 100644
--- a/lib/apache/rake/create.rb
+++ b/lib/apache/rake/create.rb
@@ -1,3 +1,6 @@
+require 'rubygems'
+
+require 'bundler/setup'
 Bundler.require(:default)
 
 require 'fileutils'
diff --git a/lib/apache/version.rb b/lib/apache/version.rb
new file mode 100644
index 0000000..af73007
--- /dev/null
+++ b/lib/apache/version.rb
@@ -0,0 +1,3 @@
+module Apache
+  VERSION = '0.2.5.2'
+end