scms 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c0c0d471cd69e02766106c06e8963d96213701a
-  data.tar.gz: a2e0a4ac536d83b3c9aea6b934b30e58c785a704
+  metadata.gz: 8fa75d14e950e8ab9bb0706c3e55b58efc637e84
+  data.tar.gz: 990d4bf361a11448dbc00f6f7e45baf9b6f0f617
 SHA512:
-  metadata.gz: 35250c77a48797cf116f5f4a7cf49079341e8227017bbf2cba7b72d9ce4114b75e0c6a0d9abdee86adc7c16632ed9bb0a0ad6ba148ea9bf7d0548a090fa718be
-  data.tar.gz: 94cf7c1f2f34c70f228fa9be7272be65b8b11a1067d9bc1f81be586a7e2f7df10472c6b8b48690e66d483d0ac1c3a08e7fe500211090a1b9b599dbacf1e0a50f
+  metadata.gz: 60ef41d6927c3dfbd93e5208f6f1bd9f2c6d0ab1d7f05e9097d1b90243e24426d38cdb53be395add8680bff95f06cc0eb5947e415c7b5f3a4fb1e8e12ef31614
+  data.tar.gz: fa4f652d48e128ced317f38bb8e7aed4e919fff8f0ad5e0407236315ebf7901d9ddc9cf4882e3c4df0779982ff6b1d4cf6c55d5603e09b307a19a7c89f116380

data/lib/scms.rb

@@ -36,7 +36,9 @@ module Scms
                         ScmsUtils.log(e.backtrace.inspect  )
                     end
                 else
-                    ScmsUtils.log("Bootstrap does not exist #{bootstrap}")
+                    ScmsUtils.errLog("Bootstrap does not exist #{@settings["bootstrap"]}")
+                    ScmsUtils.writelog("::Bootstrap does not exist #{@settings["bootstrap"]}", @website)
+                    ScmsUtils.writelog("type NUL > #{bootstrap}", @website)
                 end
             end 
             
@@ -93,7 +95,9 @@ module Scms
                                 #ScmsUtils.log( "_Resource found: #{pageconfig["resource"]}_" )
                                 resource = YAML.load_file(resourcepath)
                             else
-                                ScmsUtils.errLog( "Resource not found: #{resourcepath}" )
+                                ScmsUtils.errLog("Resource not found: #{pageconfig["resource"]}")
+                                ScmsUtils.writelog("::Resource not found #{pageconfig["resource"]}", @website)
+                                ScmsUtils.writelog("type NUL > #{resourcepath}", @website)
                             end
                         end
                         
@@ -110,7 +114,9 @@ module Scms
                                     ScmsUtils.errLog( "Handler doesnt have a render method" )
                                 end
                             else
-                                ScmsUtils.errLog( "**Handler not found: #{handlerpath}**" )
+                                ScmsUtils.errLog("Handler not found: #{pageconfig["handler"]}")
+                                ScmsUtils.writelog("::Handler not found #{pageconfig["handler"]}", @website)
+                                ScmsUtils.writelog("type NUL > #{handlerpath}", @website)
                             end
                         end
                         
@@ -162,7 +168,8 @@ module Scms
                                     end
                                 else
                                     ScmsUtils.errLog("View not found: #{view[0]} - #{view[1]} [#{viewpath}]")
-                                    ScmsUtils.writelog("View not found: #{view[0]} - #{view[1]} [#{viewpath}]", @website)
+                                    ScmsUtils.writelog("::View not found: #{view[0]} - #{view[1]} [#{viewpath}]", @website)
+                                    ScmsUtils.writelog("type NUL > #{viewpath}", @website)
                                 end
                                 #ScmsUtils.log( "view = #{view[0]} - #{view[1]}" )
                             end
@@ -187,13 +194,15 @@ module Scms
                             :rootdir => @website, 
                             :monkeyhook => monkeyhook
                         }
-                        
+
+                        break if pageconfig["generate"] == nil
+
                         erb = File.join(@website, skin)
-                        out = File.join(@website, File.join(pageconfig["generate"].sub('~/',''))) unless pageconfig["generate"] == nil
+                        out = File.join(@website, File.join(pageconfig["generate"].sub('~/',''))) 
                         
                         ScmsUtils.successLog("#{pageurl}")
-                        ScmsUtils.errLog("Template doesn't exist: #{erb}") unless File.exists?(erb)
-                        if File.exists?(erb) && out != nil
+
+                        if File.exists?(erb)
                             pubsubdir = File.dirname(out)
                             Dir.mkdir(pubsubdir, 755) unless File::directory?(pubsubdir)
 
@@ -210,6 +219,10 @@ module Scms
                             html = html.gsub('~/', websiteroot)
 
                             File.open(out, 'w') {|f| f.write(html) }
+                        else
+                            ScmsUtils.errLog("Template doesn't exist: #{skin}")
+                            ScmsUtils.writelog("::Template doesn't exist #{skin}", @website)
+                            ScmsUtils.writelog("type NUL > #{erb}", @website)
                         end
                     end
                 end
@@ -226,7 +239,6 @@ module Scms
             result = ERB.new(template).result(page.instance_eval { binding })
         rescue Exception => e  
                     ScmsUtils.errLog("Critical Error: Could not parse template")
-                    ScmsUtils.log( "(if your using resources make sure their not empty)" )
                     ScmsUtils.errLog( e.message )
         end
         
@@ -251,11 +263,14 @@ module Scms
                     if files != nil
                         files.each do |asset|
                             assetList += "\t#{asset}\n" 
-                            assetname = File.join(@website, asset)
-                            if File::exists?(assetname)
-                                content = content + "\n" + File.read(assetname)
+                            assetdir = File.join(@website, asset)
+                            if File::exists?(assetdir)
+                                #try catch for permisions
+                                content = content + "\n" + File.read(assetdir)
                             else
-                                ScmsUtils.errLog( "Error: No such file #{assetname}" )
+                                ScmsUtils.errLog( "Asset file doesn't exists: #{asset}" )
+                                ScmsUtils.writelog("::Asset file doesn't exists: #{asset}", @website)
+                                ScmsUtils.writelog("type NUL > #{assetdir}", @website)
                             end
                         end
                         ScmsUtils.log("#{assetList}")
@@ -302,6 +317,10 @@ module Scms
                 ScmsUtils.errLog( "Error processing: #{asset}" )
                 ScmsUtils.errLog( e.message )
             end
+        else
+            ScmsUtils.errLog("Sass file doesn't exists: #{asset}")
+            ScmsUtils.writelog("::Sass file doesn't exist #{asset}", @website)
+            ScmsUtils.writelog("type NUL > #{asset}", @website)
         end
     end
     
@@ -316,6 +335,10 @@ module Scms
                 ScmsUtils.errLog( "Error processing: #{asset}" )
                 ScmsUtils.errLog( e.message )
             end
+        else
+            ScmsUtils.errLog("Asset file doesn't exist: #{asset}")
+            ScmsUtils.writelog("::Asset file doesn't exist #{asset}", @website)
+            ScmsUtils.writelog("type NUL > #{asset}", @website)
         end
     end
 

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.0.7"
+  VERSION = "2.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Courtenay Probert