adaptrex 0.9.22 → 0.9.32

data/lib/adaptrex/adaptrexconfig.rb

@@ -116,7 +116,7 @@ class AdaptrexConfig
 		Pathname.new(self.weblibPath).children.select {|path|
 			folderName = path.basename.to_s
 			if folderName =~ /\s/
-				puts "Weblib folder name cannot contain spaces (" + folderName + ")".success
+				puts(("Weblib folder name cannot contain spaces (" + folderName + ")").success)
 				puts "It will not be available to your applications.\n".indent
 			else
 				if 		folderName.start_with?"adaptrex" 	then self.adaptrexVersions.push(folderName)

data/lib/adaptrex/adaptrexinstaller.rb

@@ -1,3 +1,19 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 class AdaptrexInstaller
 
 	attr_accessor	:success, :version
@@ -19,7 +35,7 @@ class AdaptrexInstaller
 			self.version = promptForAdaptrexVersion
 		end
 		
-		puts "AdaptrexJS Configured (" + self.version + ")".success
+		puts(("AdaptrexJS Configured (" + self.version + ")").success)
 	end
 
 	def promptForAdaptrexVersion
@@ -35,7 +51,7 @@ class AdaptrexInstaller
 		end
 		selection = Integer(selection)
 
-		if not selection === 1..len
+		if not (1..len).include?selection
 			puts erm
 			return promptForAdaptrexVersion
 		end

data/lib/adaptrex/appconfig.rb

@@ -1,3 +1,19 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "adaptrex/adaptrexinstaller"
 
 class AppConfig

data/lib/adaptrex/bootstrapinstaller.rb

@@ -27,25 +27,13 @@ class BootstrapInstaller
 		adaptrexVersion = appConfig.adaptrexVersion
 		puts "Generating the bootstrap file for " + adaptrexVersion + " and " + sdkVersion + "..."
 
-		adaptrexPath = adaptrexConfig.weblibPath + "/" + adaptrexVersion
 		sdkPath = adaptrexConfig.weblibPath + "/" + sdkVersion
-
-		cmdParts = nil
-		tmpDir = nil
+		adaptrexSdkPath = adaptrexConfig.weblibPath + "/" + adaptrexVersion + "/" + sdkType
+		
 		if isExt
-			cmdParts = [
-				"and include -r -f ExtDependencies.js",
-				"and exclude -t core",
-				"and include -na Adaptrex.override.ext",
-				"and exclude -f ExtDependencies.js",
-			]
+			dependencyFile = "ExtDependencies.js"
 		else
-			cmdParts = [
-				"and include -r -f TouchDependencies.js",
-				"and exclude -t core",
-				"and include -na Adaptrex.override.touch",
-				"and exclude -f TouchDependencies.js",
-			]
+			dependencyFile = "TouchDependencies.js"
 
 			#   Sencha Touch 2.1.0 has a bug that prevents compilation.  The file containing
 			#   the bug is not required for the bootstrap file so we move it to a temp file
@@ -55,10 +43,18 @@ class BootstrapInstaller
 		end
 
 		begin
-			cmd = "sencha -sdk " + sdkPath + " compile -classpath " + adaptrexPath + "/src" +
-			" exclude -all and " + cmdParts.join(" and ") +
-			" and concat adaptrex/" + sdkType + "/bootstrap-debug.js" +
-			" and concat -compress adaptrex/" + sdkType + "/bootstrap.js"
+			cmd = [
+				"sencha -sdk " + sdkPath + " compile",
+				" -classpath ",
+					adaptrexSdkPath + "/src/",
+				" exclude -all",
+				" and include -r -f " + dependencyFile,
+				" and exclude -t core",
+				" and include -na Adaptrex.override",
+				" and exclude -f " + dependencyFile,
+				" and concat adaptrex/" + sdkType + "/bootstrap-debug.js",
+				" and concat -compress adaptrex/" + sdkType + "/bootstrap.js"
+			].join("")
 			compileOutput = `#{cmd}`
 
 			if compileOutput.include?"[ERR]"

data/lib/adaptrex/builder.rb

@@ -21,57 +21,70 @@ require "fileutils"
 class AdaptrexBuilder
 	def initialize(adaptrexConfig, appConfig)
 		weblib = adaptrexConfig.weblibPath
-		
+
 		if appConfig.pages.length == 0
 			puts "There are no apps (pages) to be compiled".warn
 			return
 		end
 		
-		
 		#	Loop through each app and compile
 		appConfig.pages.each do|key,val|
 			appPath = key
 			parts = val.split(",")
 			appName = parts[0]
 			sdkType = parts[1]
-			
+
 			puts "Compiling " + appName + " (" + appPath + ")"
-			
-			if sdkType == "ext" 
-				sdkVersion = appConfig.extVersion 
-				excludes = "ExtDependencies.js" 
+
+			if sdkType == "ext"
+				sdkVersion = appConfig.extVersion
 				sdkPath = weblib + "/" + sdkVersion
-				
-			else 
+				includes = "ExtDependencies.js"
+			else
 				sdkVersion = appConfig.touchVersion
-				excludes = "TouchDependencies.js"
 				sdkPath = weblib + "/" + sdkVersion
-				
+				includes = "TouchDependencies.js"
+
 				#   Sencha Touch 2.1.0 has a bug that prevents compilation.  The file containing
 				#   the bug is not required for the bootstrap file so we move it to a temp file
 				#   during the compilation and restore it
 				tmpDir = Dir.tmpdir
-				FileUtils.mv(sdkPath + "/src/ux/auth2", tmpDir + "_senchatouch_auth2") 
+				FileUtils.mv(sdkPath + "/src/ux/auth2", tmpDir + "_senchatouch_auth2")
 			end
+
+			#
+			#	Create Ghosts
+			#
+			if not createGhosts?(sdkPath, appPath) then return end
 			
+			if sdkType == "ext" then sdkFile = "ext" else sdkFile = "sencha-touch" end
+				
 			begin
-				cmd = "sencha -d -sdk=" + sdkPath + " compile" +
-					" -classpath=" + 
-							appPath + "/app.js," + 
-							appPath + "/app," + 
-							weblib + "/" + appConfig.adaptrexVersion + "/src" +
-					" exclude -all" +
-					" and include -r -f " + appPath + "/app.js" +
-					" and save appset" +
-					" and exclude -all" +
-					" and include -r -f " + excludes +
-					" and save bootstrapexcludes" +
-					" and exclude -all" +
-					" and include -s appset and exclude -s bootstrapexcludes" +
-					" and concat " + appPath + "/app-all-debug.js" +
-					" and concat -compress " + appPath + "/app-all.js"
+				cmd = [
+					"sencha -d -sdk " + sdkPath + " compile",
+						" -classpath ",
+							"adaptrex/ghosts.js," + 
+							appPath + "/app.js,",
+							appPath + "/app,",
+							weblib + "/" + appConfig.adaptrexVersion + "/" + sdkType + "/src,",
+							sdkPath + "/src",
+						" exclude -all",
+						" and include -r -f " + appPath + "/app.js",
+						" and exclude -f " + sdkPath + "/src",
+						" and concat " + appPath + "/app-all-debug.js",
+						" and concat -compress " + appPath + "/app-all.js",
+						" and save appset",
+						" and exclude -all",
+						" and include -r -f " + appPath + "/app.js",
+						" and include -na Adaptrex.override",
+						" and include -r -f " + includes,
+						" and exclude -s appset",
+						" and exclude -f " + includes,
+						" and concat " + appPath + "/app-" + sdkFile + "-debug.js",
+						" and concat -compress " + appPath + "/app-" + sdkFile + ".js"
+					].join("")
 				compileOutput = `#{cmd}`
-	
+				
 				if compileOutput.include?"[ERR]"
 					puts((appName + " (" + appPath + ")").err)
 					puts "See the output from Sencha Cmd for more information".indent
@@ -80,14 +93,40 @@ class AdaptrexBuilder
 					print((appName + " (" + appPath + ")").success)
 					puts ""
 				end
-	
+
 			ensure
 				#   Move the broken auth2 ux back to the original Sencha Touch source folder
-				if not sdkType == "ext" 
+				if not sdkType == "ext"
 					FileUtils.mv(tmpDir + "_senchatouch_auth2", sdkPath + "/src/ux/auth2")
 				end
 			end
 		end
 	end
 
+	#
+	#	Scan for missing model/store dependencies that should be autogenerated
+	#
+	$failPattern = "failed to find meta class definition for name"
+	def createGhosts?(sdkPath,appPath)
+		ghosts = "adaptrex/ghosts.js"
+		if not File.exist?(ghosts) then File.open(ghosts, "w") {} end
+		
+		cmd = "sencha -sdk=" + sdkPath + " compile" +
+			" -classpath=" + appPath + "/app.js," +	appPath + "/app," + ghosts
+			" exclude -a"
+		compileOutput = `#{cmd}`
+		
+		if compileOutput.include?"[ERR]"
+			if compileOutput.include?$failPattern
+				failedClass = compileOutput.split($failPattern)[1].split("\n")[0].strip
+				if (failedClass.include?".store." or failedClass.include?".model.")
+					File.open(ghosts,"a") {|f| f.puts("Ext.define('" + failedClass + "',{})")}
+					return createGhosts?(sdkPath,appPath)
+				end
+			end
+			false
+		end
+		
+		true
+	end
 end

data/lib/adaptrex/deletetool.rb

@@ -1,3 +1,19 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "fileutils"
 
 class DeleteTool
@@ -33,7 +49,7 @@ class DeleteTool
 		puts ""
 		
 		appToDelete = promptForApplication
-		puts "Are you sure you want to delete " + appToDelete["text"] + ")?".warn
+		puts(("Are you sure you want to delete " + appToDelete["text"] + ")?").warn)
 		print "Type 'DELETE' to confirm: ".indent
 		confirm = STDIN.gets.chomp
 
@@ -58,13 +74,13 @@ class DeleteTool
 		print "Which page do you want to delete? : "
 		selection = STDIN.gets.chomp
 		len = @appPages.length
-		erm = ("Invalid selection. Enter a number from 1 to " + len.to_s).warn
+		erm = ("Invalid selection. Enter a number from 1 to " + len.to_s).err
 		if not selection.numeric?
 			puts erm
 			return promptForApplication
 		end
 		selection = Integer(selection)
-		if not selection === 1..len
+		if not (1..len).include?selection
 			puts erm
 			return promptForApplication
 		end

data/lib/adaptrex/generate.rb

@@ -93,7 +93,7 @@ class AdaptrexGenerator
 		#   Make sure this page doesn't already exist
 		#
 		if File.directory?appPath
-			puts "App (page) already exists at this path (" + appPath + ")".err
+			puts(("App (page) already exists at this path (" + appPath + ")").err)
 			return appWizard
 		end
 
@@ -168,12 +168,12 @@ class AdaptrexGenerator
 		
 		responseFolder = response + "/"
 		if (responseFolder.start_with?"ext/" or response.start_with?"touch/" or response.start_with?"adaptrex/")
-			puts "'" + responseFolder.split("/")[0] + "' is a reserved folder name".err
+			puts(("'" + responseFolder.split("/")[0] + "' is a reserved folder name").err)
 			return promptForPagePath
 		end
 		
 		if not response.validate?(/\A[a-z][a-z0-9\/\-\_]*\z/)
-			puts "Must be lowercase letters, numbers, underscore (_) or dash (-)".err
+			puts(("Must be lowercase letters, numbers, underscore (_) or dash (-)").err)
 			return promptForPagePath
 		end
 		
@@ -198,7 +198,7 @@ class AdaptrexGenerator
 		
 		print "Which type of page do you want to create? [" + default + "] : "
 		response = STDIN.gets.chomp
-		if response == "" then return default end
+		if response == "" then response = default end
 		if response == "1" then return "ext" end
 		if response == "2" then return "touch" end
 

data/lib/adaptrex/sdkinstaller.rb

@@ -1,3 +1,19 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "adaptrex/bootstrapinstaller"
 require "adaptrex/themeinstaller"
 
@@ -92,7 +108,7 @@ class SDKInstaller
 		end
 
 		selection = Integer(selection)
-		if not selection === 1..len
+		if not (1..len).include?selection
 			puts erm
 			return promptForSDKVersion
 		end

data/lib/adaptrex/themeinstaller.rb

@@ -1,10 +1,26 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "fileutils"
 
 class ThemeInstaller
 	
 	@@touchThemes = [
-		#["Adaptrex Touch Theme", "adaptrex", "adaptrex-all.css"],
-		["Sencha Touch Default Theme", "default", "ext-all.css"],
+		["All Adaptrex Touch Themes", "adaptrex", "adaptrex"],
+		["All Sencha Touch Default Themes", "default", "default"],
 		#["Custom Theme", "custom", "custom"]
 	]
 	
@@ -44,17 +60,26 @@ class ThemeInstaller
 		targetFolder = "adaptrex/" + sdkType + "/resources"
 		
 		#	Clean out old theme
-		FileUtils.rm_rf(targetFolder)
+		# FileUtils.rm_rf(targetFolder)
 		FileUtils.mkdir_p(targetFolder + "/css")
 		
 		#	Add additional touch theme files
-		if sdkType == "touch" 
-			sdkResourcesFolder = adaptrexConfig.weblibPath + "/" + appConfig.touchVersion + "/resources"
-			Dir.glob(sdkResourcesFolder + "/css/*") {|f|
-				if not File.directory?f
-					FileUtils.cp(File.expand_path(f), targetFolder + "/css/")
-				end 
-			}
+		if sdkType == "touch"
+			if imgFolder == "adaptrex"
+				sdkResourcesFolder = adaptrexConfig.weblibPath + "/" + appConfig.adaptrexVersion + "/touch/resources"
+				Dir.glob(sdkResourcesFolder + "/css/*") {|f|
+					if not File.directory?f
+						FileUtils.cp(File.expand_path(f), targetFolder + "/css/")
+					end 
+				}
+			else
+				sdkResourcesFolder = adaptrexConfig.weblibPath + "/" + appConfig.touchVersion + "/resources"
+				Dir.glob(sdkResourcesFolder + "/css/*") {|f|
+					if not File.directory?f
+						FileUtils.cp(File.expand_path(f), targetFolder + "/css/")
+					end 
+				}
+			end
 		
 		#	Add additional ext theme files
 		else
@@ -63,7 +88,7 @@ class ThemeInstaller
 			#	Adaptrex Theme Not Yet Implemented
 			if imgFolder == "adaptrex"
 				sdkResourcesFolder = adaptrexConfig.weblibPath + "/" + appConfig.adaptrexVersion + "/resources"
-				FileUtils.cp(sdkResourcesFolder + "/css/" + cssFile, targetFolder + "/css/" + cssFile)
+				FileUtils.cp(sdkResourcesFolder + "/css/" + cssFile, targetFolder + "/css/theme.css")
 				FileUtils.cp_r(sdkResourcesFolder + "/themes/images/" + imgFolder, targetFolder + "/themes/images/" + imgFolder)				
 
 			#	Custom Themes Not Yet Implemented
@@ -73,14 +98,17 @@ class ThemeInstaller
 			#	Standard Ext Themes
 			else
 				sdkResourcesFolder = adaptrexConfig.weblibPath + "/" + appConfig.extVersion + "/resources"
-				FileUtils.cp(sdkResourcesFolder + "/css/" + cssFile, targetFolder + "/css/" + cssFile)
-				FileUtils.cp_r(sdkResourcesFolder + "/themes/images/" + imgFolder, targetFolder + "/themes/images/" + imgFolder)
 				
 				#	Neptune needs some extra files
 				if imgFolder == "neptune"
-					FileUtils.cp_r(sdkResourcesFolder + "/themes/images/default", targetFolder + "/themes/images/default/")
+					FileUtils.cp_r(sdkResourcesFolder + "/themes/images/default", targetFolder + "/themes/images/neptune")
 					FileUtils.cp(adaptrexConfig.weblibPath + "/" + appConfig.extVersion + "/ext-neptune.js", "adaptrex/" + sdkType + "/ext-neptune.js")
+				elsif imgFolder == "access"
+					FileUtils.cp_r(sdkResourcesFolder + "/themes/images/default", targetFolder + "/themes/images/neptune")
 				end
+				
+				FileUtils.cp(sdkResourcesFolder + "/css/" + cssFile, targetFolder + "/css/" + cssFile)
+				FileUtils.cp_r(sdkResourcesFolder + "/themes/images/" + imgFolder, targetFolder + "/themes/images/" + imgFolder)
 			end
 		end
 		
@@ -90,11 +118,6 @@ class ThemeInstaller
 	end
 
 	def promptForTheme(sdkType)
-		#	Temporary until we add support for other touch themes
-		if sdkType == "touch"
-			return @@touchThemes[0]
-		end
-		
 		print "Which theme do you want to use? [1]: "
 		
 		if sdkType == "touch" then options = @@touchThemes else options = @@extThemes end
@@ -109,7 +132,7 @@ class ThemeInstaller
 			return promptForTheme(sdkType)
 		end
 		selection = Integer(selection)
-		if not selection === 1..len
+		if not (1..len).include?selection
 			puts erm
 			return promptForTheme(sdkType)
 		end

data/lib/adaptrex/themetool.rb

@@ -1,3 +1,19 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "adaptrex/themeinstaller"
 
 class ThemeTool

data/lib/adaptrex/upgradetool.rb

@@ -1,5 +1,22 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+
 require "adaptrex/sdkinstaller"
 require "adaptrex/adaptrexinstaller"
+require "adaptrex/builder"
 
 class UpgradeTool
 	
@@ -39,6 +56,8 @@ class UpgradeTool
 		else
 			sdkInstaller = SDKInstaller.new(adaptrexConfig, appConfig, sdkType)
 		end
+		
+		AdaptrexBuilder.new(adaptrexConfig, appConfig)
 	end
 	
 	def promptSDKType
@@ -53,7 +72,7 @@ class UpgradeTool
 		end
 
 		selection = Integer(selection)
-		if not selection === 1..len
+		if not (1..len).include?selection
 			puts erm
 			return promptSDKType
 		end

data/lib/adaptrex.rb

@@ -17,36 +17,14 @@
 #	Add the project to the load paths
 $:.unshift File.dirname(__FILE__)
 
+require "globals"
 require "adaptrex/adaptrexconfig"
 require "adaptrex/appconfig"
-require 'rbconfig'
-
-def gem_available?(gemname)
-	if Gem::Specification.methods.include?(:find_all_by_name)
-		not Gem::Specification.find_all_by_name(gemname).empty?
-	else
-		Gem.available?(gemname)
-	end
-end
-
-$isWindows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
-if $isWindows
-	begin
-		if not gem_available?('win32console')
-			puts "Installing win32console..."
-			`gem install win32console`
-			Gem.clear_paths
-		end
-		require "win32console"
-	rescue
-		puts "Couldn't load win32console.  ANSI colors will not be available"
-	end
-end
 
 #   Utility to run the various Adaptrex scripts
 class Adaptrex
 	def initialize(basePath, args)
-		puts "--------------------------------------------------------------------------------"
+		puts "-------------------------------------------------------------------------------"
 		puts "Adaptrex Tools".bold
 
 		trap("INT") {
@@ -62,8 +40,12 @@ class Adaptrex
 
 		#	Make sure we're running from a webapp folder
 		if not File.directory?"WEB-INF"
-			puts "Adaptrex Tools needs to be run from a webapp folder\n\n".err
-			return
+			if File.directory?"src/main/webapp/WEB-INF"
+				Dir.chdir("src/main/webapp")
+			else
+				puts "Adaptrex Tools needs to be run from a webapp folder\n\n".err
+				return
+			end
 		end
 
 		#   Test for folders with reserved names
@@ -124,7 +106,10 @@ class Adaptrex
 			DeleteTool.new(appConfig)
 		end
 
-		puts "\nHappy Coding!\n".green
+		if not command == "build" then
+			puts "\nHappy Coding!".green
+		end
+		puts ""
 	end
 
 	#   List our current adaptrex commands
@@ -139,59 +124,3 @@ class Adaptrex
 		puts ""
 	end
 end
-
-#	Extend String For Our Evil Purposes
-class String
-	def numeric?
-		Float(self) != nil rescue false
-	end
-
-	def validate? regex
-		!self[regex].nil?
-	end
-
-	{
-		:reset		=>  0,
-		:bold		=>  1,
-		:dark		=>  2,
-		:underline	=>  4,
-		:blink		=>  5,
-		:neg		=>  7,
-		:black		=> 30,
-		:red		=> 31,
-		:green		=> 32,
-		:yellow		=> 33,
-		:blue		=> 34,
-		:magenta	=> 35,
-		:cyan		=> 36,
-		:white		=> 37
-	}.each do |key, value|
-		if (not $isWindows or ($isWindows and gem_available?('win32console')))
-			define_method key do
-				"\e[#{value}m" + self + "\e[0m"
-			end
-		else
-			define_method key do
-				self
-			end
-		end
-	end
-
-	def err
-		c = " ERROR   ".red + self
-		if $isWindows then c.bold else c end
-	end
-
-	def warn
-		" WARNING ".yellow + self
-	end
-
-	def success
-		" SUCCESS ".green + self
-	end
-
-	def indent
-		"         " + self
-	end
-
-end

data/lib/globals.rb

@@ -0,0 +1,96 @@
+#
+#	Copyright 2012 Adaptrex, LLC
+#
+# 	Licensed under the Apache License, Version 2.0 (the "License");
+# 	you may not use this file except in compliance with the License.
+# 	You may obtain a copy of the License at
+#
+#   	http://www.apache.org/licenses/LICENSE-2.0
+#
+# 	Unless required by applicable law or agreed to in writing, software
+# 	distributed under the License is distributed on an "AS IS" BASIS,
+# 	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 	See the License for the specific language governing permissions and
+# 	limitations under the License.
+#
+require 'rbconfig'
+
+def gem_available?(gemname)
+	if Gem::Specification.methods.include?(:find_all_by_name)
+		not Gem::Specification.find_all_by_name(gemname).empty?
+	else
+		Gem.available?(gemname)
+	end
+end
+
+$isWindows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+if $isWindows
+	begin
+		if not gem_available?('win32console')
+			puts "Installing win32console..."
+			`gem install win32console`
+			Gem.clear_paths
+		end
+		require "win32console"
+	rescue
+		puts "Couldn't load win32console.  ANSI colors will not be available"
+	end
+end
+
+
+
+#	Extend String For Our Evil Purposes
+class String
+	def numeric?
+		Float(self) != nil rescue false
+	end
+
+	def validate? regex
+		!self[regex].nil?
+	end
+
+	{
+		:reset		=>  0,
+		:bold		=>  1,
+		:dark		=>  2,
+		:underline	=>  4,
+		:blink		=>  5,
+		:neg		=>  7,
+		:black		=> 30,
+		:red		=> 31,
+		:green		=> 32,
+		:yellow		=> 33,
+		:blue		=> 34,
+		:magenta	=> 35,
+		:cyan		=> 36,
+		:white		=> 37
+	}.each do |key, value|
+		if (not $isWindows or ($isWindows and gem_available?('win32console')))
+			define_method key do
+				"\e[#{value}m" + self + "\e[0m"
+			end
+		else
+			define_method key do
+				self
+			end
+		end
+	end
+
+	def err
+		c = " ERROR   ".red + self
+		if $isWindows then c.bold else c end
+	end
+
+	def warn
+		" WARNING ".yellow + self
+	end
+
+	def success
+		" SUCCESS ".green + self
+	end
+
+	def indent
+		"         " + self
+	end
+
+end

data/templates/touch/app.js

@@ -1,6 +1,9 @@
 Ext.application({
 	name	: '<%= appName %>',
 	views	: ['Main'],
+	requires	: [ 
+		"Ext.viewport.Viewport"
+	],	
 	launch	: function() {
 		Ext.Viewport.add(Ext.create('<%= appName %>.view.Main'));
 	}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: adaptrex
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 123
   prerelease: 
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 32
+  version: 0.9.32
 platform: ruby
 authors: 
 - Bob Obringer
@@ -39,6 +39,7 @@ files:
 - lib/adaptrex/themetool.rb
 - lib/adaptrex/upgradetool.rb
 - lib/adaptrex.rb
+- lib/globals.rb
 - bin/adaptrex
 - templates/ext/app/controller/Main.js
 - templates/ext/app/view/Main.js