scms 2.2.0 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2U2M2M3ZmZkYjFjZTkxMTU5MzliYmMxMGNkM2UyNWUzODkzMzA0Zg==
+    M2IxN2JkZDQ2YzcxZGZkZmYzZmQxNzAzZTNlMTI2NDkwODJhODdhMA==
   data.tar.gz: !binary |-
-    YmYyMDJiNDM1MDNlYWY5ZTNlOWYyODE1MGU0NjkzYmRhODVlYWU3ZQ==
+    Y2NiYWI5MzQwNWRhMGY1MWY3ZTg1ZmY3MWU4NjA1ODg5MTM2OWViZA==
 SHA512:
   metadata.gz: !binary |-
-    Njg2MTdjMTUxYzhkMmRlYTQ3ZTRmMDA0Njk2MzQxZWQ0NmIyZTM2ODZjMGU4
-    ZjRiN2U3ODRkMzNhZDZiOTkzZjY1YWUyMTZjYzc5MDJmMWMwMDZiYTg0NGYy
-    YWVlMGI3MjgxMWU1ZDIzZjAzNzc4Yzg0OWRiZTBkYzRmNmI1Y2E=
+    NmM1ODZlMWYxZWQ1YzE5NGY3ZWUyZDM0ZTZhMmRkOGJlNTUzYzZlODI0ZWY1
+    YTJiMThiYjEwOTllYTViYTRmYzhjMDNiNGYyMWViNTcyMjA4NGU3ZjMyODk3
+    YzM4NTg0ZjliOWU0ZTEzOGQ3MDNmMDZlYjExYWQyMDY0NTM0NDE=
   data.tar.gz: !binary |-
-    YmU0NTYxNGQ5MjE1ZDllZGI0NTNhZDE4Zjk3MWFiNDIxYTM4Y2RkMDIwYTU1
-    OTU2ZWI5Y2FhZjY3ZGM3MGQxNTM5YzdiODZkMmMyYmZjOGI1OTczOTkyYjhm
-    NTMxYmIzZjk1ZjkyODNiZTU3N2ViOTc5OTBiNjc2ZDhhYWVjYmU=
+    ZmI4MjJlNjliMjQ4NWNmNGRiZjljYjE2ZDA3NzkwNWJhZmUwM2U5MTlmODg4
+    MzE3OTIzMWQzZjAxNjM0NWIyMmMwYjQ4YWU3ODJmMDU3MTU1YmFhMjVkODhi
+    N2Q3ZWExNjFlMWFhZGMwNDZjZmFkMTk2MTBmM2NmMmE4NWNhYmI=

data/assets/blank-template/_config.yml

@@ -1,4 +1,4 @@
-template: _templates/skin.erb.html # The website skin (erb template)
+template: _layouts/skin.erb.html # The website skin (erb template)
 #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:
@@ -9,14 +9,14 @@ pages:
     description: Meta description
     keywords: "CMS, S3, Ruby"
     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
     navigation: About
     views:
-        intro: _views/about-intro.html
-        main: _views/about-main.html
+        intro: _views/about/intro.html
+        main: _views/about/main.html
 - contact: #Pageless for nav only
     navigation: contact
     navigation_meta: contactform
@@ -25,12 +25,13 @@ pages:
 # Define your bundles here (versioning is recomended if your caching assets)
 bundles:
 - script:
-    generate: scripts/bootstrap.min-v2.1.1.js
+    generate: js/bootstrap.min-v2.1.1.js
     files:
-     - scripts/bootstrap.js
+     - _source/scripts/bootstrap.js
+     - _source/scripts/script.js
 - style:
-    generate: stylesheets/style-1.0.css
+    generate: css/style-1.0.css
     files:
-      - stylesheets/bootstrap.css
-      - stylesheets/bootstrap-responsive.css
-      - stylesheets/style.css
+      - _source/stylesheets/bootstrap.css
+      - _source/stylesheets/bootstrap-responsive.css
+      - _source/stylesheets/style.css

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

@@ -8,7 +8,7 @@
     <meta name="keywords" content="<%= page.keywords %>">
     <meta name="author" content="Courtenay Probert">
 	
-    <script src='scripts/jquery-1.8.2.min.js'></script>
+    <script src='js/jquery-1.8.2.min.js'></script>
 	  <!-- Le styles -->
 	  <link href='<%= page.bundles["style"] %>' rel="stylesheet">
     <style type="text/css">

data/bin/scms

@@ -23,32 +23,47 @@ options = {}
 optparse = OptionParser.new do|opts|
   # Set a banner, displayed at the top of the help screen.
   opts.banner = "Usage: scms [options]"
- 
-  # Define the options, and what they do
-  opts.on('-w', '--website WEBSITE', "Website directory (defaults to ./)") do |w|
-    options[:website] = w
-  end
 
-  opts.on('-c', '--config CONFIGDIR', "Configeration directory if different from Website (defaults to ./)") do |c|
-    options[:configdir] = c
+  options[:website] = Dir.pwd
+  opts.on('-s', '--source WorkingDir', "Location of website source code (defaults to ./)") do |w|
+    options[:website] = w.to_path
   end
-  
-  opts.on('-o', '--output BuildDIR', "Website build dir (defaults to ./)") do |o|
-    options[:pub] = o
+
+  opts.on('-d', '--destination OutPutDir', "The location of the build files (defaults to ./)") do |o|
+    options[:destination] = o.to_path
   end
- 
-  options[:action] = "build"
-   opts.on( '-a', '--action ACTION', 'build, deploy, listen or create' ) do|a|
-     options[:action] = a
+
+  options[:create] = nil
+  opts.on( '-c', '--create NewWebSiteName', 'Create a new scms website' ) do |newsite|
+     options[:create] = newsite
   end
 
   options[:server] = false
-  opts.on( '-s', '--server', 'Run a scms server on port localhost:8008' ) do
+  opts.on( '-s', '--serve', 'Run a scms server on port localhost:8008' ) do
      options[:server] = true
   end
+
+  options[:port] = 8002
+  opts.on( '-p', '--port Port', 'Listen on the given port (only workes with --serve)' ) do|p|
+     options[:port] = p
+  end
+
+  options[:watch] = false
+  opts.on( '-w', '--watch', 'Run a scms server on port localhost:8008' ) do
+     options[:watch] = true
+  end
+
+  options[:publish] = false
+  opts.on( '-p', '--publish', 'Deploy site to S3' ) do
+     options[:publish] = true
+  end
+
+  opts.on('-o', '--config ConfigDir', "Configeration directory if different from Website (defaults to ./)") do |c|
+    options[:configdir] = c
+  end
    
   options[:mode] = "pub"
-  opts.on( '-m', '--mode MODE', 'CMS or Publish (for use with Air-Monkey: http://ipassexam.github.io/Air-Monkey/)' ) do|m|
+  opts.on( '-m', '--mode Mode', 'CMS or Publish (for use with Air-Monkey: http://ipassexam.github.io/Air-Monkey/)' ) do|m|
      options[:mode] = m
   end
 
@@ -68,24 +83,33 @@ optparse.parse!
 #Set globals
 $stdout.sync = true
 root_folder = File.expand_path("../", File.dirname(__FILE__))
-website = ((options[:website].nil?) ? Dir.pwd : options[:website]).to_path
-$website = website
 Folders = {
   :root => root_folder,
-  :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,
+  :website => options[:website],
+  :destination => (options[:destination] or ENV["SCMS_PUBLISH_FOLDER"] or '').to_path,
+  :config => (options[:configdir] or ENV["SCMS_CONFIG_FOLDER"] or options[:website]),
   :assets => File.join(root_folder, "assets")
 }
+$website = Folders[:website]
+
+ScmsUtils.log "System root folder = #{Folders[:root]}"
+ScmsUtils.log "Website folder = #{Folders[:website]}"
+ScmsUtils.log "Destination dir = #{Folders[:destination]}"
+ScmsUtils.log "Config dir = #{Folders[:config]}"
+ScmsUtils.log "Mode = #{options[:mode]}"
 
-if options[:action] == "create"
-    if File.exists?(File.join(Folders[:website], "_config.yml"))
+raise "Invalid working directory! #{Folders[:website]}" if !File::directory?(Folders[:website])
+
+if options[:create] != nil
+    puts "Creating scms website: #{options[:create]}"
+    newWorkingDir = File.join(Folders[:website], options[:create])
+    if File.exists?(File.join(newWorkingDir, "_config.yml"))
     #if Dir.exists? Folders[:website]
          "Website already exists!!!"
     else
-        puts "Making website: #{Folders[:website]}"
-        FileUtils.mkdir_p Folders[:website]
-        FileUtils.cp_r(Dir["#{File.join(Folders[:assets], "blank-template")}/*"], Folders[:website])
+        puts "Making website: #newWorkingDir}"
+        FileUtils.mkdir_p newWorkingDir
+        FileUtils.cp_r(Dir["#{File.join(Folders[:assets], "blank-template")}/*"], newWorkingDir)
     end
     exit
 end
@@ -94,31 +118,23 @@ monkeyhook = File.join(Folders[:website], "scripts", "air-monkey-hook.js")
 if options[:mode] == "cms"
   FileUtils.cp(File.join(Folders[:assets], "air-monkey-hook.js"), monkeyhook)
 else
-  FileUtils.rm(monkeyhook) if File.exist?(monkeyhook) && options[:action] == "deploy"
+  FileUtils.rm(monkeyhook) if File.exist?(monkeyhook) && options[:publish]
 end
 
-#ScmsUtils.log "System root folder = #{Folders[:root]}"
-#ScmsUtils.log "Website folder = #{Folders[:website]}"
-#ScmsUtils.log "Pub dir = #{Folders[:pub]}"
-#ScmsUtils.log "Config dir = #{Folders[:config]}"
-#ScmsUtils.log "Mode = #{options[:mode]}"
-
-raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:website])
-Scms.upgrade(Folders[:website])
 Scms.build(Folders[:website], Folders[:config], options[:mode])
-Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
+Scms.copywebsite(Folders[:website], Folders[:destination]) if Folders[:destination] != ''
 
 threads = []
 if options[:server]
   threads << Thread.new {
-    ScmsServer.start(8088, Folders[:website])
+    ScmsServer.start(Folders[:website], options[:port])
   }
 end
 
-if options[:action] == "watch"
+if options[:watch]
   #watcher = Thread.new {
     require 'filewatcher'
-    FileWatcher.new(["_views", "_templates", "_source"], "Watching for changes in _views, _templates or _source").watch do |filename|
+    FileWatcher.new(["_views", "_layouts", "_templates", "_source"], "Watching for changes in _views, _layouts or _source").watch do |filename|
       puts "Updated " + filename
       Scms.build(Folders[:website], Folders[:config], options[:mode])
     end
@@ -126,8 +142,13 @@ if options[:action] == "watch"
   #watcher.join
 end
 
-mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
-S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"
+if options[:publish]
+  if File.exists?(File.join(Folders[:config], "_s3config.yml"))
+    puts "Deploying to S3"
+    mimetypefile = File.join(Folders[:assets], "mime.types")   
+    S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) 
+  end
+end
 
 # join web server thread if it hasn't been used with watch action 
 threads.each { |t|

data/bin/scms-server

@@ -19,9 +19,9 @@ optparse = OptionParser.new do|opts|
   # Set a banner, displayed at the top of the help screen.
   opts.banner = "Usage: scms-server [options]"
    
-  options[:dir] = Dir::pwd
-  opts.on( '-d', '--dir DIR', 'Document Root of http server [default = current working dir]' ) do|d|
-     options[:dir] = d
+  options[:website] = Dir::pwd
+  opts.on( '-s', '--source DIR', 'Document Root of http server [default = current working dir]' ) do|d|
+     options[:website] = d
   end
 
   options[:port] = 8008
@@ -29,10 +29,10 @@ optparse = OptionParser.new do|opts|
      options[:port] = p
   end
 
-  # options[:host] = "localhost"
-  # opts.on( '-h', '--host HOST', 'http host for http server [default = localhost]' ) do|h|
-  #    options[:host] = h
-  # end
+  options[:host] = Socket.gethostname
+  opts.on( '-h', '--host HOST', 'http host for http server [default = localhost]' ) do|h|
+     options[:host] = h
+  end
 
   options[:version] = false
   opts.on( '-v', '--version', 'Output scms version' ) do
@@ -48,8 +48,7 @@ end
 optparse.parse!
 
 #puts "Working dir: #{Dir::pwd}"
-#puts "Doc root: #{options[:dir]}"
+#puts "Doc root: #{options[:website]}"
  
-port = options[:port]
-ScmsServer.start(port, options[:dir])
+ScmsServer.start(options[:website], options[:port], options[:host])
 exit

data/lib/scms.rb

@@ -396,8 +396,8 @@ module Scms
         end
     end
 
-    def Scms.upgrade(website)
-        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
+    # def Scms.upgrade(website)
+    #     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

data/lib/scms/scms-httpserver.rb

@@ -4,13 +4,17 @@ require 'launchy'
 module ScmsServer
 	include WEBrick
 
-	def ScmsServer.start(port, root_document)
+	def ScmsServer.start(root_document, port, hostname="localhost")
 
-		puts "Starting server: http://#{Socket.gethostname}:#{port}"
+		puts "Starting server: http://#{hostname}:#{port}"
 		#:BindAddress
-		server = HTTPServer.new(:Port=> port, :DocumentRoot=> root_document)
+		server = HTTPServer.new(
+			:DocumentRoot => root_document,
+			:Port => port, 
+			:BindAddress => hostname
+		)
+
 		mime_types_file = File.expand_path('../../assets/mime.types', File.dirname(__FILE__))
-		puts mime_types_file
 		WEBrick::HTTPUtils::load_mime_types(mime_types_file)
 
 		trap("INT"){ 
@@ -19,14 +23,23 @@ module ScmsServer
 		  exit!
 		}
 
-		uri = "http://localhost:#{port}"
+		uri = "http://#{hostname}:#{port}"
 		Launchy.open( uri ) do |exception|
 		  puts "Attempted to open #{uri} and failed because #{exception}"
 		end
 
-		server.start
-
-		return server
+		begin
+			server.start
+		rescue SystemExit, Interrupt
+			puts "Closing web brick"
+			server.start
+		rescue StandardError => e
+			puts "StandardError"
+			server.shutdown
+		rescue Exception => e
+			puts "scms-server exception"
+			rais e
+		end
 	end
 
 end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -139,21 +139,21 @@ files:
 - Rakefile
 - assets/air-monkey-hook.js
 - assets/blank-template/_config.yml
+- assets/blank-template/_layouts/skin.erb.html
 - assets/blank-template/_s3config.template.yml
-- 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/_source/scripts/bootstrap.js
+- assets/blank-template/_source/scripts/script.js
+- assets/blank-template/_source/stylesheets/bootstrap-responsive.css
+- assets/blank-template/_source/stylesheets/bootstrap.css
+- assets/blank-template/_source/stylesheets/style.css
+- 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/js/jquery-1.8.2.min.js
 - assets/blank-template/robots.txt
-- 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
 - assets/yuicompressor/readme
 - bin/scms