bonethug 0.0.32 → 0.0.33

data/lib/bonethug/installer.rb

@@ -234,11 +234,7 @@ module Bonethug
           bonethug_files = @@conf.get 'project_types.' + project_type + '.bonethug_files'
           bonethug_files.each do |index, file|
             puts 'Handling ' + index.to_s + ':' + file.to_s
-            src_file =  @@bonthug_gem_dir + 
-                        '/skel/project_types/' + 
-                        project_type + 
-                        '/' + 
-                        file
+            src_file =  @@bonthug_gem_dir + '/skel/project_types/' + project_type + '/' + file
             dst_file = target + '/' + file
             FileUtils.cp src_file, dst_file
           end

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/skel/project_types/silverstripe3/lib/ss_loadconf.php

@@ -7,6 +7,7 @@ use Symfony\Component\Yaml\Yaml;
 class SS_LoadConf {
 
 	protected static $constants_set = false;
+
 	// ss env translation
 	protected static $ss_env = array(
 		'development'	=> 'dev',
@@ -14,12 +15,41 @@ class SS_LoadConf {
 		'production'	=> 'live'
 	);
 
+	protected static $application_env = null;
+	protected static $ss_environment_type = null;
+
+	public static function get_application_env() {
+		self::set_constants();		
+		return self::$application_env;
+	}
+
+	public static function env() {	
+		return self::get_application_env();
+	}	
+
+	public static function get_ss_environment_type() {
+		// ensure constants are set;
+		self::set_constants();		
+		return self::$ss_environment_type;
+	}
+
+	public static function translate_env($env) {
+		if (!empty(self::$ss_env[$env])) {
+			return self::$ss_env[$env];
+		} else {
+			return $env;
+		}
+	}	
+
 	public static function set_constants() {
 
 		if (!self::$constants_set) {
 
 			// Transfer environmental vars to constants
-			if (!defined('APPLICATION_ENV')) 		define('APPLICATION_ENV', getenv('APPLICATION_ENV'));
+			$env = getenv('APPLICATION_ENV');
+			if (!$env) $env = 'production';
+
+			if (!defined('APPLICATION_ENV')) 		define('APPLICATION_ENV', $env);
 			if (!defined('PATH')) 					define('PATH', getenv('PATH'));
 			if (!defined('SS_SEND_ALL_EMAILS_TO'))	define('SS_SEND_ALL_EMAILS_TO', getenv('SS_SEND_ALL_EMAILS_TO'));
 
@@ -30,16 +60,11 @@ class SS_LoadConf {
 			}
 
 			self::$constants_set = true;
-		}
-
-	}
+			self::$application_env = APPLICATION_ENV;
+			self::$ss_environment_type = self::$ss_env[APPLICATION_ENV];
 
-	public static function translate_env($env) {
-		if (!empty(self::$ss_env[$env])) {
-			return self::$ss_env[$env];
-		} else {
-			return $env;
 		}
+
 	}
 	
 	public static function cnf() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors: