scms 4.1.1 → 4.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzc0NDUwODJkNDk4Y2FiODVmZDIxZjA3MTEyZjVlNTJjYjNmMTRkYw==
+    YWViM2NmNGUxMmRkNjE2NTY0YjBlMWFiZGQ5NDMzOTVlZDM4OGNiNg==
   data.tar.gz: !binary |-
-    N2FlZjI2YmM2NTkzNWUxNmFiZDZmYWEyNzBmYzYzYmYxNWUwYWIwMw==
+    MmZkYzFhZDJmYmRkOTcyNWE3MjljZTZiMjlmNWRkYTIzYTJjY2I4ZA==
 SHA512:
   metadata.gz: !binary |-
-    Mzg3NTU2MjhjYTgyNzYzMWI0MDUyYWMzMjQ5MmQwYzEzMGE2NWFlMmNjOTIx
-    YmNlZDViNjMwNWQ3M2NkM2Q3M2JjODA1NTFjZDY4M2I5YWJmMTU4ZDY5NmEw
-    YzRjMDFlN2ExN2M0ZTM4OTFmNmRlOTE2MDk5ODM2OTMyYTE4NjA=
+    NjY5NzAxYmQ1OGQxNWZjZWQzYWMzZDNmYjE0OTRkYTdhMWM2OGE3MTU1YmE2
+    ZWE5MGFlZDhiODJlYTU1NmVjNGRiNDlkZWQyMDNlODVhYzJkZDk2ODY2Yjky
+    ZTRjOTZlZWJlODQyNWI3MDVhYmI1YTFhNTdkMGJiM2JlODI3YzA=
   data.tar.gz: !binary |-
-    NDk4ZDgzMDk5N2E1MDZlMGIwZTBmZDM0OWJiMTQxMmI4YmU5M2E2M2IwY2E0
-    YjAzMWE2NjA2MTUwODUwOGIxNWI1YjRkMWIzYmU2YTA4MWZjN2E0YjBmM2E2
-    NDlhYTA2ZDE4MDY5MmQ0MzgxOTRkZTNiNWMxYTQ4NDhlYzk5YWU=
+    NGI1MThkNTk2ZmJhOWU4ODcyNjFmZGQyMDQwNzhkMDI3MDJkNzZlMmYzOTdj
+    YzIwMGE5ZTYxZDE5N2NkYmU5ZjBlYjkwZjZhN2JiNTQyNzI1NjEzY2U5NjVj
+    ZDA4ODRiYTM5OWJjZDEwODBiM2FkNGY2YTQ2NjQyYzg5MDlmMTg=

data/assets/air-monkey-hook.js

@@ -46,7 +46,7 @@ $(function() {
 				if ($.trim($this.html()) === "")
 					$this.html(addTextMsg);
 				$(this).css({
-						backgroundColor: 'AliceBlue',
+						backgroundColor: '#FFFFE0',
 						cursor: 'pointer'
 				});
 			})

data/lib/scms.rb

@@ -60,12 +60,12 @@ module Scms
 
     def Scms.generatePages(website, settings, options)
         # build pages defined in config file
-        Scms.generateSettingsPages(website, settings, options)
+        Scms.generatePagesFromSettings(website, settings, options)
         # build pages pased on _pages folder
-        Scms.generateFolderPages(website, settings, options)
+        Scms.generatePagesFromFolder(website, settings, options)
     end
 
-    def Scms.generateSettingsPages(website, settings, options)
+    def Scms.generatePagesFromSettings(website, settings, options)
         if settings["pages"] != nil
             ScmsUtils.log("Compiling Pages:")
             settings["pages"].each do |pagedata|
@@ -104,7 +104,7 @@ module Scms
         return views
     end
 
-    def Scms.generateFolderPages(website, settings, options)
+    def Scms.generatePagesFromFolder(website, settings, options)
         pagesFolder = File.join(website, "_pages")
         Dir.glob("#{pagesFolder}/**/*/").each do |pageFolder|
             pagename = File.basename(pageFolder, ".*")

data/lib/scms/scms-parser.rb

@@ -47,22 +47,26 @@ module Scms
 	                ScmsUtils.errLog("Critical Error: Could not parse template")
 	                #ScmsUtils.errLog(e.message)
 
-	                result = "<code style='border: 1px solid #666; background-color: light-yellow;'><pre>"
+	                result = "<div style='border: 1px solid #A8A8A8; border-radius:8px; background-color: #FFFFE0; box-shadow: 5px 5px 3px #CDCDCD; padding: 15px; margin: 15px;'>"
+	                result += "<p>Critical Error: Could not parse template</p>"
+	                result += "<code><pre>"
 	                result += e.message
 	                result += "\n\n"
 	                result += e.inspect
+
 	                result += "\n\n"
-	                result += "Invalid Keys in Template\n\n"
-	                result += "Valid Keys are:\n"
-	                @model.each do |key, value|
+	                result += "Valid Template Keys are:\n"
+	                @model.marshal_dump.each do |key, value|
 	                    result += "- page.#{key}\n"
 	                    puts "nil value foy key: #{key}" if value == nil
 	                    singleton_class.send(:define_method, key) { value }
 	                end
-	                result += "</code></pre>"
-	                
+	                result += "\n\n"
+	                result += e.backtrace.join("\n")
+	                result += "</pre></code></div>"
 	                result += "\n\n"
 	                result += template
+
 	            rescue Exception => e  
 	                puts "Problem with template - check property exists"
 	            end

data/lib/scms/scms-watcher.rb

@@ -14,9 +14,14 @@ module ScmsWatcher
 				puts "***********************************"
 				puts ""
 
-				settings = Scms.getSettings(configdir)
-				Scms.bundle(settings, Folders[:website])
-				Scms.build(Folders[:website], settings, options)
+				begin
+					settings = Scms.getSettings(configdir)
+					Scms.bundle(settings, Folders[:website])
+					Scms.build(Folders[:website], settings, options)
+				rescue Exception=>e
+	                ScmsUtils.errLog(e.message)
+	                ScmsUtils.log(e.backtrace.inspect)
+				end
 			end
 	    }
 
@@ -97,9 +102,15 @@ module ScmsWatcher
 				}
 			end
 
-			Scms.sassall(Folders[:website]) if sassfile
-			Scms.bundle(settings, Folders[:website]) if bundlefile
-			Scms.build(Folders[:website], settings, options) if buildfile
+			begin
+				Scms.sassall(Folders[:website]) if sassfile
+				Scms.bundle(settings, Folders[:website]) if bundlefile
+				Scms.build(Folders[:website], settings, options) if buildfile
+			rescue Exception=>e
+                ScmsUtils.errLog(e.message)
+                ScmsUtils.log(e.backtrace.inspect)
+			end
+
 	    end
 
 	    listener.start # not blocking

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync