vae 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d689843b072581200ad83cf7b3bbab97d62bd3cb
-  data.tar.gz: 7cec8550070b14c59de553ed59c64f64be6def74
+  metadata.gz: 6c2974493d451a951be87eec5c8909963f7bc8ce
+  data.tar.gz: 65a3d3072f97d3afa44a49f88a5316dde1a83b7d
 SHA512:
-  metadata.gz: 1b8fd311fd92b6ff5316cd99d46c9dd1513316edd797fed189b5fa71a975f06a40abbc91c84be08fcc1977cf1a9fbb1461f85f4cd4035770112dbb76e3fb900f
-  data.tar.gz: 918b1413047679ce58c51bc0554848c6e2f9bf1ee4eb828f5e7c92984e6a3cbd9ce3c9c4cb56a58d4b63a6a01017bd52b5cf4cd88442ae7b9fb7f2ae5abf3ad3
+  metadata.gz: 4eb6a694232c72d9211f86a947ccbb66019a2638b3f43621d97e3ef28a11e738cea336a115c4855e64f97069b4244c5c89086391401b74e7493142e91caf1877
+  data.tar.gz: ca4a4ad054d4397f917dae5cdc2249e5a6d4ae9ce599eb3495b0da6101514e862e1907a8f09b52db76340f27957b4a8c17b3eee4b25c98277cb8d88a647cb0dc

data/bin/vae

@@ -16,6 +16,7 @@ require 'net/http'
 require 'net/https'
 require 'optparse'
 require 'ptools'
+require 'rest-client'
 require 'shellwords'
 require 'thread'
 require 'webrick'

data/lib/full_stack.rb

@@ -8,33 +8,33 @@ class FullStack
     @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']) }
+  def run
+    write_files
+    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 write_files
+    data = @site.data
+    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}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."
+      File.open("#{@site.data_path}feed_generation",'w') { |f| f.write(data['feed_generation']) }
     end
-  rescue JSON::ParserError
-    raise VaeError, "An unknown error occurred signing into Vae Platform.  Please email support for help."
+    File.open("#{@site.data_path}settings.php",'w') { |f| f.write(data['settings']) }
   end
 
   def download_feed(url)
@@ -49,15 +49,6 @@ class FullStack
     }
   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?(9092)
       puts "Starting Vae Frontend Compiler Service using Installation at #{vae_fcs_path}"

data/lib/site.rb

@@ -1,5 +1,5 @@
 class Site
-  attr_reader :password, :root, :session_id, :subdomain, :username, :data_path
+  attr_reader :password, :root, :session_id, :subdomain, :username, :data_path, :auth_key, :data
   attr_accessor :secret_key
 
   def initialize(options)
@@ -7,9 +7,10 @@ class Site
     @subdomain = options[:subdomain] if options[:subdomain]
     @username = options[:username] if options[:username]
     @password = options[:password] if options[:password]
+    @auth_key = options[:auth_key] if options[:auth_key]
     @session_id = Digest::MD5.hexdigest(rand.to_s)
     @data_path = options[:data_path] || "#{@root}/.vae/data/"
-    login_to_server
+    @data = login_to_server
   end
 
   def fetch_from_server(req)
@@ -23,14 +24,26 @@ class Site
 
   def login_to_server
     req = Net::HTTP::Post.new("/")
-    req.body = "__vae_local=#{session_id}&__local_username=#{CGI.escape(username)}&__local_password=#{CGI.escape(password)}&__local_version=#{VER}"
+    body = "__vae_local=#{session_id}&__local_version=#{VER}"
+    if auth_key
+      req.body = "#{body}&__local_auth_key=#{CGI.escape(auth_key)}"
+    else
+      req.body = "#{body}&__local_username2=#{CGI.escape(username)}&__local_password=#{CGI.escape(password)}"
+    end
     res = fetch_from_server(req)
-    if res.body == "BAD"
+    data = JSON.parse(res.body)
+    if data['auth_key'] and !auth_key
+      VaeLocal.write_auth_key(subdomain, data['auth_key'])
+    end
+    if data == nil
+      raise VaeError, "Invalid password or insufficient permissions."
+    elsif data['alert']
+      puts data['alert']
+    elsif data['valid'] != "valid"
       raise VaeError, "Invalid password or insufficient permissions."
-    elsif res.body =~ /MSG/
-      puts res.body.gsub(/MSG/, "")
-    elsif res.body != "GOOD"
-      raise VaeError, "Could not connect to Vae servers.  Please check your Internet connection."
     end
+    data
+  rescue JSON::ParserError
+    raise VaeError, "An unknown error occurred signing into Vae Platform.  Please email support for help."
   end
 end

data/lib/vae_local.rb

