keithsalisbury-subtrac 0.1.7 → 0.1.9

data/README.markdown

@@ -21,6 +21,139 @@ For all users, you can add it here:
 	
 	...
 	export PATH=$PATH:/var/lib/gems/1.8/bin
+	
+
+# Installing on VirtualBox
+
+Start with a Fresh VM Image 
+Install jeos (hardy)
+	# mount guest additions - 
+	sudo mount /media/cdrom0/ -o unhide
+
+	# install gcc and make
+	sudo aptitude install build-essential linux-headers-`uname -r`
+
+	# install the guest additions
+	sudo /cdrom/VBoxLinuxAdditions-x86.run all
+
+	# install openssh-server?
+	sudo apt-get install openssh-server
+
+	# install gems
+	sudo apt-get install ruby rubygems
+
+	# update gems
+	sudo apt-get update --system
+
+	# edit bash.bashrc so all users can run the gem binaries
+	sudo vi /etc/bash.bashrc
+
+	# add github to the gem sources list
+	sudo gem sources -a http://gems.github.com
+
+	# some other pre-requisites
+	sudo aptitude install ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 sqlite3
+
+	# install subtrac gem package
+	sudo gem install --include-dependencies keithsalisbury-subtrac
+
+	# enable mod_rewrite
+	a2enmod rewrite
+
+	# enable dav
+	sudo apt-get install libapache2-svn
+
+	# enable mod_python
+	sudo apt-get install libapache2-mod-python libapache2-mod-python-doc
+
+	sudo apt-get install apache2 libapache2-mod-python \
+	     libapache2-svn python-setuptools subversion python-subversion
+	sudo easy_install Trac
+
+	# some trac plugin requirements
+	sudo apt-get install build-essential graphviz
+	sudo apt-get install htmldoc
+	sudo apt-get install enscript
+
+	easy_install -U setuptools
+
+	# some cool plugins
+	sudo easy_install http://svn.edgewall.org/repos/genshi/trunk/
+	sudo easy_install http://trac-hacks.org/svn/accountmanagerplugin/trunk
+	sudo easy_install http://trac-hacks.org/svn/customfieldadminplugin/0.11
+	sudo easy_install http://trac-hacks.org/svn/eclipsetracplugin/tracrpcext/0.10
+	sudo easy_install http://trac-hacks.org/svn/iniadminplugin/0.11
+	sudo easy_install http://trac-hacks.org/svn/masterticketsplugin/0.11
+	sudo easy_install http://trac-hacks.org/svn/pagetopdfplugin/0.10/
+	sudo easy_install http://trac-hacks.org/svn/progressmetermacro/0.11
+	sudo easy_install http://trac-hacks.org/svn/ticketdeleteplugin/0.11
+	sudo easy_install http://trac-hacks.org/svn/tracwysiwygplugin/0.11
+	sudo easy_install http://wikinotification.ufsoft.org/svn/trunk
+
+	# install subtrac server
+	sudo subtrac install [--clean]
+
+	# Mount a shared host folder from the VM Guest
+	mount.vboxsf pkg /mnt/subtrac/
+
+# Setting up VM to use an internal loop back interface
+
+## Create the interal interface
+	Snakey:~ adambarton$ sudo -i
+	Snakey:~ root# python
+	Python 2.5.1 (r251:54863, Apr 15 2008, 22:57:26) 
+	[GCC 4.0.1 (Apple Inc. build 5465)] on darwin
+	Type "help", "copyright", "credits" or "license" for more information.
+	>>> import os
+	>>> file_path = '/dev/tap1'
+	>>> dev_file = os.open(file_path, os.O_RDWR)
+	>>> interface = 'tap1'
+
+Leave this window open...
+
+## Configure the interface
+
+	Snakey:~ root# ifconfig tap1 10.0.2.100 up
+	Snakey:~ root# ifconfig tap1
+	tap1: flags=8943<UP,BROADCAST,RUNNING,PROMISC,SIMPLEX,MULTICAST> mtu 1500
+		inet 100.100.100.100 netmask 0xff000000 broadcast 100.255.255.255
+		ether ea:a2:95:41:b0:8f 
+		open (pid 4104)
+
+## Configure the VM
+
+VBoxManage modifyvm TestHost1 -nic1 hostif -hostifdev1 'tap1: ethernet'
+
+Boot it, and give it a static address on the same subnet
+
+## Assign a static ip
+
+sudo vi /etc/networking/interfaces
+
+# The primary network interface
+auto eth0
+iface eth0 inet static
+	address 10.0.2.2
+	netmask 255.255.255.0
+	network 10.0.2.0
+	broadcast 10.0.2.255
+	gateway 10.0.2.200
+
+# The secondary network interface
+auto eth1
+iface eth0 inet dhcp
+
+# For linux users there's an even cooler way to set this up...
+
+http://muffinresearch.co.uk/archives/2009/04/08/virtualbox-access-guests-via-a-virtual-interface/
+
+# OSX Map your new domain to the ip
+
+	sudo mate /private/etc/hosts 
+
+	10.0.2.2 dev.subtrac.com
+
+
 
 ## Copyright
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 7
+:patch: 9

