ktec-subtrac 0.1.24 → 0.1.25

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 24
+:patch: 25

data/lib/subtrac.rb

@@ -46,10 +46,45 @@ module Subtrac
 
   SUBTRAC_ROOT = "#{File.dirname(__FILE__)}/" unless defined?(SUBTRAC_ROOT)
   SUBTRAC_ENV = (ENV['SUBTRAC_ENV'] || 'development').dup unless defined?(SUBTRAC_ENV)
-  USER_CONFIG = 'config/user.yml'
+  USER_CONFIG_FILE = 'config/user.yml'
 
   class << self
 
+    # User configured options
+    def server_name
+      @server_name ||= @APP_CONFIG[:server_name]
+    end
+
+    def server_name=(name)
+      @APP_CONFIG[:server_name] = @@server_name = name
+    end
+
+    def server_hostname
+      @server_hostname ||= @APP_CONFIG[:server_hostname]
+    end
+
+    def server_hostname=(name)
+      @APP_CONFIG[:server_hostname] = @@server_hostname = name
+    end
+
+    def default_client
+      @default_client ||= @APP_CONFIG[:default_client]
+    end
+
+    def default_client=(name)
+      @APP_CONFIG[:default_client] = @@default_client = name
+    end
+    
+    def default_project
+      @default_project ||= @APP_CONFIG[:default_project]
+    end
+
+    def default_project=(name)
+      puts "Updating default_project to #{name}"
+      @APP_CONFIG[:default_project] = @@default_project = name
+    end
+
+
     # Filesystem directories
 
     def root
@@ -74,7 +109,7 @@ module Subtrac
 
     def install_dir=(name)
       puts "Setting new install_dir variable to #{name}"
-      @install_dir = name
+      @APP_CONFIG[:installation_dir] = @install_dir = name
     end
     
     def apache_conf_dir
@@ -109,39 +144,6 @@ module Subtrac
       @locations_dir ||= File.join(install_dir,@APP_CONFIG[:dirs][:locations])
     end
 
-    def server_name
-      @server_name ||= @APP_CONFIG[:server_name]
-    end
-
-    def server_name=(name)
-      @APP_CONFIG[:server_name] = @@server_name = name
-    end
-
-    def server_hostname
-      @server_hostname ||= @APP_CONFIG[:server_hostname]
-    end
-
-    def server_hostname=(name)
-      @APP_CONFIG[:server_hostname] = @@server_hostname = name
-    end
-
-    def default_client
-      @default_client ||= @APP_CONFIG[:default_client]
-    end
-
-    def default_client=(name)
-      @APP_CONFIG[:default_client] = @@default_client = name
-    end
-    
-    def default_project
-      @default_project ||= @APP_CONFIG[:default_project]
-    end
-
-    def default_project=(name)
-      puts "Updating default_project to #{name}"
-      @APP_CONFIG[:default_project] = @@default_project = name
-    end
-
     # LDAP
 
     def enable_ldap
@@ -183,7 +185,7 @@ module Subtrac
     # TODO: We need to refactor this code so it will load the default configuration only if one has not been created
     puts "\n==== Loading configuration file ===="
     # load configuration file
-    file_path = File.join(subtrac_path, USER_CONFIG)
+    file_path = File.join(subtrac_path, USER_CONFIG_FILE)
     file_path = File.join(subtrac_path,"/config/config.yml") if not File.exists?(file_path)
     puts "Attempting to read config file: #{file_path}"
     begin
@@ -272,8 +274,9 @@ module Subtrac
   # Write the changes configuration to disk
   def self.save_config
     # save the things that might have changed    
-    file_path = File.join(subtrac_path, USER_CONFIG)
-    open(file_path, 'w') {|f| YAML.dump({SUBTRAC_ENV => @APP_CONFIG}, f)}
+    file_path = File.join(subtrac_path, USER_CONFIG_FILE)
+    user_config = {SUBTRAC_ENV => @APP_CONFIG}
+    open(file_path, 'w') {|f| YAML.dump(user_config, f)}
   end
 
   # creates a directory if it does not exist

metadata

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