scms 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d87cf0e9c7ace8edfe9ab7b3b29efe5190b3949
-  data.tar.gz: 8154a52768916c8c0dea448fa7026f8ed9d13677
+  metadata.gz: 0d13e89ab65773ba3b85c1bbf9fdd3336faf0535
+  data.tar.gz: 9cd9682ef55ce720cd9d3d3d79330d26a475e665
 SHA512:
-  metadata.gz: f412b3720d06c6ed7454a28221b6ca54f88a87f7a23e0e8db79423f699c0dbcdf33139c31dc50919100faeefb2cc2654763b7de87dba8b1c8a368906c21ffca1
-  data.tar.gz: f1792b97b4980811586dddbeae6c890aed9197d14e427297a54a1976babeca11724cd712813ac7c3823cba555824dd343f23da33d0119fa6950861753b2896cb
+  metadata.gz: cde4753adbc84538ffa0fd7cb1d41e079c16a488adbfec7693813104f11fd1a77f450dc32f87221c10117d12b40f31c7989196da9431ac5e3ec6437d292de4a8
+  data.tar.gz: 213efe391c2e75b4e22b2a100974170ce452b7dae4cb901f7ca29f10861aa628221678e7c930e1f985ddac273ebea0e244c0247561b3fe93c8de6175f5bd8870

data/assets/blank-template/_config.yml

@@ -12,13 +12,11 @@ pages:
         intro: _views/about-intro.html
         main: _views/about-main.html
 
-scripts:
+bundles:
 - script:
     generate: scripts/bootstrap.min-v2.1.1.js
     bundle:
      - scripts/bootstrap.js
-
-stylesheets:
 - style:
     generate: stylesheets/style-1.0.css
     bundle:

data/build commands.txt

@@ -1,3 +1,3 @@
 rake install
 gem build Scms.gemspec
-gem push .\pkg\Scms-1.7.9.gem
+gem push scms-1.7.9.gem

data/lib/scms.rb

@@ -72,10 +72,11 @@ module Scms
             end 
             
             #Bundle resources
-            scripts = Scms.bundlescripts($settings["scripts"])
-            stylesheets = Scms.bundlestylesheets($settings["stylesheets"])
+            scripts = Scms.bundle($settings["scripts"])
+            stylesheets = Scms.bundle($settings["stylesheets"])
+            bundles = Scms.bundle($settings["bundles"])
             #Generate pages
-            Scms.parsepages(scripts, stylesheets)
+            Scms.parsepages(scripts, stylesheets, bundles)
         else
             ScmsUtils.errLog("Config is empty")
         end
@@ -101,7 +102,7 @@ module Scms
         return @pub
     end
     
-    def Scms.parsepages(scripts, stylesheets)
+    def Scms.parsepages(scripts, stylesheets, bundles)
         # build views from templates
         @template = $settings["template"] 
         if $settings["pages"] != nil
@@ -206,6 +207,7 @@ module Scms
                             :config => pageconfig, 
                             :scripts => scripts, 
                             :stylesheets => stylesheets, 
+                            :bundles => bundles,
                             :sitedir => $website, 
                             :monkeyhook => monkeyhook 
                         }
@@ -228,23 +230,23 @@ module Scms
         end
     end
 
-    def Scms.bundlescripts(scriptsConfig)
+    def Scms.bundle(bundleConfig)
         scripts = Hash.new
-        if scriptsConfig != nil
-            ScmsUtils.log("Bundeling Scripts:")
-            scriptsConfig.each do |script|
-                #ScmsUtils.log( "script (#{script.class}) = #{script}" )
-                script.each do |option|
+        if bundleConfig != nil
+            ScmsUtils.log("Bundeling:")
+            bundleConfig.each do |bundle|
+                #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
+                bundle.each do |option|
                     name = option[0]
                     if option[1]["version"] != nil
-                        scriptversion = option[1]["version"]
+                        bundleVersion = option[1]["version"]
                     else
-                        scriptversion = 1
+                        bundleVersion = 1
                     end
-                    scriptname = File.join("scripts", "#{name}-v#{scriptversion}.js") #Legasy name filename from root and version
-                    scriptname = File.join(option[1]["generate"]) if option[1]["generate"] != nil #just use the generate
-                    scripts[name] = scriptname
-                    ScmsUtils.successLog("#{scriptname}")
+                    bundleName = File.join("scripts", "#{name}-v#{bundleVersion}.js") #Legasy name filename from root and version
+                    bundleName = File.join(option[1]["generate"]) if option[1]["generate"] != nil #just use the generate
+                    scripts[name] = bundleName
+                    ScmsUtils.successLog("#{bundleName}")
 
                     content = ""
                     assetList = ""
@@ -260,57 +262,16 @@ module Scms
                     end
                     ScmsUtils.log("#{assetList}")
                     
-                    scriptsdir = File.dirname(scriptname)
-                    Dir.mkdir(scriptsdir, 755) unless File::directory?(scriptsdir)
-                    File.open(scriptname, 'w') {|f| f.write(content) }
-                    Scms.packr(scriptname) unless /(-min)|(\.min)/.match(scriptname)
+                    bundleDir = File.dirname(bundleName)
+                    Dir.mkdir(bundleDir, 755) unless File::directory?(bundleDir)
+                    File.open(bundleName, 'w') {|f| f.write(content) }
+                    Scms.packr(bundleName) unless /(-min)|(\.min)/.match(bundleName)
                 end
             end
         end
         return scripts
     end
     
-    def Scms.bundlestylesheets(styleConfig)
-        stylesheets = Hash.new
-        if styleConfig != nil
-            ScmsUtils.log("Bundeling Stylesheets:")
-            styleConfig.each do |stylesheet|
-                #ScmsUtils.log( "stylesheet (#{stylesheet.class}) = #{stylesheet}" )
-                stylesheet.each do |option|
-                    name = option[0]
-                    if option[1]["version"] != nil
-                        stylesheetversion = option[1]["version"]
-                    else
-                        stylesheetversion = 1
-                    end
-                    stylesheetname = File.join("stylesheets", "#{name}-v#{stylesheetversion}.css") #Legasy name filename from root and version
-                    stylesheetname = File.join(option[1]["generate"]) if option[1]["generate"] != nil #just use the generate
-                    stylesheets[name] = stylesheetname
-                    ScmsUtils.successLog("#{stylesheetname}")
-
-                    content = ""
-                    bundle = option[1]["bundle"]
-                    assetList = ""
-                    bundle.each do |asset|
-                        assetList += "\t #{asset}\n" 
-                        assetname = File.join(@source, asset)
-                        if File::exists?(assetname)
-                            content = content + "\n" + File.read(assetname)
-                        else
-                            ScmsUtils.errLog( "Error: No such file #{assetname}" )
-                        end
-                    end
-                    ScmsUtils.log( "#{assetList}" )
-
-                    stylesheetdir = File.dirname(stylesheetname)
-                    Dir.mkdir(stylesheetdir, 755) unless File::directory?(stylesheetdir)
-                    File.open(stylesheetname, 'w') {|f| f.write(content) }
-                end
-            end
-        end 
-        return stylesheets
-    end
-    
     def Scms.parsetemplate(template, hash)
         data = OpenStruct.new(hash)
         result = ""
@@ -357,22 +318,6 @@ module Scms
         FileUtils.mkdir_p(pub) unless File.exist? pub
         FileUtils.chmod 0755, pub
     end
-    
-    def Scms.crunch(crunchDir)
-        ScmsUtils.log( "Starting crunching CSS and JavaScript in:\n#{crunchDir}\n\n" )
-        #Scms.sassall(crunchDir)
-        Dir.chdir(crunchDir) do
-            Dir.glob("**/*.js").reject{|f| /-min/.match(f) != nil || /\.min/.match(f) != nil || /\.pack/.match(f) != nil }.each do |asset|
-                Scms.packr(asset)
-            end
-            #Dir.glob("**/*.{css, js}").each do |asset|
-            #    #fullFileName = File.basename(asset)
-            #    #ScmsUtils.log( "Crunching #{fullFileName}" )
-            #    ext = File.extname(asset)
-            #    Scms.yuicompress(asset, ext)
-            #end
-        end
-    end
 
     def Scms.sassall(crunchDir)
         ScmsUtils.log("Minimising Sass Files (.scss)")
@@ -416,7 +361,33 @@ module Scms
             end
         end
     end
-        
+
+    def Scms.deploy(pub, config)
+        yamlpath=File.join(config, "_s3config.yml")
+        if File.exists?(yamlpath) 
+            S3Deploy.sync(pub, config)
+        else
+            raise "The following file doesn't exist #{yamlpath}"
+        end
+    end
+
+    def Scms.Upgrade()
+        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
+
+    def Scms.crunch(crunchDir)
+        ScmsUtils.log( "Starting crunching CSS and JavaScript in:\n#{crunchDir}\n\n" )
+        Dir.chdir(crunchDir) do
+            Dir.glob("**/*.{css, js}").each do |asset|
+                #fullFileName = File.basename(asset)
+                #ScmsUtils.log( "Crunching #{fullFileName}" )
+                ext = File.extname(asset)
+                Scms.yuicompress(asset, ext)
+            end
+        end
+    end 
+
     def Scms.yuicompress(asset, ext)
         if File.exists?(asset)
             #ScmsUtils.log( " Encoding: #{asset.encoding}" )
@@ -434,18 +405,4 @@ module Scms
             ScmsUtils.errLog( "#{asset} does not exist" )
         end
     end
-
-    def Scms.deploy(pub, config)
-        yamlpath=File.join(config, "_s3config.yml")
-        if File.exists?(yamlpath) 
-            S3Deploy.sync(pub, config)
-        else
-            raise "The following file doesn't exist #{yamlpath}"
-        end
-    end
-
-    def Scms.Upgrade()
-        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

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "1.9.3"
+  VERSION = "1.9.4"
 end

metadata

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