aml 0.0.2 → 0.0.3

data/lib/aml.rb

@@ -1,67 +1,142 @@
+require 'aml/requirement'
 module AbstractMarkupLanguage
+	@basePath
+	@watchFile
+	@makeFile
+
 	class Base
-		@@args = {}
-		@@args_original = ''
-		@@watch = false
-		@@p = false
+		def self.initialize(arguments, instance)
+			error = Error.new()
+			argument = Argument.new(arguments,error)
+			argument.required('watch','The required --watch argument has not been defined.')
+
+			if(argument.has_requirements? == false)
+				argument.clear_required
+				argument.required('build','The required --build argument has not been defined.')
+				if(argument.has_requirements?)
+					argument.clear_required
+					argument.create('watch',argument.read('build'))
+					argument.create('build','true')
+				end
+			else
+				argument.create('build','false')
+			end
+
+			if argument.has_requirements? and File.exist?(argument.read('watch'))
+				basePath = File.dirname(argument.read('watch'))
+				@basePath = basePath
+				watchFile = File.basename(argument.read('watch'))
+				@watchFile = watchFile
+				#AML Config Arguments
+				configFile = File.join(basePath,'aml-config')
+				argument.parse(File.read(configFile)) if File.exist?(configFile)
+				#Arguments
+				argument.create('watch',watchFile)
+				argument.create_if_empty('basePath',basePath)
+				argument.create_if_empty('fileExtension','html')
+				argument.create_if_empty('fileOutput',"#{File.basename(argument.read('watch'), ".*")}.#{argument.read('fileExtension')}")
+				argument.create_if_empty('selfClosing',"area,base,basefont,bgsound,br,col,frame,hr,img,isindex,input,keygen,link,meta,param,source,track,wbr")
+				argument.create_if_empty('sortAttribute','true')
+				argument.create_if_empty('singleQuote','false')
+				argument.create_if_empty('errorLimit','5')
+				argument.create_if_empty('aml-watch-instance', "#{instance}")
+
+				parse = Parse.new(argument.read('basePath'), argument.read('watch'))
+				files = []
 
