scms 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f381843ee93fb7c0c758ba3205076e82392b921
-  data.tar.gz: 6458d3e0809e62af6f6ba24c417f0c88b3d29e1c
+  metadata.gz: 609c59402344d9305ba7e76db8552d4806ba317c
+  data.tar.gz: 12a2b3db3a156fc520f61ca422e9d6792b1534d4
 SHA512:
-  metadata.gz: 39ac479902d10445c3189c93cb0eb0e2267f046a620f41fb849317a9a2172a7a417c2525b339d7d54d75650b02cd432db0e754487af7da5f5023e5dafde1f470
-  data.tar.gz: db12283f651d7d18c4da2f0b2a74fddddce747549cff8e685f66e39d1ff3357d33beea9534f75b8768755a3d5a6c972d4b3f6894b24571c424c783ac2f224048
+  metadata.gz: 535c525277e5930d81705dfbbce442878f54ac80ec2bbe39e722779440a42682f409fa5f48e6fb5982b43527eabf0f29b696109587b8ec5a2f49c84beaadbdea
+  data.tar.gz: 3f19d0ef09e134a84015247633634f89a0129e42562ffedb075b6544d68817308718bd07daf7a452509caef24fc9f4cef8a01da3704aabc5dfbd9df8c025fb3d

data/assets/blank-template/_config.yml

@@ -1,5 +1,5 @@
 template: _templates/skin.erb.html # The website skin (erb template)
-#url: http://www.mywebsite.com/ #Whats the website root when published - All references in html ~/ will be replaced with this
+#rooturl: http://www.mywebsite.com/ #Whats the website root when published - All references in html ~/ will be replaced with this
 # Define your pages here
 pages:
 - index: 

data/bin/scms

@@ -11,6 +11,12 @@ require 'optparse'
 require 'fileutils'
 require 'Scms'
 
+class String
+  def to_path(end_slash=false)
+    "#{'/' if self[0]=='\\'}#{self.split('\\').join('/')}#{'/' if end_slash}" 
+  end 
+end
+
 options = {}
 optparse = OptionParser.new do|opts|
   # Set a banner, displayed at the top
@@ -21,6 +27,10 @@ optparse = OptionParser.new do|opts|
   opts.on('-w', '--website WEBSITE', "Website directory (full path)") do |w|
     options[:website] = w
   end
+
+  opts.on('-c', '--config CONFIGDIR', "Configeration directory if different from Website (full path)") do |c|
+    options[:configdir] = c
+  end
   
   opts.on('-o', '--output BuildDIR', "Website build dir (full path)") do |o|
     options[:pub] = o
@@ -35,11 +45,6 @@ optparse = OptionParser.new do|opts|
   opts.on( '-m', '--mode MODE', 'CMS or Publish' ) do|m|
      options[:mode] = m
   end
-   
-  options[:html] = "true"
-  opts.on( '-f', '--html HTML', 'true or false' ) do|h|
-     options[:html] = h
-  end
 
   options[:verbose] = false
   opts.on( '-v', '--verbose', 'Output more information' ) do
@@ -57,14 +62,14 @@ optparse.parse!
 #Set globals
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
-website = (options[:website].nil?) ? Dir.pwd : options[:website] 
+website = ((options[:website].nil?) ? Dir.pwd : options[:website]).to_path
 $website = website
 Folders = {
   :root => root_folder,
-  :website => File.join(website),
-  :pub => (ENV["SCMS_PUBLISH_FOLDER"] or options[:pub]),
-  :assets => File.join(root_folder, "assets"),
-  :config => (ENV["SCMS_CONFIG_FOLDER"] or File.join(website))
+  :website => website,
+  :pub => (options[:pub] or ENV["SCMS_PUBLISH_FOLDER"] or '').to_path,
+  :config => (options[:configdir] or ENV["SCMS_CONFIG_FOLDER"] or website).to_path,
+  :assets => File.join(root_folder, "assets")
 }
 
 if options[:action] == "create"
@@ -93,7 +98,7 @@ end
 
 raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
 Scms.upgrade(Folders[:website])
-Scms.build(Folders[:website], Folders[:pub], Folders[:config], options[:mode])
+Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
 mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
 S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"

data/lib/scms.rb

@@ -13,7 +13,7 @@ module Scms
     
     include YAML
     
-    def Scms.build(website, pub, config, mode)
+    def Scms.build(website, config, mode)
         @website = website
         @mode = mode
         #ScmsUtils.log("Mode: #{mode}")
@@ -32,7 +32,8 @@ module Scms
                     begin
                         require_relative bootstrap
                     rescue Exception=>e
-                        ScmsUtils.errLog( e )
+                        ScmsUtils.errLog(e.message)
+                        ScmsUtils.log(e.backtrace.inspect  )
                     end
                 else
                     ScmsUtils.log("Bootstrap does not exist #{bootstrap}")
@@ -319,7 +320,7 @@ module Scms
     end
 
     def Scms.copywebsite(website, pub)
-        if pub != nil
+        if pub.to_s.strip.length != 0
             FileUtils.mkdir pub unless Dir.exists? pub
             source = File.join(website)
             Dir.chdir(source) do          

data/lib/scms/s3deploy.rb

@@ -9,19 +9,12 @@ module S3Deploy
         ENV["S3CONF"] = config
         ENV["AWS_CALLING_FORMAT"] = "SUBDOMAIN"
         ENV["S3SYNC_MIME_TYPES_FILE"] = mimetypefile
-        puts "S3SYNC_MIME_TYPES_FILE: #{ENV["S3SYNC_MIME_TYPES_FILE"] }"
+        #puts "S3SYNC_MIME_TYPES_FILE: #{ENV["S3SYNC_MIME_TYPES_FILE"] }"
 
         s3yamlpath=File.join(config, "_s3config.yml")
         settings = YAML.load_file(s3yamlpath)
         throw "No bucket defined in _s3config.yml settings file" if settings['bucket'] == nil
         ScmsUtils.log( "Syncing with Amazon S3: #{settings['bucket']}" )
-        
-        removeold = "--delete"
-        if settings['clean'] != nil
-            unless settings['clean']
-                removeold = ""
-            end
-        end
 
         exclude = "(\\.svn$)|(^_)"
         if settings['ignore'] != nil
@@ -29,7 +22,7 @@ module S3Deploy
         end
         
         cmd = "s3sync"
-        params = "#{removeold} --exclude=\"#{exclude}\" --progress --make-dirs --recursive"
+        params = "--exclude=\"#{exclude}\" --progress --make-dirs --recursive"
 
         #First deploy private directories
         Dir.glob("#{pub}/_*/").each do |f|
@@ -49,7 +42,9 @@ module S3Deploy
         end
 
         ScmsUtils.log( "Syncing root (public)" )
-        roorparams = "#{params}  --public-read \"#{pub}/\" #{settings['bucket']}:/"
+        removeold = ""
+        removeold = "--delete"  if settings['clean'].to_s == "true"
+        roorparams = "#{removeold} #{params} --public-read \"#{pub}/\" #{settings['bucket']}:/"
         #Finnaly deploy all remaining files (except excludes)
         ScmsUtils.run(cmd, roorparams)
         ScmsUtils.successLog("Deployed :)")

data/lib/scms/scms-utils.rb

@@ -92,4 +92,5 @@ module ScmsUtils
         return uri.gsub("%20", " ")
     end
     
-end
+end
+

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.0.3"
+  VERSION = "2.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.4
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Create simple static websites, in a jiffy