data/lib/subtrac.rb

@@ -41,11 +41,96 @@ require 'fileutils'
 require 'subtrac/version'
 
 module Subtrac
-  SUBTRAC_ROOT = File.join(File.dirname(__FILE__), "subtrac")
-  DEV_ENV = 'development' # should be a system environment var 
-  
-  attr_accessor :server_name, :server_hostname, :server_ip, :default_client, :default_project, :install_dir, :docs_dir, :conf_dir, :locations_dir, :svn_dir, :trac_dir, :temp_dir
 
+  SUBTRAC_ROOT = "#{File.dirname(__FILE__)}/" unless defined?(SUBTRAC_ROOT)
+  SUBTRAC_ENV = (ENV['SUBTRAC_ENV'] || 'development').dup unless defined?(SUBTRAC_ENV)
+  USER_CONFIG = 'config/user.yml'
+
+  class << self
+
+    # The Configuration instance used to configure the Subtrac environment
+    def configuration
+      @@configuration
+    end
+
+    def configuration=(configuration)
+      @@configuration = configuration
+    end
+
+    def initialized?
+      @initialized || false
+    end
+ 
+    def initialized=(initialized)
+      @initialized ||= initialized
+    end
+
+    def root
+      Pathname.new(SUBTRAC_ROOT) if defined?(SUBTRAC_ROOT)
+    end
+
+    def public_path
+      @@public_path ||= self.root ? File.join(self.root, "public") : "public"
+    end
+    
+    def subtrac_path
+      @@subtrac_path ||= self.root ? File.join(self.root, "subtrac") : "subtrac"
+    end
+
+    def public_path=(path)
+      @@public_path = path
+    end
+
+    def docs_dir
+      @@docs_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:docs])
+    end
+
+    def docs_dir=(dir)
+      @@docs_dir = dir
+    end
+
+    def svn_dir
+      @@svn_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:svn])
+    end
+
+    def svn_dir=(dir)
+      @@svn_dir = dir
+    end
+
+    def trac_dir
+      @@trac_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:trac])
+    end
+
+    def trac_dir=(dir)
+      @@trac_dir = dir
+    end
+
+    def temp_dir
+      @@temp_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:temp])
+    end
+
+    def temp_dir=(dir)
+      @@temp_dir = dir
+    end
+
+    def log_dir
+      @@log_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:log])
+    end
+
+    def log_dir=(dir)
+      @@log_dir = dir
+    end
+
+    def locations_dir
+      @@locations_dir ||= File.join(@install_dir,@APP_CONFIG[:dirs][:locations])
+    end
+
+    def locations_dir=(dir)
+      @@locations_dir = dir
+    end
+    
+  end
+  
   module Commands
     class Install
       def initialize(args, options)
@@ -55,54 +140,34 @@ module Subtrac
     end
     class Create
       def initialize(args, options)
-        project = ask("What is the name of the project you would like to create? ") if !options.project
-        client = ask("Which client is this project for? ") if !options.client
+        options.project = ask("What is the name of the project you would like to create? ") if !options.project
+        options.client = ask("Which client is this project for? ") if !options.client
+        # this needs to load the updated configuration?
         Subtrac.load_config()
         Subtrac.create_project(options.project,options.client)
       end
     end
   end
-
-  # Install
-  def self.install(args,options)
-    puts "\n==== Installing development server files ===="
-    # Ask if the user agrees (yes or no)
-    confirm_clean = agree("Are you sure you would like a clean install? [Y/n]") if options.clean
-    # clear previous data
-    clean() if confirm_clean
-    # right lets install
-    change_server_name = agree("The default server name is \"#{@server_name}\". Would you like to change this? [Y/n]")
-    @server_name = ask("What would you like to call your new development server?  ") if change_server_name
-
-    create_environment_directories()
-    install_common_files()
-    create_virtual_host()
-    confirm_default_client = agree("Do you want to create a default client project? [Y/n]")
-    # create default project and client
-    if confirm_default_client
-      change_client = agree("The default client name is \"#{@default_client}\". Would you like to change this? [Y/n]")
-      @default_client = ask("What client name would you like to use?  ") if change_client
-      change_project = agree("The default project name is \"#{@default_project}\". Would you like to change this? [Y/n]")
-      @default_project = ask("What would you like to call your new project?  ") if change_project
-      create_project(@default_project,@default_client)
-    end
-  end
-
+  
   # Loads the configuration YML file
   def self.load_config
+    # TODO: We need to refactor this code so it will load the default configuration only if one has not been created
     puts "\n==== Loading configuration file ===="
     # load configuration file
+    file_path = File.join(subtrac_path, USER_CONFIG)
+    file_path = File.join(subtrac_path,"/config/config.yml") if not File.exists?(file_path)
+    puts "Attempting to read config file: #{file_path}"
     begin
-      raw_config = File.read(SUBTRAC_ROOT + "/config/config.yml")
+      raw_config = File.read(file_path)
       yamlFile = YAML.load(raw_config)
     rescue Exception => e
       raise StandardError, "Config #{file_path} could not be loaded."
     end
     if yamlFile
-      if yamlFile[DEV_ENV]
-        @APP_CONFIG = yamlFile[DEV_ENV]
+      if yamlFile[SUBTRAC_ENV]
+        @APP_CONFIG = yamlFile[SUBTRAC_ENV]
       else
-        raise StandardError, "config/config.yml exists, but doesn't have a configuration for DEV_ENV=#{DEV_ENV}."
+        raise StandardError, "config/config.yml exists, but doesn't have a configuration for #{SUBTRAC_ENV}."
       end
     else
       raise StandardError, "config/config.yml does not exist."
@@ -118,25 +183,69 @@ module Subtrac
     @default_project = @APP_CONFIG[:default_project]
     
     @install_dir = File.expand_path(@APP_CONFIG[:installation_dir])
-    @docs_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:docs])
     @conf_dir = @APP_CONFIG[:apache2_conf]
-    @locations_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:conf_locations])
-    @svn_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:svn])
-    @trac_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:trac])
-    @temp_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:temp])
-    @log_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:log])
     
     @ldap_bind_dn = @APP_CONFIG[:ldap][:bind_dn]
     @ldap_bind_password = @APP_CONFIG[:ldap][:bind_password]
     @ldap_url = @APP_CONFIG[:ldap][:host]
+
+  end
+
+
+  # Install
+  def self.install(args,options)
+    puts "\n==== Installing development server files ===="
+    # check where we are installing
+    change_install_dir = agree("The default installation directory is \"#{@install_dir}\". Would you like to change this? [Y/n]")
+    @install_dir = ask("Where would you like to install this server?") if change_install_dir
+
+    unless !File.directory?(@install_dir) 
+      # Ask if the user agrees (yes or no)
+      confirm_clean = agree("Err, that dirctory's got stuff init. You sure you want me to overwrite? [Y/n]") if options.clean
+    end
     
