viaduct-archfile 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a328d158b01e55dce8a9c038c5620e2cf757c4d
-  data.tar.gz: a85c5f2659324703db4089d70ba5779ee211a392
+  metadata.gz: 2868a73bceef45509254e09b8ae0fa2837f1b6aa
+  data.tar.gz: 5a6801fe28a8acb3bd9fe7499583565f93feb865
 SHA512:
-  metadata.gz: d8d5bdaf655e08d2e886590cbf885a6050df88dfc58d4032a4dc4299a1901df5402b698d03203854f158c0dd0aa11054d978c1c26eeff003aea37bd71869718d
-  data.tar.gz: f800ae80de2898efc0d60cd2383d8b95b97e1f3ed9f946cfc3f270213de4fc304069b2db564ad1edb1a8ac822e1ee1d2e3b9e86a9b141fa5e605c723d765e124
+  metadata.gz: 23ef597b0040900d8a7c8a92d043ee74738884aa3bd83ac6a466ff9ce05c0a58ef68d80b846e7dc30a909388969d163c3700c30cd2c6174a2137ebd522ccd4be
+  data.tar.gz: 8dc38d2eaf92518f1e65847bccf55d7e2d9121b61b459f52c75d8f1da6a3fd218effb9fbf59ce20b8f0477c96589da50c771213abacc5d126473e9cd38a00314

data/README.md

@@ -17,7 +17,7 @@ what it looks like would be to refer to our examples.
 
 ## How can I test the validity of an Archfile?
 
-To test that your Archfile is appropriate, you can install this library and follow the instructions 
+To test that your Archfile is appropriate, you can install this library and follow the instructions
 below. Our backend systems also use this library to validate Archfiles so if it passes here, it'll
 pass when you create your application.
 

data/bin/vdt-archfile-check

@@ -10,7 +10,7 @@ begin
     if errors.empty?
       puts
       puts "    \e[32mCongratulations. That Archfile looks excellent and should work well!\e[0m"
-      puts 
+      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

data/lib/viaduct/archfile.rb

@@ -3,9 +3,9 @@ require 'viaduct/archfile_remote_backend'
 
 module Viaduct
   class Archfile
-    
+
     PATH_REGEX = /\A[a-z0-9\_\-\/\.]+\z/
-    
+
     #
     # Create a new Archfile object from raw yaml
     #
@@ -18,9 +18,9 @@ module Viaduct
     # Return the spec document
     #
     def spec
-      @spec ||= SafeYAML.load(@yaml)
+      @spec ||= @yaml.is_a?(String) ? SafeYAML.load(@yaml) : @yaml
     end
-    
+
     #
     # Is the archfile valid?
     #
@@ -34,7 +34,7 @@ module Viaduct
     def errors
       @errors ||= []
     end
-    
+
     #
     # Store the current namespace we're working in
     #
@@ -42,47 +42,47 @@ module Viaduct
       @current_hash = hash
       @current_namespace = ns
     end
-    
+
     #
     # Return the current namespace
     #
     def current_namespace
       @current_namespace ||= []
     end
-    
+
     #
     # Return the current hash
     #
     def current_hash
       @current_hash ||= spec
     end
-    
-    # 
+
+    #
     # Add an error
     #
     def add_error(key, message)
       errors << [key.nil? ? nil : "#{current_namespace.join('.')}.#{key}".gsub(/\A\./, ''), 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.
     #
     def validate
       @errors = []
-      
+
       #
       # Ensure we have a stack
       #
       ensure_inclusion remote_properties['platforms'], 'platform'
-      
+
       #
       # Check settings
       #
@@ -92,14 +92,14 @@ module Viaduct
         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
       #
       unless spec['processes'].is_a?(Array) && spec['processes'].length > 0
         add_error nil, "You must have at least one process"
       end
-      
+
       #
       # Check processes
       #
@@ -119,7 +119,7 @@ module Viaduct
           end
         end
       end
-      
+
       #
       # Check shared databases
       #
@@ -130,7 +130,7 @@ module Viaduct
           ensure_string('label')
         end
       end
-      
+
       #
       # Check Environment Variables
       #
@@ -140,7 +140,7 @@ module Viaduct
           ensure_string('key', 'value')
         end
       end
-      
+
       #
       # Check persistent directories
       #
@@ -150,7 +150,7 @@ module Viaduct
           ensure_matches(PATH_REGEX, 'path')
         end
       end
-      
+
       #
       # Check commands
       #
@@ -162,7 +162,7 @@ module Viaduct
           ensure_integer 'success_exit_code'
         end
       end
-      
+
       #
       # Check config files
       #
@@ -173,30 +173,30 @@ module Viaduct
           ensure_string 'content'
         end
       end
-      
+
       errors
     end
-    
+
     private
-    
+
     def value_for(item)
       current_hash.is_a?(Hash) ? current_hash[item] : nil
     end
-    
+
     def ensure_boolean(*items)
       items.each do |item|
         value = value_for(item)
         add_error item, "must be a boolean" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
       end
     end
-    
+
     def ensure_string(*items)
       items.each do |item|
         value = value_for(item)
         add_error item, "must be a string" unless value.is_a?(String) && value.length > 0
       end
     end
-    
+
     def ensure_matches(regex, *items)
       items.each do |item|
         value = value_for(item)
@@ -205,19 +205,19 @@ module Viaduct
         end
       end
     end
-    
+
     def ensure_integer(*items)
       items.each do |item|
         value = value_for(item)
         add_error item, "must be a number" unless value.is_a?(Fixnum)
       end
     end
-    
+
     def ensure_inclusion(options, *items)
       items.each do |item|
         add_error item, "must be one of #{options}" unless options.include?(value_for(item))
       end
     end
-    
+
   end
-end
+end

data/lib/viaduct/archfile_remote_backend.rb

@@ -3,9 +3,9 @@ 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)
@@ -13,7 +13,7 @@ module Viaduct
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      
+
       result =  http.request(req)
       if result.is_a?(Net::HTTPSuccess)
         JSON.parse(result.body)
@@ -22,8 +22,8 @@ module Viaduct
       end
     rescue => e
       puts e
-      raise Error, "Unable to download data from Viaduct host. Please try again later."      
+      raise Error, "Unable to download data from Viaduct host. Please try again later."
     end
-    
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viaduct-archfile
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-29 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -46,10 +46,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/vdt-archfile-check
 - lib/viaduct/archfile.rb
 - lib/viaduct/archfile_remote_backend.rb
-- README.md
 homepage: http://viaduct.io
 licenses: []
 metadata: {}
@@ -59,17 +59,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A validation tool for checking the validity of a Viaduct Archfile