aml 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0cdc40b541bc19e5680c9216bc712639b954f98
-  data.tar.gz: dc1ae55d6d5c42dd4811a63689da7033436f2568
+  metadata.gz: a98badb3128b249e2d67f97138c00077cf9c29c9
+  data.tar.gz: ff741aa149c9b20fa610348db5ec7269f53d91f7
 SHA512:
-  metadata.gz: 472033267cf83259a6f37ae2041e06dfab735961148a48be84b2da66b876e2e193514d1f69887e25a0d8bc58a3f5c51cbd5206addf0ca7314f014a3a8e9e4929
-  data.tar.gz: 3c62a5f13935b8fc6c9e52a40374671693b4c272bd31d4a8ade79b49a8176a1648b0a9b2201b497b41fd6885ecc0fc7d27695cf5451d91a3e6b69fde8762ad32
+  metadata.gz: d63d25dfd2b9677de627606cc2695fb35a7ab79653471aa445fd5051a7d15244d0a974ec29d0e3dc203078779f5fbd4b22e48969965312a94d041507df23347e
+  data.tar.gz: ab2c457d4b293613ba8faf02e5dc7458d023cf5d3635f40d0352ab48ddc13181bace788cba48a8610c06461869d0cdb7838c9c594c6b28addda98b156f5c65b7

data/lib/aml.rb

@@ -107,6 +107,7 @@ module AbstractMarkupLanguage
 				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}) "
 						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

data/lib/aml/compile.rb

@@ -57,11 +57,13 @@ class Compile
 			%w"text value".each do |key|
 				line[key.to_sym] = line[key.to_sym].to_s.gsub(regex){mixin_attributes[$1.to_sym]} if line.has_key?(key.to_sym)
 			end
-			attributes = line[:attributes].clone
-			attributes.each do |k,v|
-				attributes[k] = v.to_s.gsub(regex){mixin_attributes[$1.to_sym]}
+			if(line.has_key?(:attributes))
+				attributes = line[:attributes].clone
+				attributes.each do |k,v|
+					attributes[k] = v.to_s.gsub(regex){mixin_attributes[$1.to_sym]}
+				end
+				line[:attributes] = attributes
 			end
-			line[:attributes] = attributes
 		end
 		line
 	end
@@ -72,15 +74,15 @@ class Compile
 				lines.delete_at index
 				mixin = definition.mixin(line[:name],line[:bundle])
 				if(mixin.is_a?(Hash))
-				mixin = mixin.clone
-				mixin[:structure].each_with_index do |mline,mindex|
-					mixin_line = mline.clone
-					mixin_line[:index] += line[:index]
-					mixin_line[:number] = line[:number]
-					line_attribute_replace(mixin_line,mixin[:attribute],line[:attributes])
-					lines.insert(index+mindex,mixin_line)
+					mixin = mixin.clone
+					mixin[:structure].each_with_index do |mline,mindex|
+						mixin_line = mline.clone
+						mixin_line[:index] += line[:index]
+						mixin_line[:number] = line[:number]
+						line_attribute_replace(mixin_line,mixin[:attribute],line[:attributes])
+						lines.insert(index+mindex,mixin_line)
+					end
 				end
-			end
 				break
 			end
 		end

data/lib/aml/watch.rb

@@ -16,7 +16,7 @@ class Watch
 				Kernel.sleep sleep until file_updated?
 				rescue SystemExit,Interrupt
 				puts ""
-				Kernel.exit
+				Kernel.exit!
 			end
 		end
 	end
@@ -27,7 +27,7 @@ class Watch
 			@last_mtimes[filename] = mtime
 			if(updated)
 				exec("aml #{@arguments} --aml-watch-instance #{@instance}")
-				Kernel.exit
+				Kernel.exit!
 				return true
 			end
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aml
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Esquivias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-11-07 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.