skeletor 0.8.4 → 0.9.0

data/README.md

@@ -1,7 +1,7 @@
 Skeletor
 ========
 
-Skeletor is a Ruby Library for setting up quick project skeletons based on code templates. It uses YAML templates to specify a directory structure of files and 
+Skeletor is a Ruby Library for setting up quick project skeletons based on code templates. It can use YAML or JSON templates to specify a directory structure of files and 
 folders, a list of includes to pull and any tasks to run. It also contains built in templates
 
 Installation
@@ -35,7 +35,7 @@ Cleans the entire project directory.  A helper method to let you start again. Us
 
 	skeletor validate TEMPLATE
 	
-Validates that TEMPLATE is a valid YAML file and that it matches the expected schema (see below).
+Validates that TEMPLATE is a valid YAML or JSON file and that it matches the expected schema (see below).
 
 ###Help###
 
@@ -48,10 +48,10 @@ Templates
 
 ###Creating Templates###
 
-A Skeletor template is a YAML file in a folder with the same name as the file so for instance, a basic template on file would look like this:
+A Skeletor template is a YAML or JSON file in a folder with the same name as the file so for instance, a basic template on file would look like this:
 
 	sample-template/
-		- sample-template.yml
+		- sample-template.(yml|json)
 	
 The yaml structure looks like this:
 
@@ -71,6 +71,34 @@ The yaml structure looks like this:
 		- TASKANDARGUMENTS
 		- ANOTHERTASKANDARGUMENTS
 		
+The JSON structure looks like this:
+
+	{	
+		"directory_structure":[
+			{
+				"dirname':[
+					{
+						"subdir':[]
+					},
+					[
+						"NESTEDFILE"
+					]
+				]
+			},
+			[
+				"FILENAME"
+			]
+		],
+		"includes":{
+			"FILENAME": "path/to/file"
+			"NESTEDFILE": "remoteurloffile"
+		},
+		"tasks":[
+			"TASKANDARGUMENTS"
+			"ANOTHERTASKANDARGUMENTS"
+		]
+	}
+		
 It should match the following schema:
 
 	sections:

data/lib/skeletor/cli.rb

@@ -44,7 +44,7 @@ module Skeletor
     desc "validate TEMPLATE" ,"Checks TEMPLATE is a valid YAML file and matches the required schema."
     # Loads a template, creates a new *Validator* and validates the template    
     def validate(template)
-      skeleton = Skeletons::Loader.loadTemplate(template)
+      skeleton = Skeletons::Loader.load_template(template)
       validator = Grayskull::Validator.new(skeleton,Skeletons::Skeleton::SCHEMA_FILE)
       results = validator.validate
       

data/lib/skeletor/skeletons/loader.rb

@@ -1,4 +1,6 @@
 require 'yaml'
+require 'hike'
+require 'grayskull'
 
 module Skeletor
   
@@ -17,33 +19,58 @@ module Skeletor
       # Searches for the specified template and loads it into a variable
       #
       # Also adds the path where it was found to the returned Hash
-      def self.loadTemplate(template)
+      def self.load_template(template)
         
         puts 'Loading Template - ' + template
         
+        #if File.exists?(template) && !File.directory?(template)
+        #  skeleton = YAML.load_file(template)
+        #  path = File.dirname(template)
+        #elsif File.exists?(File.join(template,File.basename(template) + '.yml'))
+        #  skeleton = YAML.load_file(File.join(template,File.basename(template) + '.yml'))
+        #  path = template
+        #elsif File.exists?(File.join(USER_TEMPLATE_PATH,template,template+'.yml'))
+        #  skeleton = YAML.load_file(File.join(USER_TEMPLATE_PATH,template,template+'.yml'))
+        #  path = File.join(USER_TEMPLATE_PATH,template)
+        #elsif File.exists?(File.join(TEMPLATE_PATH,template,template+'.yml'))
+        #  skeleton = YAML.load_file(File.join(TEMPLATE_PATH,template,template+'.yml'))
+        #  path = File.join(TEMPLATE_PATH,template)
+        #else
+        #  raise LoadError, 'Error: Template File ' + File.basename(template) + ' Could Not Be Found'
+        #end
+        
         if File.exists?(template) && !File.directory?(template)
-          skeleton = YAML.load_file(template)
-          path = File.dirname(template)
-        elsif File.exists?(File.join(template,File.basename(template) + '.yml'))
-          skeleton = YAML.load_file(File.join(template,File.basename(template) + '.yml'))
-          path = template
-        elsif File.exists?(File.join(USER_TEMPLATE_PATH,template,template+'.yml'))
-          skeleton = YAML.load_file(File.join(USER_TEMPLATE_PATH,template,template+'.yml'))
-          path = File.join(USER_TEMPLATE_PATH,template)
-        elsif File.exists?(File.join(TEMPLATE_PATH,template,template+'.yml'))
-          skeleton = YAML.load_file(File.join(TEMPLATE_PATH,template,template+'.yml'))
-          path = File.join(TEMPLATE_PATH,template)
+          result = template
         else
-          raise LoadError, 'Error: Template File ' + File.basename(template) + ' Could Not Be Found'
+          trail = Hike::Trail.new "/"
+          trail.append_extensions ".yml", ".json" 
+          
+          if File.directory?(template)
+            trail.append_paths template
+            result = trail.find File.basename(template)
+          else
+            trail.append_paths USER_TEMPLATE_PATH, TEMPLATE_PATH
+            result = trail.find File.basename(template) + "/" + File.basename(template)
+          end
+                
         end
         
-        puts 'Template ' + File.basename(template) + '.yml loaded from ' + path
-        if skeleton
-          skeleton['path'] = path
-        else
-          raise LoadError, 'Error: Template could not be parsed as vald YAML'
+        if result
+          begin
+            file = File.basename(result)
+            path = File.dirname(result)
+            skeleton = Grayskull::DataFile.load(result)
+            skeleton['file'] = file
+            skeleton['path'] = path
+            puts 'Template ' + file + ' loaded from ' + path
+         rescue Exception => e
+          puts e.message
+          exit
+         end
         end
         
+        puts 'Template ' + file + ' loaded from ' + path
+                
         return skeleton
         
       end

data/lib/skeletor/skeletons/skeleton.rb

@@ -16,7 +16,7 @@ module Skeletor
       def initialize(template)
         
         begin
-          @template = Loader.loadTemplate(template)
+          @template = Loader.load_template(template)
           validator = Grayskull::Validator.new(@template,SCHEMA_FILE)
           results = validator.validate
           if results["result"]

data/lib/skeletor/version.rb

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

metadata

@@ -1,62 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: skeletor
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
+version: !ruby/object:Gem::Version
+  version: 0.9.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Will McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-02 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70191011871680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 14
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.14.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: grayskull
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70191011871680
+- !ruby/object:Gem::Dependency
+  name: hike
+  requirement: &70191011870700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 6
-        version: 0.1.6
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   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: 
+  prerelease: false
+  version_requirements: *70191011870700
+- !ruby/object:Gem::Dependency
+  name: grayskull
+  requirement: &70191011869780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191011869780
+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
-executables: 
+executables:
 - skeletor
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - lib/skeletor/builder.rb
 - lib/skeletor/cli.rb
@@ -77,37 +74,29 @@ files:
 - lib/skeletor/templates/rb-gem/includes/sample.gemspec
 - lib/skeletor/templates/rb-gem/rb-gem.yml
 - lib/skeletor/templates/template-schema.yml
-has_rdoc: true
 homepage: http://github.com/OiNutter/skeletor
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: skeletor
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem for creating project skeletons based on YAML templates
 test_files: []
-