keithsalisbury-subtrac 0.1.6 → 0.1.7

data/VERSION.yml

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

data/lib/subtrac/config/config.yml

@@ -9,27 +9,14 @@ development: &non_production_settings
     :server_ip: "192.168.2.1"
     
     :installation_dir: test
-    
-    :dirs:
-        :svn: svn
-        :trac: trac
-        :log: log
-        :docs: www
-        :conf: conf
-        :conf_locations: conf/locations
-        :temp: tmp
-    :urls:
-        :svn: "/svn"
-    :templates:
-        :virtual_host: "templates/vhost.erb"
-        :location: "templates/location.erb"
-        :trac: "templates/trac.erb"
-        :projects: "templates/projects"
 
     :default_project_template: "blank"
     :default_client: "Subtrac"
     :default_project: "Public"
     :shared_trac_ini: "shared/trac.ini"
+
+    :apache2_conf: /etc/apache2/sites-available
+
     :ldap:
         :enable: false
         :host: 
@@ -39,8 +26,9 @@ development: &non_production_settings
         :group_rdn: 
         :store_bind: 
         :group_bind: 
-        :bind_user: 
+        :bind_dn: 
         :bind_passwd: 
+
     :trac:
         :permissions:
             admins: TRAC_ADMIN
@@ -50,6 +38,23 @@ development: &non_production_settings
             salisburyk: admin
             client: clients
 
+# Internal config
+    :dirs:
+        :svn: svn
+        :trac: trac
+        :log: log
+        :docs: www
+        :conf: conf
+        :conf_locations: conf/locations
+        :temp: tmp
+    :urls:
+        :svn: "/svn"
+    :templates:
+        :virtual_host: "templates/vhost.erb"
+        :location: "templates/location.erb"
+        :trac: "templates/trac.erb"
+        :projects: "templates/projects"
+
 test:
     <<: *non_production_settings
     

data/lib/subtrac/templates/vhost.erb

@@ -2,24 +2,24 @@
 	ServerAdmin webmaster@localhost
 	ServerName <%= @server_hostname %>
 	DocumentRoot <%= @docs_dir %>
-	ErrorLog <%= @APP_CONFIG[:dirs][:log] %>/error.<%= @server_hostname %>.log
-	CustomLog <%= @APP_CONFIG[:dirs][:log] %>/access.<%= @server_hostname %>.log combined
+	ErrorLog <%= @log_dir %>/error.<%= @server_hostname %>.log
+	CustomLog <%= @log_dir %>/access.<%= @server_hostname %>.log combined
 	LogLevel error
 
 	RewriteEngine On
-	RewriteRule ^/$ http://<%= @server_hostname %>/saint/public
-	RewriteRule ^/index*$ http://<%= @server_hostname %>/saint/public
+	RewriteRule ^/$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
+	RewriteRule ^/index*$ http://<%= @server_hostname %>/<%= @default_client %>/<%= @default_project %>
 
 	<location />
 		AuthType Basic
-		AuthName 'SaintDigitalSourceRepository'
+		AuthName '<%= @server_name %>'
 		AuthUserFile <%= @APP_CONFIG[:dirs][:install] %>/passwords
 		#Require valid-user
-		AuthBasicProvider file ldap
-		AuthLDAPBindDN 'CN=WTMS LDAP Auth,OU=WTMS,OU=STS,OU=Europe,OU=EMEA-YR-LON-GLH,OU=EMEA-YR-LON,OU=EMEA-YR,DC=emea,DC=corp,DC=yr,DC=com'
-		AuthLDAPBindPassword 'l00kmeup'
-		AuthLDAPURL 'ldap://emea-root03.emea.corp.yr.com:389/dc=emea,dc=corp,dc=yr,dc=com?sAMAccountName?sub?(&(objectClass=user)(memberOf=cn=EMEA-YR-LON-GLH-SAINT-DEVELOPERS,ou=Groups,ou=Saint,ou=RKCRYR,ou=EMEA-YR-LON-GLH,ou=EMEA-YR-LON,ou=EMEA-YR,dc=emea,dc=corp,dc=yr,dc=com))'
-		AuthzLDAPAuthoritative off
+		#AuthBasicProvider file ldap
+		#AuthLDAPBindDN '<%= @ldap_bind_dn %>'
+		#AuthLDAPBindPassword '<%= @ldap_bind_password %>'
+		#AuthLDAPURL '<%= @ldap_url %>'
+		#AuthzLDAPAuthoritative off
 	</location>
 
 	<location <%= @APP_CONFIG[:urls][:svn] %>>
@@ -27,9 +27,9 @@
 		SVNParentPath <%= @APP_CONFIG[:dirs][:svn] %>/
 		SVNListParentPath On
 		SVNAutoversioning On
-		SVNReposName 'SaintDigitalSourceRepository'
+		SVNReposName '<%= @server_name %>'
 	</location>
 
-	Include <%= @APP_CONFIG[:dirs][:conf_locations] %>/*
+	Include <%= @locations_dir %>/*
 
 </virtualhost>

data/lib/subtrac.rb

@@ -42,7 +42,7 @@ require 'subtrac/version'
 
 module Subtrac
   SUBTRAC_ROOT = File.join(File.dirname(__FILE__), "subtrac")
-  DEV_ENV = 'test' # should be a system environment var 
+  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
 
@@ -88,9 +88,6 @@ module Subtrac
     end
   end
 
-  private
-  
-=begin
   # Loads the configuration YML file
   def self.load_config
     puts "\n==== Loading configuration file ===="
@@ -120,15 +117,22 @@ module Subtrac
     @default_client = @APP_CONFIG[:default_client]
     @default_project = @APP_CONFIG[:default_project]
     
-    @install_dir = @APP_CONFIG[:installation_dir]
+    @install_dir = File.expand_path(@APP_CONFIG[:installation_dir])
     @docs_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:docs])
-    @conf_dir = File.join(@install_dir,@APP_CONFIG[:dirs][:conf])
+    @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
+
+  private
   
   # Ask the user for configuration details
   def self.get_config
@@ -203,7 +207,7 @@ module Subtrac
     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")
+    location_conf = File.join(@locations_dir,"#{client_name}.conf")
     parse_template(location_template,location_conf,binding)
     `/etc/init.d/apache2 force-reload` if DEV_ENV != 'test'
     
@@ -227,6 +231,10 @@ module Subtrac
       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
+    
     project_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:projects],@APP_CONFIG[:default_project_template])
     
     # copy template svn project to a temp folder, then svn import it into the repo
@@ -235,6 +243,7 @@ module Subtrac
     FileUtils.cp_r(svn_template_dir,temp_dir)
     
     # create a new subversion repository
+    say("Creating a new subversion repository...")
     `svnadmin create #{svn_dir}` if DEV_ENV != 'test'
     
     # import into svn
@@ -243,24 +252,25 @@ module Subtrac
     FileUtils.rm_r(temp_dir, :force => true)
     
     # create a new trac site
-    `trac-admin #{trac_dir} initenv #{project_name} sqlite:#{trac_dir}/db/trac.db svn #{svn_dir}` if DEV_ENV != 'test'
+    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
     
     # install shared trac.ini
     trac_ini_template = File.join(SUBTRAC_ROOT, @APP_CONFIG[:templates][:trac])
-    parse_template(trac_ini_template,"#{trac_dir}/conf/trac.ini",binding)
+    parse_template(trac_ini_template,File.join(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")
 
-    puts "Setting up default trac permission..."
+    say("Setting up default trac permission...")
     # set up trac permissions
     @APP_CONFIG[:trac][:permissions].each do |key, value|
       `trac-admin #{trac_dir} permission add #{key} #{value}` if DEV_ENV != 'test'
     end
 
-    puts "Adding default trac wiki pages..."
+    say("Adding default trac wiki pages...")
     # this needs to loop through the directory and import all pages
     Dir.foreach("#{project_template}/trac/wiki/.") do |file|
       # do something with the file here
@@ -273,7 +283,6 @@ module Subtrac
     end
 
   end
-=end  
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: keithsalisbury-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Keith Salisbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: subtrac
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simple and opinionated helper for creating and managing subversion and trac projects.
 test_files: []