architecture-js 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/architecture-js.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]

data/lib/architecture-js/blueprint.rb

@@ -42,7 +42,12 @@ module ArchitectureJS
       @config.merge! config unless config.nil?
       @generator = ArchitectureJS::Generator.new self
     end
-  
+
+    def add_templates(dir)
+      [*dir].each { |d| @template_directories << d }
+      @generator.load_templates
+    end
+
     def read_config
       config = YAML::load_file("#{@root}/#{@config_file}")
       assign_config_variables config

data/lib/architecture-js/generator.rb

@@ -11,17 +11,21 @@ module ArchitectureJS
       @blueprint = @project.config
       @template_paths = @project.template_directories
       @templates = Hash.new
-      find_templates @template_paths
+      load_templates
     end
 
     def find_templates(paths)
-      paths.each do |path|
+      [*paths].each do |path|
         Dir["#{path}/*"].each do |file|
           add_file_to_templates file
         end
       end
     end
 
+    def load_templates
+      find_templates @template_paths
+    end
+
     def add_file_to_templates(file)
       ext = File.extname(file)
       template_name = File.basename(file, ext)

data/spec/generator_spec.rb

@@ -10,8 +10,8 @@ describe ArchitectureJS::Generator do
     FileUtils.cp "#{FIXTURES}/templates/env_template.js", "#{TMP_DIR}/env_template.js"
 
     project = ArchitectureJS::Blueprint.new({ name: 'myapp' }, TMP_DIR)
-    project.template_directories = ["#{FIXTURES}/templates"]
-    @gen = ArchitectureJS::Generator.new(project)
+    project.add_templates "#{FIXTURES}/templates"
+    @gen = project.generator
   end
 
   after :each do
@@ -27,7 +27,7 @@ describe ArchitectureJS::Generator do
   end
 
   it 'should have template_paths' do
-    @gen.template_paths.should == ["#{FIXTURES}/templates"]
+    @gen.template_paths.should == ["#{ArchitectureJS::base_directory}/templates", "#{TMP_DIR}/templates", "#{FIXTURES}/templates"]
   end
 
   it 'should find all the templates' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70223810592840 !ruby/object:Gem::Requirement
+  requirement: &70128067772620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70223810592840
+  version_requirements: *70128067772620
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70223810592360 !ruby/object:Gem::Requirement
+  requirement: &70128067772020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70223810592360
+  version_requirements: *70128067772020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223810591820 !ruby/object:Gem::Requirement
+  requirement: &70128067771440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70223810591820
+  version_requirements: *70128067771440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70223810591320 !ruby/object:Gem::Requirement
+  requirement: &70128067770940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70223810591320
+  version_requirements: *70128067770940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70223810590840 !ruby/object:Gem::Requirement
+  requirement: &70128067770420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70223810590840
+  version_requirements: *70128067770420
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70223810590360 !ruby/object:Gem::Requirement
+  requirement: &70128067765440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70223810590360
+  version_requirements: *70128067765440
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70223810589840 !ruby/object:Gem::Requirement
+  requirement: &70128067764840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.2.16
   type: :development
   prerelease: false
-  version_requirements: *70223810589840
+  version_requirements: *70128067764840
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70223810589360 !ruby/object:Gem::Requirement
+  requirement: &70128067764240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223810589360
+  version_requirements: *70128067764240
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70223810588880 !ruby/object:Gem::Requirement
+  requirement: &70128067763640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223810588880
+  version_requirements: *70128067763640
 description: Architecture.js helps you generate scaffolding, manage third-party packages,
   compile, and compress your application.
 email: daytonn@gmail.com
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -132243405050259594
+      hash: -688315577623791318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: