scms 1.7.9 → 1.8.6

data/assets/blank-template/templates/menu.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<menu>
-	<page href="index.html">Home</page>
-	<page href="about.html">About</page>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<menu>
+	<page href="index.html">Home</page>
+	<page href="about.html">About</page>
 </menu>

data/bin/scms

@@ -33,12 +33,12 @@ optparse = OptionParser.new do|opts|
    
   options[:mode] = "pub"
   opts.on( '-m', '--mode MODE', 'CMS or Publish' ) do|m|
-	 options[:mode] = m
+     options[:mode] = m
   end
    
   options[:html] = "true"
   opts.on( '-f', '--html HTML', 'true or false' ) do|h|
-	 options[:html] = h
+     options[:html] = h
   end
 
   options[:verbose] = false
@@ -53,26 +53,29 @@ optparse = OptionParser.new do|opts|
    end
 end
 optparse.parse!
-#Now raise an exception if we have not found a website option
-if options[:website].nil?
-	puts "Please specify a website directory, e.g."
-    puts "staticcms -w ~/websites/mystaticwebsite"
-	raise OptionParser::MissingArgument 
+
+$website = Dir.pwd
+unless options[:website].nil?
+    $website = options[:website]
 end
+puts "Compiling #{$website}"
+
+##Set globals
+$html = (ENV["SCMS_HTML_OUT"] or "false")
 
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
-@pub = File.join("#{options[:website]}/compiled")
+@pub = File.join("#{$website}/_site")
 unless options[:pub].nil?
     @pub = options[:pub]
 end
 
 Folders = {
   :root => root_folder,
-  :website => File.join(options[:website]),
+  :website => File.join($website),
   :pub => (ENV["SCMS_PUBLISH_FOLDER"] or @pub),
   :assets => (ENV["SCMS_STATICCMS_FOLDER"] or File.join(root_folder, "assets")),
-  :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join(options[:website]))
+  :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join($website))
 }
 
 if options[:action] == "create"
@@ -111,10 +114,6 @@ raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:
 #puts "Config dir = #{Folders[:config]}"
 #puts "Mode = #{options[:mode]}"
 
-##Set globals
-$website = Folders[:website]
-$html = (ENV["SCMS_HTML_OUT"] or "false")
-
 deployDir = StaticCMS.build(Folders[:pub], Folders[:config], options[:mode])
 
 if options[:action] == "crunch"
@@ -124,4 +123,6 @@ end
 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

data/build commands.txt

@@ -0,0 +1,2 @@
+gem build scms.gemspec
+gem push scms-1.7.9.gem

data/lib/scms.rb

@@ -17,8 +17,11 @@ module StaticCMS
         @configdir = config
         @mode = mode
         @webroot = "public"
+        @source = File.join($website, @webroot)
         
         ScmsUtils.log("_Mode: #{mode}_")
+
+        StaticCMS.sassall(@source)
         
         yamlpath=File.join(@configdir, "config.yml")
         ScmsUtils.log("**[Getting Config](#{ScmsUtils.uriEncode("file:///#{yamlpath}")})**")
@@ -65,8 +68,7 @@ module StaticCMS
             ScmsUtils.errLog("Config is empty")
         end
         
-        webroot = File.join($website, @webroot)
-        if File.exists?(webroot)
+        if File.exists?(@source)
             ScmsUtils.log("_Merging 'public' folder_")
             
             if @cleanpub
@@ -74,19 +76,18 @@ module StaticCMS
             end
             
             FileUtils.mkdir @pub unless Dir.exists? @pub
-            Dir.chdir(webroot) do
+            Dir.chdir(@source) do
                 #files = Dir.glob('*')
                 #FileUtils.cp_r files, @pub            
                 
                 Dir.glob("**/*").reject{|f| f['.svn']}.each do |oldfile|
-                  newfile = File.join(@pub, oldfile.sub(webroot, ''))
+                  newfile = File.join(@pub, oldfile.sub(@source, ''))
                   #puts newfile
                   File.file?(oldfile) ? FileUtils.copy(oldfile, newfile) : FileUtils.mkdir(newfile) unless File.exist? newfile
                 end
             end
-            StaticCMS.sassall(@pub)
         else
-            ScmsUtils.log("**No 'public' folder in #{$webroot} - skiping  merge**")
+            ScmsUtils.log("**No 'public' folder in #{@source} - skiping  merge**")
         end
         
         ScmsUtils.successLog("**Compiled :)**")
@@ -239,7 +240,7 @@ module StaticCMS
                     bundle = option[1]["bundle"]
                     bundle.each do |asset|
                         assetList += "\t#{asset}\n" 
-                        assetname = File.join($website, @webroot, asset)
+                        assetname = File.join(@source, asset)
                         if File::exists?(assetname)
                             content = content + "\n" + File.read(assetname)
                         else
@@ -281,7 +282,7 @@ module StaticCMS
                     assetList = ""
                     bundle.each do |asset|
                         assetList += "\t #{asset}\n" 
-                        assetname = File.join($website, @webroot, asset)
+                        assetname = File.join(@source, asset)
                         if File::exists?(assetname)
                             content = content + "\n" + File.read(assetname)
                         else
@@ -362,6 +363,7 @@ module StaticCMS
     end
 
     def StaticCMS.sassall(crunchDir)
+        ScmsUtils.log( "**Minimising Sass Files (.scss) **" )
         Dir.chdir(crunchDir) do
             Dir.glob("**/*.{scss}").each do |asset|
                 StaticCMS.sass(asset)
@@ -379,8 +381,9 @@ module StaticCMS
                                                           :syntax => :scss
                                                          }.freeze)
                 output = sass_engine.to_css
