origen 0.44.0 → 0.50.0

data/origen_app_generators/lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb

@@ -77,23 +77,21 @@ module OrigenAppGenerators
           list = super  # Always pick up the parent list
           # Example of how to remove a file from the parent list
           # list.delete(:web_doc_layout)
-          list.delete(:lib_readme)
-          list.delete(:lib_readme_dev)
           list.delete(:templates_shared)
           # Example of how to add a file, in this case the file will be compiled and copied to
           # the same location in the new app
           # list[:config_shared_commands] = { source: 'config/shared_commands.rb' }
           list[:config_load_generators] = { source: 'config/load_generators.rb' }
-          list[:lib_base] = { source: 'lib/base.rb', dest: "lib/#{@name}/base.rb" }
-          list[:lib_plugin] = { source: 'lib/plugin.rb', dest: "lib/#{@name}/plugin.rb" }
-          list[:lib_application] = { source: 'lib/application.rb', dest: "lib/#{@name}/application.rb" }
+          list[:lib_base] = { source: 'app/lib/base.rb', dest: "app/lib/#{@name}/base.rb" }
+          list[:lib_plugin] = { source: 'app/lib/plugin.rb', dest: "app/lib/#{@name}/plugin.rb" }
+          list[:lib_application] = { source: 'app/lib/application.rb', dest: "app/lib/#{@name}/application.rb" }
           # Alternatively specifying a different destination, typically you would do this when
           # the final location is dynamic
           # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
           # Example of how to create a directory
-          list[:templates_app] = { dest: 'templates/app_generators/application', type: :directory }
-          list[:templates_plugin] = { dest: 'templates/app_generators/plugin', type: :directory }
-          list[:templates_base] = { dest: 'templates/app_generators/base', type: :directory }
+          list[:templates_app] = { dest: 'app/templates/app_generators/application', type: :directory }
+          list[:templates_plugin] = { dest: 'app/templates/app_generators/plugin', type: :directory }
+          list[:templates_base] = { dest: 'app/templates/app_generators/base', type: :directory }
           # By default, directories created in this way will contain a .keep file, to inhibit this:
           # list[:pattern_dir] = { dest: "pattern", type: :directory, nokeep: true }
           # Example of how to create a symlink

data/origen_app_generators/lib/origen_app_generators/plugin.rb

@@ -1,8 +1,7 @@
 module OrigenAppGenerators
   # The base generator class that should be used by all plugin generators
   class Plugin < Application
-    def get_common_user_input
-      get_name_and_namespace
+    def get_additional_user_input
       get_summary
       get_audience unless @audience
     end
@@ -19,15 +18,13 @@ module OrigenAppGenerators
         list.delete(:web_installation)
         list.delete(:web_introduction)
         list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
-        list[:templates_shared] = { dest: 'templates/shared', type: :directory }
+        list[:templates_shared] = { dest: 'app/templates/shared', type: :directory }
         if @audience == :external
           list[:travis] = { source: '.travis.yml' }
-          list[:web_navbar] = { source: 'templates/web/partials/_navbar_external.html.erb', dest: 'templates/web/partials/_navbar.html.erb' }
+          list[:web_navbar] = { source: 'app/templates/web/partials/_navbar_external.html.erb', dest: 'app/templates/web/partials/_navbar.html.erb' }
         else
-          list[:web_navbar] = { source: 'templates/web/partials/_navbar_internal.html.erb', dest: 'templates/web/partials/_navbar.html.erb' }
+          list[:web_navbar] = { source: 'app/templates/web/partials/_navbar_internal.html.erb', dest: 'app/templates/web/partials/_navbar.html.erb' }
         end
-        list[:lib_readme] = { source: 'lib/README', dest: "lib/#{@name}/README" }
-        list[:lib_readme_dev] = { source: 'lib_dev/README', dest: "lib/#{@name}_dev/README" }
         list
       end
     end

data/origen_app_generators/lib/origen_app_generators/test_engineering/common.rb

@@ -0,0 +1,29 @@
+module OrigenAppGenerators
+  module TestEngineering
+    module Common
+      def common_filelist(list)
+        # Example of how to remove a file from the parent list
+        # list.delete(:target_debug)
+        # Example of how to add a file, in this case the file will be compiled and copied to
+        # the same location in the new app
+        list[:environment_v93k] = { source: 'environment/v93k.rb' }
+        list[:environment_j750] = { source: 'environment/j750.rb' }
+        list[:environment_uflex] = { source: 'environment/uflex.rb' }
+        # Alternatively specifying a different destination, typically you would do this when
+        # the final location is dynamic
+        # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
+        # Example of how to create a directory
+        # list[:pattern_dir] = { dest: 'pattern', type: :directory }
+        # Example of how to create a symlink
+        list[:environment_default] = { source: 'uflex.rb',           # Relative to the file being linked to
+                                       dest:   'environment/default.rb', # Relative to destination_root
+                                       type:   :symlink }
+        # Test engineering source directories
+        list[:patterns_dir] = { dest: 'app/patterns', type: :directory }
+        list[:flows_dir]    = { dest: 'app/flows', type: :directory }
+        # Remember to return the final list
+        list
+      end
+    end
+  end
+end

data/origen_app_generators/lib/origen_app_generators/test_engineering/stand_alone_application.rb

@@ -1,8 +1,9 @@
 module OrigenAppGenerators
   module TestEngineering
-    require 'origen_app_generators/sub_block_parser'
     # Generates a generic application shell
     class StandAloneApplication < Application
+      include Common
+
       desc 'A stand alone test engineering application'
 
       # Any methods that are not protected will get invoked in the order that they are
@@ -13,13 +14,12 @@ module OrigenAppGenerators
         # The methods to get the common user input that applies to all applications will
         # get called at the start automatically, you have a chance here to ask any additional
         # questions that are specific to the type of application being generated
-        get_top_level_names
-        get_sub_block_names
       end
 
       def generate_files
-        # Calling this will build all files, directories and symlinks contained in the
-        # hash returned by the filelist method
+        @development_dependencies = [
+          ['origen_testers']
+        ]
         build_filelist
       end
 
@@ -37,122 +37,8 @@ module OrigenAppGenerators
 
       protected
 
-      def sub_block_parser
-        @sub_block_parser ||= SubBlockParser.new
-      end
-
-      def get_top_level_names
-        puts
-        puts 'NAME YOUR TOP-LEVEL DEVICE(S)'
-        puts
-        puts 'What do you want to call the top-level class that represents your device?'
-        puts 'By default it will be called TopLevel, but if you want this application to support multiple devices you should'
-        puts 'give them unique names.'
-        puts 'Separate multiple names with a comma:    Falcon, Eagle, Vulture'
-        puts
-
-        valid = false
-        until valid
-          @top_level_names = get_text(single: true, default: 'TopLevel').strip.split(',').map do |name|
-            name.strip.gsub(/\s+/, '_').camelize
-          end
-          unless @top_level_names.empty?
-            # Should we check anything here?
-            valid = true
-          end
-        end
-        @top_level_names
-      end
-
-      def get_sub_block_names
-        puts
-        puts 'DEFINE YOUR SUB-BLOCKS'
-        puts
-        puts 'What sub-blocks does this device contain?'
-        puts 'You can leave this blank, but entering some details of the sub-blocks you will want to involve in your tests'
-        puts 'will save you some manual setup of the associated models and controllers.'
-        puts 'You can specify layers of hierarchy and multiple instantiations, here are some examples:'
-        puts
-        puts '  A RAM, OSC, PLL and 2 ATDs at the top-level:    ram, osc, pll, atd(2)'
-        puts '  With 3 COMMS blocks with embedded components:   ram, osc, pll, atd(2), comms[ram(2), osc](3)'
-        if @top_level_names.size > 1
-          puts
-          puts 'If you want different modules for each of your top-level devices you can do:'
-          puts
-          puts "  #{@top_level_names[0]}[ram, atd(2)], #{@top_level_names[1]}[ram(2), atd(4)]"
-        end
-        puts
-
-        valid = false
-        until valid
-          input = get_text(single: true).strip
-          if input.empty?
-            @sub_blocks_lookup = {}
-            valid = true
-          else
-            begin
-              @sub_blocks_lookup = sub_block_parser.parse(input)
-              valid = true
-            rescue
-              valid = false
-            end
-          end
-        end
-        @sub_blocks_lookup
-      end
-
-      # Returns a hash that looks like:
-      #
-      #   {"Falcon"=>{"RAM"=>{}, "ATD"=>{:instances=>2}}, "Eagle"=>{"RAM"=>{:instances=>2}, "ATD"=>{:instances=>4}}}
-      def top_level_sub_blocks
-        blocks = {}
-        # Make sure that each top-level object has a sub blocks assignment
-        if @top_level_names.any? { |n| @sub_blocks_lookup[n] }
-          @top_level_names.each do |name|
-            if @sub_blocks_lookup[name]
-              blocks[name] = @sub_blocks_lookup[name][:children] || {}
-            else
-              blocks[name] = {}
-            end
-          end
-        # Duplicate the given sub blocks to all top-level objects if none have been specified
-        else
-          @top_level_names.each do |name|
-            blocks[name] = @sub_blocks_lookup
-          end
-        end
-        blocks
-      end
-
-      # Returns a hash with all sub-blocks at the top-level, e.g.:
-      #
-      #   {"RAM"=>{}, "ATD"=>{}, "Comms"=>{"RAM"=>{:instances=>2}, "Osc"=>{}}, "Osc"=>{}}
-      def sub_blocks
-        blocks = {}
-        top_level_sub_blocks.each do |top, attrs|
-          extract_sub_blocks(attrs) do |name, attrs|
-            if blocks[name]
-              if blocks[name] != (attrs[:children] || {})
-                Origen.log.warning "The app builder does not currently support different sub-block definitions for block #{name}"
-                Origen.log.warning 'Only the first defintion has been built'
-              end
-            else
-              blocks[name] = attrs[:children] || {}
-            end
-          end
-        end
-        blocks
-      end
-
-      def extract_sub_blocks(blocks, &block)
-        blocks.each do |name, attrs|
-          yield name, attrs
-          extract_sub_blocks(attrs[:children], &block) if attrs[:children]
-        end
-      end
-
       # Defines the filelist for the generator, the default list is inherited from the
-      # parent class (Application).
+      # parent class (Plugin).
       # The filelist can contain references to generate files, directories or symlinks in the
       # new application.
       #
@@ -160,74 +46,16 @@ module OrigenAppGenerators
       # from the parent generator, this means that your generator will automatically stay up
       # to date with the latest conventions
       #
-      # The master templates live in templates/app_generators/application, but
+      # The master templates live in templates/app_generators/plugin, but
       # DO NOT MODIFY THESE FILES DIRECTLY.
       # Either add or remove things post-generation in the modify_files method or copy the
-      # master file to the equivalent sub-directory of templates/app_generators/test_engineering/generic_stand_alone_application
+      # master file to the equivalent sub-directory of templates/app_generators/test_engineering/mpg_test_block
       # which will override the version in the master directory.
       #
       # Additional files can be added or removed from the filelist as shown below.
       def filelist
         @filelist ||= begin
