viaduct-archfile 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2868a73bceef45509254e09b8ae0fa2837f1b6aa
-  data.tar.gz: 5a6801fe28a8acb3bd9fe7499583565f93feb865
+  metadata.gz: 48ac37533aedb603d1c873b4254d0a12ffedeaca
+  data.tar.gz: dfd30fd03aa9f228255f8ded1627aa815b4176f9
 SHA512:
-  metadata.gz: 23ef597b0040900d8a7c8a92d043ee74738884aa3bd83ac6a466ff9ce05c0a58ef68d80b846e7dc30a909388969d163c3700c30cd2c6174a2137ebd522ccd4be
-  data.tar.gz: 8dc38d2eaf92518f1e65847bccf55d7e2d9121b61b459f52c75d8f1da6a3fd218effb9fbf59ce20b8f0477c96589da50c771213abacc5d126473e9cd38a00314
+  metadata.gz: 348fe10acb7fde08b724e35f0acb42a70be1ff9e931a1afd5e19bd7e4ada701d727976363ab5145ff7dcba5112a4e15ae7422e31744ec253251f2c80891c59c1
+  data.tar.gz: 358c65dea51319cac69ac11cc94111567fdc4826a7604e916cd2cf3fec2566a1f6da2683538dbd80628679c3b39698f363494c1ed26a959a3de8c4201aaa60e8

data/bin/vdt-archfile-check

@@ -5,9 +5,12 @@ require 'viaduct/archfile'
 begin
   path = ARGV[0] || './Archfile'
   if File.exist?(path)
-    archfile = Viaduct::Archfile.new(File.read(path))
-    errors = archfile.validate
-    if errors.empty?
+    yaml = SafeYAML.load(File.read(path))
+    if yaml.is_a?(Hash) && yaml['archfile']
+      yaml = yaml['archfile']
+    end
+    archfile = Viaduct::Archfile.new(yaml)
+    if archfile.valid?
       puts
       puts "    \e[32mCongratulations. That Archfile looks excellent and should work well!\e[0m"
       puts
@@ -18,7 +21,7 @@ begin
       puts
       puts "    \e[31mOh no. It seems there's a problem with your Archfile!\e[0m"
       puts
-      errors.each do |field, value|
+      archfile.errors.each do |field, value|
         puts "    * #{field ? field + ' ' : nil}\e[33m#{value}\e[0m"
       end
       puts

data/lib/viaduct/archfile.rb

@@ -78,6 +78,16 @@ module Viaduct
     def validate
       @errors = []
 
+      unless spec
+        add_error nil, "Archfile appears to be empty"
+        return @errors
+      end
+
+      if spec && !spec.is_a?(Hash)
+        add_error nil, "File must contain a hash"
+        return @errors
+      end
+
       #
       # Ensure we have a stack
       #
@@ -91,6 +101,7 @@ module Viaduct
         ensure_boolean('sleep_inactive_web_processes')            if spec['settings'].keys.include?('sleep_inactive_web_processes')
         ensure_boolean('serve_static_files')                      if spec['settings'].keys.include?('serve_static_files')
         ensure_matches(/\A[a-z0-9\_\-\/]+\z/, 'document_root')    if spec['settings'].keys.include?('document_root')
+        ensure_inclusion(remote_properties['database_fruits'], 'main_database') if spec['settings'].keys.include?('main_database')
       end
 
       #
@@ -123,10 +134,19 @@ module Viaduct
       #
       # Check shared databases
       #
+      fruits_seen = []
       if spec['shared_databases'].is_a?(Array)
         spec['shared_databases'].each_with_index do |db, index|
           namespace db, 'shared_databases', index
           ensure_inclusion(remote_properties['shared_database_backends'], 'type')
+          if db['fruit'] && db['fruit'].length > 0
+            ensure_inclusion(remote_properties['database_fruits'], 'fruit')
+            if fruits_seen.include?(db['fruit'])
+              add_error 'fruit', "#{db['fruit']} is already in use in this Archfile"
+            else
+              fruits_seen << db['fruit']
+            end
+          end
           ensure_string('label')
         end
       end
@@ -174,6 +194,20 @@ module Viaduct
         end
       end
 
+      #
+      # Check build cache
+      #
+      if spec['build_cache'].is_a?(Array)
+        spec['build_cache'].each_with_index do |item, index|
+          namespace item, 'build_cache', index
+          unless item =~ PATH_REGEX
+            add_error item, "must be a path"
+          end
+        end
+      elsif spec['build_cache']
+        add_error nil, "build_cache must be an array"
+      end
+
       errors
     end
 

data/lib/viaduct/archfile_remote_backend.rb

@@ -11,7 +11,7 @@ module Viaduct
       http = Net::HTTP.new(ENV['VDT_HOST'] || 'my.viaduct.io', ENV['VDT_PORT'] || 443)
       if http.port == 443
         http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end
 
       result =  http.request(req)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-archfile
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml