scms 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70608f5a221d75ec349c88c30463deeeeefd9e10
-  data.tar.gz: c46321dd2211f5e27eef6454e5eeb6a530a9f162
+  metadata.gz: d4d890650bc4b0a2fb20e609ec9e71bcb22f318f
+  data.tar.gz: 246fa4d2b29c5480c9fa1e886f8077fc1c94a70d
 SHA512:
-  metadata.gz: 01098df78d1d4d17597a906d9b6fa524492a0db4183fbd77d6979f8abe3a2e46396bc200397271342906521758a477cec9439efe07866f2da934481638ae7bc1
-  data.tar.gz: 1e9a3e49f51ba43823c0d1009d243f392640b9de128ae2ff880478649d5b7fa447a16730186710fbb5f73f7650464466f04dea84489d95f8f977543b9a35f3bc
+  metadata.gz: d8174103d4c85d19fe0a2febc793e4484d8196ab08b1f7a1901776b8e08a3e406c4798e735983606dd44e5e36bdf0f9a3c3a8a34976851905871c389db02b44a
+  data.tar.gz: 0367a45b24d39f7a11073caaf278d5b243cff1cc695945b3eeaaa7a8dd108c3d0b0acd6c0fd374153488cb064f396df75e8fc14815324d996316c815e0dfb423

data/bin/scms

@@ -95,4 +95,5 @@ raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:
 Scms.upgrade(Folders[:website])
 Scms.build(Folders[:website], Folders[:pub], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
-Scms.deploy(Folders[:website], Folders[:config]) if options[:action] == "deploy"
+mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
+S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"

data/lib/scms.rb

@@ -192,11 +192,16 @@ module Scms
                         if File.exists?(erb) && out != nil
                             pubsubdir = File.dirname(out)
                             Dir.mkdir(pubsubdir, 755) unless File::directory?(pubsubdir)
-                            html = Scms.parsetemplate(File.read(erb), pagemodel)
+
+                            erbtemplate = File.read(erb)
+                            erbtemplate = erbtemplate.gsub('data.','page.')#lagasy fix
+                            File.open(erb, 'w') {|f| f.write(erbtemplate) }#lagasy fix
+
+                            html = Scms.parsetemplate(erbtemplate, pagemodel)
 
                             html = html.gsub('~/', ScmsUtils.uriEncode("file:///#{@website}/")) if @mode == "cms"
-                            websiteroot = ''
-                            websiteroot = @settings["url"] unless @settings["url"] == nil
+                            websiteroot = '/'
+                            websiteroot = @settings["url"] unless @settings["rooturl"] == nil
 
                             html = html.gsub('~/', websiteroot)
 
@@ -210,9 +215,6 @@ module Scms
     end
 
     def Scms.parsetemplate(template, hash)
-        #lagasy fix
-        template = template.gsub('data.','page.')
-
         page = OpenStruct.new(hash)
         result = ""
         
@@ -309,15 +311,6 @@ module Scms
         end
     end
 
-    def Scms.deploy(website, config)
-        yamlpath=File.join(config, "_s3config.yml")
-        if File.exists?(yamlpath) 
-            S3Deploy.sync(website, config)
-        else
-            raise "The following file doesn't exist #{yamlpath}"
-        end
-    end
-
     def Scms.copywebsite(website, pub)
         if pub != nil
             FileUtils.mkdir pub unless Dir.exists? pub

data/lib/scms/s3deploy.rb

@@ -2,18 +2,19 @@ module S3Deploy
     VERSION = '1.0.0'
     require "scms/scms-utils.rb"
 
-    def S3Deploy.sync(pub, config)
-        yamlpath=File.join(config, "_config.yml")
-        settings = ScmsUtils.getsettings(yamlpath)
+    def S3Deploy.sync(pub, config, mimetypefile)
+        #yamlpath=File.join(config, "_config.yml")
+        #scmsSettings = ScmsUtils.getsettings(yamlpath)
 
-        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"] = mimetypefile
+        puts "S3SYNC_MIME_TYPES_FILE: #{ENV["S3SYNC_MIME_TYPES_FILE"] }"
 
-        yamlpath=File.join(config, "_s3config.yml")
-        settings = YAML.load_file(yamlpath)
+        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
@@ -31,10 +32,10 @@ module S3Deploy
         params = "#{removeold} --exclude=\"#{exclude}\" --progress --make-dirs --recursive"
 
         #First deploy private directories
-        Dir.glob("#{@pub}/_*/").each do |f|
+        Dir.glob("#{pub}/_*/").each do |f|
             privatedir = File.basename(f)
             ScmsUtils.log( "Backing up #{privatedir} (private)" )
-            privateparams = "#{params} \"#{@pub}/#{privatedir}/\" #{settings['bucket']}:#{privatedir}/"
+            privateparams = "#{params} \"#{pub}/#{privatedir}/\" #{settings['bucket']}:#{privatedir}/"
             ScmsUtils.run(cmd, privateparams)
         end
         
@@ -42,13 +43,13 @@ module S3Deploy
         if settings['cache'] != nil
             settings['cache'].each do |folder| 
                 ScmsUtils.log( "Syncing #{folder}(public: caching: 1 year)" )
-                cacheparams = "#{params}  --public-read --cache-control='max-age=31449600' \"#{@pub}/#{folder}/\" #{settings['bucket']}:#{folder}/"
+                cacheparams = "#{params}  --public-read --cache-control='max-age=31449600' \"#{pub}/#{folder}/\" #{settings['bucket']}:#{folder}/"
                 ScmsUtils.run(cmd, cacheparams)
             end
         end
 
         ScmsUtils.log( "Syncing root (public)" )
-        roorparams = "#{params}  --public-read \"#{@pub}/\" #{settings['bucket']}:/"
+        roorparams = "#{params}  --public-read \"#{pub}/\" #{settings['bucket']}:/"
         #Finnaly deploy all remaining files (except excludes)
         ScmsUtils.run(cmd, roorparams)
         ScmsUtils.successLog("Deployed :)")

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Courtenay Probert