@@ -3,7 +3,7 @@ class VaeLocal
 
   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 = Net::HTTP.new(vaeplatform_host(site), (local ? 80 : 443))
     http.use_ssl = true unless local
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     http.start { |http|
@@ -16,6 +16,36 @@ class VaeLocal
     !system("lsof -i:#{port}", out: '/dev/null')
   end
 
+  def self.vaeplatform_host(site)
+    "#{site}." + (ENV['VAEPLATFORM_LOCAL'] ? "vaeplatform.test" : "vaeplatform.com")
+  end
+
+  def self.vaeplatform_url(site)
+    "http#{ENV['VAEPLATFORM_LOCAL'] ? '' : 's'}://#{vaeplatform_host(site)}"
+  end
+
+  def self.read_auth_keys
+    if File.exists?(auth_key_path)
+      data = YAML::load_file(auth_key_path) || {}
+    else
+      data = {}
+    end
+    if !data['site_keys'].is_a?(Hash)
+      data['site_keys'] = {}
+    end
+    data
+  end
+
+  def self.write_auth_key(site, key)
+    data = read_auth_keys
+    data['site_keys'][site] = key
+    File.open(auth_key_path, 'w') { |f| f.write data.to_yaml }
+  end
+
+  def self.auth_key_path
+    File.join(Dir.home, ".vae_local_credentials.yml")
+  end
+
   def run
     options = { port: 9999, server: ProxyServer, log_level: "warning" }
     loop {
@@ -33,6 +63,7 @@ class VaeLocal
       opts.on("-f","--full-stack [php|hhvm]","Run in Full Stack Mode.  Optionally provide 'php' or 'hhvm' to specify your preferred PHP runtime") { |o| options[:server] = FullStack; options[:php_runtime] = o }
       opts.on("-U","--url <url>","If running stage or stagerelease, provide the URL of a ZIP file to deploy here") { |o| options[:branch] = o }
       opts.on("-b","--branch <branch>","If running stage or stagerelease, override the Git branch to deploy here") { |o| options[:branch] = o }
+      opts.on("-B","--built_path <path>","If running stage or stagerelease, and you want to provide the built files to deploy from a local path, provide that path here") { |o| options[:built_path] = 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 }
@@ -51,23 +82,36 @@ class VaeLocal
     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?
-    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 }
+
+    keys = VaeLocal.read_auth_keys
+    if key = keys['site_keys'][options[:site]]
+      options[:auth_key] = key
+    end
+
+    unless options[:auth_key]
+      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 }
+      end
     end
 
     if [ "deploy", "release", "rollback", "stage", "stagerelease" ].include?(ARGV.last)
-      stagerelease(ARGV.last, options[:site], options[:username], options[:password], options[:branch])
-      exit
+      stageaction = true
+    else
+      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])
     end
 
-    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])
+    site = Site.new(subdomain: options[:site], root: options[:site_root], username: options[:username], password: options[:password], auth_key: options[:auth_key])
+
+    if stageaction
+      stagerelease(ARGV.last, options[:site], site.auth_key, options[:branch], options[:built_path])
+      exit
+    end
 
     Dir.chdir File.dirname(__FILE__)
     puts BANNER
 
-    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
@@ -99,22 +143,33 @@ 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, branch)
+  def stagerelease(action, site, auth_key, branch, built_path = nil)
     if action == "deploy"
       action = "stage"
     elsif action == "stagerelease"
-      stagerelease("stage", site, username, password, branch)
-      stagerelease("release", site, username, password, branch)
+      stagerelease("stage", site, auth_key, branch, built_path)
+      stagerelease("release", site, auth_key, branch)
       return
     end
-    req = Net::HTTP::Post.new("/api/local/v1/#{action}")
-    req.body = "username=#{CGI.escape(username)}&password=#{CGI.escape(password)}&branch=#{CGI.escape(branch || "")}&vae_local=1"
-    res = VaeLocal.fetch_from_vaeplatform(site, req)
+    path = "/api/local/v1/#{action}"
+    if built_path
+      zip_path = "/tmp/vae_local_zip.zip"
+      Dir.chdir(built_path)
+      `zip -r "#{zip_path}" *`
+      res = RestClient.post(VaeLocal.vaeplatform_url(site) + path, file: File.open(zip_path, 'rb'), auth_key: auth_key, vae_local: "1")
+      `rm #{zip_path}`
+    else
+      req = Net::HTTP::Post.new(path)
+      req.body = "auth_key=#{CGI.escape(auth_key)}&branch=#{CGI.escape(branch || "")}&vae_local=1"
+      res = VaeLocal.fetch_from_vaeplatform(site, req)
+    end
     if res.is_a?(Net::HTTPFound)
       raise VaeError, "Invalid username/password or insufficient permissions."
     else
       show_job_status(res, site)
     end
+  rescue RestClient::Found
+    raise VaeError, "Invalid username/password or insufficient permissions."
   end
 
   def self.run_trapping_exceptions

data/lib/version.rb

@@ -1 +1 @@
-VER = "0.8.4"
+VER = "0.8.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vae
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - Action Verb, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
@@ -151,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement