ktec-subtrac 0.1.44 → 0.1.45

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 44
+:patch: 45

data/lib/subtrac/config.rb

@@ -36,8 +36,7 @@ module Subtrac
         end
         if yamlFile
           if yamlFile[SUBTRAC_ENV]
-            @APP_CONFIG = yamlFile[SUBTRAC_ENV]
-            @data = @APP_CONFIG # TODO: Deprecate APP_CONFIG
+            @data = yamlFile[SUBTRAC_ENV]
           else
             raise StandardError, "config/config.yml exists, but doesn't have a configuration for #{SUBTRAC_ENV}."
           end
@@ -51,7 +50,7 @@ module Subtrac
       def save
         # save the things that might have changed    
         file_path = File.join(subtrac_path, USER_CONFIG_FILE)
-        user_config = {SUBTRAC_ENV => @APP_CONFIG}
+        user_config = {SUBTRAC_ENV => @data}
         open(file_path, 'w') {|f| YAML.dump(user_config, f)}
       end
     
@@ -85,45 +84,45 @@ module Subtrac
 
       # User configured options
       def server_name
-        @server_name ||= @APP_CONFIG[:server_name]
+        @server_name ||= @data[:server_name]
       end
 
       def server_name=(name)
-        @APP_CONFIG[:server_name] = @server_name = name
+        @data[:server_name] = @server_name = name
       end
 
       def server_hostname
-        @server_hostname ||= @APP_CONFIG[:server_hostname]
+        @server_hostname ||= @data[:server_hostname]
       end
 
       def server_hostname=(name)
-        @APP_CONFIG[:server_hostname] = @server_hostname = name
+        @data[:server_hostname] = @server_hostname = name
       end
 
       def default_client
-        @default_client ||= @APP_CONFIG[:default_client]
+        @default_client ||= @data[:default_client]
       end
 
       def default_client=(name)
-        @APP_CONFIG[:default_client] = @default_client = name
+        @data[:default_client] = @default_client = name
       end
 
       def default_project
-        @default_project ||= @APP_CONFIG[:default_project]
+        @default_project ||= @data[:default_project]
       end
 
       def default_project=(name)
         puts "Updating default_project to #{name}"
-        @APP_CONFIG[:default_project] = @default_project = name
+        @data[:default_project] = @default_project = name
       end
 
       def default_project_type
-        @default_project_type ||= @APP_CONFIG[:default_project_type]
+        @default_project_type ||= @data[:default_project_type]
       end
 
       def default_project_type=(name)
         puts "Updating default_project_type to #{name}"
-        @APP_CONFIG[:default_project_type] = @default_project_type = name
+        @data[:default_project_type] = @default_project_type = name
       end
     
 
@@ -145,130 +144,130 @@ module Subtrac
       end
 
       def install_dir
-        @install_dir ||= File.expand_path(@APP_CONFIG[:installation_dir])
+        @install_dir ||= File.expand_path(@data[:installation_dir])
       end
 
       def install_dir=(name)
         puts "Setting new install_dir variable to #{name}"
-        @APP_CONFIG[:installation_dir] = @install_dir = name
+        @data[:installation_dir] = @install_dir = name
       end
     
       def apache_conf_dir
-        @apache_conf_dir ||= @APP_CONFIG[:apache_conf_dir]
+        @apache_conf_dir ||= @data[:apache_conf_dir]
       end
 
       def apache_conf_dir=(name)
-        @APP_CONFIG[:apache_conf_dir] = @apache_conf_dir = name
+        @data[:apache_conf_dir] = @apache_conf_dir = name
       end
 
       def docs_dir
-        @docs_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:docs])
+        @docs_dir ||= File.join(install_dir,@data[:dirs][:docs])
       end
 
       def svn_dir
-        @svn_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:svn])
+        @svn_dir ||= File.join(install_dir,@data[:dirs][:svn])
       end
 
       def trac_dir
-        @trac_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:trac])
+        @trac_dir ||= File.join(install_dir,@data[:dirs][:trac])
       end
 
       def temp_dir
-        @temp_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:temp])
+        @temp_dir ||= File.join(install_dir,@data[:dirs][:temp])
       end
 
       def log_dir
-        @log_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:log])
+        @log_dir ||= File.join(install_dir,@data[:dirs][:log])
       end
 
       def locations_dir
-        @locations_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:locations])
+        @locations_dir ||= File.join(install_dir,@data[:dirs][:locations])
       end
     
       # Urls
       def svn_url
