vae 0.6.10 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63081ad59417e6e9f40b02e742a226337eb22ba6
-  data.tar.gz: 1e1be82239bd0578f1a90e94f11a26d8a8e7d8bc
+  metadata.gz: acfbc6120a34efdcc155c6893b47538f47bb2da5
+  data.tar.gz: d9ef76554fcab3d7ace9348ab543e701e0708d3b
 SHA512:
-  metadata.gz: a65fe80f05ef6d8904e1184fcdae1ea1daaa9d4b0b9df598f48fd7da74c2f9ace44e8faca3db51db3bd543828b0ddfe5b2e4947852df5cdf8197c7f6fee97c15
-  data.tar.gz: 39d4e419dfdc703648aaeff80b054a44e17ba1b828ac19fc692ae1e46ac8f6cae0120a2576d9faf74499a2fbf62aa7790070469ba1f406f4bc68d83cf9b94f03
+  metadata.gz: 6fa33a2e3bedd4b78cf56cbaedc4e385a8b8230074fb62673718ecf1fc1dcd8f7060bea026c45756b80147593c2f0403d1d04a8f350b9e7caa2b34eb656c2b04
+  data.tar.gz: 84ce9c1c794f5fc18c4228270e25aa9f0861a915dae6ad85bb4cb8ef5483f62aa17484bb9fbc0270377c5c79d47b662d2bd3b6e229d5a8483e15f4a518109907

data/bin/vae

@@ -3,6 +3,36 @@
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 $:.unshift File.dirname(THIS_FILE) + '/../lib'
 
-require 'vae'
+require 'version'
 
-VaeLocal.run_trapping_exceptions!
+require 'rubygems'
+
+require 'cgi'
+require 'digest/md5'
+require 'fileutils'
+require 'json'
+require 'mongrel'
+require 'net/http'
+require 'net/https'
+require 'optparse'
+require 'ptools'
+require 'shellwords'
+require 'thread'
+require 'webrick'
+require 'yaml'
+
+require 'directory_watcher'
+require 'highline/import'
+require 'compass'
+require 'haml'
+
+require 'full_stack'
+require 'logging'
+require 'proxy_server'
+require 'servlet'
+require 'site'
+require 'vae_error'
+require 'vae_site_servlet'
+require 'vae_local'
+
+VaeLocal.run_trapping_exceptions

data/lib/full_stack.rb

@@ -0,0 +1,122 @@
+class FullStack
+  attr_reader :options
+
+  def initialize(site, options)
+    @site = site
+    @options = options
+    @stop = false
+    @pids = []
+  end
+
+  def authenticate
+    req = Net::HTTP::Post.new("/api/local/v1/authorize")
+    req.body = "username=#{CGI.escape(@site.username)}&password=#{CGI.escape(@site.password)}"
+    res = VaeLocal.fetch_from_vaeplatform(@site.subdomain, req)
+    data = JSON.parse(res.body)
+    if data['valid'] == "valid"
+      FileUtils.mkdir_p(@site.data_path)
+      if !File.exists?(@site.data_path + "/assets/")
+        FileUtils.ln_s("#{vae_remote_path}/public", @site.data_path + "/assets")
+      end
+      @site.secret_key = data['secret_key']
+      generation = File.exists?("#{@site.data_path}feed_generation") ? File.open("#{@site.data_path}feed_generation").read.to_i : 0
+      if data['feed_url'] and data['feed_generation'].to_i > generation
+        puts "Downloading updated Site Data Feed..."
+        if curl = File.which("curl")
+          `curl -o #{Shellwords.shellescape(@site.data_path)}feed.xml #{Shellwords.shellescape(data['feed_url'])}`
+        else
+          download_feed(data['feed_url'])
+        end
+        File.open("#{@site.data_path}feed_generation",'w') { |f| f.write(data['feed_generation']) }
+      end
+      File.open("#{@site.data_path}settings.php",'w') { |f| f.write(data['settings']) }
+    else
+      raise VaeError, "Error Connecting to Vae with the supplied Username and Password.  Please make sure this user has Vae Local permissions assigned."
+    end
+  rescue JSON::ParserError
+    raise VaeError, "An unknown error occurred signing into Vae Platform.  Please email support for help."
+  end
+
+  def download_feed(url)
+    url_base = url.split('/')[2]
+    url_path = '/'+url.split('/')[3..-1].join('/')
+    Net::HTTP.start(url_base) { |http|
+      File.open("#{@site.data_path}feed.xml", 'w') { |f|
+        http.get(URI.escape(url_path)) { |str|
+          f.write str
+        }
+      }
+    }
+  end
+
+  def run
+    authenticate
+    launch_daemons
+    trap("INT") { @stop = true }
+    loop { break if @stop; sleep 0.5 }
+    puts "Quit signal received, cleaning up ..."
+    @pids.map { |pid| Process.kill("TERM", pid) }
+  end
+
+  def launch_daemons
+    if VaeLocal.port_open?(9090)
+      @pids << fork {
+        Dir.chdir("#{vae_thrift_path}/rb/")
+        STDOUT.reopen("/dev/null", "w")
+        STDERR.reopen("/dev/null", "w")
+        exec "bundle exec ./vaerubyd.rb"
+      }
+    end
+    port = 9091
+    serve_root = @site.root
+    loop {
+      break if VaeLocal.port_open?(port)
+      port = port + 1
+    }
+    if File.exists?(@site.root + "/.jekyll")
+      serve_root = @site.root + "/_site/"
+      FileUtils.mkdir_p(serve_root)
+      @pids << fork {
+        exec "bundle exec jekyll build --watch --source #{Shellwords.shellescape(@site.root)} --destination #{Shellwords.shellescape(serve_root)}"
+      }
+    end
+    @pids << fork {
+      Dir.chdir("#{vae_thrift_path}/cpp/")
+      ENV['VAE_LOCAL_VAEDB_PORT'] = port.to_s
+      exec "./vaedb --port #{port} --busaddress 'tcp://*:#{port-4000}' --test --log_level #{options[:log_level]}"
+    }
+    @pids << fork {
+      Dir.chdir(serve_root)
+      ENV['VAE_LOCAL_BACKSTAGE'] = @site.subdomain + ".vaeplatform." + (ENV['VAEPLATFORM_LOCAL'] ? "dev" : "com")
+      ENV['VAE_LOCAL_SECRET_KEY'] = @site.secret_key
+      ENV['VAE_LOCAL_DATA_PATH'] = @site.data_path
+      exec "php -c #{vae_remote_path}/tests/dependencies/php.ini -S 0.0.0.0:#{options[:port]} #{vae_remote_path}/lib/index.php"
+    }
+  end
+
+  def vae_remote_path
+    return @vae_remote_path if @vae_remote_path
+    thisdir = File.dirname(__FILE__)
+    [ "#{thisdir}/../../vae_remote", "#{thisdir}/../../../vae_remote", "/usr/local/vae_remote", "/usr/local/opt/vae-thrift", "/usr/local/Cellar/vae_thrift/1.0.0", "~/vae_remote" ].each { |path|
+      if File.exists?(path)
+        return @vae_remote_path = path
+      end
+    }
+    raise VaeError, "Could not find Vae Remote on your system.#{brew_message}"
+  end
+
+  def vae_thrift_path
+    return @vae_thrift_path if @vae_thrift_path
+    thisdir = File.dirname(__FILE__)
+    [ "#{thisdir}/../../vae_thrift", "#{thisdir}/../../../vae_thrift", "/usr/local/vae_thrift", "/usr/local/opt/vae-thrift", "/usr/local/Cellar/vae_thrift/1.0.0", "~/vae_thrift", "#{vae_remote_path}/tests/dependencies/vae_thrift" ].each { |path|
+      if File.exists?(path)
+        return @vae_remote_path = path
+      end
+    }
+    raise VaeError, "Could not find Vae Thrift on your system.#{brew_message}"
+  end
+
+  def brew_message
+    "\n\nTo install Vae Local Full Stack dependencies on macOS via Homebrew, run the following commands:\n  brew tap actionverb/tap\n  brew install vae-remote vae-thrift vaeql\n\nMake sure you resolve any errors from Homebrew before proceeding."
+  end
+end

data/lib/logging.rb

@@ -4,12 +4,12 @@ module Logging
   def self.logger
     @logger ||= new_logger
   end
-  
+
   private
-  
+
   def self.new_logger
     logger = Logger.new(STDOUT)
     logger.level = Logger::Severity::WARN
     logger
   end
-end
+end

data/lib/proxy_server.rb

