scms 2.1.9 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTc2YTNmNTI2ZGViMzNmOTZlZmMxODRkMWIyOTBiY2NlZTAzYzEyMw==
+    Y2U2M2M3ZmZkYjFjZTkxMTU5MzliYmMxMGNkM2UyNWUzODkzMzA0Zg==
   data.tar.gz: !binary |-
-    MDc4NWJiZjM2ZDIxZjg5MjEwM2I1YmI4NDAxMTQyYWNhYzIwODBhNA==
+    YmYyMDJiNDM1MDNlYWY5ZTNlOWYyODE1MGU0NjkzYmRhODVlYWU3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    MjY1Mzg4ZmFiODdmY2YzMGRiZDg1OTNlYzczNjc2YTU1MDMzNTEyMDIxOGI1
-    OGQ5MWYxNDYwOWI2YzNjOGViZTc4MTE2ZmI5MzNiNjZkYmEwZWNiYjUwZDYw
-    ZTkxOWQ5YWU3MGExNGE5NGMzNzhmNmQ0MjM1OTNmZjgzYTY5MzI=
+    Njg2MTdjMTUxYzhkMmRlYTQ3ZTRmMDA0Njk2MzQxZWQ0NmIyZTM2ODZjMGU4
+    ZjRiN2U3ODRkMzNhZDZiOTkzZjY1YWUyMTZjYzc5MDJmMWMwMDZiYTg0NGYy
+    YWVlMGI3MjgxMWU1ZDIzZjAzNzc4Yzg0OWRiZTBkYzRmNmI1Y2E=
   data.tar.gz: !binary |-
-    ZDU1NjFkOGMyNDNjMDNhOTE0YjczZGNiNjU2YjMxMmM0NDk3NDU0N2Q5NGQw
-    ZDE3ZTExZWFkMzdkYWU3ODJlZjAxZDVjZGEyYjZlYjBjMjhlMTViNzM0MTRi
-    OWZjYzQ3YzM0ZDgxMzFlNzNjOWU1YWQ5YjNjMDJiZjQ5N2EzMjI=
+    YmU0NTYxNGQ5MjE1ZDllZGI0NTNhZDE4Zjk3MWFiNDIxYTM4Y2RkMDIwYTU1
+    OTU2ZWI5Y2FhZjY3ZGM3MGQxNTM5YzdiODZkMmMyYmZjOGI1OTczOTkyYjhm
+    NTMxYmIzZjk1ZjkyODNiZTU3N2ViOTc5OTBiNjc2ZDhhYWVjYmU=

data/bin/scms

@@ -11,6 +11,7 @@ require 'optparse'
 require 'fileutils'
 require 'Scms'
 require "scms/version"
+require 'scms/scms-httpserver.rb'
 
 class String
   def to_path(end_slash=false)
@@ -108,32 +109,27 @@ Scms.build(Folders[:website], Folders[:config], options[:mode])
 Scms.copywebsite(Folders[:website], Folders[:pub]) if Folders[:pub] != nil
 
 threads = []
-
 if options[:server]
   threads << Thread.new {
-    if system('scms-server')
-      puts "Launched scms-server"
-    else
-      puts "Stop scms?"
-      abort
-    end
+    ScmsServer.start(8088, Folders[:website])
   }
 end
 
 if options[:action] == "watch"
-  watcher = Thread.new {
+  #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
+  #}
+  #watcher.join
 end
 
 mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
 S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"
 
+# join web server thread if it hasn't been used with watch action 
 threads.each { |t|
-  t.join 
+  t.join
 }

data/bin/scms-server

@@ -11,8 +11,8 @@ require 'optparse'
 require 'fileutils'
 require 'Scms'
 require "scms/version"
-require 'webrick'
-require 'launchy'
+require 'scms/scms-httpserver.rb'
+
 
 options = {}
 optparse = OptionParser.new do|opts|
@@ -49,23 +49,7 @@ optparse.parse!
 
 #puts "Working dir: #{Dir::pwd}"
 #puts "Doc root: #{options[:dir]}"
-
-include WEBrick
  
 port = options[:port]
-puts "Starting server: http://#{Socket.gethostname}:#{port}"
-#:BindAddress
-server = HTTPServer.new(:Port=>port,:DocumentRoot=>options[:dir])
-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"){ server.shutdown }
-
-uri = "http://localhost:#{port}"
-Launchy.open( uri ) do |exception|
-  puts "Attempted to open #{uri} and failed because #{exception}"
-end
-
-server.start
+ScmsServer.start(port, options[:dir])
 exit

data/lib/scms/scms-httpserver.rb

@@ -0,0 +1,32 @@
+require 'webrick'
+require 'launchy'
+
+module ScmsServer
+	include WEBrick
+
+	def ScmsServer.start(port, root_document)
+
+		puts "Starting server: http://#{Socket.gethostname}:#{port}"
+		#:BindAddress
+		server = HTTPServer.new(:Port=> port, :DocumentRoot=> root_document)
+		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"){ 
+		  puts "Closed http server"
+		  server.shutdown
+		  exit!
+		}
+
+		uri = "http://localhost:#{port}"
+		Launchy.open( uri ) do |exception|
+		  puts "Attempted to open #{uri} and failed because #{exception}"
+		end
+
+		server.start
+
+		return server
+	end
+
+end

data/lib/scms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0
 platform: ruby
 authors:
 - Courtenay Probert
@@ -161,6 +161,7 @@ files:
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
+- lib/scms/scms-httpserver.rb
 - lib/scms/scms-utils.rb
 - lib/scms/version.rb
 - lib/scms/yui.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.6
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Create simple static websites, in a jiffy