ktec-subtrac 0.1.27 → 0.1.28

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 27
+:patch: 28

data/lib/subtrac/templates/location.erb

@@ -1,15 +1,15 @@
-<location /<%= client_name %>>
+<location /<%= client_path %>>
 	SetHandler mod_python
 	PythonInterpreter main_interpreter
 	PythonHandler trac.web.modpython_frontend
-	PythonOption TracEnvParentDir <%= trac_dir %>/<%= client_name %>
-	PythonOption TracUriRoot /<%= client_name %>
-	PythonOption TracEnvIndexTemplate <%= trac_dir %>/<%= client_name %>/.theme/index/index.html
+	PythonOption TracEnvParentDir <%= trac_dir %>/<%= client_path %>
+	PythonOption TracUriRoot /<%= client_path %>
+	PythonOption TracEnvIndexTemplate <%= trac_dir %>/<%= client_path %>/.theme/index/index.html
 	PythonOption PYTHON_EGG_CACHE <%= temp_dir %>
 </location>
-<location <%= @APP_CONFIG[:urls][:svn] %>/<%= client_name %>>
+<location <%= @APP_CONFIG[:urls][:svn] %>/<%= client_path %>>
 	DAV svn
-	SVNParentPath <%= svn_dir %>/<%= client_name %>
+	SVNParentPath <%= svn_dir %>/<%= client_path %>
 	SVNListParentPath On
 	SVNAutoversioning On
 	SVNReposName "<%= server_name %> for <%= client_name %>"

data/lib/subtrac/templates/projects/blank/trac/wiki/WikiStart

@@ -1,19 +1,19 @@
 [[PageOutline]]
 = Welcome to the <%= server_name %> for <%= project_name %> =
 
-This is the home of development for <%= client %>. This page is editable by design. That means YOU. If something is missing, fix it. This is what you make of it so get involved.
+This is the home of development for <%= client_name %>. This page is editable by design. That means YOU. If something is missing, fix it. This is what you make of it so get involved.
 
 == Starting Points ==
 
- * [<%= svn_url %>/<%= client_name %> Browse all <%= client_name %> SVN Repositories]
- * [<%= svn_url %>/<%= client_name %>/<%= project_name %> Browse the <%= project_name %> repository]
+ * [<%= svn_url %>/<%= client_path %> Browse all <%= client_name %> SVN Repositories]
+ * [<%= svn_url %>/<%= client_path %>/<%= project_path %> Browse the <%= project_name %> repository]
 
 === How to check this project out ===
 
 Make sure you have subversion client installed, then you can check the project out using:
 
 {{{
-svn checkout <%= svn_url %>/<%= client_name %>/<%= project_name %>/trunk <%= project_name %>
+svn checkout <%= svn_url %>/<%= client_path %>/<%= project_path %>/trunk <%= project_path %>
 }}}
 
 === Using SVN ===
@@ -22,11 +22,6 @@ svn checkout <%= svn_url %>/<%= client_name %>/<%= project_name %>/trunk <%= pro
  * [http://scplugin.tigris.org/ For OS X use SCPlugin]
  * [http://theappleblog.com/2009/02/23/12-subversion-apps-for-os-x/ There's loads more if you don't like these]
 
-== Template Projects ==
-
-This system allows you to set up a default template for different project types. All templates are available to browse in the [<%= @APP_CONFIG[:urls][:svn] %>/templates/svn/ Browse all Templates Repositories] area.
-
-
 = About Trac =
 
 Trac is a '''minimalistic''' approach to '''web-based''' management of

data/lib/subtrac/templates/projects/new/svn/trunk/trac/wiki/WikiStart

@@ -1,19 +1,19 @@
 [[PageOutline]]
-= Welcome to the <%= server_name %> for <%= project_name %> =
+= Welcome to the <%= server_name %> for <%= project_name   %> =
 
 This is the home of development for <%= client %>. This page is editable by design. That means YOU. If something is missing, fix it. This is what you make of it so get involved.
 
 == Starting Points ==
 
- * [<%= svn_url %>/<%= client_name %> Browse all <%= client_name %> SVN Repositories]
- * [<%= svn_url %>/<%= client_name %>/<%= project_name %> Browse the <%= project_name %> repository]
+ * [<%= svn_url %>/<%= client_path %> Browse all <%= client_name %> SVN Repositories]
+ * [<%= svn_url %>/<%= client_path %>/<%= project_name %> Browse the <%= project_name %> repository]
 
 === How to check this project out ===
 
 Make sure you have subversion client installed, then you can check the project out using:
 
 {{{
-svn checkout <%= svn_url %>/<%= client_name %>/<%= project_name %>/trunk <%= project_name %>
+svn checkout <%= svn_url %>/<%= client_path %>/<%= project_name %>/trunk <%= project_name %>
 }}}
 
 === Using SVN ===

data/lib/subtrac/templates/projects/new/trac/wiki/WikiStart

@@ -5,15 +5,15 @@ This is the home of development for <%= client %>. This page is editable by desi
 
 == Starting Points ==
 
- * [<%= svn_url %>/<%= client_name %> Browse all <%= client_name %> SVN Repositories]
- * [<%= svn_url %>/<%= client_name %>/<%= project_name %> Browse the <%= project_name %> repository]
+ * [<%= svn_url %>/<%= client_path %> Browse all <%= client_name %> SVN Repositories]
+ * [<%= svn_url %>/<%= client_path %>/<%= project_path %> Browse the <%= project_name %> repository]
 
 === How to check this project out ===
 
 Make sure you have subversion client installed, then you can check the project out using:
 
 {{{
-svn checkout <%= svn_url %>/<%= client_name %>/<%= project_name %>/trunk <%= project_name %>
+svn checkout <%= svn_url %>/<%= client_path %>/<%= project_path %>/trunk <%= project_path %>
 }}}
 
 === Using SVN ===

data/lib/subtrac/templates/trac.ini.erb

@@ -20,7 +20,7 @@ src =
 width = -1
 
 [trac]
-repository_dir = ../../../svn/<%= client_name %>/<%= project_name %>
+repository_dir = ../../../svn/<%= client_path %>/<%= project_path %>
 
 [components]
 batchmod.web_ui.batchmodifymodule = enabled

data/lib/subtrac.rb

@@ -56,7 +56,7 @@ module Subtrac
     end
 
     def server_name=(name)
-      @APP_CONFIG[:server_name] = @@server_name = name
+      @APP_CONFIG[:server_name] = @server_name = name
     end
 
     def server_hostname
@@ -64,7 +64,7 @@ module Subtrac
     end
 
     def server_hostname=(name)
-      @APP_CONFIG[:server_hostname] = @@server_hostname = name
+      @APP_CONFIG[:server_hostname] = @server_hostname = name
     end
 
     def default_client
@@ -72,7 +72,7 @@ module Subtrac
     end
 
     def default_client=(name)
-      @APP_CONFIG[:default_client] = @@default_client = name
+      @APP_CONFIG[:default_client] = @default_client = name
     end
     
     def default_project
@@ -81,7 +81,7 @@ module Subtrac
 
     def default_project=(name)
       puts "Updating default_project to #{name}"
-      @APP_CONFIG[:default_project] = @@default_project = name
+      @APP_CONFIG[:default_project] = @default_project = name
     end
 
 
@@ -117,7 +117,7 @@ module Subtrac
     end
 
     def apache_conf_dir=(name)
-      @APP_CONFIG[:apache_conf_dir] = @@apache_conf_dir = name
+      @APP_CONFIG[:apache_conf_dir] = @apache_conf_dir = name
     end
 
     def docs_dir
@@ -157,7 +157,7 @@ module Subtrac
     end
 
     def enable_ldap=(value)
-      @APP_CONFIG[:ldap][:enable] = @@enable_ldap = value
+      @APP_CONFIG[:ldap][:enable] = @enable_ldap = value
     end
 
     def ldap_bind_dn
@@ -165,7 +165,7 @@ module Subtrac
     end
 
     def ldap_bind_dn=(value)
-      @APP_CONFIG[:ldap][:bind_dn] = @@ldap_bind_dn = value
+      @APP_CONFIG[:ldap][:bind_dn] = @ldap_bind_dn = value
     end
     
     def ldap_bind_password
@@ -173,7 +173,7 @@ module Subtrac
     end
 
     def ldap_bind_password=(value)
-      @APP_CONFIG[:ldap][:bind_password] = @@ldap_bind_password = value
+      @APP_CONFIG[:ldap][:bind_password] = @ldap_bind_password = value
     end
     
     def ldap_bind_host
@@ -181,7 +181,7 @@ module Subtrac
     end
 
     def ldap_bind_host=(value)
-      @APP_CONFIG[:ldap][:bind_host] = @@ldap_bind_password = value
+      @APP_CONFIG[:ldap][:bind_host] = @ldap_bind_password = value
     end
     
   end
@@ -364,36 +364,37 @@ module Subtrac
 
   def self.create_client(name)
     puts "\n==== Create a new client called #{name} ===="
-    client_name = name.downcase
+    client_name = name.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase }
+    client_path = name.downcase
     # create apache configuration
     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")
+    location_conf = File.join(locations_dir,"#{client_path}.conf")
     puts "location_conf: #{location_conf}"
     parse_template(location_template,location_conf,binding)
     `/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_path)
+    create_if_missing File.join(trac_dir,client_path)
 
   end
   
   def self.install_default_theme
     puts "\n==== Create a new client called #{name} ===="
     # create a project for this clients trac theme
-    #create_project("trac_theme", client_name,@APP_CONFIG[:default_theme_template])
+    #create_project("trac_theme", client_path,@APP_CONFIG[:default_theme_template])
     
     # check the theme project out
-    #client_theme_dir = File.join(trac_dir,client_name,".theme")
+    #client_theme_dir = File.join(trac_dir,client_path,".theme")
     #create_if_missing(client_theme_dir)
     #FileUtils.chown_R('www-data', 'www-data', client_theme_dir, :verbose => true)  if SUBTRAC_ENV != 'test'
     #puts "Attempting checkout of theme project..."
     
     #`sudo svn co --username #{@APP_CONFIG[:admin_user]} --password #{@APP_CONFIG[:admin_pass]} \
-    #    file://#{svn_dir}/#{client_name}/trac_theme/trunk #{client_theme_dir}` if SUBTRAC_ENV != 'test'
+    #    file://#{svn_dir}/#{client_path}/trac_theme/trunk #{client_theme_dir}` if SUBTRAC_ENV != 'test'
     # TODO: Need to find a way to test before trying
     template_dir = File.join(subtrac_path, "templates","trac","themes","subtractheme")
     say(`sudo easy_install #{template_dir}`)
@@ -402,14 +403,17 @@ module Subtrac
   def self.create_project(project, client, project_type=@APP_CONFIG[:default_project_template])
     puts "\n==== Create a new project called #{project} for #{client} ===="
     
-    client_name = client.downcase
-    project_name = project.downcase
+    client_name = client.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase }
+    project_name = project.gsub(/^[a-z]|\s+[a-z]/) { |a| a.upcase }
+    # need to make sure this is a valid path - swap spaces for underscores etc
+    client_path = client.downcase
+    project_path = project.downcase
     
     # create client directory if needed
-    create_client(client_name) if (!File.directory? File.join(svn_dir,client_name))
+    create_client(client_path) if (!File.directory? File.join(svn_dir,client_path))
     
-    project_svn_dir = File.join(svn_dir,client_name,project_name)
-    project_trac_dir = File.join(trac_dir,client_name,project_name)
+    project_svn_dir = File.join(svn_dir,client_path,project_path)
+    project_trac_dir = File.join(trac_dir,client_path,project_path)
     
     # TODO: Need to handle this exception...
     if (File.directory? project_svn_dir) then
@@ -426,7 +430,7 @@ module Subtrac
     # 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")
-    project_temp_dir = File.join(temp_dir,project_name)
+    project_temp_dir = File.join(temp_dir,project_path)
     FileUtils.cp_r(svn_template_dir,project_temp_dir)
     
     # create a new subversion repository
@@ -441,7 +445,7 @@ module Subtrac
     
     # create a new trac site
     say("Creating a new trac site...")
-    result = `trac-admin #{project_trac_dir} initenv #{project_name} sqlite:#{project_trac_dir}/db/trac.db svn #{project_svn_dir}` if SUBTRAC_ENV != 'test'
+    result = `trac-admin #{project_trac_dir} initenv #{project_path} 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 => false)  if SUBTRAC_ENV != 'test'
     FileUtils.mkdir_p("#{project_trac_dir}/conf") if SUBTRAC_ENV == 'test' # fake the folder for tests
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ktec-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors: 
 - Keith Salisbury
@@ -58,11 +58,6 @@ files:
 - lib/subtrac/templates/projects/blank/trac/wiki/WikiStart
 - lib/subtrac/templates/projects/new/svn/trunk/trac/wiki/WikiStart
 - lib/subtrac/templates/projects/new/trac/wiki/WikiStart
-- lib/subtrac/templates/projects/trac_theme/svn/trunk/index/index.html
-- lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/layout.html
-- lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/site.html
-- lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/theme.html
-- lib/subtrac/templates/projects/trac_theme/trac/wiki/WikiStart
 - lib/subtrac/templates/trac.ini.erb
 - lib/subtrac/templates/trac/themes/sainttheme/crystalxtheme/__init__.py
 - lib/subtrac/templates/trac/themes/sainttheme/crystalxtheme/htdocs/img/bg.gif

data/lib/subtrac/templates/projects/trac_theme/svn/trunk/index/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:py="http://genshi.edgewall.org/"
-      xmlns:xi="http://www.w3.org/2001/XInclude">
-  <head>
-    <title>Available Projects</title>
-  </head>
-  <body>
-    <h1>Available Projects for Subtrac</h1>
-    <ul>
-      <py:for each="project in projects" py:choose="">
-        <li py:when="project.href">
-          <a href="$project.href"
-             title="$project.description">$project.name</a>
-        </li>
-      </py:for>
-    </ul>
-  </body>
-</html>

data/lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/layout.html

@@ -1,56 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/"
-      py:strip="">
-
-  <py:match path="head" once="true"><head>
-    <title py:with="title = list(select('title/text()'))">
-      <py:if test="title">${title} – </py:if>${project.name or 'Trac'}
-    </title>
-    <py:if test="chrome.links">
-      <py:for each="rel, links in chrome.links.items()">
-        <link rel="${rel}" py:for="link in links" py:attrs="link" />
-      </py:for>
-    </py:if>
-    <py:if test="'SEARCH_VIEW' in perm" id="search">
-      <link type="application/opensearchdescription+xml" rel="search"
-            href="${href.search('opensearch')}" title="Search $project.name"/>
-    </py:if>
-    <script py:for="script in chrome.scripts"
-            type="${script.type}" src="${script.href}"></script>
-    ${Markup('&lt;!--[if lt IE 7]&gt;')}
-    <script type="text/javascript" src="${chrome.htdocs_location}js/ie_pre7_hacks.js"
-></script>
-    ${Markup('&lt;![endif]--&gt;')}
-    ${select("*[local-name() != 'title']")}
-  </head></py:match>
-
-  <py:match path="body" once="true" buffer="false"><body>
-    ${select('*|text()')}
-
-    <script type="text/javascript" py:if="chrome.late_links">
-      <py:for each="link in chrome.late_links.get('stylesheet')">
-        jQuery.loadStyleSheet("${link.href}", "${link.type}");
-      </py:for>
-    </script>
-    <script py:for="script in chrome.late_scripts"
-            type="${script.type}" src="${script.href}"></script>
-
-    <div id="altlinks" py:if="'alternate' in chrome.links">
-      <h3>Download in other formats:</h3>
-      <ul>
-        <li py:for="idx, link in enumerate(chrome.links.alternate)"
-            class="${first_last(idx, chrome.links.alternate)}">
-          <a rel="nofollow" href="${link.href}" class="${link['class']}"
-             py:content="link.title" />
-        </li>
-      </ul>
-    </div>
-  </body></py:match>
-
-  <xi:include href="$chrome.theme"><xi:fallback /></xi:include>
-  <xi:include href="site.html"><xi:fallback /></xi:include>
-</html>

data/lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/site.html

@@ -1,27 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:py="http://genshi.edgewall.org/"
-      py:strip="">
-
-  <!--! Add site-specific style sheet -->
-  <head py:match="head" py:attrs="select('@*')">
-    ${select('*|comment()|text()')}
-    <link rel="stylesheet" type="text/css"
-          href="${href.chrome('site/style.css')}" />
-    <link rel="stylesheet" type="text/css"
-          href="/styles/trac.css"/>
-  </head>
-
-  <body py:match="body" py:attrs="select('@*')">
-    <!--! Add site-specific header -->
-    <div id="siteheader">
-      <!--! Place your header content here... -->
-    </div>
-
-    ${select('*|text()')}
-
-    <!--! Add site-specific footer -->
-    <div id="sitefooter">
-      <!--! Place your footer content here... -->
-    </div>
-  </body>
-</html>

data/lib/subtrac/templates/projects/trac_theme/svn/trunk/templates/theme.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/"
-      py:strip="">
-
-  <div py:def="navigation(category)" id="${category}" class="nav">
-    <ul py:if="chrome.nav[category]">
-      <li py:for="idx, item in  enumerate(chrome.nav[category])"
-          class="${classes(first_last(idx, chrome.nav[category]), active=item.active)
-}">${item.label}</li>
-    </ul>
-  </div>
-
-  <py:match path="body" once="true" buffer="false"><body>
-    <div id="banner">
-      <div id="header" py:choose="">
-        <a py:when="chrome.logo.src" id="logo" href="${chrome.logo.link or href.wiki(
-'TracIni')+'#header_logo-section'}"><img
-          src="${chrome.logo.src}" alt="${chrome.logo.alt}"
-          height="${chrome.logo.height or None}" width="${chrome.logo.width or None}"
- /></a>
-        <h1 py:otherwise=""><a href="${chrome.logo.link}">${project.name}</a></h1>
-      </div>
-      <form id="search" action="${href.search()}" method="get">
-        <div py:if="'SEARCH_VIEW' in perm">
-          <label for="proj-search">Search:</label>
-          <input type="text" id="proj-search" name="q" size="18" accesskey="f" value=
-"" />
-          <input type="submit" value="Search" />
-        </div>
-      </form>
-      ${navigation('metanav')}
-    </div>
-    ${navigation('mainnav')}
-
-    <div id="main">
-      <div id="ctxtnav" class="nav">
-        <h2>Context Navigation</h2>
-          <ul py:if="chrome.ctxtnav">
-              <li py:for="i, elm in enumerate(chrome.ctxtnav)"
-                  class="${classes(first_last(i, chrome.ctxtnav))}">$elm</li>
-          </ul>
-        <hr />
-      </div>
-      <div id="warning" py:if="chrome.warnings" class="system-message">
-        <py:choose test="len(chrome.warnings)">
-          <py:when test="1">
-            <strong>Warning:</strong> ${chrome.warnings[0]}
-          </py:when>
-          <py:otherwise>
-            <strong>Warnings:</strong>
-            <ul><li py:for="w in chrome.warnings">$w</li></ul>
-          </py:otherwise>
-        </py:choose>
-      </div>
-      <div id="notice" py:if="chrome.notices" class="system-message">
-        <py:choose test="len(chrome.notices)">
-          <py:when test="1">
-            <strong>Notice:</strong> ${chrome.notices[0]}
-          </py:when>
-          <py:otherwise>
-            <strong>Notices:</strong>
-            <ul><li py:for="w in chrome.notices">$w</li></ul>
-          </py:otherwise>
-        </py:choose>
-      </div>
-
-      ${select('*|text()')}
-    </div>
-
-    <div id="footer" xml:lang="en"><hr/>
-      <a id="tracpowered" href="http://trac.edgewall.org/"><img
-        src="${chrome.htdocs_location}trac_logo_mini.png" height="30"
-        width="107" alt="Trac Powered"/></a>
-      <p class="left">
-        Powered by <a href="${href.about()}"><strong>Trac ${trac.version}</strong></a
-><br />
-        By <a href="http://www.edgewall.org/">Edgewall Software</a>.
-      </p>
-      <p class="right">${chrome.footer}</p>
-    </div>
-  </body></py:match>
-</html>

data/lib/subtrac/templates/projects/trac_theme/trac/wiki/WikiStart

@@ -1,4 +0,0 @@
-= This is the Trac Templates project =
-
-This project contains the set of files that are used for creating new Trac projects for {CLIENT_NAME}.
-