scms 3.1.1 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODViYzEwYjJkYmM3OGFlMDY0ZGI3Y2U3ZTQ1YjVjMDBhOWRmMDYwMg==
+    NTQyZDcwZTdiYzYyZmM4YzQyY2Q2NTNlMWRkNjQ0ZjQ1ZDFkNTVkNA==
   data.tar.gz: !binary |-
-    ODQ2Y2JhMDVjMmNkOGY0MGU3M2Q1OTU1MWM2N2VlZTBjNDEyNDNhYQ==
+    YWNhMDA4Y2QxOGRmODJkYTExZDE2N2UzMWNiYjI3M2M5ZWM5ZWMyYQ==
 SHA512:
   metadata.gz: !binary |-
-    MjBlYTdiYTIzY2Y4NjQyMDIyMDU0MzNjZTQ5Mjg5NGVmMzEzZGUzNWM1ODlj
-    NGM3NTQ3YjM3NGYwNDc0OGRhNmI4YzhjNmY1M2ZhY2U3Nzk1ODRjZGIxZTA4
-    YjkxMDhhNzdkNmJmNmIxMWM3MmFjYWE2YjZjNDcwY2RmZmNlOGI=
+    YTdkNTc3ZjNmMTgxNjNlNGVjZGRlZDdiMWEwMzIwMzY4YzBhMDQwZGIwYjQ1
+    ZjZmODY5NDliMzg3ZDA5YjRlMmVkZWM3ZTJhMjBjM2IxYzgyNmVmYzgwZjUw
+    MTI4MWFjYTA0YTU1OTM4ZmJhOGRjZjljOWY0NGQxN2UwZWMyZjQ=
   data.tar.gz: !binary |-
-    YzRiMmZmZGZkOGU0Y2Y4YThhZWRmMzhiODdlZjgwNGZkYzVjOGNhMWY5OWE5
-    MTYxMjAxNGNmY2FjOTZmZDVlZDg5MjFjZDM3MGJhYmM1MzcyZTc5NTk4ZmYz
-    NzRmMmQxOTUxYmZiNmFkZWVjZTgzNDg3NTk5MDY4ZWQ5YmY5ZTA=
+    NGVmNjYzYmUzN2ZkNGRhMmIzNTRkM2M0MjY0NzBmYjgzZjYzYjYyNDliYmZk
+    NTJiNjkxZTZhZDEwYjI3NDFjY2U1YjYyOTY0YjY0ZjA1NDA5ZWFiMDVkNTQw
+    ZTM1ZTk1OTkzNTViZWQ2ZTU5NWY5NTkzYmM1NDg1OWFjMDZkZDM=

data/bin/scms

@@ -11,6 +11,7 @@ require 'optparse'
 require 'fileutils'
 require 'Scms'
 require "scms/version"
+require 'scms/scms-watcher.rb'
 require 'scms/scms-httpserver.rb'
 
 class String
@@ -62,7 +63,7 @@ optparse = OptionParser.new do|opts|
     options[:configdir] = c
   end
    
-  options[:mode] = "pub"
+  options[:mode] = nil
   opts.on( '-m', '--mode Mode', 'CMS or Publish (for use with Air-Monkey: http://ipassexam.github.io/Air-Monkey/)' ) do|m|
      options[:mode] = m
   end
@@ -90,13 +91,11 @@ Folders = {
   :config => (options[:configdir] or ENV["SCMS_CONFIG_FOLDER"] or options[:website]),
   :assets => File.join(root_folder, "assets")
 }
-# These can be used in the bootstrap.rb 
+# Globals: These can be used in the bootstrap.rb 
 $website = Folders[:website]
 $watch = options[:watch]
 $cmsmode = options[:mode] == "cms"
 
-configfile = File.join(Folders[:website], "_config.yml")
-
 # ScmsUtils.log "System root folder = #{Folders[:root]}"
 # ScmsUtils.log "Website folder = #{Folders[:website]}"
 # ScmsUtils.log "Destination dir = #{Folders[:destination]}"
@@ -126,44 +125,19 @@ else
   FileUtils.rm(monkeyhook) if File.exist?(monkeyhook) && options[:publish]
 end
 
-Scms.build(Folders[:website], Folders[:config], options[:mode])
+settings = Scms.getsettings(Folders[:config])
+Scms.sassall(Folders[:website])
+Scms.bundle(settings, Folders[:website])
+Scms.build(Folders[:website], settings, options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:destination]) if Folders[:destination] != ''
 
 if options[:watch]
-    require "filewatcher"
-    #  I dont really want to use filewatcher but I can't get listen to watch the config file
-    # I'd use filewatcher to monitor directories but it crashes if a file id deleted
-    watcher = Thread.new {
-      puts "Watching yam files"
-      FileWatcher.new(["_config.yml"]).watch do |filename|
-        puts "Updated " + filename
-        Scms.build(Folders[:website], Folders[:config], options[:mode])
-      end
-    }
-
-    psst = []
-    #psst.push("_config.yml")# if File.exists?(configfile)
-    psst.push("_views") if File.directory? "_views"
-    psst.push("_layouts") if File.directory? "_layouts"
-    psst.push("_templates") if File.directory? "_templates"
-    psst.push("_source") if File.directory? "_source"
-    psst.push("_resources") if File.directory? "_resources"
-
-    require "listen"
-    puts "Setting up listen"
-    listener = Listen.to(psst, force_polling: true) do |modified, added, removed|
-      puts "modified: #{modified}" if modified.length > 0
-      puts "added: #{added}" if added.length > 0
-      puts "removed: #{removed}" if removed.length > 0
-
-      Scms.build(Folders[:website], Folders[:config], options[:mode]) if modified.length > 0
-    end
-    listener.start # not blocking
-    sleep unless options[:server]
+  ScmsWatcher.watch(settings, options, Folders[:config])
+  sleep unless options[:server]
 end
 
 if options[:server]
-    ScmsServer.start(Folders[:website], options[:port])
+  ScmsServer.start(Folders[:website], options[:port])
 end
 
 if options[:publish]

data/lib/scms/s3deploy.rb

@@ -4,7 +4,7 @@ module S3Deploy
 
     def S3Deploy.sync(pub, config, mimetypefile)
         #yamlpath=File.join(config, "_config.yml")
-        #scmsSettings = ScmsUtils.getsettings(yamlpath)
+        #scmsSettings = ScmsUtils.readyaml(yamlpath)
 
         ENV["S3CONF"] = config
         ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"

data/lib/scms/scms-helpers.rb

@@ -2,6 +2,10 @@ module ScmsHelpers
     require 'find'
     
     def ScmsHelpers.isActive(pagename, activepage)
+        return active = "active" if activepage == pagename
+    end
+
+    def ScmsHelpers.isActiveIfContains(pagename, activepage)
         return active = "active" if activepage.include? pagename
     end
 

data/lib/scms/scms-utils.rb

@@ -19,8 +19,8 @@ module ScmsUtils
       false
     end
 
