scms 3.0.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2IxN2JkZDQ2YzcxZGZkZmYzZmQxNzAzZTNlMTI2NDkwODJhODdhMA==
+    MzkwY2RiZDFhZmJiNzA3NjFmYzI0MWFhMTFlMGVkMDk2NDMwNGU5ZA==
   data.tar.gz: !binary |-
-    Y2NiYWI5MzQwNWRhMGY1MWY3ZTg1ZmY3MWU4NjA1ODg5MTM2OWViZA==
+    NDk2YjU2ZDRhYTA5NTdkMTYzYjY3NTBmMzRiOGEyODI3N2E1N2EzZA==
 SHA512:
   metadata.gz: !binary |-
-    NmM1ODZlMWYxZWQ1YzE5NGY3ZWUyZDM0ZTZhMmRkOGJlNTUzYzZlODI0ZWY1
-    YTJiMThiYjEwOTllYTViYTRmYzhjMDNiNGYyMWViNTcyMjA4NGU3ZjMyODk3
-    YzM4NTg0ZjliOWU0ZTEzOGQ3MDNmMDZlYjExYWQyMDY0NTM0NDE=
+    NjRhYTU4MmEzZjFkN2ZmZGIzNTdmMDhiOTFlMDI3NTEwMjNiYTMzZjRkOWQ0
+    YjA0Y2UwZTIwYWQ1NTk2ZjNjN2JhOTViYTJhNjZlZjBkMjViOWVkNmRhMjM0
+    YzJiZDFhMTY2MjQ1MzI2OWRkOGRkYmZmYjk2NTY5NmY0YTJmNTk=
   data.tar.gz: !binary |-
-    ZmI4MjJlNjliMjQ4NWNmNGRiZjljYjE2ZDA3NzkwNWJhZmUwM2U5MTlmODg4
-    MzE3OTIzMWQzZjAxNjM0NWIyMmMwYjQ4YWU3ODJmMDU3MTU1YmFhMjVkODhi
-    N2Q3ZWExNjFlMWFhZGMwNDZjZmFkMTk2MTBmM2NmMmE4NWNhYmI=
+    ZTg2MjViMGUwMzQ5NDVlMzlkZTYxNzJlZjAyMjQ2ZDliNzAyNTM3YmVkZDkw
+    ZjI2MGNkMTdmYTQyZWFhODZiYTk2ZDBmYWJiY2RkNzgyN2Q2YzczNTY3ZTUz
+    ZjI0ZTAyZDViOTFjYTAzNjg2NTJiMmIwMTEzZTUzN2Y2NjkzYmE=

data/README.md

@@ -2,35 +2,20 @@ A static website CMS
 ====================
 
 If you need to build a quick html website but don't want to maintain each page independantly Static-CMS could be for you.
-StaticCMS is a static website builder that creates html files from an eruby template.  This facilitates the management of the skin/theme from a single file.
+StaticCMS is a static website builder that creates html files from an eruby template.  This facilitates the management of the layout/skin/theme from a single file.
 It also has a few nifty features such as JavaScript and CSS bundeling and minimisation
 When your happy with your website StaticCMS will also deploy to AmazonS3 setting approperate caching settings.
 
 Find it useful? Then let me know: https://twitter.com/c_probert
 
-### Installing 
-
-    gem install scms
-
-### Creating a website 
-
-    scms -a create -w /path/to/folder
-
-_(if the -w flag is excluded it assumes current directory)_
-
-### Building your website 
-
-    scms -a build -w /path/to/folder
-    
-_(if the -a flag is excluded defult action is 'build')_
-
-### Publishing your website 
-
-    scms -a deploy -w /path/to/folder
-
+	gem install scms
+	scms --create mynewsite
+	cd mynewsite
+	scms --serve
 
 Further Reading
 ---------------
 
- * Homepage: http://cprobert.github.io/Static-CMS/
+ * Homepage: http://cprobert.github.io/Static-CMS
+ * WYSIWYG editor: http://ipassexam.github.io/Air-Monkey/
  * ERB template language: http://www.stuartellis.eu/articles/erb/

data/bin/scms

@@ -90,13 +90,18 @@ Folders = {
   :config => (options[:configdir] or ENV["SCMS_CONFIG_FOLDER"] or options[:website]),
   :assets => File.join(root_folder, "assets")
 }
+# These can be used in the bootstrap.rb 
 $website = Folders[:website]
+$watch = options[:watch]
+$cmsmode = options[:mode] == "cms"
 
-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]}"
+configfile = File.join(Folders[:website], "_config.yml")
+
+# 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]}"
 
 raise "Invalid working directory! #{Folders[:website]}" if !File::directory?(Folders[:website])
 
@@ -124,22 +129,35 @@ end
 Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:destination]) if Folders[:destination] != ''
 
-threads = []
-if options[:server]
-  threads << Thread.new {
-    ScmsServer.start(Folders[:website], options[:port])
-  }
-end
-
 if options[:watch]
-  #watcher = Thread.new {
-    require 'filewatcher'
-    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])
+    require "Listen"
+
+    psst = []
+    #psst.push("_config.yml")# if File.exists?(configfile)
+    psst.push("_views") if File.directory? "_views"
+    psst.push("_layouts") if File.directory? "_layouts"
+    psst.push("_templates") if File.directory? "_templates"
+    psst.push("_source") if File.directory? "_source"
+    psst.push("_resources") if File.directory? "_resources"
+
+    puts "Setting up listen"
+    listener = Listen.to(psst, force_polling: true ) do |modified, added, removed|
+      puts "modified: #{modified}" if modified.length > 0
+      puts "added: #{added}" if added.length > 0
+      puts "removed: #{removed}" if removed.length > 0
+
+      Scms.build(Folders[:website], Folders[:config], options[:mode]) if modified.length > 0
     end
-  #}
-  #watcher.join
+    trap("INT"){ 
+      puts "Closing file watcher"
+      listener.stop
+    }
+    listener.start # not blocking
+    sleep unless options[:server]
+end
+
+if options[:server]
+    ScmsServer.start(Folders[:website], options[:port])
 end
 
 if options[:publish]
@@ -148,9 +166,4 @@ if options[:publish]
     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|
-  t.join
-}
+end

data/lib/scms/scms-httpserver.rb

@@ -20,7 +20,7 @@ module ScmsServer
 		trap("INT"){ 
 		  puts "Closed http server"
 		  server.shutdown
-		  exit!
+		  #exit!
 		}
 
 		uri = "http://#{hostname}:#{port}"

data/lib/scms/version.rb

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

data/scms.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "maruku"
   spec.add_dependency "sass"
   spec.add_dependency "packr"
-  spec.add_dependency "filewatcher"
+  spec.add_dependency "listen"
   spec.add_dependency "webrick"
   spec.add_dependency "launchy"
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: filewatcher
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.7
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Create simple static websites, in a jiffy