scms 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39434ffa4c1bbd9419277ac9d1df1147a93e2f7
-  data.tar.gz: ae6d56f657f22d9154be02cbdfaaa90fb185fb85
+  metadata.gz: b943e5110913001c531f5db7d229d77e32ea5f4c
+  data.tar.gz: a2eceff57906100fde18df5daa2e4d4e84100dd1
 SHA512:
-  metadata.gz: 9667ba1ff13349a6b2ae9121338adb126cb81252176fd1d0479416bd1f42e2f37910f87d1a759650b8ff2be957a94f8a4afa9ce382b7d5d910c7214c90df06ce
-  data.tar.gz: a79d5a45f8834fd1bf2ffe287eea2fba48ef34e7cd080fd5503fae2700c1d5fc6d2b96c7703f0a0976129690af9414b6999a9e84d0590bc4112c3b793aea250c
+  metadata.gz: 0ab284712cbccc96170b35a232529fb8f60f7237a3837822c1e69354112a2c06ced296c647e53ba0b4710e3d3b217c30101b8690ae43b6ed5417ce9cfaf66f57
+  data.tar.gz: 5249468af79e85557d93fdf821bce440a9e75369ace10b32d4212395225540783a8ef59336e1a697dc97064a1b6a4a7dc3536efcc0f99e8a8ba7d39afae60c2c

data/bin/scms

@@ -90,11 +90,11 @@ else
   FileUtils.rm(monkeyhook) if File.exist?(monkeyhook)
 end
 
-#puts "System root folder = #{Folders[:root]}"
-#puts "Website folder = #{Folders[:website]}"
-#puts "Pub dir = #{Folders[:pub]}"
-#puts "Config dir = #{Folders[:config]}"
-#puts "Mode = #{options[:mode]}"
+#ScmsUtils.log "System root folder = #{Folders[:root]}"
+#ScmsUtils.log "Website folder = #{Folders[:website]}"
+#ScmsUtils.log "Pub dir = #{Folders[:pub]}"
+#ScmsUtils.log "Config dir = #{Folders[:config]}"
+#ScmsUtils.log "Mode = #{options[:mode]}"
 
 raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
 Scms.upgrade(Folders[:website])

data/lib/scms.rb

@@ -18,7 +18,7 @@ module Scms
         @mode = mode
         #ScmsUtils.log("Mode: #{mode}")
         
-        ScmsUtils.log("Website #{@website}")
+        ScmsUtils.boldlog("Compiling #{@website}")
         Scms.sassall(File.join(@website))
         
         yamlpath=File.join(config, "_config.yml")
@@ -33,7 +33,7 @@ module Scms
                         require_relative bootstrap
                     rescue Exception=>e
                         ScmsUtils.errLog(e.message)
-                        ScmsUtils.log(e.backtrace.inspect  )
+                        ScmsUtils.log(e.backtrace.inspect)
                     end
                 else
                     ScmsUtils.errLog("Bootstrap does not exist #{@settings["bootstrap"]}")
@@ -48,7 +48,7 @@ module Scms
             ScmsUtils.errLog("Config is empty")
         end
 
-        ScmsUtils.log("Built website:")
+        ScmsUtils.boldlog("Built website:")
         ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@website}"))
     end
 
@@ -93,8 +93,12 @@ module Scms
                             resourcepath = File.join(@website, pageconfig["resource"])
                             if File.exists?(resourcepath)
                                 #ScmsUtils.log( "_Resource found: #{pageconfig["resource"]}_" )
-                                #todo: error handeling
-                                resource = YAML.load_file(resourcepath)
+                                begin
+                                    resource = YAML.load_file(resourcepath)
+                                rescue Exception=>e
+                                    ScmsUtils.errLog(e.message)
+                                    ScmsUtils.log(e.backtrace.inspect)
+                                end
                             else
                                 ScmsUtils.errLog("Resource not found: #{pageconfig["resource"]}")
                                 ScmsUtils.writelog("::Resource not found #{pageconfig["resource"]}", @website)
@@ -127,8 +131,12 @@ module Scms
                                 views[view[0]] = ""
                                 viewpath = File.join(@website, view[1])
                                 if File.exists?(viewpath)
