scms 4.1.2 → 4.2.0

data/lib/scms/scms-watcher.rb

@@ -4,20 +4,50 @@ module ScmsWatcher
 	require 'pathname'
 	require 'listen'
 
-    def ScmsWatcher.watch(settings, options, configdir)
+    def ScmsWatcher.watch(settings, options, configdir)   
+
+	    # Listen to sass, bundle and _config.yml file changes
 	    watcher = Thread.new {
-	    	configfile = File.join(configdir, "_config.yml")
-			FileWatcher.new([configfile]).watch do |filename|
-				puts ""
-				puts "***********************************"
-				puts " Config Modification (_config.yml) "
-				puts "***********************************"
-				puts ""
+	    	files = []
+	    	Dir.glob('**/*.scss').each do|f|
+				files << f
+			end
+			Dir.glob('**/*.bundle').each do|f|
+				files << f
+			end
+			configfile = File.join(configdir, "_config.yml")
+			files << configfile if File::exists?(configfile)
+
+			FileWatcher.new(files).watch do |filename|
+				ext = File.extname(filename)  
 
 				begin
-					settings = Scms.getSettings(configdir)
-					Scms.bundle(settings, Folders[:website])
-					Scms.build(Folders[:website], settings, options)
+					case ext
+					when ".scss"
+						puts ""
+						puts "***********************************"
+						puts " Sass file changed: #{filename}"
+						puts "***********************************"
+						puts ""
+						Scms.sass(filename)
+						#Scms.sassall(Folders[:website])
+					when ".yml"
+						puts ""
+						puts "******************************************************"
+						puts " Config Modification #{filename} "
+						puts "******************************************************"
+						puts ""
+						settings = Scms.getSettings(configdir)
+						Scms.bundle(settings, Folders[:website])
+						Scms.build(Folders[:website], settings, options)
+					when ".bundle"
+						puts ""
+						puts "******************************************************"
+						puts " Bundle Modified: #{filename} "
+						puts "******************************************************"
+						puts ""
+						Scms.bundler(filename)
+					end
 				rescue Exception=>e
 	                ScmsUtils.errLog(e.message)
 	                ScmsUtils.log(e.backtrace.inspect)
@@ -25,17 +55,16 @@ module ScmsWatcher
 			end
 	    }
 
-	    #  [todo] Create this by getting all directories that start with _
-	    psst = []
-	    psst.push("_pages") if File.directory? "_pages" # .html .htm .md .xml .erb, etc
-	    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|
+	    # Listen to changes to files withing a bundle
+		ScmsBundler.watch()
+
+		# Listen to changed to folders that start with an underscore (_)
+		folders = []
+	    Dir.glob('*').select { |fn| File.directory?(fn) and (fn.match(/^_/) ) }.each do|f|
+			folders.push(f) 
+		end
+	    puts "Listening to #{folders}"
+	    listener = Listen.to(folders, force_polling: true) do |modified, added, removed|
 
 			sassfile = false
 			bundlefile = false
@@ -78,7 +107,7 @@ module ScmsWatcher
 			if modified.length > 0
 				modified.each{|filename|
 					modifiedfile = Pathname.new(filename).relative_path_from(Pathname.new(Folders[:website])).to_s
-					ext = File.extname(modifiedfile)  
+					#ext = File.extname(modifiedfile)  
 
 					puts ""
 					puts "***********************************************"
@@ -92,13 +121,6 @@ module ScmsWatcher
 						bundlefile = true
 						buildfile = false
 					end
-
-					if ext == ".scss"
-						sassfile = true
-						bundlefile = false
-						buildfile = false
-						break
-					end
 				}
 			end
 

data/lib/scms/version.rb

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

data/lib/scms.rb

@@ -3,6 +3,7 @@ module Scms
     require 'scms/scms-utils.rb'
     require 'scms/scms-helpers.rb'
     require 'scms/scms-pageoptions.rb'
+    require 'scms/scms-bundler.rb'
     require 'scms/scms-parser.rb'
     require 'scms/scms-xmlhandler.rb'
     require 'scms/s3deploy.rb'
@@ -305,15 +306,19 @@ module Scms
 
     def Scms.getBundleModel(website, settings, options)
         bundleModel = Hash.new {}
+        websiteroot = '/'
+        websiteroot = settings["rooturl"] unless settings["rooturl"] == nil
+        websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
+        
+        Dir.glob('**/*.bundle').each do|bundle|
+            bundleModel[bundle] = ScmsBundler.getGeneratedBundleName(bundle)
+        end 
+
         bundleConfig = settings["bundles"]
         if bundleConfig != nil
             bundleConfig.each do |bundle|
                 #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
 
-                websiteroot = '/'
-                websiteroot = settings["rooturl"] unless settings["rooturl"] == nil
-                websiteroot = ScmsUtils.uriEncode("file:///#{website}/") if options[:mode] == "cms"
-
                 bundle.each do |option|
                     name = option[0]
                     config = option[1]
@@ -323,10 +328,23 @@ module Scms
                 end
             end
         end
+        # puts "Bundle model:"
+        # puts bundleModel
+        # puts "----------------------------"
         return bundleModel
     end
 
+    def Scms.bundler(bundle = nil)
+        if bundle == nil
+            ScmsBundler.run()
+        else
+            ScmsBundler.bundle(bundle)
+        end
+    end
+
     def Scms.bundle(settings, website)
+        Scms.bundler()
+
         bundleConfig = settings["bundles"]
         if bundleConfig != nil
             ScmsUtils.boldlog("Bundeling:")
@@ -392,12 +410,12 @@ module Scms
         ScmsUtils.log("Minimising Sass Files (.scss)")
         Dir.chdir(website) do
             Dir.glob("**/*.{scss}").each do |asset|
-                Scms.sass(asset, website)
+                Scms.sass(asset)
             end
         end
     end
 
-    def Scms.sass(asset, website)
+    def Scms.sass(asset)
         if File.exists?(asset)
             begin
                 template = File.read(asset)
@@ -416,8 +434,6 @@ 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)
         end
     end
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.2.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -166,22 +166,56 @@ files:
 - README.md
 - Rakefile
 - assets/air-monkey-hook.js
+- assets/blank-template-v1/_config.yml
+- assets/blank-template-v1/_layouts/skin.erb.html
+- assets/blank-template-v1/_s3config.template.yml
+- assets/blank-template-v1/_source/scripts/bootstrap.js
+- assets/blank-template-v1/_source/scripts/script.js
+- assets/blank-template-v1/_source/stylesheets/bootstrap-responsive.css
+- assets/blank-template-v1/_source/stylesheets/bootstrap.css
+- assets/blank-template-v1/_source/stylesheets/style.css
+- assets/blank-template-v1/_views/about/intro.html
+- assets/blank-template-v1/_views/about/main.html
+- assets/blank-template-v1/_views/home/intro.md
+- assets/blank-template-v1/_views/reuse.erb
+- assets/blank-template-v1/images/glyphicons-halflings-white.png
+- assets/blank-template-v1/images/glyphicons-halflings.png
+- assets/blank-template-v1/js/jquery-1.8.2.min.js
+- assets/blank-template-v1/robots.txt
 - assets/blank-template/_config.yml
-- assets/blank-template/_layouts/skin.erb.html
-- assets/blank-template/_s3config.template.yml
-- assets/blank-template/_source/scripts/bootstrap.js
-- assets/blank-template/_source/scripts/script.js
-- assets/blank-template/_source/stylesheets/bootstrap-responsive.css
-- assets/blank-template/_source/stylesheets/bootstrap.css
-- assets/blank-template/_source/stylesheets/style.css
-- assets/blank-template/_views/about/intro.html
-- assets/blank-template/_views/about/main.html
-- assets/blank-template/_views/home/intro.md
-- assets/blank-template/_views/reuse.erb
-- assets/blank-template/images/glyphicons-halflings-white.png
-- assets/blank-template/images/glyphicons-halflings.png
-- assets/blank-template/js/jquery-1.8.2.min.js
-- assets/blank-template/robots.txt
+- assets/blank-template/_layouts/home-layout.erb
+- assets/blank-template/_layouts/layout.erb
+- assets/blank-template/_pages/cleanurl/_config.yml
+- assets/blank-template/_pages/cleanurl/intro.md
+- assets/blank-template/_pages/cleanurl/leadin.md
+- assets/blank-template/_pages/cleanurl/main.erb
+- assets/blank-template/_pages/cleanurl/sidenav.erb
+- assets/blank-template/_pages/getting-started/intro.md
+- assets/blank-template/_pages/getting-started/leadin.md
+- assets/blank-template/_pages/getting-started/main.erb
+- assets/blank-template/_pages/getting-started/sidenav.erb
+- assets/blank-template/_pages/index/_config.yml
+- assets/blank-template/_pages/index/carousel.erb
+- assets/blank-template/_pages/index/main.erb
+- assets/blank-template/css/bootstrap-theme.css
+- assets/blank-template/css/bootstrap-theme.min.css
+- assets/blank-template/css/bootstrap.css
+- assets/blank-template/css/bootstrap.min.css
+- assets/blank-template/css/carousel.css
+- assets/blank-template/css/carousel.scss
+- assets/blank-template/css/layout.css
+- assets/blank-template/css/layout.scss
+- assets/blank-template/fonts/glyphicons-halflings-regular.eot
+- assets/blank-template/fonts/glyphicons-halflings-regular.svg
+- assets/blank-template/fonts/glyphicons-halflings-regular.ttf
+- assets/blank-template/fonts/glyphicons-halflings-regular.woff
+- assets/blank-template/js/application.js
+- assets/blank-template/js/bootstrap.js
+- assets/blank-template/js/bootstrap.min.js
+- assets/blank-template/js/jquery-1.10.2.min.js
+- assets/blank-template/js/shims/holder.js
+- assets/blank-template/js/shims/html5shiv.js
+- assets/blank-template/js/shims/respond.min.js
 - assets/mime.types
 - assets/scms help.txt
 - assets/yuicompressor/readme
@@ -190,6 +224,7 @@ files:
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
+- lib/scms/scms-bundler.rb
 - lib/scms/scms-customHandler.rb
 - lib/scms/scms-helpers.rb
 - lib/scms/scms-httpserver.rb