-          list = super  # Always pick up the parent list
-          # Example of how to remove a file from the parent list
-          list.delete(:lib_top_level)
-          list.delete(:target_debug)
-          list.delete(:target_production)
-          list.delete(:target_default)
-          # Example of how to add a file, in this case the file will be compiled and copied to
-          # the same location in the new app
-          @top_level_names.each_with_index do |name, i|
-            list["top_level_model_#{i}"] = { source:  'lib/top_level.rb',
-                                             dest:    "lib/#{@name}/#{name.underscore}.rb",
-                                             options: { name: name, sub_blocks: top_level_sub_blocks[name] }
-                                           }
-
-            list["top_level_controller_#{i}"] = { source:  'lib/top_level_controller.rb',
-                                                  dest:    "lib/#{@name}/#{name.underscore}_controller.rb",
-                                                  options: { name: name }
-                                                }
-
-            list["target_#{name}"] = { source:  'target/top_level.rb',
-                                       dest:    "target/#{name.underscore}.rb",
-                                       options: { name: name }
-                                     }
-            if i == 0
-              list[:target_default] =  { source: "#{name.underscore}.rb", # Relative to the file being linked to
-                                         dest:   'target/default.rb',     # Relative to destination_root
-                                         type:   :symlink }
-            end
-          end
-
-          sub_blocks.each do |name, blocks|
-            list["ip_block_#{name}"] = { source:  'lib/ip_block.rb',
-                                         dest:    "lib/#{@name}/#{name.underscore}.rb",
-                                         options: { name: name, sub_blocks: blocks }
-                                       }
-
-            list["ip_block_controller_#{name}"] = { source: 'lib/ip_block_controller.rb',
-                                                    dest:   "lib/#{@name}/#{name.underscore}_controller.rb" }
-          end
-
-          list[:environment_j750] = { source: 'environment/j750.rb' }
-          list[:environment_uflex] = { source: 'environment/uflex.rb' }
-          list[:environment_v93k] = { source: 'environment/v93k.rb' }
-          list[:environment_jlink] = { source: 'environment/jlink.rb' }
-          # Alternatively specifying a different destination, typically you would do this when
-          # the final location is dynamic
-          # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
-          # Example of how to create a directory
-          # list[:pattern_dir] = { dest: "pattern", type: :directory }
-          # Example of how to create a symlink
-          list[:environment_default] = { source: 'j750.rb',          # Relative to the file being linked to
-                                         dest:   'environment/default.rb', # Relative to destination_root
-                                         type:   :symlink }
-          # Test engineering source directories
-          list[:program_dir] = { dest: 'program', type: :directory }
-          list[:pattern_dir] = { dest: 'pattern', type: :directory }
-          # Example source files
-          list[:pattern_example] = { source: 'pattern/example.rb' }
-          # Remember to return the final list
+          list = common_filelist(super)  # Always pick up the parent list
           list
         end
       end

data/origen_app_generators/lib/origen_app_generators/test_engineering/test_block.rb

@@ -2,6 +2,8 @@ module OrigenAppGenerators
   module TestEngineering
     # Generates a generic plugin shell
     class TestBlock < Plugin
+      include Common
+
       desc 'An IP test module intended to plugin into a top-level (SoC) application'
 
       def initialize(*args)
@@ -13,8 +15,6 @@ module OrigenAppGenerators
         # The methods to get the common user input that applies to all applications will
         # get called at the start automatically, you have a chance here to ask any additional
         # questions that are specific to the type of application being generated
-        get_ip_names
-        get_sub_block_name
       end
 
       def generate_files
@@ -25,72 +25,15 @@ module OrigenAppGenerators
       end
 
       def final_modifications
-        prepend_to_file "lib/#{@name}.rb", "require 'origen_testers'\n"
-        # Add require line
-        doc_helpers = /gem 'origen_doc_helpers'/
-        inject_into_file 'Gemfile', "\ngem 'origen_jtag'\ngem 'origen_arm_debug'\n",
-                         after: doc_helpers
+        prepend_to_file "app/lib/#{@name}.rb", "require 'origen_testers'\n"
       end
 
       def conclude
         puts "New test module created at: #{destination_root}"
-        puts
-        puts 'Generate an example pattern by running "origen g example"'
       end
 
       protected
 
-      def get_ip_names
-        puts
-        puts 'NAME THE IP BLOCKS THAT THIS MODULE WILL SUPPORT'
-        puts
-        puts "You don't need to name them all up front, but you must declare at least one."
-        puts 'We recommend that you use the official name(s) for the IP(s) as used by your design team.'
-        puts 'Separate multiple names with a comma:    FLASH_C40_512K, FLASH_C40_2M'
-        puts
-
-        valid = false
-        until valid
-          @ip_names = get_text(single: true).strip.split(',').map do |name|
-            n = name.strip.symbolize.to_s.upcase
-            unless n.empty?
-              n
-            end
-          end.compact
-          unless @ip_names.empty?
-            # Should we check anything here?
-            valid = true
-          end
-        end
-        @ip_names
-      end
-
-      def get_sub_block_name
-        puts
-        puts "WHAT SHOULD BE THE PATH TO #{@ip_names.first} WHEN IT IS INSTANTIATED IN AN SOC?"
-        puts
-        puts 'Your IP(s) will be instantiated by a top-level (SoC) model, at which point it should be given a generic nickname'
-        puts 'that will provide an easy way to access it.'
-        puts 'For example, if you had an IP model for an NVM block, the IP name might be "FLASH_C40_512K_128K", but when it is'
-        puts 'instantiated it would be given the name "flash", allowing it be easily accessed as "dut.flash".'
-        puts
-
-        valid = false
-        until valid
-          @sub_block_name = get_text(single: true).strip.split(',').map do |name|
-            n = name.strip.symbolize.to_s.downcase
-            unless n.empty?
-              n
-            end
-          end.compact
-          unless @sub_block_name.empty?
-            # Should we check anything here?
-            valid = true
-          end
-        end
-        @sub_block_name = @sub_block_name.first
-      end
-
       # Defines the filelist for the generator, the default list is inherited from the
       # parent class (Plugin).
       # The filelist can contain references to generate files, directories or symlinks in the
@@ -109,51 +52,7 @@ module OrigenAppGenerators
       # Additional files can be added or removed from the filelist as shown below.
       def filelist
         @filelist ||= begin
-          list = super  # Always pick up the parent list
-          # Example of how to remove a file from the parent list
-          list.delete(:target_debug)
-          list.delete(:target_production)
-          # Example of how to add a file, in this case the file will be compiled and copied to
-          # the same location in the new app
-          list[:target_default] = { source: 'target/default.rb' }
-          list[:environment_v93k] = { source: 'environment/v93k.rb' }
-          list[:environment_j750] = { source: 'environment/j750.rb' }
-          list[:environment_ultraflex] = { source: 'environment/ultraflex.rb' }
-          list[:program_prb1] = { source: 'program/prb1.rb' }
-          list[:lib_interface] = { source: 'lib/interface.rb', dest: "lib/#{@name}/interface.rb" }
-          # Alternatively specifying a different destination, typically you would do this when
-          # the final location is dynamic
-          # list[:gemspec] = { source: 'gemspec.rb', dest: "#{@name}.gemspec" }
-          # Example of how to create a directory
-          list[:pattern_dir] = { dest: 'pattern', type: :directory }
-          # Example of how to create a symlink
-          list[:environment_default] = { source: 'ultraflex.rb',           # Relative to the file being linked to
-                                         dest:   'environment/default.rb', # Relative to destination_root
-                                         type:   :symlink }
-          list[:dev_dut] = { source:  'lib_dev/dut.rb',
-                             dest:    "lib/#{@name}_dev/dut.rb",
-                             options: { class_name: @ip_names.first, sub_block_name: @sub_block_name }
-                           }
-          list[:dev_dutc] = { source: 'lib_dev/dut_controller.rb',
-                              dest:   "lib/#{@name}_dev/dut_controller.rb"
-                            }
-
-          @ip_names.each_with_index do |name, i|
-            list["ip_#{i}"] = { source:  'lib/model.rb',
-                                dest:    "lib/#{@name}/#{name.underscore}.rb",
-                                options: { name: name }
-                              }
-
-            list["ip_controller_#{i}"] = { source:  'lib/controller.rb',
-                                           dest:    "lib/#{@name}/#{name.underscore}_controller.rb",
-                                           options: { name: name }
-                                         }
-          end
-
-          list[:pattern_example] = { source:  'pattern/example.rb',
-                                     options: { sub_block_name: @sub_block_name }
-                                   }
-          # Remember to return the final list
+          list = common_filelist(super)  # Always pick up the parent list
           list
         end
       end

data/origen_app_generators/lib/origen_app_generators.rb

@@ -7,6 +7,7 @@ require 'origen_app_generators/plugin'
 require 'origen_app_generators/empty_application'
 require 'origen_app_generators/empty_plugin'
 require 'origen_app_generators/new'
+require 'origen_app_generators/test_engineering/common'
 require 'origen_app_generators/test_engineering/test_block'
 require 'origen_app_generators/test_engineering/stand_alone_application'
 require 'origen_app_generators/origen_infrastructure/app_generator_plugin'
@@ -16,15 +17,16 @@ module OrigenAppGenerators
 
   TEST_INPUTS = [
     # 0 - Empty app
-    ['0', '0', :default, :default, :default],
+    ['0', '0', :default],
     # 1 - Empty plugin
     ['0', '1', :default, :default, 'A test block', 'yes', :default],
     # 2 - Stand alone test engineering app
-    ['2', '0', :default, :default, 'Falcon, Eagle', 'Falcon[ram, atd(2), comm[ram(2), osc](3)], Eagle[ram(2), atd(4)]', [:default, 'origen g example']],
+    ['2', '0', [:default]],
     # 3 - Test module
-    ['2', '1', :default, :default, 'Test module for all flash IPs', 'FLASH_512K, FLASH_1024K', 'flash', [:default, 'origen g example']],
+    # ['2', '1', 'Test module for all flash IPs', [:default, 'origen g example']],
+    ['2', '1', 'Test module for all flash IPs', :default],
     # 4 - An app generators plugin
-    ['1', '0', :default, :default, 'My application generators', :default]
+    ['1', '0', 'My application generators', :default]
   ] # END_OF_TEST_INPUTS Don't remove this comment, it is used by the app_gen:new command!
 
   # As you add new generators to this app they will be entered here, this enables the

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,26 +8,26 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2019-05-16"
+  s.date = "2019-05-27"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
-  s.files = ["bin/boot.rb".freeze, "bin/fix_my_workspace".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/sub_block_parser.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "lib/tasks/app_generators.rake".freeze, "lib/tasks/new_app_tests.rake".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/lib".freeze, "templates/app_generators/application/lib/app.rake".freeze, "templates/app_generators/application/lib/module.rb".freeze, "templates/app_generators/application/lib/top_level.rb".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/application/templates".freeze, "templates/app_generators/application/templates/web".freeze, "templates/app_generators/application/templates/web/index.md.erb".freeze, "templates/app_generators/application/templates/web/layouts".freeze, "templates/app_generators/application/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/templates/web/partials".freeze, "templates/app_generators/application/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/templates/web/release_notes.md.erb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/lib/plugin.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/plugin/lib".freeze, "templates/app_generators/plugin/lib/README".freeze, "templates/app_generators/plugin/lib_dev".freeze, "templates/app_generators/plugin/lib_dev/README".freeze, "templates/app_generators/plugin/templates".freeze, "templates/app_generators/plugin/templates/web".freeze, "templates/app_generators/plugin/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/templates/web/partials".freeze, "templates/app_generators/plugin/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/Gemfile".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/j750.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/jlink.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/ip_block.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/ip_block_controller.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/top_level.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/lib/top_level_controller.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/pattern".freeze, "templates/app_generators/test_engineering/stand_alone_application/pattern/example.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application/target".freeze, "templates/app_generators/test_engineering/stand_alone_application/target/top_level.rb".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/environment".freeze, "templates/app_generators/test_engineering/test_block/environment/j750.rb".freeze, "templates/app_generators/test_engineering/test_block/environment/ultraflex.rb".freeze, "templates/app_generators/test_engineering/test_block/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/test_block/lib".freeze, "templates/app_generators/test_engineering/test_block/lib/controller.rb".freeze, "templates/app_generators/test_engineering/test_block/lib/interface.rb".freeze, "templates/app_generators/test_engineering/test_block/lib/model.rb".freeze, "templates/app_generators/test_engineering/test_block/lib_dev".freeze, "templates/app_generators/test_engineering/test_block/lib_dev/dut.rb".freeze, "templates/app_generators/test_engineering/test_block/lib_dev/dut_controller.rb".freeze, "templates/app_generators/test_engineering/test_block/pattern".freeze, "templates/app_generators/test_engineering/test_block/pattern/example.rb".freeze, "templates/app_generators/test_engineering/test_block/program".freeze, "templates/app_generators/test_engineering/test_block/program/prb1.rb".freeze, "templates/app_generators/test_engineering/test_block/target".freeze, "templates/app_generators/test_engineering/test_block/target/default.rb".freeze]
+  s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/application/test".freeze, "templates/app_generators/application/test/spec".freeze, "templates/app_generators/application/test/spec/spec_helper.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.7.6".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "2.7.6" if s.respond_to? :installed_by_version
+  s.installed_by_version = "2.7.7" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<origen>.freeze, [">= 0.23.0"])
+      s.add_runtime_dependency(%q<origen>.freeze, [">= 0.40.2"])
     else
-      s.add_dependency(%q<origen>.freeze, [">= 0.23.0"])
+      s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
     end
   else
-    s.add_dependency(%q<origen>.freeze, [">= 0.23.0"])
+    s.add_dependency(%q<origen>.freeze, [">= 0.40.2"])
   end
 end

data/origen_app_generators/templates/app_generators/application/Gemfile

@@ -6,13 +6,24 @@ source '<%= server %>'
 source 'https://rubygems.org'
 <% end -%>
 
-gem 'origen', '>= <%= @latest_origen_version %>'
+#gem 'origen', '>= <%= @latest_origen_version %>'
+gem 'origen', git: 'https://github.com/Origen-SDK/origen.git', branch: 'app_dir'
 
 gem 'origen_doc_helpers'
+<% if @development_dependencies -%>  
+  <% @development_dependencies.each do |dep| -%>
+gem <%= dep.map{ |d| "\"#{d}\"" }.join(', ') %>
+  <% end -%>
+<% end -%>
 
-gem 'byebug'
+gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
+                     # supporting earlier versions of Ruby 2
+<% if RUBY_VERSION < "2.3.0" -%>
 
-gem 'origen_updater'
+# Lock this version of nokogiri to enable compatibility with Ruby 2.2, if you don't need
+# that then you can remove this line
+gem 'nokogiri', '1.8.5'
+<% end -%>
 
 # Uncomment these if you want to use a visual debugger (e.g. Visual Studio Code) to debug your app
 #gem 'ruby-debug-ide'

data/origen_app_generators/templates/app_generators/application/{lib → app/blocks}/top_level.rb

@@ -4,7 +4,7 @@ module <%= @namespace %>
     #
     #   origen i
     #
-    #   > $dut.hi
+    #   > dut.hi
     def hi
       puts "Hello master!"
     end

data/origen_app_generators/templates/app_generators/application/app/lib/module.rb

@@ -0,0 +1,6 @@
+require 'origen'
+<% if @type == :plugin -%>
+require_relative '../../config/application.rb'
+<% end -%>
+module <%= @namespace %>
+end