+    # right lets install
+    change_server_name = agree("The default server name is \"#{@server_name}\". Would you like to change this? [Y/n]")
+    @server_name = ask("What would you like to call your new development server?  ") if change_server_name
+
+    create_environment_directories(confirm_clean)
+    install_common_files()
+    # TODO: Need to check for default client/project before creating virtual host
+    # otherwise we need remove the rewrite rule
+    create_virtual_host()
+    confirm_default_client = agree("Do you want to create a default client project? [Y/n]")
+    # create default project and client
+    if confirm_default_client
+      change_client = agree("The default client name is \"#{@default_client}\". Would you like to change this? [Y/n]")
+      @default_client = ask("What client name would you like to use?  ") if change_client
+      change_project = agree("The default project name is \"#{@default_project}\". Would you like to change this? [Y/n]")
+      @default_project = ask("What would you like to call your new project?  ") if change_project
+      create_project(@default_project,@default_client)
+    end
+    save_config()
   end
 
   private
   
-  # Ask the user for configuration details
-  def self.get_config
+  # Write the changes configuration to disk
+  def self.save_config
+    # save the things that might have changed
+    @APP_CONFIG[:server_name] = @server_name
+    @APP_CONFIG[:server_hostname] = @server_hostname
+    @APP_CONFIG[:server_ip] = @server_ip
+    
+    @APP_CONFIG[:default_client] = @default_client
+    @APP_CONFIG[:default_project] = @default_project
+    
+    @APP_CONFIG[:installation_dir] = @install_dir
+    @APP_CONFIG[:apache2_conf] = @conf_dir
     
+    @APP_CONFIG[:ldap][:bind_dn] = @ldap_bind_dn
+    @APP_CONFIG[:ldap][:bind_password] = @ldap_bind_password
+    @APP_CONFIG[:ldap][:host] = @ldap_url
+    
+    file_path = File.join(subtrac_path, USER_CONFIG)
+    open(file_path, 'w') {|f| YAML.dump({SUBTRAC_ENV => @APP_CONFIG}, f)}
   end
 
   # creates a directory if it does not exist
@@ -167,53 +276,51 @@ module Subtrac
   # creates a new virtual host and reloads apache and enables the new virtual host
   def self.create_virtual_host
     puts "\n==== Creating new virtual host ===="
-    vhost_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:virtual_host])
+    vhost_template = File.join(subtrac_path, @APP_CONFIG[:templates][:virtual_host])
+    puts "group apache tempalte: #{vhost_template}"
     new_vhost = File.join(@conf_dir,@server_hostname)
-    parse_template(vhost_template,new_vhost,binding)
+    puts "group apache file: #{new_vhost}"
+    parse_template(vhost_template,new_vhost,binding) if SUBTRAC_ENV != 'test'
     # reload apache configuration
-    `/etc/init.d/apache2 force-reload` if DEV_ENV != 'test'
-    `a2ensite #{@server_hostname}` if DEV_ENV != 'test'
+    `/etc/init.d/apache2 force-reload` if SUBTRAC_ENV != 'test'
+    `a2ensite #{@server_hostname}` if SUBTRAC_ENV != 'test'
   end
   
   def self.install_common_files
     puts "\n==== Installing common files ===="
     # TODO: implement a mask for .svn folders
     # TODO: refactor /common to the app config
-    common_dir = File.join(SUBTRAC_ROOT, "common")
-    source = Dir.glob("#{common_dir}/.")
-    dest = @docs_dir
-    FileUtils.cp_r(source,dest)
+    FileUtils.cp_r(Dir.glob(File.join(subtrac_path, "common/.")),docs_dir)
+    FileUtils.cp_r(Dir.glob(File.join(subtrac_path, "shared/.")),File.join(trac_dir, ".shared"))
   end
 
-  def self.create_environment_directories
+  def self.create_environment_directories(overwrite=false)
     puts "\n==== Creating new environment directories ===="
+    FileUtils.rm_rf @install_dir if overwrite
+    create_if_missing @install_dir
     # create the environment directories
     @APP_CONFIG[:dirs].each do |key, value|
-      create_if_missing File.join(@install_dir,value)
+      dir = File.join(@install_dir,value)
+      create_if_missing dir
     end
   end  
 
-  def self.clean
-    puts "\n==== Remove old data if exists ===="
-    @APP_CONFIG[:dirs].each do |key, value|
-      #TODO: Ask for confirmation - yes,no,All
-      puts "Deleting #{value}"
-      FileUtils.rm_rf value
-    end
-  end
-  
   def self.create_client(name)
     puts "\n==== Create a new client called #{name} ===="
     client_name = name.downcase
     # create apache configuration
-    location_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:location])
-    location_conf = File.join(@locations_dir,"#{client_name}.conf")
+    puts "subtrac_path: #{subtrac_path}"
+    puts "templates_location: #{@APP_CONFIG[:templates][:location]}"
+    location_template = File.join(subtrac_path, @APP_CONFIG[:templates][:location])
+    puts "location_template: #{location_template}"
+    location_conf = File.join(locations_dir,"#{client_name}.conf")
+    puts "location_conf: #{location_conf}"
     parse_template(location_template,location_conf,binding)
-    `/etc/init.d/apache2 force-reload` if DEV_ENV != 'test'
+    `/etc/init.d/apache2 force-reload` if SUBTRAC_ENV != 'test'
     
     # create svn+trac directory
-    create_if_missing File.join(@svn_dir,client_name)
-    create_if_missing File.join(@trac_dir,client_name)
+    create_if_missing File.join(svn_dir,client_name)
+    create_if_missing File.join(trac_dir,client_name)
   end
   
   def self.create_project(project, client)
@@ -223,51 +330,57 @@ module Subtrac
     project_name = project.downcase
     
     # create client directory if needed
-    create_client(client_name) if (!File.directory? File.join(@svn_dir,client_name))
+    create_client(client_name) if (!File.directory? File.join(svn_dir,client_name))
+    
+    project_svn_dir = File.join(svn_dir,client_name,project_name)
+    project_trac_dir = File.join(trac_dir,client_name,project_name)
     
-    svn_dir = File.join(@svn_dir,client_name,project_name)
-    trac_dir = File.join(@trac_dir,client_name,project_name)
-    if (File.directory? svn_dir) then
+    # TODO: Need to change this to use a 'groups' yml file
+    if (File.directory? project_svn_dir) then
       raise StandardError, "A project called #{project} already exists in the #{client} repository. Would you like to replace it?"
     end
     
     # create new project directories
-    create_if_missing svn_dir
-    create_if_missing trac_dir
+    say("Create project directories...")
+    create_if_missing project_svn_dir
+    create_if_missing project_trac_dir
     
-    project_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:projects],@APP_CONFIG[:default_project_template])
+    project_template = File.join(subtrac_path, @APP_CONFIG[:templates][:projects],@APP_CONFIG[:default_project_template])
     
     # copy template svn project to a temp folder, then svn import it into the repo
+    say("Create temporary project directory and copy template files...")
     svn_template_dir = File.join(project_template,"svn")
-    temp_dir = File.join(@temp_dir,project_name)
-    FileUtils.cp_r(svn_template_dir,temp_dir)
+    project_temp_dir = File.join(temp_dir,project_name)
+    FileUtils.cp_r(svn_template_dir,project_temp_dir)
     
     # create a new subversion repository
     say("Creating a new subversion repository...")
-    `svnadmin create #{svn_dir}` if DEV_ENV != 'test'
+    `svnadmin create #{project_svn_dir}` if SUBTRAC_ENV != 'test'
     
     # import into svn
-    `svn import #{temp_dir} file:///#{svn_dir} --message "initial import"` if DEV_ENV != 'test'
+    say("Importing temporary project into the new subversion repository...")
+    `svn import #{project_temp_dir} file:///#{project_svn_dir} --message "initial import"` if SUBTRAC_ENV != 'test'
     # delete the temporary directory
-    FileUtils.rm_r(temp_dir, :force => true)
+    FileUtils.rm_r(project_temp_dir, :force => true)
     
     # create a new trac site
     say("Creating a new trac site...")
-    result = `trac-admin #{trac_dir} initenv #{project_name} sqlite:#{trac_dir}/db/trac.db svn #{svn_dir}` if DEV_ENV != 'test'
-    FileUtils.chown_R('www-data', 'www-data', trac_dir, :verbose => true)  if DEV_ENV != 'test'
-    FileUtils.mkdir_p("#{trac_dir}/conf") if DEV_ENV == 'test' # fake the folder for tests
+    result = `trac-admin #{project_trac_dir} initenv #{project_name} sqlite:#{project_trac_dir}/db/trac.db svn #{project_svn_dir}` if SUBTRAC_ENV != 'test'
+    FileUtils.chown_R('www-data', 'www-data', project_trac_dir, :verbose => true)  if SUBTRAC_ENV != 'test'
+    FileUtils.mkdir_p("#{project_trac_dir}/conf") if SUBTRAC_ENV == 'test' # fake the folder for tests
     
+    say("Installing trac configuration...")
     # install shared trac.ini
-    trac_ini_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:trac])
-    parse_template(trac_ini_template,File.join(trac_dir,"/conf/trac.ini"),binding)
+    trac_ini_template = File.join(subtrac_path, @APP_CONFIG[:templates][:trac])
+    parse_template(trac_ini_template,File.join(project_trac_dir,"/conf/trac.ini"),binding)
     
     # remove custom templates directory so trac uses the shared location (while we wait for trac patch)
-    FileUtils.rm_rf("#{trac_dir}/templates")
+    FileUtils.rm_rf("#{project_trac_dir}/templates")
 
-    say("Setting up default trac permission...")
+    say("Setting up default trac permissions...")
     # set up trac permissions
     @APP_CONFIG[:trac][:permissions].each do |key, value|
-      `trac-admin #{trac_dir} permission add #{key} #{value}` if DEV_ENV != 'test'
+      `trac-admin #{project_trac_dir} permission add #{key} #{value}` if SUBTRAC_ENV != 'test'
     end
 
     say("Adding default trac wiki pages...")
@@ -275,13 +388,17 @@ module Subtrac
     Dir.foreach("#{project_template}/trac/wiki/.") do |file|
       # do something with the file here
       unless ['.', '..','.svn'].include? file
-        temp_file = File.join(@temp_dir,file)
+        temp_file = File.join(temp_dir,file)
         parse_template(File.join(project_template,"trac/wiki",file), temp_file, binding)
-        `trac-admin #{trac_dir} wiki import #{file} #{temp_file}` if DEV_ENV != 'test'
+        `trac-admin #{project_trac_dir} wiki import #{file} #{temp_file}` if SUBTRAC_ENV != 'test'
         FileUtils.rm(temp_file)
       end
     end
-
+    
+    # run trac upgrade
+    say("Upgrading the trac installation...")
+    `trac-admin #{project_trac_dir} upgrade` if SUBTRAC_ENV != 'test'
+    
   end
 end
 

data/lib/subtrac/config/config.yml

@@ -45,7 +45,7 @@ development: &non_production_settings
         :log: log
         :docs: www
         :conf: conf
-        :conf_locations: conf/locations
+        :locations: locations
         :temp: tmp
     :urls:
         :svn: "/svn"

data/lib/subtrac/templates/location.erb

@@ -2,14 +2,14 @@
 	SetHandler mod_python
 	PythonInterpreter main_interpreter
 	PythonHandler trac.web.modpython_frontend
-	PythonOption TracEnvParentDir <%= @trac_dir %>/<%= client_name %>
+	PythonOption TracEnvParentDir <%= trac_dir %>/<%= client_name %>
 	PythonOption TracUriRoot /<%= client_name %>
-	PythonOption TracEnvIndexTemplate <%= @trac_dir %>/<%= client_name %>/trac_theme/htdocs/index/index.html
+	PythonOption TracEnvIndexTemplate <%= trac_dir %>/<%= client_name %>/trac_theme/htdocs/index/index.html
 	PythonOption PYTHON_EGG_CACHE /tmp
 </location>
 <location <%= @APP_CONFIG[:urls][:svn] %>/<%= client_name %>>
 	DAV svn
