viaduct-archfile 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d17b454ac6a627689305e8d342e17386eb329669
-  data.tar.gz: 5122ab3c059cc27540e450a6624dfe89c7d66d2c
+  metadata.gz: 502a658bf4d86831fc2ecc3ef374d49cb3cd9a95
+  data.tar.gz: a79ee80a23d723efc98eb42cfce061b8ef2f2815
 SHA512:
-  metadata.gz: 8b377d903e849995cecc5eab83a92f069778e7361a1507651732f905b8a41604faae6656eda53af5ed54200d73497f4a1633bf0aa8c3b086834b7e11fabaeaa7
-  data.tar.gz: 1e20b690758fb2e32d04fc0f73a8fc5ee3a113bdfc198d8a698739c87a1e07602f885ccd5cc147c39d9fbc79f69b4c09ba6044c0cfbb8526043a6129500ee8d4
+  metadata.gz: 4f386fb0f5e89237322d10bc53b5ee5669d53b6caef840ff8dc7ef16d17d3c8d4ca6a4d8d075d10a6815d88e2ff42ccf7012e01820b5892ad00305d540da930a
+  data.tar.gz: 8ba2c3c562eaa9b5f9a8c15a73c082f9c549a2fc34e0c66d4c11fb9c849916474f142ff6698004d02b295ffca2e156e30214e3f6c3ce37ff11217cf88040feb8

data/bin/vdt-archfile-check

@@ -2,27 +2,36 @@
 $:.unshift(File.expand_path('../../lib', __FILE__))
 require 'viaduct/archfile'
 
-path = ARGV[0] || './Archfile'
-if File.exist?(path)
-  archfile = Viaduct::Archfile.new(File.read(path))
-  errors = archfile.validate
-  if errors.empty?
-    puts
-    puts "    \e[32mCongratulations. That Archfile looks excellent and should work well!\e[0m"
-    puts 
-    puts "    Just head over to \e[35mhttps://my.viaduct.io\e[0m to create your new application."
-    puts "    Don't forget to add your Archfile to your repository so we can find it."
-    puts
-  else
-    puts
-    puts "    \e[31mOh no. It seems there's a problem with your Archfile!\e[0m"
-    puts
-    errors.each do |field, value|
-      puts "    * #{field ? field + ' ' : nil}\e[33m#{value}\e[0m"
+begin
+  path = ARGV[0] || './Archfile'
+  if File.exist?(path)
+    archfile = Viaduct::Archfile.new(File.read(path))
+    errors = archfile.validate
+    if errors.empty?
+      puts
+      puts "    \e[32mCongratulations. That Archfile looks excellent and should work well!\e[0m"
+      puts 
+      puts "    Just head over to \e[35mhttps://my.viaduct.io\e[0m to create your new application."
+      puts "    Don't forget to add your Archfile to your repository so we can find it."
+      puts
+    else
+      puts
+      puts "    \e[31mOh no. It seems there's a problem with your Archfile!\e[0m"
+      puts
+      errors.each do |field, value|
+        puts "    * #{field ? field + ' ' : nil}\e[33m#{value}\e[0m"
+      end
+      puts
     end
-    puts
+  else
+    $stderr.puts "\e[31m!! Couldn't find Viaduct Archfile at #{path}\e[0m"
+    exit 1
   end
-else
-  $stderr.puts "\e[31m!! Couldn't find Viaduct Archfile at #{path}\e[0m"
+rescue Viaduct::ArchfileRemoteBackend::Error
+  $stderr.puts "\e[31m!! Couldn't download required data from Viaduct. Please try again later.\e[0m"
+  exit 1
+rescue Psych::SyntaxError => e
+  $stderr.puts "\e[31m!! The Archfile could not be read as it was not valid YAML. Please check and try again.\e[0m"
+  $stderr.puts e.message
   exit 1
-end
+end

data/lib/viaduct/archfile.rb

@@ -1,21 +1,24 @@
 require 'safe_yaml/load'
+require 'viaduct/archfile_remote_backend'
 
 module Viaduct
   class Archfile
     
-    APPLICATION_STACKS = ['ruby2.0']
-    SHARED_DATABASE_TYPES = ['mysql']
-    START_DETECTOR_MODULES = ['none', 'log_string', 'timer']
-    COMMAND_EVENTS = ['build', 'start', 'firstrun']
-    
     PATH_REGEX = /\A[a-z0-9\_\-\/\.]+\z/
     
-    
     #
     # Create a new Archfile object from raw yaml
     #
-    def initialize(yaml)
+    def initialize(yaml, remote_backend = ArchfileRemoteBackend)
       @yaml = yaml
+      @remote_backend = remote_backend
+    end
+
+    #
+    # Return the spec document
+    #
+    def spec
+      @spec ||= SafeYAML.load(@yaml)
     end
 
     #
@@ -40,6 +43,13 @@ module Viaduct
       errors << [key.nil? ? nil : "#{@current_namespace.join('.')}.#{key}", message]
     end
     
+    #
+    # Return remote properties for this archfile
+    #
+    def remote_properties
+      @remote_properties ||= @remote_backend.properties
+    end
+    
     #
     # Validate that the object is valid, returning an array of errors
     # or an empty array if there are no errors.
@@ -47,23 +57,15 @@ module Viaduct
     def validate
       @errors = []
       
-      #
-      # Load the YAML
-      #
-      begin
-        spec = SafeYAML.load(@yaml)
-      rescue Psych::SyntaxError => e
-        errors << [nil, "YAML document could not be read (#{e.message})"]
-        return @errors
-      end
-      
       #
       # Check settings
       #
-      namespace spec['settings'], 'settings'
-      ensure_boolean('sleep_inactive_web_processes')
-      ensure_boolean('serve_static_files')
-      ensure_matches(/\A[a-z0-9\_\-\/]+\z/, 'document_root')
+      if spec['settings']
+        namespace spec['settings'], 'settings'
+        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')
+      end
       
       #
       # Check that we have some processes to begin with
@@ -79,13 +81,14 @@ module Viaduct
         spec['processes'].each_with_index do |process, index|
           namespace process, 'processes', index
           ensure_string('command')
-          ensure_inclusion(APPLICATION_STACKS, 'stack')
+          ensure_inclusion(remote_properties['container_memory_allocations'], 'memory')
+          ensure_inclusion(remote_properties['application_stacks'], 'stack')
           ensure_integer('quantity')
           ensure_matches(PATH_REGEX, 'name')
           ensure_integer('kill_after') if process['kill_after']
           if sm = process['start_monitor']
             namespace sm, 'processes', index, 'start_monitor'
-            ensure_inclusion(START_DETECTOR_MODULES, 'module')
+            ensure_inclusion(remote_properties['process_start_detectors'], 'module')
             ensure_integer('timer') if sm['module'] == 'timer'
             ensure_string('string') if sm['module'] == 'log_string'
           end
@@ -98,7 +101,7 @@ module Viaduct
       if spec['shared_databases'].is_a?(Array)
         spec['shared_databases'].each_with_index do |db, index|
           namespace db, 'shared_databases', index
-          ensure_inclusion(SHARED_DATABASE_TYPES, 'type')
+          ensure_inclusion(remote_properties['shared_database_backends'], 'type')
           ensure_string('label')
         end
       end
@@ -129,8 +132,8 @@ module Viaduct
       if spec['commands'].is_a?(Array)
         spec['commands'].each_with_index do |command, index|
           namespace command, 'commands', index
-          ensure_inclusion APPLICATION_STACKS, 'stack'
-          ensure_inclusion COMMAND_EVENTS, 'event'
+          ensure_inclusion remote_properties['application_stacks'], 'stack'
+          ensure_inclusion remote_properties['command_events'], 'event'
           ensure_string 'command'
           ensure_integer 'success_exit_code'
         end
@@ -153,7 +156,7 @@ module Viaduct
     private
     
     def value_for(item)
-      @current_hash[item]
+      @current_hash.is_a?(Hash) ? @current_hash[item] : nil
     end
     
     def ensure_boolean(*items)

data/lib/viaduct/archfile_remote_backend.rb

@@ -0,0 +1,28 @@
+require 'net/https'
+require 'json'
+
+module Viaduct
+  class ArchfileRemoteBackend
+    
+    class Error < StandardError; end
+    
+    def self.properties
+      req = Net::HTTP::Get.new('/archfile/properties')
+      http = Net::HTTP.new(ENV['VDT_HOST'] || 'my.viaduct.io', ENV['VDT_PORT'] || 443)
+      if ENV['VDT_PORT'] == 443
+        res.use_ssl = true
+        res.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      
+      result =  http.request(req)
+      if result.is_a?(Net::HTTPSuccess)
+        JSON.parse(result.body)
+      else
+        raise Error, "Unable to download data from Viaduct host. Please try again later."
+      end
+    rescue
+      raise Error, "Unable to download data from Viaduct host. Please try again later."      
+    end
+    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-archfile
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 description: A validation tool for checking the validity of a Viaduct Archfile
 email:
 - adam@viaduct.io
@@ -34,6 +48,7 @@ extra_rdoc_files: []
 files:
 - bin/vdt-archfile-check
 - lib/viaduct/archfile.rb
+- lib/viaduct/archfile_remote_backend.rb
 - README.md
 homepage: http://viaduct.io
 licenses: []