scms 2.1.7 → 2.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzMwZjY1MzA5N2NhODYwMjIyY2MyZmYzNTE1NmFlZmUyMmE0YzI4MA==
+    MGFkN2Y3YjM3MjE4OTBlYjFlZjJhMTJjMGFlYjAyZjI2N2JiMzRmZg==
   data.tar.gz: !binary |-
-    OTIyN2Q2MjI4ZjYzMTU1NDVmM2RkZjk0MDIyNzQ5MmQ0NTk1ZDgzNA==
+    NGVjMGQzOWQ0YzE3OGQwMzkxNmQ4ODQzMjcyOTI5OGU0MTE5MzczOQ==
 SHA512:
   metadata.gz: !binary |-
-    NzRkNDZlOWUwNWY1MTBjOGViMzFmY2ZmNjZiOWIzZTM5NmI5Y2FjMWEyOWVi
-    N2NjMjI4NDlmM2U1YmY3NjZjNTdkNTdmYTk4YTM5NTBiMDAyNzI4NDE4ODc3
-    MTFiMzk0MTAxMjRhNWMzYjZjMDY3OWNjOGY1MGZkNjNlNDYzYWI=
+    MGU5ZWQxNWY0MWNlMjE2YjJjZWJlNjY2Y2E0NmQ3NjJiNTRmNWNiY2FjYTI0
+    NGFmMjE0MWE2OTE1ODEwMTFlMjRkZTI4NmNiNWQ2MDFkMjFlMTZhYjVmZmMz
+    MzlhZjA2NDMxMGZiMTQ5MWU1MDU0ZmYxYmM4MWE5ZDU1MWM3NGQ=
   data.tar.gz: !binary |-
-    NWE5ODA5YWEzNzlkM2FkYmIxNGQzNzc1MWYyMmFmZDgxNzYwYjk0YjhhY2Q0
-    ODlhZDg2MTM5ZGZlNTc5YmZhZWY2MjFkZDA5MzljZDQ1MzhhNWE2YjIxYWVh
-    MmMwMmUyYTE4NDE2ODljZDg1ZjA1YTA4NGRiMjBhMjkxYmE3ZDg=
+    NTFmNGIyODQ2NTI0YmQxNTEzNDA3NjMyN2RkN2E3Yzc3Mzk4NTZhMDMwYTQ2
+    MzI5MzE1ZDE3NDk3ZmVhMWY0YmNhYjVmZGM2ZGYyMDljODA5MDk2ZTAzYTdj
+    ODQ2NTFkMzU0ZjMwNTA3OTk1MjZmOGM3ZGJjYzNjNjg0NDYwOTM=

data/bin/scms

@@ -24,15 +24,15 @@ optparse = OptionParser.new do|opts|
   opts.banner = "Usage: scms [options]"
  
   # Define the options, and what they do
-  opts.on('-w', '--website WEBSITE', "Website directory (full path)") do |w|
+  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 (full path)") do |c|
+  opts.on('-c', '--config CONFIGDIR', "Configeration directory if different from Website (defaults to ./)") do |c|
     options[:configdir] = c
   end
   
-  opts.on('-o', '--output BuildDIR', "Website build dir (full path)") do |o|
+  opts.on('-o', '--output BuildDIR', "Website build dir (defaults to ./)") do |o|
     options[:pub] = o
   end
  
@@ -47,7 +47,7 @@ optparse = OptionParser.new do|opts|
   end
    
   options[:mode] = "pub"
-  opts.on( '-m', '--mode MODE', 'CMS or Publish' ) 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
 
@@ -107,23 +107,33 @@ Scms.upgrade(Folders[:website])
 Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
 
+threads = []
+
 if options[:server]
-  if system('scms-server --dir "#{Folders[:website]}"')
-    puts "Launched scms-server"
-  else
-    puts "Close scms-server?"
-  end
+  threads << Thread.new {
+    if system('scms-server')
+      puts "Launched scms-server"
+    else
+      puts "Stop scms?"
+      abort
+    end
+  }
 end
 
 if options[:action] == "watch"
-  require 'filewatcher'
-  FileWatcher.new(["_views", "_templates", "_source"], "Watching for changes in _views, _templates or _source").watch do |filename|
-    puts "Updated " + filename
-    Scms.build(Folders[:website], Folders[:config], options[:mode])
-  end
+  watcher = Thread.new {
+    require 'filewatcher'
+    FileWatcher.new(["_views", "_templates", "_source"], "Watching for changes in _views, _templates or _source").watch do |filename|
+      puts "Updated " + filename
+      Scms.build(Folders[:website], Folders[:config], options[:mode])
+    end
+  }
+  watcher.join
 end
 
 mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
 S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"
 
-Process.exit!(true)
+threads.each { |t|
+  t.join 
+}

data/bin/scms-server

@@ -14,8 +14,6 @@ require "scms/version"
 require 'webrick'
 require 'launchy'
 
-puts "Working dir: #{Dir::pwd}"
-
 options = {}
 optparse = OptionParser.new do|opts|
   # Set a banner, displayed at the top of the help screen.
@@ -26,16 +24,16 @@ optparse = OptionParser.new do|opts|
      options[:dir] = d
   end
 
-  # options[:host] = "localhost"
-  # opts.on( '-h', '--host HOST', 'http host for http server [default = localhost]' ) do|h|
-  #    options[:host] = h
-  # end
-
   options[:port] = 8008
   opts.on( '-p', '--port PORT', 'port for http server [default = 8008]' ) do|p|
      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[:version] = false
   opts.on( '-v', '--version', 'Output scms version' ) do
      puts "Version: #{Scms::VERSION}"
@@ -48,7 +46,9 @@ optparse = OptionParser.new do|opts|
    end
 end
 optparse.parse!
-puts "Doc root: #{options[:dir]}"
+
+#puts "Working dir: #{Dir::pwd}"
+#puts "Doc root: #{options[:dir]}"
 
 include WEBrick
  
@@ -63,8 +63,5 @@ Launchy.open( uri ) do |exception|
   puts "Attempted to open #{uri} and failed because #{exception}"
 end
 
-begin
-  server.start
-ensure
-  server.shutdown
-end
+server.start
+exit

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.1.7"
+  VERSION = "2.1.8"
 end

metadata

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