scms 4.0.0 → 4.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDRkYmE3ODg1NzQzMDQ3NjcwYjJlNTAxNTk4YWJiYzg4MzQ5MmI0MA==
+    YzZkNWExZWQzODM0MTVjNDcxNjFiYzk3MTk1MmNjYTQyZjdmODQzNw==
   data.tar.gz: !binary |-
-    YjliNjY2YzNhNTFmYzg1NjI2Y2I1ZjE3NTg0NmExMDY4ODA2ZWJkZg==
+    ODFmODVjZTU0NjYyYmMxNmY4MzcwOWRmZDJkMTMzMDIyMzJjNjFjNw==
 SHA512:
   metadata.gz: !binary |-
-    ODdlZWEzZGM0MDQ2NTA5MzczOTQzZDMwYzY2Y2Q2NTA5Nzg0NzExYjE3NzA3
-    NGU5OGQzYjEyNmZhMWY4NTA1NWVkNmFhNDUwYjJjYzZiYjA3NTI5ZTM3N2Q2
-    MDA3NmRmYjE3NDViNTY4OWE3ZjdlNTkwODY4M2M1NTg3N2IxZWU=
+    YmUxY2VlMTU3ZDg5ODUyNGIzNGNiMjk1MDA2OTE5YmE0OGM3MTNkOGNmNDhh
+    ZmY2Njk5ZWMwNTVlMDIzNTUwNGQxYjBmNWEyYTc5Nzc5NzJkZWIzZjJhNDA3
+    NDU3NjZhYzUwOTRiMzcyZDcxNjEyNTA1MTUyMDlkNmUzM2FmNDY=
   data.tar.gz: !binary |-
-    NTMyYTMwMGVlMzNiODZjZDg2MmUzOTk4MTMxZTRjMDFkMWZmZjRmMGUyOWIw
-    M2YyY2RiZmQzYWUyNjRiYzczOTI1YWQ4OTVmN2Q2ZmU2MzQ2Y2Y1NzM2MjMw
-    M2E4OTRjNGQyZWM2NGFlYTA3OWRmZjI2YmMxZjczZTAxYzhhY2Q=
+    YTFhMDY3YjgzNDFlNjQ2Mjk2NDZiY2QzNzgzYjI4MjQ5MDlkZTAzNWMwNmNj
+    ODM0OGUyZTNmZTA4YzlhNmU5ZjRmNTJhNWMwMjVkMTgxMmNmMWUxYzhkNTgx
+    YjdjNmEyNzJiMjNmODUxMjM1ODEzYzEwMTk2YmU3N2EyMzM5Yjk=

data/lib/scms.rb

@@ -413,7 +413,8 @@ module Scms
     def Scms.bundle(settings, website)
         bundleConfig = settings["bundles"]
         if bundleConfig != nil
-            
+            ScmsUtils.boldlog("Bundeling:")
+
             bundleConfig.each do |bundle|
                 #ScmsUtils.log( "bundle (#{bundle.class}) = #{bundle}" )
                 bundle.each do |option|
@@ -421,7 +422,7 @@ module Scms
                     config = option[1]
 
                     bundleName = File.join(config["generate"].gsub("~/",""))
-                    ScmsUtils.boldlog("Bundeling:")
+                    
 
                     content = ""
                     assetList = ""
@@ -433,10 +434,12 @@ module Scms
                             if File::exists?(assetdir)
                                 #try catch for permisions
                                 begin
-                                    content = content + "\n" + File.read(assetdir)
+                                    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}")
@@ -444,26 +447,26 @@ module Scms
                                 ScmsUtils.writelog("type NUL > #{assetdir}", website)
                             end
                         end
-                        ScmsUtils.log("#{assetList}")
                         
-                        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
                     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)
+                    end
                 end
             end
         end
@@ -503,6 +506,7 @@ module Scms
     end
     
     def Scms.packr(asset)
+        #puts "Trying to pack: #{asset}"
         if File.exists?(asset)
             begin
                 code = File.read(asset)

data/lib/scms/s3deploy.rb

@@ -16,7 +16,7 @@ module S3Deploy
         throw "No bucket defined in _s3config.yml settings file" if settings['bucket'] == nil
         ScmsUtils.boldlog( "Syncing with Amazon S3: #{settings['bucket']}" )
 
-        exclude = "(\\.svn$)|(^_)"
+        exclude = "(\\.svn$)|(\\.git$)|(^_)"
         if settings['ignore'] != nil
             exclude = "#{exclude}|(#{settings["ignore"]})"
         end

data/lib/scms/scms-xmlhandler.rb

@@ -17,9 +17,20 @@ module ScmsXmlHandler
 			xslpi = File.join($website, xslpi)
 			
 			if File.exists?(xslpi)
-				xsl = File.read(xslpi)
-				xslt  = Nokogiri::XSLT(xsl)
-				return xslt.transform(xml).to_html
+				begin 
+					xsl = File.read(xslpi)
+					xslt  = Nokogiri::XSLT(xsl)
+					return xslt.transform(xml).to_html
+				rescue StandardError => e
+					ScmsUtils.errLog("Error transforming")
+					ScmsUtils.errLog(xslpi)
+					ScmsUtils.errLog(e.message)
+					ScmsUtils.errLog(e.inspect)
+					#print e.backtrace.join("\n")
+				rescue Exception => e  
+					ScmsUtils.errLog("Error transforming with #{xslpi}")
+					ScmsUtils.errLog(e.message)
+				end
 			else
 				puts "Cant find pi: #{xslpi}"
 			end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

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