vae 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00c2f7b1b1887ce254238234b0aa7a10db3ebf1
-  data.tar.gz: 12e99bdb18b40e27c6aa19de0848f09a5e312e85
+  metadata.gz: 7b11fdcfa1bea4ede251a9e873e0f7a26949e41e
+  data.tar.gz: 056e35277b00eb7efed32b3f26cd05d86742a4d6
 SHA512:
-  metadata.gz: 2c6aa894ab6068dff0e9479aa1e4df4744ca23dd640ef4de0bf1926ac810e9a592656070dbb0ce23b4866cdf5db4f83e20ef4f310dd2d99c4d17a3bedd9add59
-  data.tar.gz: 4b66219b0b66b0310773b9c2448ec52ce5903a29e78d5c113ffd38cc822f44edd8179b6848c0b0d3490bc0d1797493f087f34588bbf880ebb606b48e165ffdf2
+  metadata.gz: 33dd3ca9637e7a9858ac82436d5be96b98505e28a4f4991aefd29f46310c6e490e830eb5b30b5de020c17f2289d3d7600371a41ffe3d077cd3c7cdd30bf243de
+  data.tar.gz: fcdac100f40415eb3c421332337c46461a89094020a87a75ca999de62fa3cfdfdd4b014934fa8efc2ee8465b0f6960196f832c039c83ec39cce847b4387c226c

data/lib/full_stack.rb

@@ -59,6 +59,7 @@ class FullStack
   end
 
   def launch_daemons
+    puts "Using Vae daemons at #{vae_thrift_path}"
     if VaeLocal.port_open?(9090)
       @pids << fork {
         Dir.chdir("#{vae_thrift_path}/rb/")
@@ -98,7 +99,7 @@ class FullStack
     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-remote", "/usr/local/Cellar/vae_remote/1.0.0", "~/vae_remote" ].each { |path|
-      if File.exists?(path)
+      if File.exists?(path) and File.exists?(path + "/lib/general.php")
         return @vae_remote_path = path
       end
     }
@@ -109,8 +110,8 @@ class FullStack
     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
+      if File.exists?(path) and File.exists?(path + "/cpp/vaedb")
+        return @vae_thrift_path = path
       end
     }
     raise VaeError, "Could not find Vae Thrift on your system.#{brew_message}"

data/lib/vae_local.rb

@@ -64,6 +64,7 @@ class VaeLocal
       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("-b","--branch","If running stage or stagerelease, override the branch to deploy here") { |o| options[:branch] = o }
       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 }
@@ -94,7 +95,7 @@ class VaeLocal
     end
 
     if [ "deploy", "release", "rollback", "stage", "stagerelease" ].include?(ARGV.last)
-      stagerelease(ARGV.last, options[:site], options[:username], options[:password])
+      stagerelease(ARGV.last, options[:site], options[:username], options[:password], options[:branch])
       exit
     end
 
@@ -132,16 +133,16 @@ class VaeLocal
     raise VaeError, "An unknown error occurred requesting this operation from Vae Platform.  Please email support for help."
   end
 
-  def stagerelease(action, site, username, password)
+  def stagerelease(action, site, username, password, branch)
     if action == "deploy"
       action = "stage"
     elsif action == "stagerelease"
-      stagerelease("stage", site, username, password)
-      stagerelease("release", site, username, password)
+      stagerelease("stage", site, username, password, branch)
+      stagerelease("release", site, username, password, branch)
       return
     end
     req = Net::HTTP::Post.new("/api/local/v1/#{action}")
-    req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}&vae_local=1"
+    req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}&branch=#{CGI.escape(branch)}&vae_local=1"
     res = VaeLocal.fetch_from_vaeplatform(site, req)
     if res.is_a?(Net::HTTPFound)
       raise VaeError, "Invalid username/password or insufficient permissions."

data/lib/vae_site_servlet.rb

@@ -27,7 +27,11 @@ class VaeSiteServlet < Servlet
       @changed = {}
     }
     source_files.concat(changed.map { |filename,action|
-      get_source_file(filename, (action == :deleted))
+      begin
+        get_source_file(filename, (action == :deleted))
+      rescue FileNotFound
+        nil
+      end
     }).reject { |src| src.nil? }
   end
 
@@ -87,6 +91,7 @@ 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
+    req['X-Vae-Local-Host'] = wb_req.params['HTTP_HOST']
     res = @site.fetch_from_server(req)
     if res.body =~ /__vae_local_needs=(.*)/
       begin

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.7.1"
+VER = "0.7.2"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png