scms 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 949a83b503e813115cd68ca5706861040b203b2d
-  data.tar.gz: 1788aa5ae7872d4982339907414c44ebc6f02a44
+  metadata.gz: ce31ecc9d9369edd7858fd14b68725d9a6b2199b
+  data.tar.gz: a776a26cbdb502cfb100e10332b967bd14d60103
 SHA512:
-  metadata.gz: ae97e05a269a910e5a74894a3b92a62ad4119134b8f72eb07dfefa98cc7b74559d904aa326b07f8a467db2fa618a15dfabb4dc88a44ca4607230d6773ae5794e
-  data.tar.gz: 3ff7747ef6ce525e1f33d4d09012eaae42db529b20550f1246b9d7cff0299db16be68045108d07baec92727e46ade1f4ace6a89dd8bd906536e05b482d13352a
+  metadata.gz: 17eecea46db52b5687577fed5ee1353429c88abdef6fd5d27e5ef461ee97387e08b785ca8ebeb5afd1538d89461df6206c4d8bebcdb29a9e519dc2190d41a562
+  data.tar.gz: 958feec11241c8440ef0f639420df3e3f4a55c2b098493efc93a1c6063a11cc0ffbe9621d19409d95b3cb062932a498bf67fb58014fbe78516fcf98c70b72d2b

data/assets/blank-template/_config.yml

@@ -14,17 +14,14 @@ pages:
 
 scripts:
 - script:
-    version: 1.0
+    generate: scripts/bootstrap.min-v2.1.1.js
     bundle:
      - scripts/bootstrap.js
 
 stylesheets:
 - style:
-    version: 1.0
+    generate: stylesheets/style-1.0.css
     bundle:
       - stylesheets/bootstrap.css
       - stylesheets/bootstrap-responsive.css
       - stylesheets/style.css
-      
-#options:
-#    build_dir: <%= ENV['TEMP'] %>\my-Scms-website

data/bin/scms

@@ -57,13 +57,14 @@ optparse.parse!
 #Set globals
 $website = (options[:website].nil?) ? Dir.pwd : options[:website] 
 $html = (ENV["SCMS_HTML_OUT"] or "false")
+#puts "html mode: #{$html}"
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
 Folders = {
   :root => root_folder,
   :website => File.join($website),
   :pub => (ENV["SCMS_PUBLISH_FOLDER"] or options[:pub]),
-  :assets => (ENV["SCMS_STATICCMS_FOLDER"] or File.join(root_folder, "assets")),
+  :assets => File.join(root_folder, "assets"),
   :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join($website))
 }
 
@@ -73,10 +74,7 @@ if options[:action] == "create"
     else
         puts "Making website: #{Folders[:website]}"
         FileUtils.mkdir_p Folders[:website]
-        Dir.chdir(File.join(Folders[:assets], "blank-template")) do
-            files = Dir.glob('*')
-            FileUtils.cp_r files, Folders[:website]
-        end
+        FileUtils.cp_r(Dir["#{File.join(Folders[:assets], "blank-template")}/*"], Folders[:website])
     end
     exit
 end

data/lib/scms.rb

@@ -160,7 +160,7 @@ module Scms
                                     model = Hash.new
                                     model = { :page => page, :sitedir => $website, :resource => resource }
                                     if hasHandler == "yes"
-                                        ScmsUtils.log("_Rendering with handler_")
+                                        ScmsUtils.log("Rendering with handler")
                                         viewSnippet = Handler.render(viewpath)
                                     else
                                         snnipetCode = File.read(viewpath)
@@ -241,14 +241,11 @@ module Scms
                     else
                         scriptversion = 1
                     end
-                    scriptname = "#{name}-v#{scriptversion}.js"
-                    scriptsdir = File.join(@pub, "scripts")
-                    
-                    #puts scriptsdir
-                    FileUtils.mkdir_p(scriptsdir) unless File::directory?(scriptsdir)
-                    #Dir.mkdir_p(scriptsdir, 755 ) if !File::directory?(scriptsdir)
-                    out = File.join(scriptsdir, scriptname)
-                    
+                    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
+                    scriptsdir = File.dirname(scriptname)
+                    Dir.mkdir(scriptsdir, 755) unless File::directory?(scriptsdir)
+
                     ScmsUtils.successLog("#{scriptname}")
                     content = ""
                     
@@ -265,9 +262,9 @@ module Scms
                     end
                     ScmsUtils.log("#{assetList}")
                     
-                    scripts[name] = "scripts/#{scriptname}"
-                    File.open(out, 'w') {|f| f.write(content) }
-                    Scms.packr(out) unless /(-min)|(\.min)/.match(name)
+                    scripts[name] = scriptname
+                    File.open(scriptname, 'w') {|f| f.write(content) }
+                    Scms.packr(scriptname) unless /(-min)|(\.min)/.match(scriptname)
                 end
             end
         end
@@ -287,10 +284,10 @@ module Scms
                     else
                         stylesheetversion = 1
                     end
-                    stylesheetname = "#{name}-v#{stylesheetversion}.css"
-                    
-                    Dir.mkdir(File.join(@pub, "stylesheets"), 755 ) if !    File::directory?(File.join(@pub, "stylesheets"))
-                    out = File.join(@pub, "stylesheets", stylesheetname)
+                    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
+                    stylesheetdir = File.dirname(stylesheetname)
+                    Dir.mkdir(stylesheetdir, 755) unless File::directory?(stylesheetdir)
                     
                     ScmsUtils.successLog("#{stylesheetname}")
                     content = ""
@@ -308,8 +305,8 @@ module Scms
                     end
                     ScmsUtils.log( "#{assetList}" )
                     
-                    stylesheets[name] = "stylesheets/#{stylesheetname}"
-                    File.open(out, 'w') {|f| f.write(content) }
+                    stylesheets[name] = stylesheetname
+                    File.open(stylesheetname, 'w') {|f| f.write(content) }
                 end
             end
         end 
@@ -380,7 +377,7 @@ module Scms
     end
 
     def Scms.sassall(crunchDir)
-        ScmsUtils.log( "Minimising Sass Files (.scss)" )
+        ScmsUtils.log("Minimising Sass Files (.scss)")
         Dir.chdir(crunchDir) do
             Dir.glob("**/*.{scss}").each do |asset|
                 Scms.sass(asset)

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "1.9.0"
+  VERSION = "1.9.2"
 end

metadata

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