scms 2.1.5 → 2.1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg2MjIwNjIwYTc1MjEzZjUyMDNhMzA0ODBmZGZjOGIxMzY3M2UwYg==
+    MWY0MWZjZGU0MmJjYWZmZDE1ZTc3MGI3MDQ4MjRjZGMwMmVlMDhkNg==
   data.tar.gz: !binary |-
-    ZWVkOWZkNTcyMTVkN2ZiZDQ5MmZmMWJmNzMxY2I5YzI4NTFhMDNiNw==
+    N2YwMDFmMzE0NDM1NDRmNjI3YjBiMTlmNTM2MWU3OTY1MjZhYTIxNA==
 SHA512:
   metadata.gz: !binary |-
-    ODYzMWViZDExOGUxZDJkOTMwMTgzMGRmNThlZDg2M2Q5NTU4MGNmODc0M2Ey
-    NmIxNDY2ZDE3OTRmZTZiNzQwY2I5YTdlMDZjYTIwNjVmNWM5NTc2ZDk2Mzg4
-    NWU0NTVlODk4YjkzNmI0YWMwODYyNDU5ZjEzMWQxMDQzOThlZjM=
+    NjYyMGJiNzQ0NDRmNGVjODg0MjgwYjAyNGU4ZDIwOTBlNjQwNjUwNTAxMDgw
+    ZmEyMjAwZjlhNWUyMjI2YzVmYTAyZTZmMWJlZDEzOWViNTdiZDg2YWEyZDg0
+    Yzk1MTRiZmI5YzJiNGI1NTI4ZWM1MmUwMjE2YTM0ODRmNGYyNjU=
   data.tar.gz: !binary |-
-    ODg4ZjM5NzRmZDRiYmNkYzEwNTlmODA4YzQ5NzMyNDE1YTIwNWQwNTY4YTI0
-    MWQyNmUyNjlmZjdlZWQ4NjY4NDZjMGUzNTk0NWUyZmEwODEyYTk5YzZkMjEw
-    MjRjZDdlMzNiM2NmYTZiMzQ4YjZmMWE1MDFhZGFiMzg5M2ViMGM=
+    YmIzZTdkNzBhMWRmZDdkZTlmNTMwODRlYTA1NDdjN2Y4OTRiYjAxZTkzNjJm
+    MjkyMDNjZTgzMTNkNzQ2ZDdiZTFmYTA3MmU4ZWQ0NDE1MGYxNTJhNjI5NGI4
+    NTkzODU0ZDcwNWY0YjRhM2YxMGZjZWU4ODZkZGYzNWU0NDU4M2E=

data/bin/scms

@@ -20,9 +20,8 @@ end
 
 options = {}
 optparse = OptionParser.new do|opts|
-  # Set a banner, displayed at the top
-  # of the help screen.
-  opts.banner = "Usage: Scms [options]"
+  # Set a banner, displayed at the top of the help screen.
+  opts.banner = "Usage: scms [options]"
  
   # Define the options, and what they do
   opts.on('-w', '--website WEBSITE', "Website directory (full path)") do |w|
@@ -41,19 +40,22 @@ optparse = OptionParser.new do|opts|
    opts.on( '-a', '--action ACTION', 'build, deploy, listen or create' ) do|a|
      options[:action] = a
   end
+
+  options[:server] = false
+  opts.on( '-s', '--server', 'Run a scms server on port localhost:8008' ) do
+     options[:server] = true
+  end
    
   options[:mode] = "pub"
   opts.on( '-m', '--mode MODE', 'CMS or Publish' ) do|m|
      options[:mode] = m
   end
 
-  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.
+  # 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
@@ -105,13 +107,23 @@ 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] == "listen"
+if options[:server]
+  Dir.chdir(Folders[:website]) do
+    Thread.new {
+      %x("scms-server")
+    }
+  end
+end
+
+if options[:action] == "watch"
   require 'filewatcher'
-  FileWatcher.new(["_views", "_templates", "_source"],"Watching files:").watch do |filename|
+  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
 end
 
 mimetypefile = File.join(Folders[:root], "assets", "mime.types")   
-S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"
+S3Deploy.sync(Folders[:website], Folders[:config], mimetypefile) if options[:action] == "deploy"
+
+Process.exit!(true)

data/bin/scms-server

@@ -0,0 +1,67 @@
+#!/usr/bin/env ruby
+# This software code is made available "AS IS" without warranties of any
+# kind.  You may copy, display, modify and redistribute the software
+# code either by itself or as incorporated into your code; provided that
+# you do not remove any proprietary notices.  Your use of this software
+# code is at your own risk and you waive any claim against the author
+# with respect to your use of this software code.
+# (c) 2007 Static-CMS
+
+require 'optparse'
+require 'fileutils'
+require 'Scms'
+require "scms/version"
+require 'webrick'
+require 'launchy'
+
+options = {}
+optparse = OptionParser.new do|opts|
+  # Set a banner, displayed at the top of the help screen.
+  opts.banner = "Usage: scms-server [options]"
+   
+  options[:dir] = Dir::pwd
+  opts.on( '-d', '--dir DIR', 'Document Root of http server [default = current working dir]' ) do|d|
+     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[: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 opts
+     exit
+   end
+end
+optparse.parse!
+
+include WEBrick
+ 
+port = options[:port]
+puts "Starting server: http://#{Socket.gethostname}:#{port}"
+#:BindAddress
+server = HTTPServer.new(:Port => port, :DocumentRoot => options[:dir])
+trap("INT"){ server.shutdown }
+
+uri = "http://localhost:#{port}"
+Launchy.open( uri ) do |exception|
+  puts "Attempted to open #{uri} and failed because #{exception}"
+end
+
+begin
+  server.start
+ensure
+  server.shutdown
+end

data/lib/scms/version.rb

@@ -1,3 +1,3 @@
 module Scms
-  VERSION = "2.1.5"
+  VERSION = "2.1.6"
 end

data/scms.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "scms"
   spec.version       = Scms::VERSION
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 1.9.1'
 
   spec.authors       = ["Courtenay Probert"]
   spec.email         = ["courtenay@probert.me.uk"]
@@ -17,6 +17,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
+
+  spec.files.grep(%r{^bin/.*}) { |f| 
+    puts "exe: #{f}"
+  }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -28,7 +32,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sass"
   spec.add_dependency "packr"
   spec.add_dependency "filewatcher"
+  spec.add_dependency "webrick"
+  spec.add_dependency "launchy"
   
-  spec.add_development_dependency "bundler", "~> 1.3"
+  #spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scms
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Courtenay Probert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cprobert-s3sync
@@ -81,19 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,7 @@ email:
 - courtenay@probert.me.uk
 executables:
 - scms
+- scms-server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -142,6 +157,7 @@ files:
 - assets/mime.types
 - assets/yuicompressor/readme
 - bin/scms
+- bin/scms-server
 - build commands.txt
 - lib/scms.rb
 - lib/scms/s3deploy.rb
@@ -161,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='