-    def ScmsUtils.getsettings(yamlpath)
-        ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
+    def ScmsUtils.readyaml(yamlpath)
+        ScmsUtils.log("Loading yaml: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
         config = nil
 
         ##http://snk.tuxfamily.org/log/yaml-json-validation-kwalify-ruby19.html

data/lib/scms/scms-watcher.rb

@@ -0,0 +1,74 @@
+module ScmsWatcher
+	require 'fileutils'
+	require 'filewatcher'
+	require 'pathname'
+	require 'listen'
+
+    def ScmsWatcher.watch(settings, options, configdir)
+	    watcher = Thread.new {
+	    	configfile = File.join(configdir, "_config.yml")
+			FileWatcher.new([configfile]).watch do |filename|
+				puts ""
+				puts "***********************************"
+				puts " Config Modification (_config.yml) "
+				puts "***********************************"
+				puts ""
+
+				settings = Scms.getsettings(configdir)
+				Scms.bundle(settings, Folders[:website])
+				Scms.build(Folders[:website], settings, options[:mode])
+			end
+	    }
+
+	    psst = []
+	    psst.push("_views") if File.directory? "_views" # .html .htm .md .xml .erb, etc
+	    psst.push("_layouts") if File.directory? "_layouts" # .html .htm .erb
+	    psst.push("_templates") if File.directory? "_templates" # .html .htm .erb
+	    psst.push("_resources") if File.directory? "_resources" # .yml
+	    psst.push("_source") if File.directory? "_source" # .scss .css .js
+	    
+	    puts "Listening to #{psst}"
+	    listener = Listen.to(psst, force_polling: true) do |modified, added, removed|
+			# puts "modified: #{modified}" if modified.length > 0
+			# puts "added: #{added}" if added.length > 0
+			# puts "removed: #{removed}" if removed.length > 0
+
+			if modified.length > 0
+				sassfile = false
+				bundlefile = false
+				buildfile = true
+
+				modified.each{|filename|
+					modifiedfile = Pathname.new(filename).relative_path_from(Pathname.new(Folders[:website])).to_s
+					ext = File.extname(modifiedfile)  
+
+					puts ""
+					puts "***********************************************"
+					puts "  Modified: #{modifiedfile}"
+					puts "***********************************************"
+					puts ""
+
+					if modifiedfile.start_with?('_source/')
+						bundlefile = true
+						buildfile = false
+					end
+
+					if ext == ".scss"
+						sassfile = true
+						bundlefile = false
+						buildfile = false
+						break
+					end
+				}
+
+				Scms.sassall(Folders[:website]) if sassfile
+				Scms.bundle(settings, Folders[:website]) if bundlefile
+				Scms.build(Folders[:website], settings, options[:mode]) if buildfile
+			end
+	    end
+	    listener.start # not blocking
+	    listener.ignore! /\.png/
+	    listener.ignore! /\.gif/
+	    listener.ignore! /\.jpg/
+    end
+end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/lib/scms.rb

@@ -15,20 +15,26 @@ module Scms
     
     include YAML
     
-    def Scms.build(website, config, mode)
-        @website = website
+    def Scms.getsettings(configdir)
+        yamlpath=File.join(configdir, "_config.yml")
+        settings = ScmsUtils.readyaml(yamlpath)
+        if settings           
+            return settings
+        else
+            ScmsUtils.errLog("Config is empty")
+        end
+    end
+
+    def Scms.build(website, settings, mode = "pub")
         @mode = mode
         #ScmsUtils.log("Mode: #{mode}")
         
-        ScmsUtils.boldlog("Compiling #{@website}")
-        Scms.sassall(File.join(@website))
+        ScmsUtils.boldlog("Compiling #{website}")
         
-        yamlpath=File.join(config, "_config.yml")
-        settings = ScmsUtils.getsettings(yamlpath)
         if settings           
             #Bootstrap here
             if settings["bootstrap"] != nil
-                bootstrap = File.join(@website, settings["bootstrap"])
+                bootstrap = File.join(website, settings["bootstrap"])
                 #ScmsUtils.log("Bootstrap is: #{settings["bootstrap"]}")
                 if File.exists?(bootstrap)
                     begin
@@ -39,45 +45,33 @@ module Scms
                     end
                 else
                     ScmsUtils.errLog("Bootstrap does not exist #{settings["bootstrap"]}")
-                    ScmsUtils.writelog("::Bootstrap does not exist #{settings["bootstrap"]}", @website)
-                    ScmsUtils.writelog("type NUL > #{bootstrap}", @website)
+                    ScmsUtils.writelog("::Bootstrap does not exist #{settings["bootstrap"]}", website)
+                    ScmsUtils.writelog("type NUL > #{bootstrap}", website)
                 end
             end 
-            
-            Scms.parsepages(settings)
+            Scms.parsepages(settings, website)
         else
             ScmsUtils.errLog("Config is empty")
         end
 
         ScmsUtils.boldlog("Built website:")
-        ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@website}"))
+        ScmsUtils.log(ScmsUtils.uriEncode("file:///#{website}"))
     end
 
-    def Scms.parsepages(settings)
-        bundles = Scms.bundle(settings["bundles"])
+    def Scms.parsepages(settings, website)
         # build views from templates
-        @template = settings["template"] 
         
         if settings["pages"] != nil
