scms 3.0.1 → 3.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzkwY2RiZDFhZmJiNzA3NjFmYzI0MWFhMTFlMGVkMDk2NDMwNGU5ZA==
+    YmEyNWY2NzYyNjE4NzNiODllNDFlMjFhZTIyMTRhM2YwNWUzNWQ2MQ==
   data.tar.gz: !binary |-
-    NDk2YjU2ZDRhYTA5NTdkMTYzYjY3NTBmMzRiOGEyODI3N2E1N2EzZA==
+    NjYyNDhmNTEwOTQyZThmNWY1NDRjYTI3YjE4NDM1MjgyODRlY2M4Mg==
 SHA512:
   metadata.gz: !binary |-
-    NjRhYTU4MmEzZjFkN2ZmZGIzNTdmMDhiOTFlMDI3NTEwMjNiYTMzZjRkOWQ0
-    YjA0Y2UwZTIwYWQ1NTk2ZjNjN2JhOTViYTJhNjZlZjBkMjViOWVkNmRhMjM0
-    YzJiZDFhMTY2MjQ1MzI2OWRkOGRkYmZmYjk2NTY5NmY0YTJmNTk=
+    MTEyYjNjMzk3NWZkYTk4NTJhZTc2Y2QxODQ3YTQyNTU5NjQ4MGFkYWIyNmE2
+    ZTE4OWE0MmU0YWU3NzExN2YyYzBmYmNiMDhkMDUzYWQ4YTIwNGE3MjU5N2U0
+    NTFjNmViZjMyYTgwZjhmMDJlYmJjOTBlNmM3ZmI1ZGQ4M2M5NjY=
   data.tar.gz: !binary |-
-    ZTg2MjViMGUwMzQ5NDVlMzlkZTYxNzJlZjAyMjQ2ZDliNzAyNTM3YmVkZDkw
-    ZjI2MGNkMTdmYTQyZWFhODZiYTk2ZDBmYWJiY2RkNzgyN2Q2YzczNTY3ZTUz
-    ZjI0ZTAyZDViOTFjYTAzNjg2NTJiMmIwMTEzZTUzN2Y2NjkzYmE=
+    ZjM5NWIyNDg1NGZlYTQ4NzVhNWJkOTM2NzEyZDQ4ZTQ5NjhlMDc0ZWFhM2I3
+    NjY1MmM2NGJlYTc1OTk4MTEzYWVlYzFkYTAyMGU0MWUxOTQzN2ViZGYyMzRh
+    YzY5ZjM3YTBhNDIwMDk0NDllZDQwMDBlYjY0NWM5MGIzMGU0NDY=

data/bin/scms

@@ -130,7 +130,16 @@ Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:destination]) if Folders[:destination] != ''
 
 if options[:watch]
-    require "Listen"
+    require "filewatcher"
+    #  I dont really want to use filewatcher but I can't get listen to watch the config file
+    # I'd use filewatcher to monitor directories but it crashes if a file id deleted
+    watcher = Thread.new {
+      puts "Watching yam files"
+      FileWatcher.new(["_config.yml"]).watch do |filename|
+        puts "Updated " + filename
+        Scms.build(Folders[:website], Folders[:config], options[:mode])
+      end
+    }
 
     psst = []
     #psst.push("_config.yml")# if File.exists?(configfile)
@@ -140,18 +149,15 @@ if options[:watch]
     psst.push("_source") if File.directory? "_source"
     psst.push("_resources") if File.directory? "_resources"
 
+    require "listen"
     puts "Setting up listen"
-    listener = Listen.to(psst, force_polling: true ) do |modified, added, removed|
+    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
-    trap("INT"){ 
-      puts "Closing file watcher"
-      listener.stop
-    }
     listener.start # not blocking
     sleep unless options[:server]
 end

data/lib/scms/scms-httpserver.rb

@@ -1,44 +1,54 @@
 require 'webrick'
 require 'launchy'
+require "scms/scms-utils.rb"
 
 module ScmsServer
 	include WEBrick
 
 	def ScmsServer.start(root_document, port, hostname="localhost")
 
-		puts "Starting server: http://#{hostname}:#{port}"
-		#:BindAddress
-		server = HTTPServer.new(
-			:DocumentRoot => root_document,
-			:Port => port, 
-			:BindAddress => hostname
-		)
-
-		mime_types_file = File.expand_path('../../assets/mime.types', File.dirname(__FILE__))
-		WEBrick::HTTPUtils::load_mime_types(mime_types_file)
-
-		trap("INT"){ 
-		  puts "Closed http server"
-		  server.shutdown
-		  #exit!
-		}
+		portopen = ScmsUtils.port_open? hostname, port
+		puts "Port Open: #{portopen}"
+
+		if !portopen
+			puts "Starting server: http://#{hostname}:#{port}"
+			#:BindAddress
+			server = HTTPServer.new(
+				:DocumentRoot => root_document,
+				:Port => port, 
+				:BindAddress => hostname
+			)
+
+			mime_types_file = File.expand_path('../../assets/mime.types', File.dirname(__FILE__))
+			WEBrick::HTTPUtils::load_mime_types(mime_types_file)
+
+			trap("INT"){ 
+			  puts "Closed http server"
+			  server.shutdown
+			  #exit!
+			}
+		else
+			puts "Server already running on port: #{port}"
+		end
 
 		uri = "http://#{hostname}:#{port}"
 		Launchy.open( uri ) do |exception|
 		  puts "Attempted to open #{uri} and failed because #{exception}"
 		end
 
-		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
+		if !portopen
+			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/scms-utils.rb

@@ -3,11 +3,27 @@ module ScmsUtils
     require 'fileutils'
     require 'open-uri'
 
+    require 'socket'
+    require 'timeout'
+
+    def ScmsUtils.port_open?(ip, port, seconds=1)
+      Timeout::timeout(seconds) do
+        begin
+          TCPSocket.new(ip, port).close
+          true
+        rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+          false
+        end
+      end
+    rescue Timeout::Error
+      false
+    end
+
     def ScmsUtils.getsettings(yamlpath)
         ScmsUtils.log("Loading Config: #{ScmsUtils.uriEncode("file:///#{yamlpath}")}")
         config = nil
 
-##http://snk.tuxfamily.org/log/yaml-json-validation-kwalify-ruby19.html
+        ##http://snk.tuxfamily.org/log/yaml-json-validation-kwalify-ruby19.html
         #'kwalify'
         #schema = Kwalify::Yaml.load_file('some_complex_schema.yaml')
         #validator = Kwalify::Validator.new(schema)

data/lib/scms/version.rb

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

data/scms.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Courtenay Probert
@@ -80,6 +80,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: webrick
   requirement: !ruby/object:Gem::Requirement