scms 1.8.8 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 241573260a9d95993301a614042d73ec8c8fc562
-  data.tar.gz: 234efa2167f1b9356fe2c2004bc75993874f517d
+  metadata.gz: 949a83b503e813115cd68ca5706861040b203b2d
+  data.tar.gz: 1788aa5ae7872d4982339907414c44ebc6f02a44
 SHA512:
-  metadata.gz: 8ed2e74ad0aef5def980af64120838015c7123e92bfcfb10bed95977e4a43151399948dd7c5da3a0222cb1802cead102519caca9b104c0d7380e03b6254317e2
-  data.tar.gz: e46a620c21c8733ee1e33c8e70635096dcf364299bd192e4966d65b9188ee355b5eec0efc8e0f0241d58f2bfe7dfd463de7e029b93f40b273f8bdc341bc5a0ed
+  metadata.gz: ae97e05a269a910e5a74894a3b92a62ad4119134b8f72eb07dfefa98cc7b74559d904aa326b07f8a467db2fa618a15dfabb4dc88a44ca4607230d6773ae5794e
+  data.tar.gz: 3ff7747ef6ce525e1f33d4d09012eaae42db529b20550f1246b9d7cff0299db16be68045108d07baec92727e46ade1f4ace6a89dd8bd906536e05b482d13352a

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in Scms.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Courtenay Probert
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -0,0 +1 @@
+require "bundler/gem_tasks"

data/assets/blank-template/{config.yml → _config.yml}

@@ -1,16 +1,16 @@
-template: templates/skin.erb.html
+template: _templates/skin.erb.html
 
 pages:
 - index: 
     generate: index.html 
     views : 
-        intro: views/home-intro.html
-        main: views/home-main.html
+        intro: _views/home-intro.html
+        main: _views/home-main.html
 - about: 
     generate: about.html
     views : 
-        intro: views/about-intro.html
-        main: views/about-main.html
+        intro: _views/about-intro.html
+        main: _views/about-main.html
 
 scripts:
 - script:
@@ -27,4 +27,4 @@ stylesheets:
       - stylesheets/style.css
       
 #options:
-#    build_dir: <%= ENV['TEMP'] %>\my-scms-website
+#    build_dir: <%= ENV['TEMP'] %>\my-Scms-website

data/assets/blank-template/{templates → _templates}/skin.erb.html

@@ -47,7 +47,7 @@
 					end
 
 					require 'nokogiri'
-					xml_doc  = Nokogiri::XML(File.read(File.join(data.sitedir, "templates", "menu.xml")))
+					xml_doc  = Nokogiri::XML(File.read(File.join(data.sitedir, "_templates", "menu.xml")))
 					xml_doc.xpath('/menu/page').each do |link|
 				%>
 					<li><a href='<%= link.attr("href") %>' class='<%=isActive(link.attr("href"))%> <%= link.attr("class") %>'>

data/bin/scms

@@ -9,13 +9,13 @@
 
 require 'optparse'
 require 'fileutils'
-require 'scms'
+require 'Scms'
 
 options = {}
 optparse = OptionParser.new do|opts|
   # Set a banner, displayed at the top
   # of the help screen.
-  opts.banner = "Usage: scms [options]"
+  opts.banner = "Usage: Scms [options]"
  
   # Define the options, and what they do
   opts.on('-w', '--website WEBSITE', "Website directory (full path)") do |w|
@@ -54,26 +54,15 @@ optparse = OptionParser.new do|opts|
 end
 optparse.parse!
 
-$website = Dir.pwd
-unless options[:website].nil?
-    $website = options[:website]
-end
-puts "Compiling #{$website}"
-
-##Set globals
+#Set globals
+$website = (options[:website].nil?) ? Dir.pwd : options[:website] 
 $html = (ENV["SCMS_HTML_OUT"] or "false")
-
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
-@pub = File.join("#{$website}/-site")
-unless options[:pub].nil?
-    @pub = options[:pub]
-end
-
 Folders = {
   :root => root_folder,
   :website => File.join($website),
-  :pub => (ENV["SCMS_PUBLISH_FOLDER"] or @pub),
+  :pub => (ENV["SCMS_PUBLISH_FOLDER"] or options[:pub]),
   :assets => (ENV["SCMS_STATICCMS_FOLDER"] or File.join(root_folder, "assets")),
   :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join($website))
 }
@@ -92,37 +81,14 @@ if options[:action] == "create"
     exit
 end
 
-if options[:action] == "createapp"
-    if Dir.exists? Folders[:website]
-        throw "App already exists!!!"
-    else
-        puts "Making Air app: #{Folders[:website]}"
-        FileUtils.mkdir_p Folders[:website]
-        Dir.chdir(File.join(Folders[:assets], "blank-app-template")) do
-            files = Dir.glob('*')
-            FileUtils.cp_r files, Folders[:website]
-        end
-    end
-    exit
-end
-
-raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
-
 #puts "System root folder = #{Folders[:root]}"
 #puts "Website folder = #{Folders[:website]}"
 #puts "Pub dir = #{Folders[:pub]}"
 #puts "Config dir = #{Folders[:config]}"
 #puts "Mode = #{options[:mode]}"
 
-deployDir = StaticCMS.build(Folders[:pub], Folders[:config], options[:mode])
-
-if options[:action] == "crunch"
-    StaticCMS.crunch(deployDir)
-end
+raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
+Scms.Upgrade()
+deployDir = Scms.build(Folders[:pub], Folders[:config], options[:mode])
 #puts "deployDir = #{deployDir}"
-if options[:action] == "deploy"
-    StaticCMS.crunch(deployDir)
-    StaticCMS.deploy(deployDir, Folders[:config])
-    backupdir = File.join(Folders[:website], "private")
-    S3Deploy.backup(backupdir, Folders[:config]) if File.directory? backupdir
-end
+Scms.deploy(deployDir, Folders[:config]) if options[:action] == "deploy"

data/build commands.txt

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

data/lib/scms.rb

@@ -1,6 +1,7 @@
-module StaticCMS
-    VERSION = '1.1.0'
-    require 'scms/scms_utils.rb'
+require "scms/version"
+
+module Scms
+    require 'scms/scms-utils.rb'
     require 'scms/s3deploy.rb'
 
     require 'erb'
@@ -8,40 +9,51 @@ module StaticCMS
     require 'yaml'
     require 'sass'
     require 'packr'
+    require 'maruku'
     
     include YAML
     
-    def StaticCMS.build(pub, config, mode)
-        @pub = pub
-        @cleanpub = true
+    def Scms.build(pub, config, mode)
+        @pub = $website
+        @cleanpub = false
+        if pub != nil
+            @pub = pub 
+            @cleanpub = true
+        end
+
         @configdir = config
         @mode = mode
-        @webroot = "public"
-        @source = File.join($website, @webroot)
+        #ScmsUtils.log("Mode: #{mode}")
         
-        ScmsUtils.log("_Mode: #{mode}_")
-
-        StaticCMS.sassall(@source)
+        @source = File.join($website)
+        # Support for legacy publick folders
+        if (Dir.exists? File.join($website, "public"))
+            @source =  File.join($website, "public")
+            @pub = File.join($website, "_site") if pub == nil
+        end
         
-        yamlpath=File.join(@configdir, "config.yml")
-        ScmsUtils.log("**[Getting Config](#{ScmsUtils.uriEncode("file:///#{yamlpath}")})**")
-        $settings = StaticCMS.getsettings(yamlpath)
+        ScmsUtils.log("Source #{@source}")
+        Scms.sassall(@source)
+        
+        yamlpath=File.join(@configdir, "_config.yml")
+        ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
+        $settings = Scms.getsettings(yamlpath)
         if $settings
             if $settings["options"] != nil
+                # Don't overwrite environment settings
                 if ENV["SCMS_PUBLISH_FOLDER"] == nil && $settings["options"]["build_dir"] != nil
-                    ScmsUtils.log("_Setting pub dir from config.yml_")
+                    ScmsUtils.log("_Getting pub dir from _config.yml_")
                     @pub = $settings["options"]["build_dir"]
                 end
-                if $settings["options"]["clean_build_dir"] == false
-                    @cleanpub = false
+                if $settings["options"]["clean_build_dir"] == true
+                    ScmsUtils.log("Cleaning build dir")
+                    @cleanpub = true
                 end
             end
             
             if @cleanpub
-                StaticCMS.cleanpubdir(@pub)
+                Scms.cleanpubdir(@pub)
                 @cleanpub = false
-            else
-                ScmsUtils.log("Skipping cleaning \n#{@pub}")
             end
             
             #Bootstrap here
@@ -60,21 +72,18 @@ module StaticCMS
             end 
             
             #Bundle resources
-            scripts = StaticCMS.bundlescripts($settings["scripts"])
-            stylesheets = StaticCMS.bundlestylesheets($settings["stylesheets"])
+            scripts = Scms.bundlescripts($settings["scripts"])
+            stylesheets = Scms.bundlestylesheets($settings["stylesheets"])
             #Generate pages
-            StaticCMS.parsetemplates(scripts, stylesheets)
+            Scms.parsepages(scripts, stylesheets)
         else
             ScmsUtils.errLog("Config is empty")
         end
         
-        if File.exists?(@source)
-            ScmsUtils.log("_Merging 'public' folder_")
-            
-            if @cleanpub
-                StaticCMS.cleanpubdir(@pub)
-            end
+        if @pub != $website
+            ScmsUtils.log("Merging 'public' folder")
             
+            Scms.cleanpubdir(@pub) if @cleanpub
             FileUtils.mkdir @pub unless Dir.exists? @pub
             Dir.chdir(@source) do
                 #files = Dir.glob('*')
@@ -86,21 +95,17 @@ module StaticCMS
                   File.file?(oldfile) ? FileUtils.copy(oldfile, newfile) : FileUtils.mkdir(newfile) unless File.exist? newfile
                 end
             end
-        else
-            ScmsUtils.log("**No 'public' folder in #{@source} - skiping  merge**")
         end
         
-        ScmsUtils.successLog("**Compiled :)**")
-        ScmsUtils.log("[_#{@pub}_](#{ScmsUtils.uriEncode("file:///#{@pub}")})")
-        
+        ScmsUtils.log(ScmsUtils.uriEncode("file:///#{@pub}"))
         return @pub
     end
     
-    def StaticCMS.parsetemplates(scripts, stylesheets)
+    def Scms.parsepages(scripts, stylesheets)
         # build views from templates
         @template = $settings["template"] 
         if $settings["pages"] != nil
-            ScmsUtils.log("**Compiling Pages:**")
+            ScmsUtils.log("Compiling Pages:")
             $settings["pages"].each do |page|
                 if page != nil
                     page.each do |option|
@@ -128,7 +133,7 @@ module StaticCMS
                             end
                         end
                         
-                        hasHandler = nil
+                        hasHandler = "no"
                         if pageconfig["handler"] != nil
                             handlerpath = File.join($website, pageconfig["handler"])
                             if File.exists?(handlerpath)
@@ -158,13 +163,26 @@ module StaticCMS
                                         ScmsUtils.log("_Rendering with handler_")
                                         viewSnippet = Handler.render(viewpath)
                                     else
-                                        viewSnippet = File.read(viewpath)
+                                        snnipetCode = File.read(viewpath)
+                                        case File.extname(view[1])
+                                        when ".md"
+                                            begin  
+                                                doc = Maruku.new(snnipetCode)
+                                                viewSnippet = doc.to_html
+                                            rescue Exception => e  
+                                                viewSnippet = snnipetCode
+                                                puts e.message  
+                                                puts e.backtrace.inspect  
+                                            end
+                                        else
+                                          viewSnippet = snnipetCode
+                                        end
                                     end
                                     
                                     if @mode == "cms"
-                                        views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{page}'>#{StaticCMS.parsetemplate(viewSnippet, model)}</div>"
+                                        views[view[0]] = "<div class='cms' data-view='#{view[1]}' data-page='#{page}'>#{Scms.parsetemplate(viewSnippet, model)}</div>"
                                     else
-                                        views[view[0]] = StaticCMS.parsetemplate(viewSnippet, model)
+                                        views[view[0]] = Scms.parsetemplate(viewSnippet, model)
                                     end
                                 else
                                     ScmsUtils.writelog(@pub, "Empty file: #{viewpath}")
@@ -198,13 +216,11 @@ module StaticCMS
                         if File.exists?(erb)
                             pubsubdir = File.dirname(out)
                             Dir.mkdir(pubsubdir, 755) unless File::directory?(pubsubdir)
-                            html = StaticCMS.parsetemplate(File.read(erb), hash)
+                            html = Scms.parsetemplate(File.read(erb), hash)
                             File.open(out, 'w') {|f| f.write(html) }
                         else
                             ScmsUtils.errLog("Template doesn't exist: #{erb}")
                         end
-                        
-
                     end
                 end
                 #ScmsUtils.log( out )
@@ -212,10 +228,10 @@ module StaticCMS
         end
     end
 
-    def StaticCMS.bundlescripts(scriptsConfig)
+    def Scms.bundlescripts(scriptsConfig)
         scripts = Hash.new
         if scriptsConfig != nil
-            ScmsUtils.log("**Bundeling Scripts:**")
+            ScmsUtils.log("Bundeling Scripts:")
             scriptsConfig.each do |script|
                 #ScmsUtils.log( "script (#{script.class}) = #{script}" )
                 script.each do |option|
@@ -228,7 +244,7 @@ module StaticCMS
                     scriptname = "#{name}-v#{scriptversion}.js"
                     scriptsdir = File.join(@pub, "scripts")
                     
-                    puts scriptsdir
+                    #puts scriptsdir
                     FileUtils.mkdir_p(scriptsdir) unless File::directory?(scriptsdir)
                     #Dir.mkdir_p(scriptsdir, 755 ) if !File::directory?(scriptsdir)
                     out = File.join(scriptsdir, scriptname)
@@ -251,16 +267,17 @@ module StaticCMS
                     
                     scripts[name] = "scripts/#{scriptname}"
                     File.open(out, 'w') {|f| f.write(content) }
+                    Scms.packr(out) unless /(-min)|(\.min)/.match(name)
                 end
             end
         end
         return scripts
     end
     
-    def StaticCMS.bundlestylesheets(styleConfig)
+    def Scms.bundlestylesheets(styleConfig)
         stylesheets = Hash.new
         if styleConfig != nil
-            ScmsUtils.log("**Bundeling Stylesheets:**")
+            ScmsUtils.log("Bundeling Stylesheets:")
             styleConfig.each do |stylesheet|
                 #ScmsUtils.log( "stylesheet (#{stylesheet.class}) = #{stylesheet}" )
                 stylesheet.each do |option|
@@ -299,7 +316,7 @@ module StaticCMS
         return stylesheets
     end
     
-    def StaticCMS.parsetemplate(template, hash)
+    def Scms.parsetemplate(template, hash)
         data = OpenStruct.new(hash)
         result = ""
         
@@ -314,7 +331,7 @@ module StaticCMS
         return result
     end
 
-    def StaticCMS.getsettings(yamlpath)
+    def Scms.getsettings(yamlpath)
         config = nil
         
         if File.exist?(yamlpath)
@@ -325,7 +342,7 @@ module StaticCMS
                 config = YAML.load(myconfig)
                 #config = YAML.load_file(yamlpath)
             rescue Exception => e  
-                ScmsUtils.errLog("Error Loading config.yml (check there are no tabs in the file)")
+                ScmsUtils.errLog("Error Loading _config.yml (check there are no tabs in the file)")
                 ScmsUtils.log( "_[Verify your config](http://yaml-online-parser.appspot.com/)_")
                 ScmsUtils.errLog( e.message )
                 ScmsUtils.errLog( e.backtrace.inspect )
@@ -337,7 +354,7 @@ module StaticCMS
         return config
     end
     
-    def StaticCMS.cleanpubdir(pub)
+    def Scms.cleanpubdir(pub)
         ScmsUtils.log("_Cleaning pub folder #{pub}_")
         FileUtils.rm_rf pub
         #FileUtils.remove_dir(pub, force = true)
@@ -346,32 +363,32 @@ module StaticCMS
         FileUtils.chmod 0755, pub
     end
     
-    def StaticCMS.crunch(crunchDir)
+    def Scms.crunch(crunchDir)
         ScmsUtils.log( "Starting crunching CSS and JavaScript in:\n#{crunchDir}\n\n" )
-        #StaticCMS.sassall(crunchDir)
+        #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|
-                StaticCMS.packr(asset)
+                Scms.packr(asset)
             end
             #Dir.glob("**/*.{css, js}").each do |asset|
             #    #fullFileName = File.basename(asset)
             #    #ScmsUtils.log( "Crunching #{fullFileName}" )
             #    ext = File.extname(asset)
-            #    StaticCMS.yuicompress(asset, ext)
+            #    Scms.yuicompress(asset, ext)
             #end
         end
     end
 
-    def StaticCMS.sassall(crunchDir)
-        ScmsUtils.log( "**Minimising Sass Files (.scss) **" )
+    def Scms.sassall(crunchDir)
+        ScmsUtils.log( "Minimising Sass Files (.scss)" )
         Dir.chdir(crunchDir) do
             Dir.glob("**/*.{scss}").each do |asset|
-                StaticCMS.sass(asset)
+                Scms.sass(asset)
             end
         end
     end
 
-    def StaticCMS.sass(asset)
+    def Scms.sass(asset)
         if File.exists?(asset)
             begin
                 template = File.read(asset)
@@ -391,13 +408,13 @@ module StaticCMS
         end
     end
     
-    def StaticCMS.packr(asset)
+    def Scms.packr(asset)
         if File.exists?(asset)
             begin
                 code = File.read(asset)
                 compressed = Packr.pack(code)
                 File.open(asset, 'w') { |f| f.write(compressed) }
-                ScmsUtils.log( "_Packed #{File.basename(asset)}_" )
+                ScmsUtils.log( "Minified #{File.basename(asset)}" )
             rescue Exception => e  
                 ScmsUtils.errLog( "Error processing: #{asset}" )
                 ScmsUtils.errLog( e.message )
@@ -405,7 +422,7 @@ module StaticCMS
         end
     end
         
-    def StaticCMS.yuicompress(asset, ext)
+    def Scms.yuicompress(asset, ext)
         if File.exists?(asset)
             #ScmsUtils.log( " Encoding: #{asset.encoding}" )
             enc = "--charset utf-8"
@@ -423,13 +440,17 @@ module StaticCMS
         end
     end
 
-    def StaticCMS.deploy(pub, config)
-        yamlpath=File.join(config, "s3config.yml")
+    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