scms 4.2.3 → 4.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2ZiNGI3MjY4NGQ0YzI3MDBhZDBhMDgzNWQzNWE0YzlkYzY1MWUxMg==
+    NWI5MmI3NjMwMGM3MWNkMTNhZjM1NGM2OTg4N2Y1NzIxYmY5NWUyMw==
   data.tar.gz: !binary |-
-    ZjUxODg5M2IyZWRmNzkxMGU3M2Y4MGVmZDUwNTgwZTQ3YzA4MGYzZQ==
+    ODRjY2QzODk0NjU5YTlkZTUzMTYwZDA0N2UwNzQwOGMxNWVlZGViYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjBmOTliMDQ2ZDI2ZTU3MWExMTJhNmJiM2JiY2FhNmUzNDY5YTg2NDhiM2Ji
-    NDM2NzA0NWVkNzM3OTcwNGZlZDgwZTI2YzE1MThmNmFmNWZhOGEyNjNjMzcw
-    Yzk3ZWNmYjVjMWNmNjllOGFiMzcyMDRmZjIzMzQ3ZDk5MDMwYzQ=
+    ZTNjOGQ1N2RjMGUzNGVlNjVkNjJkOTNkYWIzYjI5YjMxZGNkYzkzZmZjZDQ5
+    MjIzNTk3OTczZTE2NWRmMTU2NzQwNDI2NGNkM2RmNGMyZWY2MzMxMjg5NWU5
+    NDBkMjdiNjkxOGMzYjE4ZTY3NzYzMmU3YzQyZDJkZDNhNDc1M2M=
   data.tar.gz: !binary |-
-    Y2Q0ODU2MTc4NmUxOTQzMjU2YjgzNTJiNjE5NmRiMWJiOWIxMWE1YzllOWVi
-    ZGZjODViOGY5ZTE1ZjRhMTc1OGQ2YzMzMWI1ZGJlNDIyMjU2N2M1ZjRkN2Ux
-    NTY1ODdmZGU4OTBiZWVlZWNmYTQ2NDE2MjBiMjI5MTljMWU4MjQ=
+    OTI5MTdmZWZhMTViZWE5ZDMyNDdkYWU0ZmYwNDcwYjQxZDc2ZDE3MGI3MDgz
+    YWYyYTk5M2MzZTY4MDVhYzg4MDgxMWY2NjQ1Y2EyM2QyODcxYjVlOWE3NDQ0
+    OWJkOTMzZGMyNjdiZGU4OTJlY2M3MTQ0NTJhNmM1NDg4YTBkNDY=

data/lib/scms.rb

@@ -348,61 +348,63 @@ module Scms
     def Scms.bundle(settings, website)
         Scms.bundler()
 
-        bundleConfig = settings["bundles"]
-        if bundleConfig != nil
-            ScmsUtils.boldlog("Bundeling:")
-
-            bundleConfig.each do |bundle|
-                #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
-                bundle.each do |option|
-                    name = option[0]
-                    config = option[1]
+        if settings != nil
+            bundleConfig = settings["bundles"]
+            if bundleConfig != nil
+                ScmsUtils.boldlog("Bundeling:")
+
+                bundleConfig.each do |bundle|
+                    #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
+                    bundle.each do |option|
+                        name = option[0]
+                        config = option[1]
+
+                        bundleName = File.join(config["generate"].gsub("~/",""))
+                        
 
-                    bundleName = File.join(config["generate"].gsub("~/",""))
-                    
-
-                    content = ""
-                    assetList = ""
-                    files = config["files"]
-                    if files != nil
-                        files.each do |asset|
-                            assetList += " - #{asset}\n" 
-                            assetdir = File.join(website, asset)
-                            if File::exists?(assetdir)
-                                #try catch for permisions
-                                begin
-                                    content = content + "\n\n" + File.read(assetdir)
-                                rescue Exception=>e
-                                    ScmsUtils.errLog(e.message)
-                                    ScmsUtils.log(e.backtrace.inspect)
-
-                                    ScmsUtils.log("#{assetList}")
+                        content = ""
+                        assetList = ""
+                        files = config["files"]
+                        if files != nil
+                            files.each do |asset|
+                                assetList += " - #{asset}\n" 
+                                assetdir = File.join(website, asset)
+                                if File::exists?(assetdir)
+                                    #try catch for permisions
+                                    begin
+                                        content = content + "\n\n" + File.read(assetdir)
+                                    rescue Exception=>e
+                                        ScmsUtils.errLog(e.message)
+                                        ScmsUtils.log(e.backtrace.inspect)
+
+                                        ScmsUtils.log("#{assetList}")
+                                    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)
                                 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)
                             end
+                            
+                        else
+                            ScmsUtils.errLog("No files in bundle"); 
                         end
-                        
-                    else
-                        ScmsUtils.errLog("No files in bundle"); 
-                    end
 
-                    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(bundleFullPath) unless /(-min)|(\.min)/.match(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) }
+                            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(bundleFullPath) unless /(-min)|(\.min)/.match(bundleName)
+                        end
                     end
                 end
             end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.2.3"
+  VERSION = "4.2.4"
 end

metadata

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