keithsalisbury-subtrac 0.1.13 → 0.1.14

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 13
+:patch: 14

data/lib/subtrac/commands/create.rb

@@ -0,0 +1,13 @@
+module Subtrac
+  module Commands
+    class Create
+      def initialize(args, options)
+        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
+end

data/lib/subtrac/commands/install.rb

@@ -0,0 +1,10 @@
+module Subtrac
+  module Commands
+    class Install
+      def initialize(args, options)
+        Subtrac.load_config()
+        Subtrac.install(args,options)
+      end
+    end
+  end
+end

data/lib/subtrac/commands.rb

@@ -0,0 +1,6 @@
+module Subtrac
+  module Commands
+    autoload :Install, "subtrac/commands/install"
+    autoload :Create, "subtrac/commands/create"
+  end
+end

data/lib/subtrac/config/config.yml

@@ -1,9 +1,6 @@
 development: &non_production_settings
 # Things that can be changed
-    :admin:
-        :username: "admin"
-        :password: "6kvCHrTLk3ubo" # passw0rd
-    
+    :admin_user: "admin"
     :server_name: "Subtrac Development Server"
     :server_hostname: "dev.subtrac.com"
     :server_ip: "192.168.2.1"
@@ -35,8 +32,6 @@ development: &non_production_settings
             admins: TRAC_ADMIN
             clients: WIKI_VIEW TICKET_CREATE TICKET_APPEND
             developers: BROWSER_VIEW LOG_VIEW FILE_VIEW CHANGESET_VIEW TICKET_VIEW TICKET_CREATE TICKET_APPEND MILESTONE_VIEW MILESTONE_CREATE MILESTONE_MODIFY ROADMAP_VIEW REPORT_VIEW REPORT_SQL_VIEW`BROWSER_VIEW LOG_VIEW FILE_VIEW CHANGESET_VIEW TICKET_VIEW TICKET_CREATE TICKET_APPEND MILESTONE_VIEW MILESTONE_CREATE MILESTONE_MODIFY ROADMAP_VIEW REPORT_VIEW REPORT_SQL_VIEW
-            admins: admin
-            salisburyk: admin
             client: clients
 
 # Internal config

data/lib/subtrac/passwords

@@ -1 +1,3 @@
-admin:6kvCHrTLk3ubo
+admin:2UPs2u5oj2mIc
+admin:2UPs2u5oj2mIc
+keith:aaLYeLlpy5Tu6

data/lib/subtrac/templates/vhost.erb

@@ -13,13 +13,16 @@
 	<location />
 		AuthType Basic
 		AuthName '<%= @server_name %>'
-		AuthUserFile <%= @install_dir %>/passwords
-		#Require valid-user
+		AuthUserFile <%= @install_dir %>/.passwd
+		Require valid-user
+		AuthBasicProvider file
+		<% if @ldap_enable then %>
 		#AuthBasicProvider file ldap
 		#AuthLDAPBindDN '<%= @ldap_bind_dn %>'
 		#AuthLDAPBindPassword '<%= @ldap_bind_password %>'
 		#AuthLDAPURL '<%= @ldap_url %>'
 		#AuthzLDAPAuthoritative off
+		<% end %>
 	</location>
 
 	<location <%= @APP_CONFIG[:urls][:svn] %>>

data/lib/subtrac.rb

@@ -39,6 +39,8 @@ require 'yaml'
 require 'erb'
 require 'fileutils'
 require 'subtrac/version'
+require 'subtrac/commands'
+
 
 module Subtrac
 
@@ -131,24 +133,6 @@ module Subtrac
     
   end
   
-  module Commands
-    class Install
-      def initialize(args, options)
-        Subtrac.load_config()
-        Subtrac.install(args,options)
-      end
-    end
-    class Create
-      def initialize(args, options)
-        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
-  
   # 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
@@ -185,9 +169,12 @@ module Subtrac
     @install_dir = File.expand_path(@APP_CONFIG[:installation_dir])
     @conf_dir = @APP_CONFIG[:apache2_conf]
     
-    @ldap_bind_dn = @APP_CONFIG[:ldap][:bind_dn]
-    @ldap_bind_password = @APP_CONFIG[:ldap][:bind_password]
-    @ldap_url = @APP_CONFIG[:ldap][:host]
+    @ldap_enable = @APP_CONFIG[:ldap][:enable]
+    if (@ldap_enable) then
+      @ldap_bind_dn = @APP_CONFIG[:ldap][:bind_dn]
+      @ldap_bind_password = @APP_CONFIG[:ldap][:bind_password]
+      @ldap_url = @APP_CONFIG[:ldap][:host]
+    end
 
   end
 
@@ -201,7 +188,8 @@ module Subtrac
 
     unless !File.directory?(@install_dir) 
       # Ask if the user agrees (yes or no)
-      confirm_clean = agree("Err, that directory's got stuff init. You sure you want me to overwrite? [Y/n]") if options.clean
+      confirm_clean = agree("Err, it seems there's some stuff in there. You sure you want me to overwrite? [Y/n]") if options.clean
+      confirm_clean = agree("Doubly sure? I can't undo this....[Y/n]") if confirm_clean
     end
     
     # right lets install
@@ -210,6 +198,7 @@ module Subtrac
 
     create_environment_directories(confirm_clean)
     install_common_files()
+    configure_admin_user()
     # TODO: Need to check for default client/project before creating virtual host
     # otherwise we need remove the rewrite rule
     create_virtual_host()
@@ -292,6 +281,20 @@ module Subtrac
     # TODO: refactor /common to the app config
     FileUtils.cp_r(Dir.glob(File.join(subtrac_path, "common/.")),docs_dir)
     FileUtils.cp_r(Dir.glob(File.join(subtrac_path, "shared/.")),create_if_missing(File.join(trac_dir, ".shared")))
+    # this need to be replaced with a question/answer session
+    #FileUtils.cp(,@install_dir)
+  end
+  
+  def self.configure_admin_user
+    puts "\n==== Configure admin user ===="
+    # create admin user
+    passwd_file = File.join(@install_dir, ".passwd")
+    admin_user = ask("Pick an admin username:  ") { |q| q.echo = true }
+    `htpasswd -c #{passwd_file} #{admin_user}`
+    @APP_CONFIG[:admin_user] = admin_user
+    # ensure this guy is added to trac admin group
+    @APP_CONFIG[:trac][:permissions][admin_user] = "admins"
+    #FileUtils.chown_R('www-data', 'www-data', passwd_file, :verbose => true)  if SUBTRAC_ENV != 'test'
   end
 
   def self.create_environment_directories(overwrite=false)