-	SVNParentPath <%= @APP_CONFIG[:urls][:svn] %>/<%= client_name %>
+	SVNParentPath <%= svn_dir %>/<%= client_name %>
 	SVNListParentPath On
 	SVNAutoversioning On
 	SVNReposName "Saint Digital Source Repository for <%= client_name %>"

data/lib/subtrac/templates/trac.erb

@@ -1,6 +1,6 @@
 [inherit]
-file = <%= @docs_dir %>/common/trac.ini
-templates_dir = ../../trac_theme/shared/theme/templates
+file = ../../../.shared/trac.ini
+templates_dir = ../../.theme/templates
 
 [project]
 name = <%= project_name %>

data/lib/subtrac/templates/vhost.erb

@@ -1,19 +1,19 @@
 <virtualhost *>
 	ServerAdmin webmaster@localhost
 	ServerName <%= @server_hostname %>
-	DocumentRoot <%= @docs_dir %>
-	ErrorLog <%= @log_dir %>/error.<%= @server_hostname %>.log
-	CustomLog <%= @log_dir %>/access.<%= @server_hostname %>.log combined
+	DocumentRoot <%= docs_dir %>
+	ErrorLog <%= log_dir %>/error.<%= @server_hostname %>.log
+	CustomLog <%= log_dir %>/access.<%= @server_hostname %>.log combined
 	LogLevel error
 
 	RewriteEngine On
-	RewriteRule ^/$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
-	RewriteRule ^/index*$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
+	RewriteRule ^/$ http://<%= @server_hostname %>/<%= @default_client.downcase %>/<%= @default_project.downcase %>
+	RewriteRule ^/index*$ http://<%= @server_hostname %>/<%= @default_client.downcase %>/<%= @default_project.downcase %>
 
 	<location />
 		AuthType Basic
 		AuthName '<%= @server_name %>'
-		AuthUserFile <%= @APP_CONFIG[:dirs][:install] %>/passwords
+		AuthUserFile <%= @install_dir %>/passwords
 		#Require valid-user
 		#AuthBasicProvider file ldap
 		#AuthLDAPBindDN '<%= @ldap_bind_dn %>'
@@ -30,6 +30,6 @@
 		SVNReposName '<%= @server_name %>'
 	</location>
 
-	Include <%= @locations_dir %>/*
+	Include <%= locations_dir %>/*
 
 </virtualhost>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: keithsalisbury-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors: 
 - Keith Salisbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-17 00:00:00 -07:00
+date: 2009-04-19 00:00:00 -07:00
 default_executable: subtrac
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,6 @@ files:
 - lib/subtrac/common/images/trac/saint_logo_small.png
 - lib/subtrac/common/static/404.html
 - lib/subtrac/common/styles/trac.css
-- lib/subtrac/common/trac.ini
 - lib/subtrac/config/config.yml
 - lib/subtrac/passwords
 - lib/subtrac/shared/trac.ini

data/lib/subtrac/common/trac.ini

@@ -1,178 +0,0 @@
-# -*- coding: utf-8 -*-
-
-[attachment]
-max_size = 262144
-render_unsafe_content = false
-
-[browser]
-color_scale = True
-downloadable_paths = /trunk, /branches/*, /tags/*
-hide_properties = svk:merge
-intermediate_color = 
-intermediate_point = 
-newest_color = (255, 136, 136)
-oldest_color = (136, 136, 255)
-oneliner_properties = trac:summary
-render_unsafe_content = false
-wiki_properties = trac:description
-
-[changeset]
-max_diff_bytes = 10000000
-max_diff_files = 0
-wiki_format_messages = true
-
-[header_logo]
-alt = Saint Development Server
-height = -1
-link = /
-src = /images/trac/saint_logo_small.png 
-width = -1
-
-[inherit]
-plugins_dir = 
-templates_dir = 
-
-[logging]
-log_file = trac.log
-# log_format = <inherited>
-log_level = DEBUG
-log_type = none
-
-[milestone]
-stats_provider = DefaultTicketGroupStatsProvider
-
-[mimeviewer]
-enscript_modes = text/x-dylan:dylan:4
-enscript_path = enscript
-max_preview_size = 262144
-mime_map = text/x-dylan:dylan,text/x-idl:ice,text/x-ada:ads:adb
-php_path = php
-tab_width = 8
-
-[notification]
-admit_domains = 
-always_notify_owner = false
-always_notify_reporter = false
-always_notify_updater = true
-ignore_domains = 
-mime_encoding = base64
-smtp_always_bcc = 
-smtp_always_cc = 
-smtp_default_domain = 
-smtp_enabled = false
-smtp_from = trac@localhost
-smtp_from_name = 
-smtp_password = 
-smtp_port = 25
-smtp_replyto = trac@localhost
-smtp_server = localhost
-smtp_subject_prefix = __default__
-smtp_user = 
-ticket_subject_template = $prefix #$ticket.id: $summary
-use_public_cc = false
-use_short_addr = false
-use_tls = false
-
-[project]
-admin = 
-admin_trac_url = .
-descr = My example project
-footer = Visit the Trac open source project at<br /><a href="http://trac.edgewall.org/">http://trac.edgewall.org/</a>
-icon = /favicon.ico
-url = 
-
-[query]
-default_anonymous_query = status!=closed&cc~=$USER
-default_query = status!=closed&owner=$USER
-items_per_page = 100
-
-[report]
-items_per_page = 100
-items_per_page_rss = 0
-
-[revisionlog]
-default_log_limit = 100
-
-[roadmap]
-stats_provider = DefaultTicketGroupStatsProvider
-
-[search]
-min_query_length = 3
-
-[svn]
-branches = trunk,branches/*
-tags = tags/*
-
-[ticket]
-default_cc = 
-default_component = 
-default_description = 
-default_keywords = 
-default_milestone = 
-default_owner = 
-default_priority = major
-default_resolution = fixed
-default_severity = 
-default_summary = 
-default_type = defect
-default_version = 
-max_comment_size = 262144
-max_description_size = 262144
-preserve_newlines = default
-restrict_owner = false
-workflow = ConfigurableTicketWorkflow
-
-[ticket-workflow]
-accept = new,assigned,accepted,reopened -> accepted
-accept.operations = set_owner_to_self
-accept.permissions = TICKET_MODIFY
-leave = * -> *
-leave.default = 1
-leave.operations = leave_status
-reassign = new,assigned,accepted,reopened -> assigned
-reassign.operations = set_owner
-reassign.permissions = TICKET_MODIFY
-reopen = closed -> reopened
-reopen.operations = del_resolution
-reopen.permissions = TICKET_CREATE
-resolve = new,assigned,accepted,reopened -> closed
-resolve.operations = set_resolution
-resolve.permissions = TICKET_MODIFY
-
-[timeline]
-abbreviated_messages = True
-changeset_collapse_events = false
-changeset_long_messages = false
-changeset_show_files = 0
-default_daysback = 30
-max_daysback = 90
-newticket_formatter = oneliner
-ticket_show_details = false
-
-[trac]
-authz_file = 
-authz_module_name = 
-auto_reload = False
-base_url = 
-check_auth_ip = false
-database = sqlite:db/trac.db
-default_charset = iso-8859-15
-htdocs_location = 
-ignore_auth_case = false
-mainnav = wiki,timeline,roadmap,browser,tickets,newticket,search
-metanav = login,logout,prefs,help,about
-permission_policies = DefaultPermissionPolicy, LegacyAttachmentPolicy
-permission_store = DefaultPermissionStore
-repository_type = svn
-secure_cookies = False
-show_email_addresses = false
-show_ip_addresses = false
-timeout = 20
-use_base_url_for_redirect = False
-
-[wiki]
-ignore_missing_pages = false
-max_size = 262144
-render_unsafe_content = false
-split_page_names = false
-