-        @svn_url ||= @APP_CONFIG[:urls][:svn]
+        @svn_url ||= @data[:urls][:svn]
       end
     
       def trac_permissions
-        @trac_permissions ||= @APP_CONFIG[:trac][:permissions]
+        @trac_permissions ||= @data[:trac][:permissions]
       end
     
       # LDAP
       def enable_ldap
-        @enable_ldap ||= @APP_CONFIG[:ldap][:enable]
+        @enable_ldap ||= @data[:ldap][:enable]
       end
 
       def enable_ldap=(value)
-        @APP_CONFIG[:ldap][:enable] = @enable_ldap = value
+        @data[:ldap][:enable] = @enable_ldap = value
       end
 
       def ldap_host
-        @ldap_host ||= @APP_CONFIG[:ldap][:host]
+        @ldap_host ||= @data[:ldap][:host]
       end
 
       def ldap_host=(value)
-        @APP_CONFIG[:ldap][:host] = @ldap_host = value
+        @data[:ldap][:host] = @ldap_host = value
       end
 
       def ldap_port
-        @ldap_port ||= @APP_CONFIG[:ldap][:port]
+        @ldap_port ||= @data[:ldap][:port]
       end
 
       def ldap_port=(value)
-        @APP_CONFIG[:ldap][:port] = @ldap_port = value
+        @data[:ldap][:port] = @ldap_port = value
       end
 
       def ldap_basedn
-        @ldap_basedn ||= @APP_CONFIG[:ldap][:basedn]
+        @ldap_basedn ||= @data[:ldap][:basedn]
       end
 
       def ldap_basedn=(value)
-        @APP_CONFIG[:ldap][:basedn] = @ldap_basedn = value
+        @data[:ldap][:basedn] = @ldap_basedn = value
       end
 
       def ldap_user_rdn
-        @ldap_user_rdn ||= @APP_CONFIG[:ldap][:user_rdn]
+        @ldap_user_rdn ||= @data[:ldap][:user_rdn]
       end
 
       def ldap_user_rdn=(value)
-        @APP_CONFIG[:ldap][:user_rdn] = @ldap_user_rdn = value
+        @data[:ldap][:user_rdn] = @ldap_user_rdn = value
       end
 
       def ldap_group_rdn
-        @ldap_group_rdn ||= @APP_CONFIG[:ldap][:group_rdn]
+        @ldap_group_rdn ||= @data[:ldap][:group_rdn]
       end
 
       def ldap_group_rdn=(value)
-        @APP_CONFIG[:ldap][:group_rdn] = @ldap_group_rdn = value
+        @data[:ldap][:group_rdn] = @ldap_group_rdn = value
       end
 
       def ldap_store_bind
-        @ldap_store_bind ||= @APP_CONFIG[:ldap][:store_bind]
+        @ldap_store_bind ||= @data[:ldap][:store_bind]
       end
 
       def ldap_store_bind=(value)
-        @APP_CONFIG[:ldap][:store_bind] = @ldap_store_bind = value
+        @data[:ldap][:store_bind] = @ldap_store_bind = value
       end
 
       def ldap_store_bind
-        @ldap_bind_password ||= @APP_CONFIG[:ldap][:bind_password]
+        @ldap_bind_password ||= @data[:ldap][:bind_password]
       end
 
       def ldap_bind_user
-        @ldap_bind_user ||= @APP_CONFIG[:ldap][:bind_user]
+        @ldap_bind_user ||= @data[:ldap][:bind_user]
       end
 
       def ldap_bind_user=(value)
-        @APP_CONFIG[:ldap][:bind_user] = @ldap_bind_user = value
+        @data[:ldap][:bind_user] = @ldap_bind_user = value
       end
 
       def ldap_bind_passwd
-        @ldap_bind_passwd ||= @APP_CONFIG[:ldap][:bind_passwd]
+        @ldap_bind_passwd ||= @data[:ldap][:bind_passwd]
       end
 
       def ldap_bind_passwd=(value)
-        @APP_CONFIG[:ldap][:bind_passwd] = @ldap_bind_passwd = value
+        @data[:ldap][:bind_passwd] = @ldap_bind_passwd = value
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ktec-subtrac
 version: !ruby/object:Gem::Version 
-  version: 0.1.44
+  version: 0.1.45
 platform: ruby
 authors: 
 - Keith Salisbury