@@ -0,0 +1,31 @@
+class ProxyServer
+  def initialize(site, options)
+    $site = site
+    @options = options
+
+    set_mime_types
+  end
+
+  def run
+    server = Mongrel::Configurator.new host: "0.0.0.0", port: @options[:port] do
+      listener do
+        uri "/", handler: VaeSiteServlet.new($site)
+      end
+      trap("INT") { raise Mongrel::StopServer }
+      run
+    end
+
+    puts "Vae is in action at http://localhost:#{@options[:port]}/"
+    puts "  (hit Control+C to exit)"
+
+    begin
+      server.join
+    rescue Mongrel::StopServer
+    end
+  end
+
+  def set_mime_types
+    WEBrick::HTTPUtils::DefaultMimeTypes.store 'js', 'application/javascript'
+    WEBrick::HTTPUtils::DefaultMimeTypes.store 'svg', 'image/svg+xml'
+  end
+end

data/lib/servlet.rb

@@ -6,8 +6,8 @@ class Servlet < Mongrel::HttpHandler
       out << "Servlet"
     end
   end
-  
+
 end
 
 class FileNotFound < ArgumentError
-end
+end

data/lib/site.rb

@@ -1,27 +1,29 @@
 class Site
-  attr_accessor :password, :root, :session_id, :subdomain, :username
-  
-  def fetch_from_server(req)
-    http = Net::HTTP.new("#{subdomain}.vaesite.com")
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.start { |http|
-      http.read_timeout = 120
-      http.request(req)
-    }
-  end
-  
+  attr_reader :password, :root, :session_id, :subdomain, :username, :data_path
+  attr_accessor :secret_key
+
   def initialize(options)
     @root = options[:root] if options[:root]
     @subdomain = options[:subdomain] if options[:subdomain]
     @username = options[:username] if options[:username]
     @password = options[:password] if options[:password]
     @session_id = Digest::MD5.hexdigest(rand.to_s)
+    @data_path = options[:data_path] || "#{@root}/.vae/data/"
     login_to_server
   end
-  
+
+  def fetch_from_server(req)
+    http = Net::HTTP.new("#{subdomain}.vaesite.com")
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    http.start { |http|
+      http.read_timeout = 120
+      http.request(req)
+    }
+  end
+
   def login_to_server
-    req = Net::HTTP::Post.new("/?__vae_local=#{session_id}")
-    req.body = "__local_username=#{CGI.escape(username)}&__local_password=#{CGI.escape(password)}&__local_version=#{VER}"
+    req = Net::HTTP::Post.new("/")
+    req.body = "__vae_local=#{session_id}&__local_username=#{CGI.escape(username)}&__local_password=#{CGI.escape(password)}&__local_version=#{VER}"
     res = fetch_from_server(req)
     if res.body == "BAD"
       raise VaeError, "Invalid password or insufficient permissions."
@@ -31,5 +33,4 @@ class Site
       raise VaeError, "Could not connect to Vae servers.  Please check your Internet connection."
     end
   end
-  
-end
+end

data/lib/{vae.rb → vae_local.rb}

@@ -1,45 +1,21 @@
-require 'rubygems'
-
-require 'cgi'
-require 'digest/md5'
-require 'json'
-require 'mongrel'
-require 'net/http'
-require 'net/https'
-require 'optparse'
-require 'thread'
-require 'webrick'
-require 'yaml'
-
-require 'directory_watcher'
-require 'highline/import'
-require 'compass'
-require 'haml'
-
-require 'logging'
-require 'servlet'
-require 'site'
-require 'vae_error'
-require 'vae_site_servlet'
-require 'vae_local_servlet'
-require 'version'
-
-SERVER_PARSED = [ ".html", ".haml", ".php", ".xml", ".rss", ".pdf.haml", ".pdf.haml.php", ".haml.php" ]
-SERVER_PARSED_GLOB = [ "**/*.html", "**/*.haml", "**/*.php", "**/*.xml", "**/*.rss", "**/*.pdf.haml", "**/*.pdf.haml.php", "**/*.haml.php" ]
-BANNER = "Vae local preview server, version #{VER}"
-
 class VaeLocal
-  
-  def fetch_from_vaeplatform(site, req)
-    http = Net::HTTP.new("#{site}.vaeplatform.com", 443)
-    http.use_ssl = true
+  BANNER = "Vae local preview server, version #{VER}"
+
+  def self.fetch_from_vaeplatform(site, req)
+    local = ENV['VAEPLATFORM_LOCAL']
+    http = Net::HTTP.new("#{site}." + (local ? "vaeplatform.dev" : "vaeplatform.com"), (local ? 80 : 443))
+    http.use_ssl = true unless local
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     http.start { |http|
       http.read_timeout = 120
       http.request(req)
     }
   end
-  
+
+  def self.port_open?(port)
+    !system("lsof -i:#{port}", out: '/dev/null')
+  end
+
   def get_svn_credentials(site)
     home = Dir.chdir { Dir.pwd }
     Dir.glob("#{home}/.subversion/auth/svn.simple/*").each do |file|
@@ -50,7 +26,7 @@ class VaeLocal
     end
     {}
   end
-  
+
   def parse_svn_auth_file(file)
     key = nil
     mode = nil
@@ -73,18 +49,27 @@ class VaeLocal
     end
     params
   end
-  
-  def run!
-    options = { :port => 9999 }
+
+  def run
+    options = { port: 9999, server: ProxyServer, log_level: "warning" }
+    loop {
+      break if VaeLocal.port_open?(options[:port])
+      options[:port] = options[:port] - 1
+    }
+
     ARGV.options  do |opts|
-      opts.banner = BANNER + "\n\nUsage: vae [options]\n         starts a local development server\n       vae [options] deploy\n         promotes the source in Subversion repository to the FTP\n\n  If you are using the Vae Production environment features:\n       vae [options] stage\n         promotes the source in Subversion repository to the staging environment\n       vae [options] stagerelease\n         promotes the source in Subversion repository to the staging environment\n         and releases it to the production environment\n       vae [options] release\n         releases the current staging environment to the production environment\n       vae [options] rollback\n         rolls back the production environment to a previous release\n\nAvailable Options:"
-      opts.on("-u","--username <username>","Your Vae username") { |o| options[:username] = o } 
-      opts.on("-p","--port <port number>","Start server on this port") { |o| options[:port] = o } 
-      opts.on("-r","--root <path to site root>","Path to the root of the local copy of your Vae site.") { |o| options[:site_root] = o }   
-      opts.on("-s","--site <subdomain>","Vae subdomain for this site") { |o| options[:site] = o }  
+      opts.banner = BANNER + "\n\nUsage: vae [options]\n         starts a local development server\n       vae [options] deploy\n         promotes the source in Git/Subversion repository to the FTP\n\n  If you are using the Vae Production environment features:\n       vae [options] stage\n         promotes the source in Git/Subversion repository to the staging environment\n       vae [options] stagerelease\n         promotes the source in Git/Subversion repository to the staging environment\n         and releases it to the production environment\n       vae [options] release\n         releases the current staging environment to the production environment\n       vae [options] rollback\n         rolls back the production environment to a previous release\n\nAvailable Options:"
+      opts.on("-u","--username <username>","Your Vae username") { |o| options[:username] = o }
+      opts.on("-p","--port <port number>","Start server on this port") { |o| options[:port] = o.to_i; raise VaeError "Port #{o.to_i} is already in use." unless VaeLocal.port_open?(o.to_i) }
+      opts.on("-r","--root <path to site root>","Path to the root of the local copy of your Vae site.") { |o| options[:site_root] = o }
+      opts.on("-s","--site <subdomain>","Vae subdomain for this site") { |o| options[:site] = o }
+      opts.on("-f","--full-stack","Run in Full Stack Mode (experimental)") { options[:server] = FullStack }
+      opts.on("-d","--data-path <path>","Where to Store Content and Image Data When In Full Stack Mode") { |o| options[:data_path] = o }
+      opts.on("-l","--log-level <level>","Vaedb Log Level (for Full Stack Mode)") { |o| options[:log_level] = o }
       opts.on_tail("-h","--help", "Show this help message") { puts opts; exit }
       opts.parse!
     end
+
     options[:site_root] = Dir.pwd if options[:site_root].nil? and (File.exists?("#{Dir.pwd}/__vae.yml") or File.exists?("#{Dir.pwd}/__verb.yml"))
     if options[:site_root]
       [ "verb", "vae" ].each do |name|
@@ -95,7 +80,9 @@ class VaeLocal
         end
       end
     end
+
     raise VaeError, "We could not determine the Vae subdomain for this site.  Please specify it manually by using the --site option or create a __vae.yml file within the site root." if options[:site].nil?
+
     unless options[:username]
       svn_credentials = get_svn_credentials(options[:site])
       options[:username] = svn_credentials["username"]
