origen_app_generators 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bd751932ba648a39c5f1b2d8cd61d1cc224d739
-  data.tar.gz: a71ffc595f1da44df412126be1bcaf68e5f369e7
+  metadata.gz: efe3f54f85b5eb4fbf72aa62d4735d1b3eb91a0d
+  data.tar.gz: a7ac8e0632d178b7549e39fdb1c2b7da8c9a0bd5
 SHA512:
-  metadata.gz: 3990cdbb27929fb3fe39665776ddd6ad2d559ff8ba65c158e9761fe47aa8f004b1bd9ba8142a8721d4103c4e4e6c0f492ed23671a3cd105e5ae03d479160699b
-  data.tar.gz: 442e825f3e580a2edb99c5c32584f69c6665fc5db5015812ed5ece72bf7353ce7a10576554ecb6fef7c8f6f5440ac4402ce0d36b3f46024d07cf018b4b9db3e5
+  metadata.gz: b5234f29caa0c4f6611ec22b79cfa3cca7714104b6487ae22f0fa8dc222349c992238df591856d630c1d984e5f80d7e2579d1dd59900c830720dd974be0929ae
+  data.tar.gz: f26c931c0aec81bdc5f8125db023736e105e37eb5f21d70352b2022aa30a58ea23f36b302d938a1f15d8f22d231e85c58764e22fce31c8303dde9286d4e53f20

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenAppGenerators
   MAJOR = 1
   MINOR = 0
-  BUGFIX = 0
+  BUGFIX = 1
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_app_generators.rb

@@ -43,8 +43,9 @@ module OrigenAppGenerators
   }
 
   # @api private
-  def self.add_generators(new_generators)
+  def self.add_generators(new_generators, options = {})
     new_generators.each do |domain, gens|
+      gens.each { |gen| template_dirs[gen] ||= options[:template_dir] if options[:template_dir] }
       if generators[domain]
         gens.each { |g| generators[domain].unshift(g) }
         new_generators.delete(domain)
@@ -63,6 +64,11 @@ module OrigenAppGenerators
     @generators ||= AVAILABLE
   end
 
+  # @api private
+  def self.template_dirs
+    @template_dirs ||= {}
+  end
+
   # @api private
   def self.invoke(path)
     puts

data/lib/origen_app_generators/base.rb

@@ -12,10 +12,17 @@ module OrigenAppGenerators
       # So to keep things sane remove any inherited source paths.
       self.class.source_paths.pop until self.class.source_paths.empty?
       klass = self.class
+
       until klass == OrigenAppGenerators::Base
-        dir = klass.to_s.sub('OrigenAppGenerators::', '').split('::').map(&:underscore).join('/')
-        dir = File.expand_path("../../../templates/app_generators/#{dir}", __FILE__)
-        self.class.source_paths << dir if File.exist?(dir)
+        names = klass.to_s.split('::')
+        names.shift
+        dir = names.map(&:underscore).join('/')
+        if OrigenAppGenerators.template_dirs[klass]
+          dir = File.expand_path("#{OrigenAppGenerators.template_dirs[klass]}/#{dir}", __FILE__)
+        else
+          dir = File.expand_path("#{Origen.root!}/templates/app_generators/#{dir}", __FILE__)
+        end
+        self.class.source_paths << dir if File.exist?(dir) && !self.class.source_paths.include?(dir)
         klass = klass.superclass
       end
     end

data/lib/origen_app_generators/new.rb

@@ -136,7 +136,14 @@ module OrigenAppGenerators
       puts "Enter something like 'Test Engineering', 'Design', etc."
       puts
       domain = get_text(single: true)
-      domain = domain.titleize
+      domain = domain.split(' ').map do |word|
+        # Ensure all first letters capitalized, but make sure something like
+        # 'NVM' remains 'NVM' and not 'Nvm'
+        letters = word.split('')
+        letters.first.upcase!
+        letters.join
+      end.join(' ')
+
       @domain_summary = domain
       @domain_namespace =  @domain_summary.gsub(' ', '')
     end

data/templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb

@@ -1,7 +1,6 @@
 # This file is used to hook the generators defined in this plugin into the
 # 'origen new' command, it must not be removed or modified
-
 require 'origen_app_generators'
 require "<%= @name %>"
-
-OrigenAppGenerators.add_generators(<%= @namespace %>::AVAILABLE)
+template_dir = File.expand_path('../../templates/app_generators', __FILE__)
+OrigenAppGenerators.add_generators(<%= @namespace %>::AVAILABLE, template_dir: template_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_app_generators
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen