origen_app_generators 1.2.0 → 2.0.0

data/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/templates/app_generators/application/Gemfile

@@ -9,10 +9,20 @@ source 'https://rubygems.org'
 gem 'origen', '>= <%= @latest_origen_version %>'
 
 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/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/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

data/templates/app_generators/application/config/application.rb

@@ -1,20 +1,19 @@
 require 'origen'
 class <%= @namespace %>Application < Origen::Application
-
   # See http://origen-sdk.org/origen/api/Origen/Application/Configuration.html
   # for a full list of the configuration options available
 
   # These attributes should never be changed, the duplication here will be resolved in future
   # by condensing these attributes that do similar things
-  self.name       = "<%= @name %>"
-  self.namespace  = "<%= @namespace %>"
-  config.name     = "<%= @name %>"
-  config.initials = "<%= @namespace %>"
+  self.name       = '<%= @name %>'
+  self.namespace  = '<%= @namespace %>'
+  config.name     = '<%= @name %>'
+  config.initials = '<%= @namespace %>'
   # Change this to point to the revision control repository for this <%= @type %>
 <% if @audience == :external -%>
-  #config.rc_url   = "ssh://git@github.com:myaccount/<%= @name %>.git" 
+  # config.rc_url   = "ssh://git@github.com:myaccount/<%= @name %>.git"
 <% else -%>
-  #config.rc_url   = "ssh://git@sw-stash.mycompany.net/myproject/<%= @name %>.git"
+  # config.rc_url   = "ssh://git@sw-stash.mycompany.net/myproject/<%= @name %>.git"
 <% end -%>
 <% if @audience == :external -%>
   config.release_externally = true
@@ -23,11 +22,11 @@ class <%= @namespace %>Application < Origen::Application
   # To enable deployment of your documentation to a web server (via the 'origen web'
   # command) fill in these attributes.
 <% if @audience == :external -%>
-  #config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/<%= @name %>"
-  #config.web_domain = "http://origen-sdk.org/<%= @name %>"
+  # config.web_directory = 'git@github.com:Origen-SDK/Origen-SDK.github.io.git/<%= @name %>'
+  # config.web_domain = 'http://origen-sdk.org/<%= @name %>'
 <% else -%>
-  #config.web_directory = "/path/to/server/<%= @name %>"
-  #config.web_domain = "http://origen.mycompany.net/<%= @name %>"
+  # config.web_directory = '/path/to/server/<%= @name %>'
+  # config.web_domain = 'http://origen.mycompany.net/<%= @name %>'
 <% end -%>
 
   # When false Origen will be less strict about checking for some common coding errors,
@@ -38,76 +37,74 @@ class <%= @namespace %>Application < Origen::Application
   # See: http://origen-sdk.org/origen/latest/guides/utilities/lint/
   config.lint_test = {
     # Require the lint tests to pass before allowing a release to proceed
-    run_on_tag: true,
+    run_on_tag:   true,
     # Auto correct violations where possible whenever 'origen lint' is run
-    auto_correct: true, 
-    # Limit the testing for large legacy applications
-    #level: :easy,
+    auto_correct: true,
     # Run on these directories/files by default
-    #files: ["lib", "config/application.rb"],
+    files:        ['app', 'config/application.rb']
   }
 
   config.semantically_version = true
 
   # An example of how to set application specific LSF parameters
-  #config.lsf.project = "msg.te"
-  
+  # config.lsf.project = "msg.te"
+
   # An example of how to specify a prefix to add to all generated patterns
-  #config.pattern_prefix = "nvm"
+  # config.pattern_prefix = "nvm"
 
   # An example of how to add header comments to all generated patterns
-  #config.pattern_header do
-  #  cc "This is a pattern created by the example origen application"
-  #end
+  # config.pattern_header do
+  #   cc "This is a pattern created by the example origen application"
+  # end
 
   # By default all generated output will end up in ./output.
   # Here you can specify an alternative directory entirely, or make it dynamic such that
-  # the output ends up in a setup specific directory. 
-  #config.output_directory do
-  #  "#{Origen.root}/output/#{$dut.class}"
-  #end
+  # the output ends up in a setup specific directory.
+  # config.output_directory do
+  #   "#{Origen.root}/output/#{$dut.class}"
+  # end
 
   # Similarly for the reference files, generally you want to setup the reference directory
   # structure to mirror that of your output directory structure.
-  #config.reference_directory do
-  #  "#{Origen.root}/.ref/#{$dut.class}"
-  #end
- 
+  # config.reference_directory do
+  #   "#{Origen.root}/.ref/#{$dut.class}"
+  # end
+
   # This will automatically deploy your documentation after every tag
-  #def after_release_email(tag, note, type, selector, options)
-  #  command = "origen web compile --remote --api"
-  #  Dir.chdir Origen.root do
-  #    system command
-  #  end
-  #end
-<% if @validate_release_tests %>  
+  # def after_release_email(tag, note, type, selector, options)
+  #   command = "origen web compile --remote --api"
+  #   Dir.chdir Origen.root do
+  #     system command
+  #   end
+  # end
+<% if @validate_release_tests -%>
   # Ensure that all tests pass before allowing a release to continue
   def validate_release
     if <%= Array(@validate_release_tests).map { |t| "!system('#{t}')" }.join(' || ') %>
       puts "Sorry but you can't release with failing tests, please fix them and try again."
       exit 1
     else
-      puts "All tests passing, proceeding with release process!"
+      puts 'All tests passing, proceeding with release process!'
     end
   end
-<% else %>
+<% else -%>
   # Ensure that all tests pass before allowing a release to continue
-  #def validate_release
-  #  if !system("origen specs") || !system("origen examples")
-  #    puts "Sorry but you can't release with failing tests, please fix them and try again."
-  #    exit 1
-  #  else
-  #    puts "All tests passing, proceeding with release process!"
-  #  end
-  #end
+  # def validate_release
+  #   if !system('origen specs') || !system('origen examples')
+  #     puts "Sorry but you can't release with failing tests, please fix them and try again."
+  #     exit 1
+  #   else
+  #     puts 'All tests passing, proceeding with release process!'
+  #   end
+  # end
 <% end -%>
 
   # To enabled source-less pattern generation create a class (for example PatternDispatcher)
   # to generate the pattern. This should return false if the requested pattern has been
   # dispatched, otherwise Origen will proceed with looking up a pattern source as normal.
-  #def before_pattern_lookup(requested_pattern)
-  #  PatternDispatcher.new.dispatch_or_return(requested_pattern)
-  #end
+  # def before_pattern_lookup(requested_pattern)
+  #   PatternDispatcher.new.dispatch_or_return(requested_pattern)
+  # end
 
   # If you use pattern iterators you may come across the case where you request a pattern
   # like this:
@@ -115,11 +112,10 @@ class <%= @namespace %>Application < Origen::Application
   #
   # However it cannot be found by Origen since the pattern name is actually example_pat_bx.atp
   # In the case where the pattern cannot be found Origen will pass the name to this translator
-  # if it exists, and here you can make any substitutions to help Origen find the file you 
+  # if it exists, and here you can make any substitutions to help Origen find the file you
   # want. In this example any instances of _b\d, where \d means a number, are replaced by
   # _bx.
-  #config.pattern_name_translator do |name|
-  #  name.gsub(/_b\d/, "_bx")
-  #end
-
+  # config.pattern_name_translator do |name|
+  #   name.gsub(/_b\d/, "_bx")
+  # end
 end

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

@@ -2,5 +2,5 @@
 # 'origen new' command, it must not be removed or modified
 require 'origen_app_generators'
 require "<%= @name %>"
-template_dir = File.expand_path('../../templates/app_generators', __FILE__)
+template_dir = File.expand_path('../../app/templates/app_generators', __FILE__)
 OrigenAppGenerators.add_generators(<%= @namespace %>::AVAILABLE, template_dir: template_dir)

data/templates/app_generators/plugin/Gemfile

@@ -13,10 +13,11 @@ source 'https://rubygems.org'
 # your application's test coverage
 gem 'coveralls', require: false
 <% end -%>
-gem 'byebug', '<9.1.0' # This version restriction required if you need Ruby < 2.2, otherwise you can remove it
+gem 'byebug', '~>8'  # You can remove this version constraint if you don't care about your app
+                     # supporting earlier versions of Ruby 2
 gem 'ripper-tags'
 gem 'origen_doc_helpers'
-gem 'origen_updater'
+
 # Uncomment these if you want to use a visual debugger (e.g. Visual Studio Code) to debug your app
 #gem 'ruby-debug-ide'
 #gem 'debase'

data/templates/app_generators/plugin/gemspec.rb

@@ -21,11 +21,12 @@ Gem::Specification.new do |spec|
   # packaged gem, the default should hit everything in most cases but this will
   # need to be added to if you have any custom directories
   spec.files         = Dir["lib/<%= @name %>.rb", "lib/<%= @name %>/**/*.rb", "templates/**/*", "config/**/*.rb",
-                           "bin/*", "lib/tasks/**/*.rake", "pattern/**/*.rb",
-                           "program/**/*.rb"
+                           "bin/*", "lib/tasks/**/*.rake", "pattern/**/*.rb", "program/**/*.rb",
+                           "app/lib/**/*.rb", "app/templates/**/*",
+                           "app/patterns/**/*.rb", "app/flows/**/*.rb", "app/blocks/**/*.rb"
                           ]
   spec.executables   = []
-  spec.require_paths = ["lib"]
+  spec.require_paths = ["lib", "app/lib"]
 
   # Add any gems that your plugin needs to run within a host application
   spec.add_runtime_dependency "origen", ">= <%= @latest_origen_version %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_app_generators
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-20 00:00:00.000000000 Z
+date: 2019-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.40.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.40.2
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -32,7 +32,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/boot.rb
-- bin/fix_my_workspace
 - config/application.rb
 - config/boot.rb
 - config/commands.rb
@@ -44,19 +43,24 @@ files:
 - lib/origen_app_generators/empty_application.rb
 - lib/origen_app_generators/empty_plugin.rb
 - lib/origen_app_generators/new.rb
+- lib/origen_app_generators/new_app_tests.rb
 - lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb
 - lib/origen_app_generators/plugin.rb
-- lib/origen_app_generators/sub_block_parser.rb
+- lib/origen_app_generators/test_engineering/common.rb
 - lib/origen_app_generators/test_engineering/stand_alone_application.rb
 - lib/origen_app_generators/test_engineering/test_block.rb
-- lib/tasks/app_generators.rake
-- lib/tasks/new_app_tests.rake
 - templates/app_generators/application/.gitignore
 - templates/app_generators/application/.irbrc
 - templates/app_generators/application/.rspec
 - templates/app_generators/application/.travis.yml
 - templates/app_generators/application/Gemfile
 - templates/app_generators/application/Rakefile
+- templates/app_generators/application/app/blocks/top_level.rb
+- templates/app_generators/application/app/lib/module.rb
+- templates/app_generators/application/app/templates/web/index.md.erb
+- templates/app_generators/application/app/templates/web/layouts/_basic.html.erb
+- templates/app_generators/application/app/templates/web/partials/_navbar.html.erb
+- templates/app_generators/application/app/templates/web/release_notes.md.erb
 - templates/app_generators/application/config/application.rb
 - templates/app_generators/application/config/boot.rb
 - templates/app_generators/application/config/commands.rb
@@ -65,56 +69,30 @@ files:
 - templates/app_generators/application/config/version.rb
 - templates/app_generators/application/doc/history
 - templates/app_generators/application/dot_keep
-- templates/app_generators/application/lib/app.rake
-- templates/app_generators/application/lib/module.rb
-- templates/app_generators/application/lib/top_level.rb
 - templates/app_generators/application/origen_core_session
 - templates/app_generators/application/spec/spec_helper.rb
 - templates/app_generators/application/target/debug.rb
 - templates/app_generators/application/target/default.rb
 - templates/app_generators/application/target/production.rb
-- templates/app_generators/application/templates/web/index.md.erb
-- templates/app_generators/application/templates/web/layouts/_basic.html.erb
-- templates/app_generators/application/templates/web/partials/_navbar.html.erb
-- templates/app_generators/application/templates/web/release_notes.md.erb
 - templates/app_generators/new/generator.rb
 - templates/app_generators/new/info.md.erb
+- templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb
+- templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb
+- templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb
+- templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb
 - templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb
-- templates/app_generators/origen_infrastructure/app_generator_plugin/lib/application.rb
-- templates/app_generators/origen_infrastructure/app_generator_plugin/lib/base.rb
-- templates/app_generators/origen_infrastructure/app_generator_plugin/lib/module.rb
-- templates/app_generators/origen_infrastructure/app_generator_plugin/lib/plugin.rb
 - templates/app_generators/plugin/Gemfile
 - templates/app_generators/plugin/Rakefile
+- templates/app_generators/plugin/app/templates/web/index.md.erb
+- templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb
+- templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb
 - templates/app_generators/plugin/config/boot.rb
 - templates/app_generators/plugin/gemspec.rb
-- templates/app_generators/plugin/lib/README
-- templates/app_generators/plugin/lib_dev/README
-- templates/app_generators/plugin/templates/web/index.md.erb
-- templates/app_generators/plugin/templates/web/partials/_navbar_external.html.erb
-- templates/app_generators/plugin/templates/web/partials/_navbar_internal.html.erb
-- templates/app_generators/test_engineering/stand_alone_application/Gemfile
-- templates/app_generators/test_engineering/stand_alone_application/environment/j750.rb
-- templates/app_generators/test_engineering/stand_alone_application/environment/jlink.rb
-- templates/app_generators/test_engineering/stand_alone_application/environment/uflex.rb
-- templates/app_generators/test_engineering/stand_alone_application/environment/v93k.rb
-- templates/app_generators/test_engineering/stand_alone_application/lib/ip_block.rb
-- templates/app_generators/test_engineering/stand_alone_application/lib/ip_block_controller.rb
-- templates/app_generators/test_engineering/stand_alone_application/lib/top_level.rb
-- templates/app_generators/test_engineering/stand_alone_application/lib/top_level_controller.rb
-- templates/app_generators/test_engineering/stand_alone_application/pattern/example.rb
-- templates/app_generators/test_engineering/stand_alone_application/target/top_level.rb
-- templates/app_generators/test_engineering/test_block/environment/j750.rb
-- templates/app_generators/test_engineering/test_block/environment/ultraflex.rb
-- templates/app_generators/test_engineering/test_block/environment/v93k.rb
-- templates/app_generators/test_engineering/test_block/lib/controller.rb
-- templates/app_generators/test_engineering/test_block/lib/interface.rb
-- templates/app_generators/test_engineering/test_block/lib/model.rb
-- templates/app_generators/test_engineering/test_block/lib_dev/dut.rb
-- templates/app_generators/test_engineering/test_block/lib_dev/dut_controller.rb
-- templates/app_generators/test_engineering/test_block/pattern/example.rb
-- templates/app_generators/test_engineering/test_block/program/prb1.rb
-- templates/app_generators/test_engineering/test_block/target/default.rb
+- templates/app_generators/test_engineering/environment/j750.rb
+- templates/app_generators/test_engineering/environment/uflex.rb
+- templates/app_generators/test_engineering/environment/v93k.rb
+- templates/app_generators/test_engineering/stand_alone_application/.keep
+- templates/app_generators/test_engineering/test_block/.keep
 homepage: http://origen-sdk.org/origen_app_generators
 licenses:
 - MIT
@@ -135,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Origen application generators