skeletor 0.7.0 → 0.8.4

data/lib/skeletor/cli.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'grayskull'
 
 module Skeletor
   
@@ -44,8 +45,19 @@ module Skeletor
     # Loads a template, creates a new *Validator* and validates the template    
     def validate(template)
       skeleton = Skeletons::Loader.loadTemplate(template)
-      validator = Skeletons::Validator.new(skeleton)
-      validator.validate()
+      validator = Grayskull::Validator.new(skeleton,Skeletons::Skeleton::SCHEMA_FILE)
+      results = validator.validate
+      
+       if !results['result']
+        puts 'Validation Failed with ' + @errors.count.to_s + ' errors';
+            puts ''
+            results["errors"].each{
+              |error|
+              puts error            
+            }
+      else
+        puts 'Validated Successfully!'
+      end
     end
     
   end

data/lib/skeletor/skeletons/skeleton.rb

@@ -1,3 +1,5 @@
+require 'grayskull'
+
 module Skeletor
   
   module Skeletons
@@ -7,18 +9,29 @@ module Skeletor
     # default values for any missing sections.
     class Skeleton
       
+      # Defines the location to the required schema file for the templates
+      SCHEMA_FILE = File.join Skeletons::Loader::TEMPLATE_PATH,'template-schema.yml'
+      
       #Creates a new *Skeleton* instance from `template`
       def initialize(template)
         
         begin
           @template = Loader.loadTemplate(template)
-          validator = Validator.new(@template)
-          if validator.validate
+          validator = Grayskull::Validator.new(@template,SCHEMA_FILE)
+          results = validator.validate
+          if results["result"]
+            puts "Validated Successfully!"
             @directory_structure = @template["directory_structure"] || []
             @tasks = @template["tasks"] || {}
             @includes = @template["includes"] || {}
             @path = @template["path"]
           else
+            puts 'Validation Failed with ' + @errors.count.to_s + ' errors';
+            puts ''
+            results["errors"].each{
+              |error|
+              puts error            
+            }
             exit
           end
         rescue LoadError => e

data/lib/skeletor/skeletons.rb

@@ -3,7 +3,6 @@ module Skeletor
   # Contains the classes for dealing with the project templates
   module Skeletons
     autoload :Loader,     'skeletor/skeletons/loader'
-    autoload :Validator,  'skeletor/skeletons/validator' 
     autoload :Skeleton,   'skeletor/skeletons/skeleton'
   end  
     

data/lib/skeletor/templates/template-schema.yml

@@ -1,6 +1,6 @@
 sections:
   - name: directory_structure
-    required: yes
+    required: no
     type: Array
     ok_empty: yes
     accepts:

data/lib/skeletor/version.rb

@@ -1,4 +1,4 @@
 module Skeletor
   # Current version number
-  VERSION="0.7.0"
+  VERSION="0.8.4"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 0
-  version: 0.7.0
+  - 8
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Will McKenzie
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +01:00
+date: 2011-10-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,30 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 14
+        - 6
+        version: 0.14.6
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: grayskull
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
+  type: :runtime
+  version_requirements: *id002
 description: Skeletor is a command line gem for creating project skeletons based on a YAML template. It will create files and folders, including pulling in specified includes, and run tasks to set up your project.
 email: 
 - will@oinutter.co.uk
@@ -48,7 +65,6 @@ files:
 - lib/skeletor/protocols/https.rb
 - lib/skeletor/skeletons/loader.rb
 - lib/skeletor/skeletons/skeleton.rb
-- lib/skeletor/skeletons/validator.rb
 - lib/skeletor/skeletons.rb
 - lib/skeletor/tasks.rb
 - lib/skeletor/version.rb

data/lib/skeletor/skeletons/validator.rb

@@ -1,186 +0,0 @@
-require 'yaml'
-
-module Skeletor
-  
-  module Skeletons
-    
-    # *Validator* handles validation of the loaded project template files against 
-    # the required schema
-    
-    class Validator
-      
-      # Defines the location to the required schema file for the templates
-      SCHEMA_FILE = File.join Skeletons::Loader::TEMPLATE_PATH,'template-schema.yml'
-      
-      # Creates a new *Validator* instance
-      def initialize(template,schema=SCHEMA_FILE)
-        @errors = []
-        @template = template
-        @schema = Loader.loadTemplate(schema)
-        @types = @schema['types'] || {}
-      end
-      
-      # Validates the template against the schema
-      def validate()
-        failed = []
-        
-        @schema['sections'].each{
-          |section|
-          
-          #check required sections are there
-          if (section['required'] && !@template.has_key?(section['name']))
-            @errors.push('Error: missing required section - ' + section['name'])
-            failed.push(section['name'])
-          elsif @template.has_key?(section['name'])
-            node = @template[section['name']]
-            validated = match_node(node,section,section['name'])
-            if(!validated)
-              failed.push(section['name'])
-            end
-          end
-               
-        }
-        
-        puts 'Result: ' + (failed.empty? ? 'Validated Successfully!' : 'Validation Failed!')
-        
-        if !failed.empty? && !@errors.empty?
-          puts 'Validation Failed with ' + @errors.count.to_s + ' errors';
-          puts ''
-          @errors.each{
-            |error|
-            puts error            
-          }
-          return false
-        else
-          return true
-        end
-        
-      end
-      
-      # Checks template node matches the schema.
-      #
-      # Checks type of node against expected type and 
-      # checks any children are of the accepted types.
-      def match_node(node,expected,label)
-        
-        #check type    
-        if !check_type(node,expected['type'],label,expected['ok_empty'])
-          return false
-        end
-        
-        if (node.kind_of?(Hash) || node.kind_of?(Array))
-          
-          if node.empty? && !expected['ok_empty']
-            @errors.push('Error: node ' + label + ' cannot be empty')
-            return false
-          elsif !node.empty? && expected.has_key?('accepts')
-            valid_content = false
-            
-            if node.kind_of?(Hash)
-              matched = []
-              unmatched = []
-              node.each_pair{
-                |key,value|
-                
-                expected['accepts'].each{
-                  |accepts|
-                     
-                  result = check_type(value,accepts,key)
-                  
-                  if result
-                    matched.push(key)
-                    if !unmatched.find_index(key).nil?
-                      unmatched.slice(unmatched.find_index(key))
-                    end
-                    break
-                  else
-                    unmatched.push(key)
-                  end
-                 
-                }
-                
-              }
-                         
-              if(matched.count==node.count)
-                valid_content = true
-               else
-                unmatched.each{
-                  |node|
-                  
-                  @errors.push('Error: node ' + node + ' is not of an accepted type. Should be one of ' + expected['accepts'].join(', '))
-                }
-              end
-              
-            elsif node.kind_of?(Array)
-              matched = []
-              unmatched = []
-              node.each_index{
-                |n|
-                
-                expected['accepts'].each{
-                  |accepts|
-                  
-                  key = label + '[' + n.to_s + ']'
-                  result = check_type(node[n],accepts,key)
-                  
-                  if result
-                    
-                    matched.push(key)
-                    if !unmatched.find_index(key).nil?
-                      unmatched.slice(unmatched.find_index(key))
-                    end
-                    break
-                  else
-                    unmatched.push(key)
-                  end
-                  
-                }
-              }
-              
-              if(matched.count==node.count)
-                valid_content = true
-              else
-                unmatched.each{
-                  |node|
-                  
-                  @errors.push('Error: node ' + node + ' is not of an accepted type. Should be one of ' + expected['accepts'].join(', '))
-                }
-              end
-            
-            end
-            
-            if !valid_content
-              @errors.push('Error: node ' + label + ' contains an unaccepted type.')
-              return false
-            end
-         end
-         
-        end
-       
-        return true
-                
-      end
-      
-      # Checks that the node is of the correct type
-      #
-      # If the expected node is a custom node type as defined in the schema
-      # It will run `match_node` to check that the node schema matches the 
-      # custom type.
-      def check_type(node,expected_type,label,accept_nil = false)
-        
-        valid_type = true;
-        if(@types.has_key?(expected_type))
-          valid_type = match_node(node,@types[expected_type],label)
-        elsif node.class.to_s != expected_type && !(node.kind_of?(NilClass) && (expected_type=='empty' || accept_nil))
-          valid_type = false
-        end
-       
-        return valid_type
-        
-      end
-      
-      end
-      
-  end
-  
-end