-                                    #todo: error handeling
-                                    htmlsnipet = File.read(viewpath)
+                                    begin
+                                        htmlsnipet = File.read(viewpath)
+                                    rescue Exception=>e
+                                        ScmsUtils.errLog(e.message)
+                                        ScmsUtils.log(e.backtrace.inspect)
+                                    end
                                     if !htmlsnipet.empty?
                                         viewmodel = Hash.new
                                         viewmodel = { 
@@ -142,8 +150,13 @@ module Scms
 
                                         if hasHandler
                                             ScmsUtils.log("Rendering with handler")
-                                            #todo: error handeling
-                                            viewSnippet = Handler.render(viewpath)
+                                            begin
+                                                viewSnippet = Handler.render(viewpath)
+                                            rescue Exception=>e
+                                                ScmsUtils.errLog(e.message)
+                                                ScmsUtils.log(e.backtrace.inspect)
+                                            end
+                                            
                                         else
                                             #todo: why not use htmlsnipet
                                             snnipetCode = File.read(viewpath)
@@ -154,8 +167,8 @@ module Scms
                                                     viewSnippet = doc.to_html
                                                 rescue Exception => e  
                                                     viewSnippet = snnipetCode
-                                                    puts e.message  
-                                                    puts e.backtrace.inspect  
+                                                    ScmsUtils.errLog(e.message)
+                                                    ScmsUtils.log(e.backtrace.inspect)
                                                     #todo: use scmslog
                                                 end
                                             else
@@ -222,8 +235,12 @@ module Scms
                             websiteroot = @settings["url"] unless @settings["rooturl"] == nil
 
                             html = html.gsub('~/', websiteroot)
-                            #todo: error handeling
-                            File.open(out, 'w') {|f| f.write(html) }
+                            begin
+                                File.open(out, 'w') {|f| f.write(html) }
+                            rescue Exception=>e
+                                ScmsUtils.errLog(e.message)
+                                ScmsUtils.log(e.backtrace.inspect)
+                            end
                         else
                             ScmsUtils.errLog("Template doesn't exist: #{skin}")
                             ScmsUtils.writelog("::Template doesn't exist #{skin}", @website)
@@ -243,9 +260,8 @@ module Scms
         begin 
             result = ERB.new(template).result(page.instance_eval { binding })
         rescue Exception => e  
-                    ScmsUtils.errLog("Critical Error: Could not parse template")
-                    ScmsUtils.errLog( e.message )
-                    #todo: log error to build.log
+            ScmsUtils.errLog("Critical Error: Could not parse template")
+            ScmsUtils.errLog(e.message)
         end
         
         return result
@@ -254,41 +270,52 @@ module Scms
     def Scms.bundle(bundleConfig)
         bundles = Hash.new
         if bundleConfig != nil
-            ScmsUtils.log("Bundeling:")
+            
             bundleConfig.each do |bundle|
                 #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
                 bundle.each do |option|
                     name = option[0]
                     bundleName = File.join(option[1]["generate"])
                     bundles[name] = bundleName
-                    ScmsUtils.successLog("#{bundleName}")
+                    ScmsUtils.boldlog("Bundeling:")
 
                     content = ""
                     assetList = ""
                     files = option[1]["files"]
                     if files != nil
                         files.each do |asset|
-                            assetList += "\t#{asset}\n" 
+                            assetList += " - #{asset}\n" 
                             assetdir = File.join(@website, asset)
                             if File::exists?(assetdir)
                                 #try catch for permisions
-                                #todo: error handeling
-                                content = content + "\n" + File.read(assetdir)
+                                begin
+                                    content = content + "\n" + File.read(assetdir)
+                                rescue Exception=>e
+                                    ScmsUtils.errLog(e.message)
+                                    ScmsUtils.log(e.backtrace.inspect)
+                                end
                             else
-                                ScmsUtils.errLog( "Asset file doesn't exists: #{asset}" )
+                                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}")
                         
-                        bundleDir = File.dirname(bundleName)
-                        #todo: error handeling
-                        Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
-                        File.open(bundleName, 'w') {|f| f.write(content) }
+                        bundleFullPath = File.join(@website, bundleName)
+                        bundleDir = File.dirname(File.join(@website, bundleName))
+                        begin
+                            Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
+                            File.open(bundleFullPath, 'w') {|f| f.write(content) }
+                            ScmsUtils.successLog("Created: #{bundleName}")
+                        rescue Exception=>e
+                            ScmsUtils.errLog("Error creating bundle: #{bundleName}")
+                            ScmsUtils.errLog(e.message)
+                            ScmsUtils.log(e.backtrace.inspect)
+                        end
                         if File.extname(bundleName) == ".js"
                             puts "Minifing: #{bundleName}"
-                            Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
+                            Scms.packr(bundleFullPath) unless /(-min)|(\.min)/.match(bundleName)
                         end
                     else
                         ScmsUtils.errLog("No files in bundle"); 
@@ -320,10 +347,10 @@ module Scms
                 output = sass_engine.to_css
                 css_file = "#{File.dirname(asset)}/#{File.basename(asset,'.*')}.css"
                 File.open(css_file, 'w') { |file| file.write(output) }
-                ScmsUtils.log( "_Sassed: #{css_file}_" )
+                ScmsUtils.log( "CSS minified (sassed): #{css_file}" )
             rescue Exception => e  
-                ScmsUtils.errLog( "Error processing: #{asset}" )
-                ScmsUtils.errLog( e.message )
+                ScmsUtils.errLog("Error processing: #{asset}")
+                ScmsUtils.errLog(e.message)
             end
         else
             ScmsUtils.errLog("Sass file doesn't exists: #{asset}")
@@ -338,15 +365,13 @@ module Scms
                 code = File.read(asset)
                 compressed = Packr.pack(code)
                 File.open(asset, 'w') { |f| f.write(compressed) }
-                ScmsUtils.log( "Minified #{File.basename(asset)}" )
+                ScmsUtils.log("Minified #{File.basename(asset)}")
             rescue Exception => e  
-                ScmsUtils.errLog( "Error processing: #{asset}" )
-                ScmsUtils.errLog( e.message )
+                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)
+            ScmsUtils.errLog("Can't minify asset because file doesn't exist: #{asset}")
         end
     end
 

data/lib/scms/s3deploy.rb

@@ -14,7 +14,7 @@ module S3Deploy
         s3yamlpath=File.join(config, "_s3config.yml")
         settings = YAML.load_file(s3yamlpath)
         throw "No bucket defined in _s3config.yml settings file" if settings['bucket'] == nil
-        ScmsUtils.log( "Syncing with Amazon S3: #{settings['bucket']}" )
+        ScmsUtils.boldlog( "Syncing with Amazon S3: #{settings['bucket']}" )
 
         exclude = "(\\.svn$)|(^_)"
         if settings['ignore'] != nil
@@ -27,7 +27,7 @@ module S3Deploy
         #First deploy private directories
         Dir.glob("#{pub}/_*/").each do |f|
             privatedir = File.basename(f)
-            ScmsUtils.log( "Backing up #{privatedir} (private)" )
+            ScmsUtils.log( "Backing up: #{privatedir} (private)" )
             privateparams = "#{params} \"#{pub}/#{privatedir}/\" #{settings['bucket']}:#{privatedir}/"
             ScmsUtils.run(cmd, privateparams)
         end
@@ -35,13 +35,13 @@ module S3Deploy
         #Them deploy publid dir with caching
         if settings['cache'] != nil
             settings['cache'].each do |folder| 
-                ScmsUtils.log( "Syncing #{folder}(public: caching: 1 year)" )
+                ScmsUtils.log("Publishing: #{folder}(public: caching: 1 year)")
                 cacheparams = "#{params}  --public-read --cache-control='max-age=31449600' \"#{pub}/#{folder}/\" #{settings['bucket']}:#{folder}/"
                 ScmsUtils.run(cmd, cacheparams)
             end
         end
 
-        ScmsUtils.log( "Syncing root (public)" )
+        ScmsUtils.log("Publishing root (public)")
         removeold = ""
         removeold = "--delete"  if settings['clean'].to_s == "true"
         roorparams = "#{removeold} #{params} --public-read \"#{pub}/\" #{settings['bucket']}:/"

data/lib/scms/scms-utils.rb

@@ -7,6 +7,7 @@ module ScmsUtils
         ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
         config = nil
 
+##http://snk.tuxfamily.org/log/yaml-json-validation-kwalify-ruby19.html
         #'kwalify'
         #schema = Kwalify::Yaml.load_file('some_complex_schema.yaml')
         #validator = Kwalify::Validator.new(schema)
@@ -63,6 +64,16 @@ module ScmsUtils
         end
     end
     
+    def ScmsUtils.boldlog(msg)
+        if !msg.nil?
+            if ENV["SCMS_HTML_OUT"] == "true"
+                puts "<strong>#{ScmsUtils.txt_2_html(msg)}</strong>"
+            else
+                puts msg
+            end
+        end
+    end
+
     def ScmsUtils.log(msg)
         if !msg.nil?
             if ENV["SCMS_HTML_OUT"] == "true"
@@ -75,7 +86,7 @@ module ScmsUtils
     
 	def ScmsUtils.writelog(log, pub)
         if !pub.nil? && !log.nil? 
-            open(File.join(pub, "build.log"), 'a') { |f|
+            open(File.join(pub, "_build.log"), 'a') { |f|
               f.puts log
             }
         end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.0.9"
+  VERSION = "2.1.0"
 end

metadata

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