origen_app_generators 1.1.4 → 2.2.0

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

@@ -1,6 +1,9 @@
+<% if (@audience != :external) && (Origen.site_config.gem_server_pull || Origen.site_config.gem_server) -%>
+<%   Array(Origen.site_config.gem_server_pull || Origen.site_config.gem_server).each do |server| -%>
+source '<%= server %>'
+<%   end -%>
+<% else %>
 source 'https://rubygems.org'
-<% if (@audience != :external) && Origen.site_config.gem_server -%>
-source '<%= Origen.site_config.gem_server %>'
 <% end -%>
 
 # Only development dependencies (things your plugin needs only when it is running in its own workspace)
@@ -10,10 +13,16 @@ source '<%= Origen.site_config.gem_server %>'
 # 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'
 gem 'ripper-tags'
 gem 'origen_doc_helpers'
-gem 'origen_updater'
+<% if (@audience != :external) && Origen.site_config.gem_push_plugins -%>
+<%   Origen.site_config.gem_push_plugins.each do |plugin| -%>
+gem <%= Array(plugin).map{ |d| "\"#{d}\"" }.join(', ') %>
+<%   end -%>
+<% end -%>
+
 # 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.1.4
+  version: 2.2.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2020-12-03 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
@@ -134,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Origen application generators

data/bin/fix_my_workspace

@@ -1,100 +0,0 @@
-#!/usr/bin/env ruby
-$VERBOSE = nil  # Don't care about world writable dir warnings and the like
-
-if $_fix_my_workspace_version_check
-  $_fix_my_workspace_version = '0.7.0'
-else
-  if File.exist?(File.expand_path('../../lib/origen.rb', __FILE__))
-    # If this script is being run from within an origen-core workspace, use that Origen-core,
-    # not the system-installed origen-core version.
-    $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-    require 'origen'
-  else
-    # Use system-installed Origen (the gem in system Ruby)
-    require 'origen'
-  end
-
-  if !Origen.site_config.gem_manage_bundler
-    puts 'Sorry but you have opted to manage Bundler yourself via your Origen site config, and this means'
-    puts 'that I cannot make certain assumptions about how your workspace is configured.'
-    puts 'You will need to either resolve this problem yourself, or else change the value of'
-    puts 'gem_mange_bundler to true.'
-    puts 'See here for more details on how to do that: http://origen-sdk.org/origen/guides/starting/company/'
-
-  else
-    ENV['BUNDLE_GEMFILE'] = File.join(Origen.root, 'Gemfile')
-    ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
-    ENV['BUNDLE_BIN'] = File.join(Origen.root, 'lbin')
-
-    # Force copy system gems to local gems
-    if Origen.site_config.gem_use_from_system
-      local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
-      gem_dir = Pathname.new(Gem.dir)
-
-      Origen.site_config.gem_use_from_system.each do |gem, version|
-        begin
-          # This will raise an error if the system doesn't have this gem installed, that
-          # will be rescued below
-          spec = Gem::Specification.find_by_name(gem, version)
-
-          local_dir = File.join(local_gem_dir, Pathname.new(spec.gem_dir).relative_path_from(gem_dir))
-          FileUtils.mkdir_p local_dir
-          FileUtils.cp_r("#{spec.gem_dir}/.", local_dir)
-
-          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.cache_file).relative_path_from(gem_dir)))
-          FileUtils.mkdir_p local_file.dirname
-          FileUtils.cp(spec.cache_file, local_file)
-
-          if spec.extension_dir && File.exist?(spec.extension_dir)
-            local_dir = File.join(local_gem_dir, Pathname.new(spec.extension_dir).relative_path_from(gem_dir))
-            FileUtils.mkdir_p local_dir
-            FileUtils.cp_r("#{spec.extension_dir}/.", local_dir)
-          end
-
-          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.spec_file).relative_path_from(gem_dir)))
-          FileUtils.mkdir_p local_file.dirname
-          FileUtils.cp(spec.spec_file, local_file)
-
-        rescue Gem::LoadError
-          # This just means that one of the gems that should be copied from the system
-          # was not actually installed in the system, so nothing we can do about that here
-        end
-      end
-    end
-
-    # Delete lbin
-    FileUtils.rm_rf(ENV['BUNDLE_BIN']) if File.exist?(ENV['BUNDLE_BIN'])
-
-    # Run bundler with correct switches
-    cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
-    `chmod o-w #{Origen.root}` # Stops some annoying world writable warnings during install
-    `chmod o-w #{Origen.root}/bin` if File.exist?("#{Origen.root}/bin")
-    `chmod o-w #{Origen.root}/.bin` if File.exist?("#{Origen.root}/.bin")
-
-    # Try again, this time updating the bundle
-    if system(cmd)
-      fixed = true
-    elsif system 'bundle update'
-      fixed = true
-    end
-
-    if File.exist?(ENV['BUNDLE_BIN'])
-      `chmod o-w #{ENV['BUNDLE_BIN']}`
-
-      # Make .bat versions of all executables, Bundler should really be doing this when running
-      # on windows
-      if Origen.os.windows?
-        Dir.glob("#{ENV['BUNDLE_BIN']}/*").each do |bin|
-          unless bin =~ /.bat$/
-            bat = "#{bin}.bat"
-            unless File.exist?(bat)
-              File.open(bat, 'w') { |f| f.write('@"ruby.exe" "%~dpn0" %*') }
-            end
-          end
-        end
-      end
-    end
-
-    system 'origen -v' if fixed
-  end
-end

data/lib/origen_app_generators/sub_block_parser.rb

@@ -1,81 +0,0 @@
-module OrigenAppGenerators
-  require 'strscan'
-  # Responsible for parsing something like this:
-  #
-  #   "ram, osc, pll, atd(2), comms[ram(2), osc](3)"
-  #
-  # into this:
-  #
-  #   {
-  #     "RAM"=>{}, "Osc"=>{}, "PLL"=>{}, "ATD"=> {:instances=>2},
-  #     "Comms"=>{:instances=>3, :children=>{"RAM"=>{:instances=>2}, "Osc"=>{}}}
-  #   }
-  #
-  class SubBlockParser
-    def parse(str)
-      r = {}
-      split(str).each do |tag|
-        tag, i = extract_instances(tag)
-        name, children = extract_children(tag)
-        name = camelize(name)
-        r[name] = {}
-        r[name][:instances] = i if i
-        r[name][:children] = children if children
-      end
-      r
-    end
-
-    private
-
-    # Splits the given string by comma, but understands that nested
-    # commas should not be split on
-    def split(str)
-      r = []
-      str = StringScanner.new(str)
-      r << next_tag(str) until str.eos?
-      r
-    end
-
-    def next_tag(str)
-      v = str.scan_until(/,|\[|$/)
-      if v[-1] == ','
-        v.chop.strip
-      elsif v[-1] == '['
-        open = 1
-        while open > 0
-          v += str.scan_until(/\[|\]/)
-          if v[-1] == '['
-            open += 1
-          else
-            open -= 1
-          end
-        end
-        v += next_tag(str)
-      # End of line
-      else
-        v.strip
-      end
-    end
-
-    def extract_children(tag)
-      # http://rubular.com/r/plGILY2e2U
-      if tag.strip =~ /([^\[]*)\[(.*)\]/
-        [Regexp.last_match(1), parse(Regexp.last_match(2))]
-      else
-        [tag.strip, nil]
-      end
-    end
-
-    def extract_instances(tag)
-      if tag.strip =~ /(.*)\((\d+)\)$/
-        [Regexp.last_match(1), Regexp.last_match(2).to_i]
-      else
-        [tag.strip, nil]
-      end
-    end
-
-    def camelize(val)
-      val.strip.gsub(/\s+/, '_').camelize
-    end
-  end
-end

data/lib/tasks/app_generators.rake

@@ -1,6 +0,0 @@
-# You can define any Rake tasks to support your application here (or in any file
-# ending in .rake in this directory).
-#
-# Rake (Ruby Make) is very useful for creating build scripts, see this short video
-# for a quick introduction:
-# http://railscasts.com/episodes/66-custom-rake-tasks

data/templates/app_generators/application/lib/app.rake

@@ -1,6 +0,0 @@
-# You can define any Rake tasks to support your application here (or in any file
-# ending in .rake in this directory).
-#
-# Rake (Ruby Make) is very useful for creating build scripts, see this short video
-# for a quick introduction:
-# http://railscasts.com/episodes/66-custom-rake-tasks

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

@@ -1,22 +0,0 @@
-require 'origen'
-<% if @type == :plugin -%>
-require_relative '../config/application.rb'
-<% end -%>
-module <%= @namespace %>
-<% if @type == :plugin -%>
-  # THIS FILE SHOULD ONLY BE USED TO LOAD RUNTIME DEPENDENCIES
-  # If this plugin has any development dependencies (e.g. dummy DUT or other models that are only used
-  # for testing), then these should be loaded from config/boot.rb
-
-<% end -%>
-  # Example of how to explicitly require a file
-  # require "<%= @name %>/my_file"
-
-  # Load all files in the lib/<%= @name %> directory.
-  # Note that there is no problem from requiring a file twice (Ruby will ignore
-  # the second require), so if you have a file that must be required first, then
-  # explicitly require it up above and then let this take care of the rest.
-  Dir.glob("#{File.dirname(__FILE__)}/<%= @name %>/**/*.rb").sort.each do |file|
-    require file
-  end
-end