scms 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0f12ee53bf634617b6078d2ab7a5746edfc26af
-  data.tar.gz: 74287cbcb52b4e34f82c8dda6290e7de0ec8c661
+  metadata.gz: 67aeb5520c7e409fe81f50e84e3c02bad04ff364
+  data.tar.gz: 4aa673d9e4eac14fa353de89c0d1738a89cf9d5f
 SHA512:
-  metadata.gz: 13f00edeee34e23e6ce79e0dbf002e83e7a9b0bf8d74ffff286903ad1f7768c8c98702c9c02da5388661962aebe1f51dd423976bb25983ceedaf9ec19c46c4bd
-  data.tar.gz: 765a78126f55b89fe08ae294045804e1b67c40f4d2069ab258c0711a34df7f5ea6054d3f85fd3743379d57796fd4195a9df8bcb4db78526d15be2c48da8b33ba
+  metadata.gz: 7242e1999abbde3814f56370c65631ac4cfd362cb137aa59e20ba6841373be4362936a6c28e75c184a786d7ee57da0be618eb4c7444a1fa3d83707960f2a6874
+  data.tar.gz: c85a647d2ba582bb952392d56c77a466adb5ea626aaf8852347e23883daeb368b3d17cf295711f8f558281247cf67ed4cbf613a63748ab15dade88c082275534

data/bin/scms

@@ -10,6 +10,7 @@
 require 'optparse'
 require 'fileutils'
 require 'Scms'
+require "scms/version"
 
 class String
   def to_path(end_slash=false)
@@ -46,13 +47,15 @@ optparse = OptionParser.new do|opts|
      options[:mode] = m
   end
 
-  options[:verbose] = false
-  opts.on( '-v', '--verbose', 'Output more information' ) do
-     options[:verbose] = true
+  options[:version] = false
+  opts.on( '-v', '--version', 'Output scms version' ) do
+     puts "Version: #{Scms::VERSION}"
+     exit
   end
   # This displays the help screen, all programs are
   # assumed to have this option.
    opts.on( '-h', '--help', 'Display this help screen' ) do
+     puts "Default action = build; default website directory = current working directory"
      puts opts
      exit
    end
@@ -88,7 +91,7 @@ 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)
+  FileUtils.rm(monkeyhook) if File.exist?(monkeyhook) && options[:action] == "deploy"
 end
 
 #ScmsUtils.log "System root folder = #{Folders[:root]}"
@@ -101,5 +104,15 @@ raise "No website in folder #{Folders[:website]}" if !File::directory?(Folders[:
 Scms.upgrade(Folders[:website])
 Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
+
+if options[:action] == "watch"
+  require 'filewatcher'
+  puts "Setting up watcher"
+  FileWatcher.new(["_views"],"Watching files:").watch do |filename|
+    puts "Updated " + filename
+    Scms.build(Folders[:website], Folders[:config], options[:mode])
+  end
+end
+
 mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
 S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"

data/lib/scms.rb

@@ -197,6 +197,9 @@ module Scms
 
                         monkeyhook = "";
                         monkeyhook = "<script src='scripts/air-monkey-hook.js'></script>" if @mode == "cms"
+
+                        livereload = ""
+                        livereload = "<script>document.write('<script src=\"http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1\"></' + 'script>')</script>" if @mode != "deploy"
                         
                         pagemodel = Hash.new
                         pagemodel = { 
@@ -212,7 +215,8 @@ module Scms
                             :navigation => navigation,
                             :data => pagedata,
                             :rootdir => @website, 
-                            :monkeyhook => monkeyhook
+                            :monkeyhook => monkeyhook,
+                            :livereload => livereload
                         }
 
                         break if pageconfig["generate"] == nil

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/scms.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "maruku"
   spec.add_dependency "sass"
   spec.add_dependency "packr"
+  spec.add_dependency "filewatcher"
+  #spec.add_dependency "guard-livereload"
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: filewatcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.3
 signing_key: 
 specification_version: 4
 summary: Create simple static websites, in a jiffy