@@ -103,53 +90,23 @@ class VaeLocal
     end
     raise VaeError, "We could not determine the Vae username that you use.  Please specify it manually by using the --username option." if options[:username].nil?
     if options[:password].nil?
-      options[:password] = ask("Please enter the Vae password for username #{options[:username]}:") {|q| q.echo = false}
+      options[:password] = ask("Please enter the Vae password for username #{options[:username]}:") { |q| q.echo = false }
     end
+
     if [ "deploy", "release", "rollback", "stage", "stagerelease" ].include?(ARGV.last)
       stagerelease(ARGV.last, options[:site], options[:username], options[:password])
       exit
     end
 
-    # Move mongrel dependency here so not as required on Windows
-
     raise VaeError, "You did not specify the path to the root of the local copy of your Vae site.  Please specify it manually by using the --root option or cd to the site root (and make sure it contains a __vae.yml file)." unless options[:site_root]
     raise VaeError, "You specified an invalid path to the local copy of your Vae site." unless File.exists?(options[:site_root])
 
-    $biglock = Mutex.new
-    dw = DirectoryWatcher.new options[:site_root], :interval => 1.0, :glob => SERVER_PARSED_GLOB, :pre_load => true, :logger => DirectoryWatcher::NullLogger.new
-    dw.add_observer { |*args| 
-      args.each { |event|
-        path = event.path.gsub($site.root, "")
-        $biglock.synchronize {
-          $changed[path] = event.type
-        }
-      }
-    }
-    dw.start
-
-    set_mime_types
-
     Dir.chdir File.dirname(__FILE__)
     puts BANNER
-    puts "Vae is in action at http://localhost:#{options[:port]}/"  
-    puts "  (hit Control+C to exit)"
-    $site = Site.new(:subdomain => options[:site], :root => options[:site_root], :username => options[:username], :password => options[:password])
-    $cache = {}
-    $changed = {}
-    $server = Mongrel::Configurator.new :host => "0.0.0.0", :port => options[:port] do
-      listener do
-        uri "/", :handler => VaeSiteServlet.new
-        #uri "/__welcome/", :handler => VaeLocalServlet.new
-      end
-      trap("INT") { raise Mongrel::StopServer }
-      run
-    end
 
-    begin
-      $server.join
-    rescue Mongrel::StopServer
-      puts "Thanks for using Vae!"
-    end
+    site = Site.new(subdomain: options[:site], root: options[:site_root], username: options[:username], password: options[:password])
+    options[:server].new(site, options).run
+    puts "Thanks for using Vae!"
   end
 
   def show_job_status(res, site)
@@ -161,7 +118,7 @@ class VaeLocal
       loop do
         sleep 5
         req = Net::HTTP::Get.new("/api/local/v1/job_status/#{data['job']}")
-        res = fetch_from_vaeplatform(site, req)
+        res = VaeLocal.fetch_from_vaeplatform(site, req)
         status = JSON.parse(res.body)
         if status['status'] == "completed"
           puts data['success']
@@ -175,11 +132,6 @@ class VaeLocal
     raise VaeError, "An unknown error occurred requesting this operation from Vae Platform.  Please email support for help."
   end
 
-  def set_mime_types
-    WEBrick::HTTPUtils::DefaultMimeTypes.store 'js', 'application/javascript'
-    WEBrick::HTTPUtils::DefaultMimeTypes.store 'svg', 'image/svg+xml'
-  end
-  
   def stagerelease(action, site, username, password)
     if action == "deploy"
       action = "stage"
@@ -190,18 +142,17 @@ class VaeLocal
     end
     req = Net::HTTP::Post.new("/api/local/v1/#{action}")
     req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}&vae_local=1"
-    res = fetch_from_vaeplatform(site, req)
+    res = VaeLocal.fetch_from_vaeplatform(site, req)
     if res.is_a?(Net::HTTPFound)
       raise VaeError, "Invalid username/password or insufficient permissions."
     else
       show_job_status(res, site)
     end
   end
-  
-  def self.run_trapping_exceptions!
+
+  def self.run_trapping_exceptions
     begin
-      v = VaeLocal.new
-      v.run!
+      new.run
     rescue VaeError => e
       cmd = $0
       cmd = "vae" if cmd =~ /\.\.\/vae_local/
@@ -210,5 +161,4 @@ class VaeLocal
       puts "Type #{cmd} --help for help."
     end
   end
-
 end

