ktec-subtrac 0.1.54 → 0.1.55

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 54
+:patch: 55
 :major: 0

data/bin/subtrac

@@ -21,14 +21,6 @@ command :install do |c|
 end
 
 command :create do |c|
-  c.syntax = 'subtrac create [options]'
-  c.summary = 'Provides access to subtrac create menu.'
-  c.description = 'Provides access to subtrac create menu.'
-  c.example 'subtrac create', 'Provides access to subtrac create menu.'
-  c.when_called Subtrac::Commands::Create
-end
-
-command :create_project do |c|
   c.syntax = 'subtrac create_project [options]'
   c.summary = 'Creates a new Subversion repository and associated Trac site for to specified project and client.'
   c.description = 'Creates a new Subversion repository and associated Trac site for the specified project and client.'

data/lib/subtrac/commands/create.rb

@@ -0,0 +1,9 @@
+module Subtrac
+  module Commands
+    class Create
+      def initialize(args, options)
+          Subtrac.create_project(options.project,options.client,options.template)
+      end
+    end
+  end
+end

data/lib/subtrac/commands.rb

@@ -1,7 +1,7 @@
 module Subtrac
   module Commands
     autoload :Install, "subtrac/commands/install"
-    autoload :Create, "subtrac/commands/create"
     autoload :CreateTemplate, "subtrac/commands/create_template"
+    autoload :CreateProject, "subtrac/commands/create_project"
   end
 end

data/lib/subtrac/config/config.yml

@@ -26,6 +26,9 @@ development: &non_production_settings
         :bind_dn: 
         :bind_passwd: 
 
+    :smtp:
+        :enable: false
+
     :trac:
         :permissions:
             admins: TRAC_ADMIN

data/lib/subtrac/config.rb

@@ -268,6 +268,16 @@ module Subtrac
         @data[:ldap][:bind_passwd] = @ldap_bind_passwd = value
       end
 
+
+      # SMTP
+      def enable_smtp
+        @enable_smtp ||= @data[:smtp][:enable]
+      end
+
+      def enable_smtp=(value)
+        @data[:smtp][:enable] = @enable_smtp = value
+      end
+
     end
 
   end

data/lib/subtrac.rb

@@ -110,17 +110,38 @@ module Subtrac
       configure_admin_user()
     
       # create default project
-      create_project(Config.default_project,Config.default_client)
+      create_project(Config.default_project,Config.default_client,"blank")
 
       # store any user preferences for later use
       Config.save()
 
     end
   
-    def create_project(project,client,template="blank")
+    def create_project(project,client,template=nil)
 
       load_config()
 
+      project = ask("What is the name of the project you would like to create? ") if project.nil?
+      client = ask("Which client is this project for? ") if client.nil?
+      use_custom_template = agree("Would you like to use a custom template for this project? [y/n]") if template.nil?
+      if use_custom_template then
+        list_of_templates = Dir.entries(File.join(Config.svn_dir,"templates"))
+        
+        # The new and improved choose()...
+        #choices = %{#{list_of_templates}} # %w{ruby python perl}
+        say("\nThis is the new mode (default)...")
+        choose do |menu|
+          menu.prompt = "Which template would you like to use for this project?  "
+          list_of_templates.each do |t|
+            unless File.directory?(t)
+              menu.choice t do template = t end
+            end
+          end
+        end
+      else
+        template = "blank"
+      end
+
       # create default project
       project = Project.new(project,client,template)
     

data/subtrac.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subtrac}
-  s.version = "0.1.54"
+  s.version = "0.1.55"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Salisbury"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
      "lib/subtrac/apache/vhost.conf.erb",
      "lib/subtrac/client.rb",
      "lib/subtrac/commands.rb",
-     "lib/subtrac/commands/create_project.rb",
+     "lib/subtrac/commands/create.rb",
      "lib/subtrac/commands/create_template.rb",
      "lib/subtrac/commands/install.rb",
      "lib/subtrac/common/favicon.ico",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ktec-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.54
+  version: 0.1.55
 platform: ruby
 authors: 
 - Keith Salisbury
@@ -45,7 +45,7 @@ files:
 - lib/subtrac/apache/vhost.conf.erb
 - lib/subtrac/client.rb
 - lib/subtrac/commands.rb
-- lib/subtrac/commands/create_project.rb
+- lib/subtrac/commands/create.rb
 - lib/subtrac/commands/create_template.rb
 - lib/subtrac/commands/install.rb
 - lib/subtrac/common/favicon.ico

data/lib/subtrac/commands/create_project.rb

@@ -1,29 +0,0 @@
-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.nil?
-        options.client = ask("Which client is this project for? ") if options.client.nil?
-        use_custom_template = agree("Would you like to use a custom template for this project? [y/n]") if options.template.nil?
-        if use_custom_template then
-          Subtrac.load_config()
-          list_of_templates = Dir.entries(File.join(Config.svn_dir,"templates"))
-          
-          # The new and improved choose()...
-          choose do |menu|
-            menu.prompt = "Which template would you like to use for this project?  "
-            list_of_templates.each do |t|
-              unless File.directory?(t)
-                menu.choice t do options.template = t end
-              end
-            end
-          end
-
-          Subtrac.create_project(options.project,options.client,options.template)
-        else
-          Subtrac.create_project(options.project,options.client)
-        end
-      end
-    end
-  end
-end