@@ -393,11 +396,11 @@ module Subtrac
     say("Setting up default trac permissions...")
     # set up trac permissions
     @APP_CONFIG[:trac][:permissions].each do |key, value|
-      `trac-admin #{project_trac_dir} permission add #{key} #{value}` if SUBTRAC_ENV != 'test'
+      `sudo trac-admin #{project_trac_dir} permission add #{key} #{value}` if SUBTRAC_ENV != 'test'
     end
 
     say("Adding default trac wiki pages...")
-    # this needs to loop through the directory and import all pages
+    # loop through the directory and import all pages
     Dir.foreach("#{project_template}/trac/wiki/.") do |file|
       # do something with the file here
       unless ['.', '..','.svn'].include? file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: keithsalisbury-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Keith Salisbury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-19 00:00:00 -07:00
+date: 2009-04-20 00:00:00 -07:00
 default_executable: subtrac
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,9 @@ files:
 - VERSION.yml
 - bin/subtrac
 - lib/subtrac.rb
+- lib/subtrac/commands.rb
+- lib/subtrac/commands/create.rb
+- lib/subtrac/commands/install.rb
 - lib/subtrac/common/clients/index.wsgi
 - lib/subtrac/common/favicon.ico
 - lib/subtrac/common/images/trac/banner_bg.jpg