vae 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b95fc5024589647fe8a5ce90b61558bbc8c65e1
-  data.tar.gz: 6f978752af76b5550d52b20dcc914e6786e0feaf
+  metadata.gz: 4ec82dc23a41fff2a7a89e04338dc1ff5c0fed51
+  data.tar.gz: c0aeff2aca03ef853afd0f133824f6b233c7e3e9
 SHA512:
-  metadata.gz: ce47bba6853b2295f51bed8c083e9db6ba6871fb3a254fe20fe41e03f117033f3dff80ccea9b1bdfd4dd1e6a936d3a8e1246c11830a583e824fee6c1c5637d12
-  data.tar.gz: 46ffb5c49910fbf7591b13b029c77e7e4a182fb5691d4e1865c720b95938e63a4457b395cd58f92cf709f9766e835105f67fd1e6a6729b54a2945412188397df
+  metadata.gz: ef87b54104a5a9639418c7f3c750bf5a4974cda227f515ddf8e25f57639e54ce8d2cd56042595ad8d4fc4212b610a66f205f60a632595230fee313faa4e84291
+  data.tar.gz: 7a730539aa6e18731ae6dae35c2ddb4ce3e2fdb872791d2323560a05523a4f4d936c6329f8669782daa3742474f601ec7e626d7f0d90032d50b290c38528d297

data/lib/full_stack.rb

@@ -59,16 +59,16 @@ class FullStack
   end
 
   def launch_daemons
-    puts "Using Vae daemons at #{vae_thrift_path}"
-    if VaeLocal.port_open?(9090)
+    if VaeLocal.port_open?(9092)
+      puts "Starting Vae Frontend Compiler Service using Installation at #{vae_fcs_path}"
       @pids << fork {
-        Dir.chdir("#{vae_thrift_path}/rb/")
+        Dir.chdir(vae_fcs_path)
         STDOUT.reopen("/dev/null", "w")
         STDERR.reopen("/dev/null", "w")
-        exec "bundle exec ./vaerubyd.rb"
+        exec "bundle exec ./vaefcs.rb"
       }
     end
-    port = 9091
+    port = 9100
     serve_root = @site.root
     loop {
       break if VaeLocal.port_open?(port)
@@ -81,9 +81,10 @@ class FullStack
         exec "bundle exec jekyll build --watch --source #{Shellwords.shellescape(@site.root)} --destination #{Shellwords.shellescape(serve_root)}"
       }
     end
+    ENV['VAE_LOCAL_VAEDB_PORT'] = port.to_s
     @pids << fork {
-      Dir.chdir("#{vae_thrift_path}/cpp/")
-      ENV['VAE_LOCAL_VAEDB_PORT'] = port.to_s
+      Dir.chdir(vaedb_path)
+      puts "Starting Vaedb on Port #{port} using Installation at #{vaedb_path}"
       exec "./vaedb --port #{port} --busaddress 'tcp://*:#{port-4000}' --test --log_level #{options[:log_level]}"
     }
     @pids << fork {
@@ -100,29 +101,31 @@ class FullStack
     }
   end
 
+  def vaedb_path
+    @vaedb_path ||= find_dependency_project("vaedb", "vaedb", "Vaedb")
+  end
+
+  def vae_fcs_path
+    @vae_fcs_path ||= find_dependency_project("vae-frontend-compiler-service", "vaefcs.rb", "Vae Frontend Compiler Service")
+  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-remote", "/usr/local/Cellar/vae_remote/1.0.0", "~/vae_remote" ].each { |path|
-      if File.exists?(path) and File.exists?(path + "/lib/general.php")
-        return @vae_remote_path = path
-      end
-    }
-    raise VaeError, "Could not find Vae Remote on your system.#{brew_message}"
+    @vae_remote_path ||= find_dependency_project("vae_remote", "lib/general.php", "Vae Remote")
   end
 
-  def vae_thrift_path
-    return @vae_thrift_path if @vae_thrift_path
+  def find_dependency_project(folder, main_file, name)
     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) and File.exists?(path + "/cpp/vaedb")
-        return @vae_thrift_path = path
+    paths = [ "#{thisdir}/../../#{folder}", "#{thisdir}/../../../#{folder}", "/usr/local/#{folder}", "/usr/local/opt/#{folder}", "/usr/local/Cellar/#{folder}/1.0.0", "~/#{folder}" ]
+    paths << "#{vae_remote_path}/tests/dependencies/#{folder}" if folder != "vae_remote"
+    paths.each { |path|
+      if File.exists?(path) and File.exists?("#{path}/#{main_file}")
+        return path
       end
     }
-    raise VaeError, "Could not find Vae Thrift on your system.#{brew_message}"
+    raise VaeError, "Could not find #{name} 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."
+    "\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-frontend-compiler-service vae-remote vaedb vaeql\n\nMake sure you resolve any errors from Homebrew before proceeding."
   end
 end

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.7.3"
+VER = "0.8.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png