apache-config-generator 0.2.4 → 0.2.5.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.2.5.1. Bad release, forgot to add files.
+
+v0.2.5. New option for default environments.
+
 v0.2.4. Support proxy RewriteRule option.
 
 v0.2.3. Small updates to Rake tasks.

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,57 @@
+GEM
+  specs:
+    autotest (4.4.1)
+    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)
+      rake
+    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)
+      sexp_processor (~> 3.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+    ruby2ruby (1.2.4)
+      ruby_parser (~> 2.0)
+      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
+  autotest
+  echoe
+  mocha
+  rainbow
+  rdiscount
+  reek
+  rspec
+  sdoc
+  sdoc-helpers

data/Manifest

@@ -1,6 +1,9 @@
 CHANGELOG
+Gemfile
+Gemfile.lock
 README.rdoc
 Rakefile
+autotest/discover.rb
 bin/apache-configurator
 config/config.reek
 lib/apache.rb
@@ -16,6 +19,7 @@ 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/README.rdoc

@@ -9,7 +9,15 @@ Programmatically construct your Apache configuration using a powerful DSL built
 == Usage
 
 Run <tt>apache-configurator <directory></tt> to create a new directory to hold your config files.
-A Rakefile and config.yml file will also be generated.
+A Rakefile, Gemfile, and config.yml file will also be generated.
+
+=== Rakefile tasks
+
+Apache Config Generator defines several tasks for managing Apache config files:
+
+* apache:create[environment] creates your config files for the specified environment
+* apache:environments lists all possible environments that can be generated
+* apache:default[environment] sets a default environment to use with a parameter-less apache:create (or the default rake task)
 
 == Building a config file
 

data/Rakefile

@@ -1,13 +1,15 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require(:default)
+
 $LOAD_PATH << 'lib'
 
-require 'rubygems'
 require 'yaml'
 
 require 'apache'
-require 'spec/rake/spectask'
-require 'sdoc'
+require 'rspec/core/rake_task'
 require 'sdoc_helpers/markdown'
-require 'echoe'
 
 namespace :apache do
   desc "Generate the configs"
@@ -28,11 +30,11 @@ end
 
 namespace :spec do
   desc "Run RCov tests"
-  Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = FileList['spec/*.rb']
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.pattern = 'spec/*.rb'
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec', '--exclude', 'gems']
-    t.spec_opts = ['-b']
+    t.rspec_opts = ['-b']
   end
 end
 

data/apache-config-generator.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apache-config-generator}
-  s.version = "0.2.4"
+  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-05}
+  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", "README.rdoc", "Rakefile", "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/Rakefile", "skel/config.yml", "Manifest", "apache-config-generator.gemspec"]
+  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"]

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/lib/apache/config.rb

@@ -1,4 +1,8 @@
 require 'rubygems'
+require 'bundler'
+
+Bundler.require(:default)
+
 require 'fileutils'
 require 'rainbow'
 

data/lib/apache/rake/create.rb

@@ -1,8 +1,9 @@
+Bundler.require(:default)
+
 require 'fileutils'
 require 'yaml'
 require 'apache/config'
 require 'apache/rake/create'
-require 'rainbow'
 
 CONFIG = Hash[YAML.load_file('config.yml').collect { |k,v| [ k.to_sym, v ] }]
 
@@ -14,17 +15,29 @@ def get_environments
   }.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|
-    if !args[:environment]
-      puts "You need to specify an environment. Available environments:"
-      puts
-      puts get_environments.collect { |env| "rake apache:create[#{env}]" } * "\n"
-      exit 1
-    end
+    need_environment if !args[:environment] && !get_default_environment
 
-    APACHE_ENV = (args[:environment] || 'production').to_sym
+    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])
@@ -44,4 +57,17 @@ namespace :apache do
   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/skel/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gem 'apache-config-generator'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: apache-config-generator
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 73
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  - 1
+  version: 0.2.5.1
 platform: ruby
 authors: 
 - John Bintz
@@ -15,13 +16,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rainbow
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rainbow
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,8 +32,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 description: A Ruby DSL for programmatically generating Apache configs
 email: ""
 executables: 
@@ -57,8 +58,11 @@ extra_rdoc_files:
 - lib/apache/ssl.rb
 files: 
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
+- autotest/discover.rb
 - bin/apache-configurator
 - config/config.reek
 - lib/apache.rb
@@ -74,6 +78,7 @@ files:
 - lib/apache/rake/create.rb
 - lib/apache/rewrites.rb
 - lib/apache/ssl.rb
+- skel/Gemfile
 - skel/Rakefile
 - skel/config.yml
 - Manifest