-                File.open(asset, 'w') { |file| file.write(output) }
-                ScmsUtils.log( "_Sassed #{File.basename(asset)}_" )
+                css_file = "#{File.dirname(asset)}/#{File.basename(asset,'.*')}.css"
+                File.open(css_file, 'w') { |file| file.write(output) }
+                ScmsUtils.log( "_Sassed: #{css_file}_" )
             rescue Exception => e  
                 ScmsUtils.errLog( "Error processing: #{asset}" )
                 ScmsUtils.errLog( e.message )

data/lib/scms/s3deploy.rb

@@ -1,45 +1,64 @@
-module S3Deploy
-	VERSION = '1.0.0'
-    require "scms/scms_utils.rb"
-
-	def S3Deploy.sync(pub, config)
-        @pub = pub
-        ENV["S3CONF"] = config
-        ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
-        #ENV["SSL_CERT_DIR"] = File.join($website, "s3certs")
-        ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")
-
-        yamlpath=File.join(config, "s3config.yml")
-        #ScmsUtils.log( "Getting s3sync settings: \n#{yamlpath}\n\n")
-        $settings = YAML.load_file(yamlpath)
-        
-        ScmsUtils.log( "Syncing with Amazon S3: **#{$settings['bucket']}**" )
-		
-		removeold = "--delete"
-		if $settings['clean'] != nil
-			unless $settings['clean']
-				removeold = ""
-			end
-		end
-		
-        cmd = "s3sync"
-        cache = "--cache-control='max-age=31449600'"
-        params = "--exclude='.svn' --progress --make-dirs --recursive --public-read #{removeold} #{cache} \"#{@pub}/\" #{$settings['bucket']}:/"
-		if $settings['cache'] != nil
-			$settings['cache'].each do |folder| 
-				ScmsUtils.log( "Syncing **#{folder}** caching: 1 year" )
-				ScmsUtils.run(cmd, params)
-			end
-		end
-
-		cache = ""
-		ScmsUtils.log( "Syncing **root** no caching" )
-		ScmsUtils.run(cmd, params)
-        
-        ScmsUtils.successLog("**Deployed :)**")
-        
-        if $settings['uri'] != nil
-			ScmsUtils.log("[_#{$settings['uri']}_](#{$settings['uri']})")
-		end
-	end	
+module S3Deploy
+    VERSION = '1.0.0'
+    require "scms/scms_utils.rb"
+
+    def S3Deploy.sync(pub, config)
+        @pub = pub
+        ENV["S3CONF"] = config
+        ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
+        ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")
+
+        yamlpath=File.join(config, "s3config.yml")
+        $settings = YAML.load_file(yamlpath)
+        
+        ScmsUtils.log( "Syncing with Amazon S3: **#{$settings['bucket']}**" )
+        
+        removeold = "--delete"
+        if $settings['clean'] != nil
+            unless $settings['clean']
+                removeold = ""
+            end
+        end
+        
+        cmd = "s3sync"
+        params = "--exclude='.svn' --progress --make-dirs --recursive --public-read #{removeold}"
+        
+        if $settings['cache'] != nil
+            $settings['cache'].each do |folder| 
+                ScmsUtils.log( "Syncing **#{folder}** caching: 1 year" )
+                cacheparams = "#{params} --cache-control='max-age=31449600' \"#{@pub}/#{folder}/\" #{$settings['bucket']}:#{folder}/"
+                ScmsUtils.run(cmd, cacheparams)
+            end
+        end
+
+        ScmsUtils.log( "Syncing **root** no caching" )
+        roorparams = "#{params} \"#{@pub}/\" #{$settings['bucket']}:/"
+        ScmsUtils.run(cmd, roorparams)
+        ScmsUtils.successLog("**Deployed :)**")
+        
+        if $settings['uri'] != nil
+            ScmsUtils.log("[_#{$settings['uri']}_](#{$settings['uri']})")
+        end
+    end 
+
+    def S3Deploy.backup(privatedir, config)
+        ENV["S3CONF"] = config
+        ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
+        ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")
+
+        yamlpath=File.join(config, "s3config.yml")
+        $settings = YAML.load_file(yamlpath)
+        
+        ScmsUtils.log( "Backing up to Amazon S3: **#{$settings['bucket']}**" )
+        cmd = "s3sync"
+        removeold = "--delete"
+        if $settings['clean'] != nil
+            unless $settings['clean']
+                removeold = ""
+            end
+        end
+        params = "--exclude='.svn' --progress --make-dirs --recursive #{removeold} \"#{privatedir}/\" #{$settings['bucket']}:private/"
+        ScmsUtils.run(cmd, params)
+        ScmsUtils.successLog("** Done :) **")
+    end 
 end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
-module StaticCMS
-  VERSION = '1.7.9'
-end
+module StaticCMS
+  VERSION = '1.8.6'
+end

data/scms.gemspec

@@ -1,24 +1,24 @@
-# -*- encoding: utf-8 -*-
-
-$:.push File.expand_path("../lib", __FILE__)
-require 'scms/version'
-
-Gem::Specification.new do |s|
-  s.name        = 'scms'
-  s.version     = StaticCMS::VERSION
-  s.date        = '2013-06-29'
-  s.homepage    = 'https://github.com/cprobert/Static-CMS'
-  s.summary     = "Create simple static websites, in a jiffy"
-  s.description = "A gem for creating static html websites"
-  s.authors     = ["Courtenay Probert"]
-  s.email       = 'courtenay@probert.me.uk'
-  s.files       = Dir.glob("**/*")
-  
-  s.add_dependency "aproxacs-s3sync"
-  s.add_dependency "nokogiri"
-  s.add_dependency "maruku"
-  s.add_dependency "sass"
-  s.add_dependency "packr"
-  
-  s.executables << 'scms'
+# -*- encoding: utf-8 -*-
+
+$:.push File.expand_path("../lib", __FILE__)
+require 'scms/version'
+
+Gem::Specification.new do |s|
+  s.name        = 'scms'
+  s.version     = StaticCMS::VERSION
+  s.date        = '2013-06-29'
+  s.homepage    = 'http://cprobert.github.io/Static-CMS/'
+  s.summary     = "Create simple static websites, in a jiffy"
+  s.description = "A gem for creating static html websites"
+  s.authors     = ["Courtenay Probert"]
+  s.email       = 'courtenay@probert.me.uk'
+  s.files       = Dir.glob("**/*")
+  
+  s.add_dependency "aproxacs-s3sync"
+  s.add_dependency "nokogiri"
+  s.add_dependency "maruku"
+  s.add_dependency "sass"
+  s.add_dependency "packr"
+  
+  s.executables << 'scms'
 end

data/staticcms.sublime-project

@@ -1,8 +1,8 @@
-{
-	"folders":
-	[
-		{
-			"path": "/I/Code/GitHub/Static-CMS"
-		}
-	]
-}
+{
+	"folders":
+	[
+		{
+			"path": "/I/Code/GitHub/Static-CMS"
+		}
+	]
+}

data/staticcms.sublime-workspace

@@ -111,6 +111,30 @@
 	},
 	"buffers":
 	[
+		{
+			"file": "bin/scms",
+			"settings":
+			{
+				"buffer_size": 3766,
+				"line_ending": "Windows"
+			}
+		},
+		{
+			"file": "/C/Users/cprobert/AppData/Local/Temp/scmsDeploy.rb-rev50.svn000.tmp.rb",
+			"settings":
+			{
+				"buffer_size": 1860,
+				"line_ending": "Unix"
+			}
+		},
+		{
+			"file": "lib/scms/s3deploy.rb",
+			"settings":
+			{
+				"buffer_size": 2329,
+				"line_ending": "Windows"
+			}
+		}
 	],
 	"build_system": "",
 	"command_palette":
@@ -136,11 +160,19 @@
 	},
 	"file_history":
 	[
-		"/I/Code/GitHub/Static-CMS/lib/scms.rb",
-		"/I/Code/GitHub/Static-CMS/bin/scms",
+		"/C/Users/cprobert/AppData/Local/Temp/scmsDeploy.rb-rev150.svn000.tmp.rb",
+		"/C/Users/cprobert/AppData/Local/Temp/scmsDeploy.rb-rev250.svn000.tmp.rb",
 		"/I/Code/GitHub/Static-CMS/lib/scms/s3deploy.rb",
-		"/I/Code/GitHub/Static-CMS/lib/scms/version.rb",
+		"/I/Code/GitHub/Static-CMS/bin/scms.rb",
+		"/I/Code/GitHub/Static-CMS/bin/scms",
+		"/I/Code/GitHub/Static-CMS/build commands.txt",
+		"/I/Code/GitHub/Static-CMS/staticcms.sublime-workspace",
+		"/I/Code/GitHub/Static-CMS/lib/scms.rb",
+		"/I/Code/GitHub/Static-CMS/assets/blank-app-template/application.xml",
+		"/I/Code/GitHub/Static-CMS/assets/blank-app-template/package.cmd",
+		"/I/Code/GitHub/Static-CMS/README.md",
 		"/I/Code/GitHub/Static-CMS/scms.gemspec",
+		"/I/Code/GitHub/Static-CMS/lib/scms/version.rb",
 		"/I/Code/GitHub/Static-CMS/lib/staticcms/ScmsUtils.rb",
 		"/I/Code/GitHub/Static-CMS/lib/staticcms/ScmsDeploy.rb",
 		"/I/Code/GitHub/Static-CMS/staticcms.gemspec",
@@ -197,7 +229,7 @@
 	},
 	"find_in_files":
 	{
-		"height": 0.0,
+		"height": 90.0,
 		"where_history":
 		[
 			"I:\\Code\\GitHub\\Static-CMS",
@@ -211,6 +243,9 @@
 		"case_sensitive": false,
 		"find_history":
 		[
+			"S3Deploy.backup",
+			"Folders[:website]",
+			"compiled",
 			"Loading config",
 			"Loading config:",
 			"@configdir",
@@ -335,9 +370,7 @@
 			"app.data(\"firstRun\"",
 			"app.updateGems",
 			"prefs.firstRun",
-			"installUpdate",
-			"onUpdateInstall",
-			"$.publish"
+			"installUpdate"
 		],
 		"highlight": true,
 		"in_selection": false,
@@ -379,8 +412,87 @@
 	"groups":
 	[
 		{
+			"selected": 0,
 			"sheets":
 			[
+				{
+					"buffer": 0,
+					"file": "bin/scms",
+					"settings":
+					{
+						"buffer_size": 3766,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								0,
+								3766
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 1655.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 1,
+					"file": "/C/Users/cprobert/AppData/Local/Temp/scmsDeploy.rb-rev50.svn000.tmp.rb",
+					"settings":
+					{
+						"buffer_size": 1860,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								934,
+								991
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				},
+				{
+					"buffer": 2,
+					"file": "lib/scms/s3deploy.rb",
+					"settings":
+					{
+						"buffer_size": 2329,
+						"regions":
+						{
+						},
+						"selection":
+						[
+							[
+								2329,
+								2329
+							]
+						],
+						"settings":
+						{
+							"syntax": "Packages/Ruby/Ruby.tmLanguage"
+						},
+						"translation.x": 0.0,
+						"translation.y": 0.0,
+						"zoom_level": 1.0
+					},
+					"type": "text"
+				}
 			]
 		}
 	],