scms 1.8.8 → 1.9.0

data/lib/scms/s3deploy.rb

@@ -1,18 +1,17 @@
 module S3Deploy
     VERSION = '1.0.0'
-    require "scms/scms_utils.rb"
+    require "scms/scms-utils.rb"
 
     def S3Deploy.sync(pub, config)
+        ScmsUtils.log( "Syncing with Amazon S3: #{$settings['bucket']}" )
         @pub = pub
         ENV["S3CONF"] = config
         ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
-        ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")
+        ENV["S3SYNC_MIME_TYPES_FILE"] = File.join(Folders[:root], "assets", "mime.types")   
 
-        yamlpath=File.join(config, "s3config.yml")
+        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']
@@ -20,56 +19,39 @@ module S3Deploy
             end
         end
 
-        exclude = "--exclude='.svn'"
+        exclude = "(\\.svn$)|(^_)"
         if $settings['ignore'] != nil
-            exclude = "--exclude=#{$settings["ignore"]}"
+            exclude = "#{exclude}|(#{$settings["ignore"]})"
         end
         
         cmd = "s3sync"
-        params = "#{removeold} #{exclude} --progress --make-dirs --recursive --public-read "
+        params = "#{removeold} --exclude=\"#{exclude}\" --progress --make-dirs --recursive"
+
+        #First deploy private directories
+        Dir.glob("#{@pub}/_*/").each do |f|
+            privatedir = File.basename(f)
+            ScmsUtils.log( "Backing up #{privatedir} (private)" )
+            privateparams = "#{params} \"#{@pub}/#{privatedir}/\" #{$settings['bucket']}:#{privatedir}/"
+            ScmsUtils.run(cmd, privateparams)
+        end
         
+        #Them deploy publid dir with caching
         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.log( "Syncing #{folder}(public: caching: 1 year)" )
+                cacheparams = "#{params}  --public-read --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.log( "Syncing root (public)" )
+        roorparams = "#{params}  --public-read \"#{@pub}/\" #{$settings['bucket']}:/"
+        #Finnaly deploy all remaining files (except excludes)
         ScmsUtils.run(cmd, roorparams)
-        ScmsUtils.successLog("**Deployed :)**")
+        ScmsUtils.successLog("Deployed :)")
         
         if $settings['uri'] != nil
-            ScmsUtils.log("[_#{$settings['uri']}_](#{$settings['uri']})")
+            ScmsUtils.log($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
-        
-        exclude = "--exclude='.svn'"
-        if $settings['ignore'] != nil
-            exclude = "--exclude=#{$settings["ignore"]}"
-        end
-        
-        params = "#{exclude} --progress --make-dirs --recursive #{removeold} \"#{privatedir}/\" #{$settings['bucket']}:private/"
-        ScmsUtils.run(cmd, params)
-        ScmsUtils.successLog("** Done :) **")
-    end 
 end

data/lib/scms/{scms_utils.rb → scms-utils.rb}

@@ -1,12 +1,11 @@
 module ScmsUtils
     require 'find'
     require 'fileutils'
-    require 'maruku'
     require 'open-uri'
 
     def ScmsUtils.run(cmd, params)
         if system("#{cmd} #{params}")
-            ScmsUtils.successLog( "**#{cmd} ran successfully**" )
+            ScmsUtils.successLog( "#{cmd} ran successfully" )
         else
             raise "Error running #{cmd}"
         end
@@ -15,12 +14,7 @@ module ScmsUtils
     def ScmsUtils.errLog(msg)
         if !msg.nil?
             if $html == "true"
-                begin
-                    doc = Maruku.new(msg)
-                    puts "<span style='color: red;'>#{doc.to_html}</span>"
-                rescue Exception=>e
-                    puts msg
-                end
+                puts "<div style='color: red;'>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg
             end
@@ -30,12 +24,7 @@ module ScmsUtils
     def ScmsUtils.successLog(msg)
         if !msg.nil?
             if $html == "true"
-                begin
-                    doc = Maruku.new(msg)
-                    puts "<span style='color: green;'>#{doc.to_html}</span>"
-                rescue Exception=>e
-                    puts msg
-                end
+                puts "<div style='color: green;'>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg
             end
@@ -45,12 +34,7 @@ module ScmsUtils
     def ScmsUtils.log(msg)
         if !msg.nil?
             if $html == "true"
-                begin
-                    doc = Maruku.new(msg)
-                    puts doc.to_html
-                rescue Exception=>e
-                    puts msg
-                end
+                puts "<div>#{ScmsUtils.txt_2_html(msg)}</div>"
             else
                 puts msg
             end
@@ -68,6 +52,7 @@ module ScmsUtils
 	def ScmsUtils.txt_2_html(rawsnippet)
 		if rawsnippet != nil
 			rawsnippet.gsub!(/(http:\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
+            rawsnippet.gsub!(/(file:\/\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
 			rawsnippet.gsub!(/\n/, "<br />")
 		end
 		

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
-module StaticCMS
-  VERSION = '1.8.8'
+module Scms
+  VERSION = "1.9.0"
 end

data/scms.gemspec

@@ -1,24 +1,31 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'Scms/version'
 
-$:.push File.expand_path("../lib", __FILE__)
-require 'scms/version'
+Gem::Specification.new do |spec|
+  spec.name          = "scms"
+  spec.version       = Scms::VERSION
+  spec.authors       = ["Courtenay Probert"]
+  spec.email         = ["courtenay@probert.me.uk"]
+  spec.description   = "A static website CMS for Amazon's S3"
+  spec.summary       = "Create simple static websites, in a jiffy"
+  spec.homepage      = "http://cprobert.github.io/Static-CMS/"
+  spec.license       = "MIT"
 
-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       = `git ls-files`.split("\n")
-  
-  s.add_dependency "aproxacs-s3sync"
-  s.add_dependency "nokogiri"
-  s.add_dependency "maruku"
-  s.add_dependency "sass"
-  s.add_dependency "packr"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.executables << 'scms'
+
+  spec.add_dependency "cprobert-s3sync"
+  spec.add_dependency "nokogiri"
+  spec.add_dependency "maruku"
+  spec.add_dependency "sass"
+  spec.add_dependency "packr"
   
-  s.executables << 'scms'
-end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.9.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aproxacs-s3sync
+  name: cprobert-s3sync
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -80,8 +80,37 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A gem for creating static html websites
-email: courtenay@probert.me.uk
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A static website CMS for Amazon's S3
+email:
+- courtenay@probert.me.uk
 executables:
 - scms
 extensions: []
@@ -89,73 +118,39 @@ extra_rdoc_files: []
 files:
 - .gitattributes
 - .gitignore
+- Gemfile
+- LICENSE.txt
 - README.md
-- assets/blank-app-template/application.xml
-- assets/blank-app-template/cert.p12
-- assets/blank-app-template/config.yml
-- assets/blank-app-template/debug.cmd
-- assets/blank-app-template/package.cmd
-- assets/blank-app-template/public/ico/favicon.ico
-- assets/blank-app-template/public/ico/logo-128.png
-- assets/blank-app-template/public/ico/logo-16.png
-- assets/blank-app-template/public/ico/logo-32.png
-- assets/blank-app-template/public/ico/logo-48.png
-- assets/blank-app-template/public/images/glyphicons-halflings-white.png
-- assets/blank-app-template/public/images/glyphicons-halflings.png
-- assets/blank-app-template/public/robots.txt
-- assets/blank-app-template/public/scripts/air/AIRAliases.js
-- assets/blank-app-template/public/scripts/air/AIRIntrospector.js
-- assets/blank-app-template/public/scripts/air/AIRMenuBuilder.js
-- assets/blank-app-template/public/scripts/air/applicationupdater.swf
-- assets/blank-app-template/public/scripts/air/applicationupdater_ui.swf
-- assets/blank-app-template/public/scripts/air/servicemonitor.swf
-- assets/blank-app-template/public/scripts/libs/bootstrap.js
-- assets/blank-app-template/public/scripts/libs/jquery-1.8.2.min.js
-- assets/blank-app-template/public/scripts/libs/jquery.fn.custom.js
-- assets/blank-app-template/public/scripts/libs/knockout-2.1.0-min.js
-- assets/blank-app-template/public/scripts/presenters/dashboard-presenter.js
-- assets/blank-app-template/public/scripts/presenters/global-presenter.js
-- assets/blank-app-template/public/scripts/shared/data-persistance.js
-- assets/blank-app-template/public/scripts/shared/utils.js
-- assets/blank-app-template/public/stylesheets/bootstrap-responsive.css
-- assets/blank-app-template/public/stylesheets/bootstrap.css
-- assets/blank-app-template/public/stylesheets/style.css
-- assets/blank-app-template/s3config.template.yml
-- assets/blank-app-template/templates/menu.xml
-- assets/blank-app-template/templates/skin.erb.html
-- assets/blank-app-template/tools/msxsl.exe
-- assets/blank-app-template/tools/update-descriptor.xsl
-- assets/blank-app-template/tools/version.xsl
-- assets/blank-app-template/views/about.html
-- assets/blank-app-template/views/dashboard.html
-- assets/blank-template/config.yml
-- assets/blank-template/public/images/glyphicons-halflings-white.png
-- assets/blank-template/public/images/glyphicons-halflings.png
-- assets/blank-template/public/robots.txt
-- assets/blank-template/public/scripts/air-monkey-hook.js
-- assets/blank-template/public/scripts/bootstrap.js
-- assets/blank-template/public/scripts/jquery-1.8.2.min.js
-- assets/blank-template/public/scripts/script.js
-- assets/blank-template/public/stylesheets/bootstrap-responsive.css
-- assets/blank-template/public/stylesheets/bootstrap.css
-- assets/blank-template/public/stylesheets/style.css
-- assets/blank-template/s3config.template.yml
-- assets/blank-template/templates/menu.xml
-- assets/blank-template/templates/skin.erb.html
-- assets/blank-template/views/about-intro.html
-- assets/blank-template/views/about-main.html
-- assets/blank-template/views/home-intro.html
-- assets/blank-template/views/home-main.html
+- Rakefile
+- assets/blank-template/_config.yml
+- assets/blank-template/_s3config.template.yml
+- assets/blank-template/_templates/menu.xml
+- assets/blank-template/_templates/skin.erb.html
+- assets/blank-template/_views/about-intro.html
+- assets/blank-template/_views/about-main.html
+- assets/blank-template/_views/home-intro.html
+- assets/blank-template/_views/home-main.html
+- assets/blank-template/images/glyphicons-halflings-white.png
+- assets/blank-template/images/glyphicons-halflings.png
+- assets/blank-template/robots.txt
+- assets/blank-template/scripts/air-monkey-hook.js
+- assets/blank-template/scripts/bootstrap.js
+- assets/blank-template/scripts/jquery-1.8.2.min.js
+- assets/blank-template/scripts/script.js
+- assets/blank-template/stylesheets/bootstrap-responsive.css
+- assets/blank-template/stylesheets/bootstrap.css
+- assets/blank-template/stylesheets/style.css
 - assets/mime.types
 - bin/scms
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
-- lib/scms/scms_utils.rb
+- lib/scms/scms-utils.rb
 - lib/scms/version.rb
 - scms.gemspec
 homepage: http://cprobert.github.io/Static-CMS/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/assets/blank-app-template/application.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<application xmlns="http://ns.adobe.com/air/application/3.0">
-	<!-- The application identifier string, unique to this application. Required. -->
-	<id>uk.co.mydomain.myapp</id>
-	<!-- Used as the filename for the application. Required. -->
-	<filename>AirApp</filename>
-	<!-- The name that is displayed in the AIR application installer. Optional. -->
-	<name>Air App</name>
-	<!-- An application version designator Required. -->
-	<versionNumber>0.0.1</versionNumber>
-	<!-- Description, displayed in the AIR application installer. Optional. -->
-	<description> 
-        <text xml:lang="en">Test App</text> 
-    </description> 
-	<!-- Copyright information. Optional -->
-	<copyright>Copyright (c) 2012 Courtenay Probert.</copyright> 
-	<!-- Settings for the application's initial window. Required. -->
-	<initialWindow>
-		<!-- The main HTML file of the application. Required. -->
-		<content>-site/app.html</content>
-		<!-- The title of the main window. Optional. -->
-		<title/>
-		<!-- The type of system chrome to use (either "standard" or "none"). Optional. Default standard. -->
-		<systemChrome>standard</systemChrome>
-		<!-- Whether the window is transparent. Only applicable when systemChrome is false. Optional. Default false. -->
-		<transparent>false</transparent>
-		<!-- Whether the window is initially visible. Optional. Default false. -->
-		<visible>true</visible>
-		<!-- Whether the user can minimize the window. Optional. Default true. -->
-		<minimizable>true</minimizable>
-		<!-- Whether the user can maximize the window. Optional. Default true. -->
-		<maximizable>true</maximizable>
-		<!-- Whether the user can resize the window. Optional. Default true. -->
-		<resizable>true</resizable>
-		<!-- The window's initial width. Optional. -->
-		<width>1024</width>
-		<!-- The window's initial height. Optional. -->
-		<height>1024</height>
-		<!-- The window's initial x position. Optional. -->
-		<x>0</x>
-		<!-- The window's initial y position. Optional. -->
-		<y>0</y>
-		<!-- The window's minimum size, specified as a width/height pair, such as "400 200". Optional. -->
-		<minSize>800 600</minSize>
-		<!-- The window's initial maximum size, specified as a width/height pair, such as "1600 1200". Optional. -->
-		<maxSize>1600 1200</maxSize>
-	</initialWindow>
-	<installFolder>AirApp</installFolder> 
-    <programMenuFolder>Air App</programMenuFolder> 
-	<icon>
-		<image16x16>-site/ico/logo-16.png</image16x16>
-		<image32x32>-site/ico/logo-32.png</image32x32>
-		<image48x48>-site/ico/logo-48.png</image48x48>
-		<image128x128>-site/ico/logo-128.png</image128x128>
-	</icon>
-	<fileTypes></fileTypes>
-</application>

data/assets/blank-app-template/config.yml

@@ -1,32 +0,0 @@
-template: templates/skin.erb.html
-
-pages:
-- app: 
-    generate: app.html 
-    views : 
-        main: views/dashboard.html
-- about: 
-    generate: about.html
-    views : 
-        main: views/about.html
-
-scripts:
-- script:
-    version: 1.0
-    bundle:
-     - scripts/air/AIRAliases.js
-     - scripts/air/AIRIntrospector.js
-     - scripts/libs/bootstrap.js
-     - scripts/libs/knockout-2.1.0-min.js
-     - scripts/libs/jquery.fn.custom.js
-     - scripts/shared/data-persistance.js
-     - scripts/shared/utils.js
-     - scripts/presenters/global-presenter.js
-     
-stylesheets:
-- style:
-    version: 1.0
-    bundle:
-      - stylesheets/bootstrap.css
-      - stylesheets/bootstrap-responsive.css
-      - stylesheets/style.css