-		def self.initialize(arguments)
-			log = Log.new('The following errors have occured:')
-			argument = Argument.new(arguments)
-			@@args_original = arguments
-			argument.required('watch','The required --watch attribute has not been defined.')
-			if(argument.has_requirements?)
-				if File.exist?(argument.read('watch'))
-					basePath = File.dirname(argument.read('watch'))
-					argument.create('watch',"#{File.basename(argument.read('watch'))}")
-					argument.create_if_empty('basePath',basePath)
-					argument.create_if_empty('fileExtension','html')
-					argument.create_if_empty('fileOutput',"#{File.basename(argument.read('watch'), ".*")}.#{argument.read('fileExtension')}")
-					argument.create_if_empty('selfClosing',"area,base,basefont,bgsound,br,col,frame,hr,img,isindex,input,keygen,link,meta,param,source,track,wbr")
-					argument.create_if_empty('sortAttribute','true')
-					argument.create_if_empty('singleQuote','false')
-					@@args = argument.hash
-					@@p = Parse.new(@@args)
-					process
+				parse.watch.each do |this|
+					file = File.join(basePath, this[:bundle] ? File.join(this[:bundle],'partial') : this[:partial] ? 'partial' : '' , this[:file])
+					files << file
+				end
+
+				#Define Core Bundle's Methods, Mixins, & Variables...
+				core_definition =  false
+				if(File.exists?(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','mixin.aml')))
+					bundle = Parse.new(File.join(File.dirname(File.expand_path(__FILE__)), 'aml','core'),'mixin.aml')
+					definition = Definition.new(bundle.file,"core",false,true,true)
+					core_definition = true
 				else
-					log.add('The file to watch does not exist.')
-					argument.missing_required.each do |message|
-						log.add(message)
+					error.log('core',false,'mixin.aml',false,'file does not exist')
+				end
+				if(File.exists?(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','method.rb')))
+				 	begin
+				 		class_eval File.read(File.join(File.dirname(File.expand_path(__FILE__)),'aml','core','method.rb'))
+				 	rescue Exception => e
+						x = e.message.match(error.match)
+						error.log('core',false,"method.rb",x[:line],x[:message])
 					end
-					log.display
+				else
+					error.log('core',false,'method.rb',false,'file does not exist')
 				end
-			else
-				argument.missing_required.each do |message|
-					log.add(message)
+
+				#Define --watch Methods, Mixins, & Variables...
+				if core_definition
+					definition.add(parse.file,false,true,true,true)
+				else
+					definition = Definition.new(parse.file,false,true,true,true)
 				end
-				log.display
+
+				#Define Additional Bundle Methods & Mixins
+				definition.bundles.each do |directory,name|
+					if directory != 'core' then
+						if File.exists?(File.join(basePath,directory,'method.rb'))
+							begin
+								class_eval File.read(File.join(basePath,directory,'method.rb'))
+							rescue Exception => e
+								x = e.message.match(error.match)
+								error.log(directory,false,"method.rb",x[:line],x[:message])
+							end
+						else
+							error.log(directory,false,'method.rb',false,'file does not exist')
+						end
+						if File.exists?(File.join(basePath,directory,'mixin.aml'))
+							bundle = Parse.new(File.join(basePath,directory),'mixin.aml')
+							definition.add(bundle.file,directory,false,true,true)
+						else
+							error.log(directory,false,'mixin.aml',false,'file does not exist')
+						end
+						#Watch Additional Bundle Partials
+						Dir[File.join(basePath,directory,'partial','*.aml')].each do |partial|
+							files << partial
+						end
+					end
+				end
+
+				@makeFile = argument.read('fileOutput')
+				compile = Compile.new(parse,argument,definition,error)
+				if(error.count == 0)
+					error.log_delete
+					if argument.read('build') == 'false'
+						print "\r\b\e[0K#{Gem.loaded_specs['aml'].summary.to_s} is watching #{files.count-1} partial instance#{files.count-1 != 1 ? "s" : ""}""... (#{argument.read('aml-watch-instance').to_i+1}) "
+						watch = Watch.new(files, arguments, argument.read('aml-watch-instance').to_i+1, argument.read('build'))
+					else
+						puts "Build complete..."
+					end
+				else
+					error_count = error.count == 1 ? "" : "s"
+					if error.count <=  argument.read('errorLimit').to_i
+						error.log_delete
+						puts error.output
+					else
+						error.log_create
+						print "\r\n#{error.count} error#{error_count} occured, please see error.log for details.\r\n"
+					end
+				end
+			else
+				puts "Please define the --watch or --build argument."
 			end
 		end
-		def self.process
-			file = []
-			@@watch = Watch.new()
-			parse  = Parse.new(@@args)
-			file << File.join(@@args[:basePath],@@args[:watch])
-			parse.process_partials(File.join(@@args[:basePath],@@args[:watch])).each do |partial|
-				partial_file = File.join(@@args[:basePath],"~","#{partial[:name]}.aml")
-				file << partial_file if File.exist?(partial_file)
-			end
-			@@watch.process(file)
-			message = "Watching #{file[0]}"
-			message += " and #{file.count-1} partial" if file.count >= 2
-			message += "s" if file.count >= 3
-			message += "...\r\n"
-			puts message
-			@@watch.watch
+
+		def self.makeFile
+			@makeFile
+		end
+
+		def self.basePath
+			@basePath
 		end
 
-		def file_update(name)
-			puts "updating #{@@args[:watch]} - #{name} has been updated..."
-			@@p.init(File.join(@@args[:basePath],@@args[:watch]),@@args)
+		def self.watchFile
+			@watchFile
 		end
 	end
-end
-require 'aml/argument'
-require 'aml/log'
-require 'aml/watch'
-require 'aml/parse'
+end

metadata

@@ -1,29 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies: []
 description: Abstract Markup Language is a robust and feature rich markup language
   designed to avoid repetition and promote clear, well-indented markup.
 email: daniel@aml-info.org
 executables:
 - aml
+- aml-bundle
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/aml-bundle
+- bin/aml
 - lib/aml.rb
+- lib/aml-bundle.rb
+- lib/aml/definition.rb
+- lib/aml/error.rb
+- lib/aml/core/method.rb
+- lib/aml/core/mixin.aml
+- lib/aml/parse.rb
 - lib/aml/argument.rb
-- lib/aml/log.rb
+- lib/aml/line_type.rb
+- lib/aml/make.rb
 - lib/aml/watch.rb
-- lib/aml/parse.rb
-- bin/aml
+- lib/aml/compile.rb
+- lib/aml/requirement.rb
 homepage: https://aml-info.org/
 licenses:
 - MIT
@@ -44,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Abstract Markup Language

data/lib/aml/log.rb

@@ -1,25 +0,0 @@
-class Log
-	
-	@@introduction = false
-	@@message = []
-	
-	def initialize(introduction=false)
-		@@introduction = introduction
-	end
-
-	def introduction(message)
-		@@introduction = message
-	end
-
-	def add(message)
-		@@message << message
-	end
-
-	def display(introduction=true)
-		puts @@introduction if(@@introduction != false) and introduction
-		@@message.each do |message|
-			puts "- #{message}"
-		end
-	end
-
-end