-            # Build navigation
-            navigation = Array.new
-            settings["pages"].each do |pagedata|
-                if pagedata != nil
-                    pagedata.each do |pageoptions|
-                        pagename =  pageoptions[0]
-                        pageconfig = pageoptions[1]
-                        pageurl = "about:blank"
-                        pageurl = pageconfig["generate"]
-                        pageurl = pageconfig["url"] unless pageconfig["url"] == nil
-                        navtext = pageconfig["navigation"]
-                        navmeta = pageconfig["navigation_meta"]
-                        navigation.push({"text" => navtext, "url" => pageurl, "pagename" => pagename, "meta" => navmeta}) unless navtext == nil
-                    end
-                end
-            end
+
+            # Build bundle model
+            bundlemodel = Scms.bundlemodel(settings)
+            # Build navigation model
+            navmodel = Scms.navmodel(settings)
+            #puts "navmodel: #{navmodel}"
 
             ScmsUtils.log("Compiling Pages:")
             settings["pages"].each do |pagedata|
+                #puts "pagedata: #{pagedata}"
                 if pagedata != nil
                     pagedata.each do |pageoptions|
                         pagename =  pageoptions[0]
@@ -85,15 +79,16 @@ module Scms
                         pageurl = pageconfig["generate"]
                         title = pagename
                         title = pageconfig["title"] unless pageconfig["title"] == nil
-                        description = pageconfig["description"]
-                        keywords = pageconfig["keywords"]
-
-                        skin = @template
+                        description = ""
+                        description = pageconfig["description"] if pageconfig["description"] != nil
+                        keywords = ""
+                        keywords = pageconfig["keywords"] if pageconfig["keywords"] != nil
+                        skin = settings["template"]
                         skin = pageconfig["template"] unless pageconfig["template"] == nil
                         
                         resource = Hash.new
                         if pageconfig["resource"] != nil
-                            resourcepath = File.join(@website, pageconfig["resource"])
+                            resourcepath = File.join(website, pageconfig["resource"])
                             if File.exists?(resourcepath)
                                 #ScmsUtils.log( "_Resource found: #{pageconfig["resource"]}_" )
                                 begin
@@ -104,14 +99,14 @@ module Scms
                                 end
                             else
                                 ScmsUtils.errLog("Resource not found: #{pageconfig["resource"]}")
-                                ScmsUtils.writelog("::Resource not found #{pageconfig["resource"]}", @website)
-                                ScmsUtils.writelog("type NUL > #{resourcepath}", @website)
+                                ScmsUtils.writelog("::Resource not found #{pageconfig["resource"]}", website)
+                                ScmsUtils.writelog("type NUL > #{resourcepath}", website)
                             end
                         end
                         
                         hasHandler = false
                         if pageconfig["handler"] != nil
-                            handlerpath = File.join(@website, pageconfig["handler"])
+                            handlerpath = File.join(website, pageconfig["handler"])
                             if File.exists?(handlerpath)
                                 ScmsUtils.log( "Handler found: #{pageconfig["handler"]}" )
                                 hasHandler = true
@@ -128,8 +123,8 @@ module Scms
                                 end
                             else
                                 ScmsUtils.errLog("Handler not found: #{pageconfig["handler"]}")
-                                ScmsUtils.writelog("::Handler not found #{pageconfig["handler"]}", @website)
-                                ScmsUtils.writelog("type NUL > #{handlerpath}", @website)
+                                ScmsUtils.writelog("::Handler not found #{pageconfig["handler"]}", website)
+                                ScmsUtils.writelog("type NUL > #{handlerpath}", website)
                             end
                         end
                         
@@ -143,7 +138,7 @@ module Scms
 
                                 #puts "viewname: #{viewname}, viewqs: #{viewqs}"
 
-                                viewpath = File.join(@website, viewname)
+                                viewpath = File.join(website, viewname)
                                 
 
                                 if File.exists?(viewpath)
@@ -167,7 +162,7 @@ module Scms
                                         :title => title,
                                         :url => pageurl,
                                         :data => pagedata,
-                                        :rootdir => @website, 
+                                        :rootdir => website, 
                                         :resource => resource,
                                         :view => {
                                             :name => viewname,
@@ -213,8 +208,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("type NUL > #{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
@@ -238,32 +233,32 @@ module Scms
                             :views => views, 
                             :resource => resource, 
                             :config => pageconfig, 
-                            :bundles => bundles,
-                            :navigation => navigation,
+                            :bundles => bundlemodel,
+                            :navigation => navmodel,
                             :data => pagedata,
-                            :rootdir => @website, 
+                            :rootdir => website, 
                             :monkeyhook => monkeyhook,
                             :livereload => livereload
                         }
 
                         break if pageconfig["generate"] == nil
 
-                        erb = File.join(@website, skin)
-                        out = File.join(@website, File.join(pageconfig["generate"].sub('~/',''))) 
+                        erb = File.join(website, skin)
+                        out = File.join(website, File.join(pageconfig["generate"].sub('~/',''))) 
                         
-                        ScmsUtils.successLog("#{pageurl}")
+                        #ScmsUtils.log("Generating: #{pageurl} with #{skin}")
 
                         if File.exists?(erb)
                             pubsubdir = File.dirname(out)
                             Dir.mkdir(pubsubdir, 755) unless File::directory?(pubsubdir)
 
                             erbtemplate = File.read(erb)
-                            #erbtemplate = erbtemplate.gsub('data.','page.')#lagasy fix
-                            #File.open(erb, 'w') {|f| f.write(erbtemplate) }#lagasy fix
 
+                            #puts "pagemodel: #{pagemodel}"
+                            #html = ""
                             html = Scms.parsetemplate(erbtemplate, pagemodel)
 
-                            html = html.gsub('~/', ScmsUtils.uriEncode("file:///#{@website}/")) if @mode == "cms"
+                            html = html.gsub('~/', ScmsUtils.uriEncode("file:///#{website}/")) if @mode == "cms"
                             websiteroot = '/'
                             websiteroot = settings["url"] unless settings["rooturl"] == nil
 
@@ -276,9 +271,11 @@ module Scms
                             end
                         else
                             ScmsUtils.errLog("Template doesn't exist: #{skin}")
-                            ScmsUtils.writelog("::Template doesn't exist #{skin}", @website)
-                            ScmsUtils.writelog("type NUL > #{erb}", @website)
+                            ScmsUtils.writelog("::Template doesn't exist #{skin}", website)
+                            ScmsUtils.writelog("type NUL > #{erb}", website)
                         end
+
+                        ScmsUtils.successLog("Generated: #{pageurl}")
                     end
                 end
                 #ScmsUtils.log( out )
@@ -288,26 +285,79 @@ module Scms
 
     def Scms.parsetemplate(template, hash = Hash.new)
         result = ""
-        OpenStruct.new(hash)
+        if template != nil
+            begin 
+                if hash.class == OpenStruct 
+                    page = hash 
+                else
+                    page = OpenStruct.new(hash)
+                end  
+
+                erb = ERB.new(template)
+                result = erb.result(page.instance_eval { binding })
+            rescue StandardError => e
+                ScmsUtils.errLog("Critical Error: Could not parse template")
+                #ScmsUtils.errLog(e.message)
+                #puts e.inspect
 
-        if hash.class == OpenStruct 
-            page = hash 
+                result = "Invalid Keys in Template\n\n"
+                result += "Valid Keys are:\n"
+                hash.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 += "\n\n"
+                result += template
+            rescue Exception => e  
+                puts "Problem with template - check property exists"
+            end
         else
-            page = OpenStruct.new(hash)
-        end
-        
-        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)
+            ScmsUtils.log("Error: Can not parse template.  Template is empty")
         end
         
         return result
     end
 
-    def Scms.bundle(bundleConfig)
-        bundles = Hash.new
+    def Scms.bundlemodel(settings)
+        puts "Bundeling Assets"
+        bundlemodel = Hash.new
+        bundleConfig = settings["bundles"]
+        if bundleConfig != nil
+            bundleConfig.each do |bundle|
+                #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
+                bundle.each do |option|
+                    name = option[0]
+                    bundleName = File.join(option[1]["generate"])
+                    bundlemodel[name] = bundleName
+                end
+            end
+        end
+        return bundlemodel
+    end
+
+    def Scms.navmodel(settings)
+        navmodel = Array.new
+        settings["pages"].each do |pagedata|
+            if pagedata != nil
+                pagedata.each do |pageoptions|
+                    pagename =  pageoptions[0]
+                    pageconfig = pageoptions[1]
+                    pageurl = "about:blank"
+                    pageurl = pageconfig["generate"]
+                    pageurl = pageconfig["url"] unless pageconfig["url"] == nil
+                    navtext = pageconfig["navigation"]
+                    navmeta = pageconfig["navigation_meta"]
+                    navmodel.push({"text" => navtext, "url" => pageurl, "pagename" => pagename, "meta" => navmeta}) unless navtext == nil
+                end
+            end
+        end
+        return navmodel
+    end  
+
+    def Scms.bundle(settings, website)
+        bundleConfig = settings["bundles"]
         if bundleConfig != nil
             
             bundleConfig.each do |bundle|
@@ -315,7 +365,6 @@ module Scms
                 bundle.each do |option|
                     name = option[0]
                     bundleName = File.join(option[1]["generate"])
-                    bundles[name] = bundleName
                     ScmsUtils.boldlog("Bundeling:")
 
                     content = ""
@@ -324,7 +373,7 @@ module Scms
                     if files != nil
                         files.each do |asset|
                             assetList += " - #{asset}\n" 
-                            assetdir = File.join(@website, asset)
+                            assetdir = File.join(website, asset)
                             if File::exists?(assetdir)
                                 #try catch for permisions
                                 begin
@@ -335,14 +384,14 @@ module Scms
                                 end
                             else
                                 ScmsUtils.errLog("Asset file doesn't exists: #{asset}")
-                                ScmsUtils.writelog("::Asset file doesn't exists: #{asset}", @website)
-                                ScmsUtils.writelog("type NUL > #{assetdir}", @website)
+                                ScmsUtils.writelog("::Asset file doesn't exists: #{asset}", website)
+                                ScmsUtils.writelog("type NUL > #{assetdir}", website)
                             end
                         end
                         ScmsUtils.log("#{assetList}")
                         
-                        bundleFullPath = File.join(@website, bundleName)
-                        bundleDir = File.dirname(File.join(@website, bundleName))
+                        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) }
@@ -362,19 +411,18 @@ module Scms
                 end
             end
         end
-        return bundles
     end
 
-    def Scms.sassall(crunchDir)
+    def Scms.sassall(website)
         ScmsUtils.log("Minimising Sass Files (.scss)")
-        Dir.chdir(crunchDir) do
+        Dir.chdir(website) do
             Dir.glob("**/*.{scss}").each do |asset|
-                Scms.sass(asset)
+                Scms.sass(asset, website)
             end
         end
     end
 
-    def Scms.sass(asset)
+    def Scms.sass(asset, website)
         if File.exists?(asset)
             begin
                 template = File.read(asset)
@@ -393,8 +441,8 @@ module Scms
             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)
+            ScmsUtils.writelog("::Sass file doesn't exist #{asset}", website)
+            ScmsUtils.writelog("type NUL > #{asset}", website)
         end
     end
     
@@ -428,9 +476,4 @@ module Scms
             ScmsUtils.log("Output to: #{ScmsUtils.uriEncode("file:///#{pub}")}")
         end
     end
-
-    # def Scms.upgrade(website)
-    #     File.rename("config.yml", "_config.yml") if File.exists? File.join(website, "config.yml")
-    #     File.rename("s3config.yml", "_s3config.yml") if File.exists? File.join(website, "s3config.yml")
-    # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -192,6 +192,7 @@ files:
 - lib/scms/scms-helpers.rb
 - lib/scms/scms-httpserver.rb
 - lib/scms/scms-utils.rb
+- lib/scms/scms-watcher.rb
 - lib/scms/scms-xmlhandler.rb
 - lib/scms/version.rb
 - lib/scms/yui.rb