data/lib/vae_site_servlet.rb

@@ -1,24 +1,43 @@
-class VaeSiteServlet < Servlet      
-  
+class VaeSiteServlet < Servlet
+  SERVER_PARSED = [ ".html", ".haml", ".php", ".xml", ".rss", ".pdf.haml", ".pdf.haml.php", ".haml.php" ]
+
+  def initialize(site)
+    @cache = {}
+    @changed = {}
+    @lock = Mutex.new
+    @site = site
+
+    dw = DirectoryWatcher.new @site.root, interval: 1.0, glob: SERVER_PARSED.map { |ext| "**/*#{ext}" }, pre_load: true, logger: DirectoryWatcher::NullLogger.new
+    dw.add_observer { |*args|
+      args.each { |event|
+        path = event.path.gsub(@site.root, "")
+        @lock.synchronize {
+          @changed[path] = event.type
+        }
+      }
+    }
+    dw.start
+  end
+
   def bundle_changed_source_files(source_files)
     source_files ||= []
     changed = nil
-    $biglock.synchronize {
-      changed = $changed
-      $changed = {}
+    @lock.synchronize {
+      changed = @changed
+      @changed = {}
     }
     source_files.concat(changed.map { |filename,action|
       get_source_file(filename, (action == :deleted))
     }).reject { |src| src.nil? }
   end
-  
+
   def get_source_file(path, optional = false)
     full_path = nil
-    if File.exists?($site.root + path)
+    if File.exists?(@site.root + path)
       full_path = path
     else
       SERVER_PARSED.each do |ext|
-        if full_path.nil? and File.exists?($site.root + path + ext)
+        if full_path.nil? and File.exists?(@site.root + path + ext)
           full_path = path + ext
         end
       end
@@ -27,7 +46,7 @@ class VaeSiteServlet < Servlet
       raise FileNotFound
     elsif full_path
       begin
-        file = File.read($site.root + full_path)
+        file = File.read(@site.root + full_path)
         md5 = Digest::MD5.hexdigest(file)
       rescue Errno::EISDIR
         return nil
@@ -37,16 +56,16 @@ class VaeSiteServlet < Servlet
       md5 = ""
       file = ""
     end
-    if $cache[full_path] != md5
-      $cache[full_path] = md5
+    if @cache[full_path] != md5
+      @cache[full_path] = md5
       [ full_path, file ]
     else
       nil
     end
   end
-  
+
   def fetch_from_vae(wb_req, method, source_files = nil)
-    uri = wb_req.params["REQUEST_URI"] + ((wb_req.params["REQUEST_URI"] =~ /\?/) ? "&" : "?") + "__vae_local=#{$site.session_id}"
+    uri = wb_req.params["REQUEST_URI"] + ((wb_req.params["REQUEST_URI"] =~ /\?/) ? "&" : "?") + "__vae_local=#{@site.session_id}"
     source_files = bundle_changed_source_files(source_files)
     if method == "GET"
       if source_files.is_a?(Array) and source_files.size > 0
@@ -68,31 +87,31 @@ class VaeSiteServlet < Servlet
     if wb_req.params['HTTP_X_REQUESTED_WITH']
       req['X-Requested-With'] = req_404['X-Requested-With'] = wb_req.params['HTTP_X_REQUESTED_WITH']
     end
-    res = $site.fetch_from_server(req)
+    res = @site.fetch_from_server(req)
     if res.body =~ /__vae_local_needs=(.*)/
       begin
         return fetch_from_vae(wb_req, method, [ get_source_file($1) ])
       rescue FileNotFound
         puts "* Could not find requested file: #{$1}"
-        return $site.fetch_from_server(req_404)
+        return @site.fetch_from_server(req_404)
       end
     end
     res
   end
-  
+
   def fetch_from_vae_and_include_source_of_current_page(req, method)
     fetch_from_vae(req, method, [ find_source_file_from_path(req.params["REQUEST_URI"]), get_source_file("/__vae.php", true), get_source_file("/__verb.php", true) ])
   end
-  
+
   def find_source_file_from_path(path)
     path_parts = path.split("/").reject { |part| part.length < 1 }
     local_path = ""
-    loop do 
+    loop do
       gotit = false
       if part = path_parts.shift
         new_local_path = local_path + "/" + part
         (SERVER_PARSED + [ "" ]).each do |ext|
-          if File.exists?($site.root + new_local_path + ext)
+          if File.exists?(@site.root + new_local_path + ext)
             gotit = true
             local_path = new_local_path + ext
           end
@@ -103,22 +122,22 @@ class VaeSiteServlet < Servlet
     return nil unless local_path.length > 0
     get_source_file(local_path)
   end
- 
+
   def get_line_from_sass_exception(exception)
     return exception.message.scan(/:(\d+)/).first.first if exception.is_a?(::SyntaxError)
     exception.backtrace[0].scan(/:(\d+)/).first.first
-  end 
+  end
 
   def not_modified?(req, res, mtime, etag)
     return true if (ims = req.params['IF_MODIFIED_SINCE']) && Time.parse(ims) >= mtime
     return true if (inm = req.params['IF_NONE_MATCH']) && WEBrick::HTTPUtils::split_header_value(inm).member?(etag)
     false
   end
-  
+
   def render_sass(local_path)
     begin
       options = Compass.sass_engine_options
-      options[:load_paths] << File.dirname(local_path) 
+      options[:load_paths] << File.dirname(local_path)
       options[:syntax] = :scss if local_path =~ /\.scss$/
       engine = Sass::Engine.new(open(local_path, "rb").read, options)
       engine.render
@@ -132,10 +151,10 @@ class VaeSiteServlet < Servlet
     serve(request, response)
     response.finished
   end
-  
+
   def serve(req, res)
     res.status = 200
-    local_path = ($site.root+req.params["REQUEST_URI"] || "/").split("?").first
+    local_path = (@site.root+req.params["REQUEST_URI"] || "/").split("?").first
     if File.exists?(local_path) and !File.directory?(local_path) and !server_parsed?(local_path)
       st = File::stat(local_path)
       mtime = st.mtime
@@ -158,7 +177,7 @@ class VaeSiteServlet < Servlet
       end
     else
       if req.params["REQUEST_URI"] =~ /^\/__data\// or req.params["REQUEST_URI"] =~ /^\/__assets\//
-        from_vae = { 'location' => "http://#{$site.subdomain}.vaesite.com#{req.params["REQUEST_URI"]}"}
+        from_vae = { 'location' => "http://#{@site.subdomain}.vaesite.com#{req.params["REQUEST_URI"]}"}
         puts "#{req.params["REQUEST_URI"]} static asset"
       else
         from_vae = fetch_from_vae_and_include_source_of_current_page(req, req.params["REQUEST_METHOD"])
@@ -169,7 +188,7 @@ class VaeSiteServlet < Servlet
       if from_vae['location']
         res.body << "<p>Redirecting to <a href=\"#{from_vae['location']}\">#{from_vae['location']}</a>"
         res.status = 302
-        res.header['Location'] = from_vae['location']    
+        res.header['Location'] = from_vae['location']
       else
         res.header['Etag'] = from_vae['etag']
         res.header['Last-Modified'] = from_vae['last-modified']
@@ -185,13 +204,11 @@ class VaeSiteServlet < Servlet
   def req_scss?(req)
     req.params["REQUEST_URI"] =~ /\.(sass|scss)$/
   end
-  
+
   def server_parsed?(path)
     SERVER_PARSED.each do |ext|
       return true if Regexp.new("#{ext}$").match(path)
     end
     false
   end
-  
 end
-

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.6.10"
+VER = "0.7.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.7.0
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,92 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.5
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: directory_watcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: haml
+  name: github-pages
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '87'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: '87'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: jekyll-multiple-languages-plugin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: mongrel
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +137,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0.pre2
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.10
+        version: '3.4'
 description: Supports local development for Vae Platform (http://vaeplatform.com/)
 email: support@actionverb.com
 executables:
@@ -131,18 +173,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/vae
+- lib/full_stack.rb
 - lib/logging.rb
+- lib/proxy_server.rb
 - lib/servlet.rb
 - lib/site.rb
-- lib/vae.rb
 - lib/vae_error.rb
-- lib/vae_local_servlet.rb
+- lib/vae_local.rb
 - lib/vae_site_servlet.rb
 - lib/version.rb
 - test/vae_test.rb
 homepage: http://docs.vaeplatform.com/vae_local
 licenses:
-- GPL
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -160,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: This gem allows for local development for sites on Vae Platform (http://vaeplatform.com/)

data/lib/vae_local_servlet.rb

@@ -1,3 +0,0 @@
-class VaeLocalServlet < Servlet
-end
-