origen 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 680531e26b7e211517e36649bd3d684d5d8452ef
-  data.tar.gz: aa8bde4fe52e7d10775eb9fc790baaf7f99a7fc7
+  metadata.gz: 57352a8b9560ae28fd11789e2338de6d77691e46
+  data.tar.gz: 41ad98388361e0e274e3d113b179e8a707f83ecb
 SHA512:
-  metadata.gz: 933e06b3c0e4b4c4ce85a0c54ccd4e855ef1fdb9292b6d39828083bdffecc92df0434d28b4b38115c705b421922bfb43cdbc3cbd1470887f4b936189316ead83
-  data.tar.gz: dc94a81757cb13be94012c7d9cd699842c0075d10f4abf11882531e93b8333752a176ca5d0c1a9eb09f6a31fda2675ff6e058220cb6abffbd7fc5452eaefd020
+  metadata.gz: dd1086933ce68c4e4218d260efda5d612c7c0a4372d4dc6a6325310e8941522d6e70b51c4f31a5a22ffbeeaceb1fdde0f450b5f1d9fceea3eb8aeac24430470c
+  data.tar.gz: 787cff0c13841c02c7f846005fb29bd08510bd8ddc38a49942120713494aa463542b451afade21922ff1a5e936e20346bb087fa1be82b5e8788cc4f29c8c178e

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 24
+  MINOR = 25
   BUGFIX = 0
   DEV = nil
 

data/lib/origen.rb

@@ -159,6 +159,10 @@ unless defined? RGen::ORIGENTRANSITION
       end
       alias_method :application!, :app!
 
+      def has_plugin?(plugin)
+        _applications_lookup[:name][plugin.to_sym].nil? ? false : true
+      end
+
       # @api private
       def with_source_file(file)
         @current_source_dir = Pathname.new(file).dirname

data/lib/origen/commands.rb

@@ -228,7 +228,7 @@ end.compact
 
 case @command
 when 'generate', 'program', 'compile', 'merge', 'interactive', 'target', 'environment',
-     'save', 'lsf', 'web', 'time', 'dispatch', 'rc', 'lint', 'plugin', 'fetch', 'mode' # , 'add'
+     'save', 'lsf', 'web', 'time', 'dispatch', 'rc', 'lint', 'plugin', 'fetch', 'mode', 'gem' # , 'add'
 
   require "origen/commands/#{@command}"
   exit 0 unless @command == 'interactive'

data/lib/origen/commands/compile.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -42,9 +43,8 @@ Usage: origen compile [space separated files, lists or directories] [options]
   opts.on('-n', '--name NAME', String, 'Override the default output file name') { |o| options[:output_file_name] = o }
   opts.on('-r', '--reference DIR', String, 'Override the default reference directory') { |o| options[:reference] = o }
   opts.on('-z', '--zip', 'Gzip all output files (diff checking will be skipped)') { |o| options[:zip] = o }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit 0 }
 end

data/lib/origen/commands/gem.rb

@@ -0,0 +1,270 @@
+require 'optparse'
+require 'fileutils'
+require 'rubygems'
+require 'origen/version_string'
+
+include Origen::Utility::InputCapture
+
+options = {}
+
+opt_parser = OptionParser.new do |opts|
+  opts.banner = <<-END
+Usage: origen gem
+       origen gem gem_name [option]
+       origen gem fetch gem_name
+       origen gem clean (gem_name|all)
+
+Quickstart Examples:
+  origen gem                           # Displays the list of currently used gems
+  origen gem gem_name                  # Displays details of specified gem
+  origen gem fetch gem name            # Poluates/copies gem source to a local repo (<application_top_level_path>/tmp/gems)
+                                       #  and updates Gemfile to use local copy
+  origen gem clean (gem_name|all)      # Removes/deletes the local copy of the gem source and updated Gemfile to
+                                       #  use originally specified version/path
+
+The following options are available:
+  END
+  opts.on('--location', 'Display the location of the specified gem') { options[:gem_location] = true }
+  opts.on('--version', 'Display the version of the specified gem') { options[:gem_version] = true }
+  opts.on('-h', '--help', 'Show this message') { puts opts; exit }
+end
+
+opt_parser.parse! ARGV
+
+QUIET_ATTRS = %w(
+  files test_files signing_key licenses rdoc_options
+  autorequire cert_chain post_install_message
+)
+
+def self._local_gems
+  gems = {}
+  Gem::Specification.sort_by { |g| [g.name.downcase, g.version] }.group_by(&:name).map do |name, specs|
+    gems[name.to_sym] = {
+      name:     name,
+      version:  specs.map(&:version).join(','),
+      location: specs.map(&:full_gem_path).join(','),
+      authors:  specs.map(&:authors).join(',')
+    }
+  end
+  gems
+end
+
+def self._local_gems_orig
+  Gem::Specification.sort_by { |g| [g.name.downcase, g.version] }.group_by(&:name)
+end
+
+def self._session_gem_path
+  "#{Origen.app.root}/tmp/gems"
+end
+
+def self._application_gemfile
+  "#{Origen.app.root}/Gemfile"
+end
+
+def self._local_path_to_gem(gem)
+  "#{_session_gem_path}/#{Pathname(gem[:location]).basename}"
+end
+
+def self._gem_basename(gem)
+  "#{Pathname(gem[:location]).basename}"
+end
+
+def self._gem_rc_version(gem)
+  gem[:version]
+end
+
+def self._update_gemfile
+  content = File.read(_application_gemfile)
+
+  search_regexp = "# ORIGEN GEM AUTO-GENERATED.*# /ORIGEN GEM AUTO-GENERATED.*?\n"
+
+  if Origen.app.session.gems.keys.empty?
+    new_contents = content.gsub(/#{search_regexp}/m, '')
+  else
+    replacement_string = "# ORIGEN GEM AUTO-GENERATED---------------DO NOT REMOVE THIS LINE-------------\n"
+    replacement_string += "# -- DO NOT CHECK IN WITH THIS SECTION!\n"
+    replacement_string += "# -- DO NOT HAND MODIFY!\n"
+    replacement_string += "# -- USE 'origen gem clean all' to reset\n"
+    replacement_string += "\n"
+
+    Origen.app.session.gems.keys.sort.each do |g|
+      replacement_string += "gem '#{g}', path: '#{Origen.app.session.gems[g.to_sym]}'\n"
+      replacement_string += "puts \"\\e[1;93;40mWARNING: Using session gem for '#{g}'\\e[0m\"\n"
+    end
+
+    replacement_string += "def gem(*args)\n"
+    replacement_string += "  return if [#{Origen.app.session.gems.keys.sort.map { |e| "'" + e.to_s + "'" }.join(',')}].include? args[0]\n"
+    replacement_string += "  super(*args)\n"
+    replacement_string += "end\n"
+    replacement_string += "#\n"
+    replacement_string += "# /ORIGEN GEM AUTO-GENERATED---------------DO NOT REMOVE THIS LINE------------\n"
+
+    if content =~ /#{search_regexp}/m
+      new_contents = content.gsub(/#{search_regexp}/m, replacement_string)
+    else
+      new_contents = replacement_string + content
+    end
+  end
+  File.open(_application_gemfile, 'w') { |file| file.puts new_contents }
+end
+
+gems = _local_gems
+
+if !ARGV[0]
+  longest_key = gems.keys.max_by(&:length)
+  puts ''
+  printf "%-#{longest_key.length}s %-15s %s\n", 'Gem', 'Version', 'Location'
+  puts '--------------------------------------------------------------------------------------------------------------'
+  gems.each do |k, v|
+    printf "%-#{longest_key.length}s %-15s %s\n", k, v[:version], v[:location]
+  end
+  puts ''
+else
+  case input = ARGV.shift
+  when 'clean'
+    gem = ARGV[0]
+    if gem
+      if gem == 'all'
+        if Dir.exist? _session_gem_path
+          puts ''
+          puts 'You are about to delete all local gems (tmp/gems/).  IS THAT CORRECT?'
+          puts ''
+          get_text confirm: true
+          Origen::Log.console_only do
+            Dir.chdir Origen.root do
+              system("rm -fr #{_session_gem_path}")
+            end
+          end
+          unless Origen.app.session.gems.keys.empty?
+            Origen.app.session.gems.keys.sort.each do |g|
+              Origen.app.session.gems.delete_key(g)
+            end
+            _update_gemfile
+          end
+        else
+          puts 'There are no local gems present, nothing to clean.'
+        end
+      elsif gems.key?(gem.to_sym)
+        if Dir.exist? _local_path_to_gem(gems[gem.to_sym])
+          # check if already exists, ask for permission to blow away
+          puts ''
+          puts "You are about to delete the local copy of '#{gem}' (tmp/gems/#{_gem_basename(gems[gem.to_sym])}).  IS THAT CORRECT?"
+          puts ''
+          get_text confirm: true
+          Origen::Log.console_only do
+            Dir.chdir Origen.root do
+              system("rm -fr #{_local_path_to_gem(gems[gem.to_sym])}")
+            end
+          end
+          Origen.app.session.gems.delete_key(gem.to_sym)
+          _update_gemfile
+        else
+          puts "Gem '#{gem}' is not locally present, nothing to clean."
+        end
+      end
+    else
+      puts "Error: Must specify gem to be cleaned or 'all'. Use 'origen gem -h' for usage"
+    end
+  when 'fetch'
+    gem = ARGV[0]
+    if gem
+      if gems.key?(gem.to_sym)
+        # Initialize ./tmp/gems/
+        FileUtils.mkdir_p(_session_gem_path) unless Dir.exist? _session_gem_path
+
+        if Dir.exist? _local_path_to_gem(gems[gem.to_sym])
+          # check if already exists, ask for permission to blow away
+          puts ''
+          puts "Gem '#{_gem_basename(gems[gem.to_sym])}' already exists locally, would you like to replace?"
+          puts "(This will delete and replace the exising copy at #{_local_path_to_gem(gems[gem.to_sym])})"
+          puts ''
+          get_text confirm: true
+          Origen::Log.console_only do
+            Dir.chdir Origen.root do
+              # Blow away these temporary files
+              system("rm -fr #{_local_path_to_gem(gems[gem.to_sym])}")
+            end
+          end
+        end
+
+        if Origen.has_plugin?(gem)
+          # Set up the requested plugin workspace
+          rc_url = Origen.app(gem.to_sym).config.rc_url || Origen.app(gem.to_sym).config.vault
+          if rc_url =~ /git/
+            Origen::RevisionControl::Git.git("clone #{rc_url} #{_gem_basename(gems[gem.to_sym])}", local: _session_gem_path, verbose: true)
+          else
+            # Use Origen::RevisionControl for DesignSync
+            rc = Origen::RevisionControl.new remote: rc_url, local: _local_path_to_gem(gems[gem.to_sym])
+            tag = Origen::VersionString.new(_gem_rc_version(gems[gem.to_sym]))
+            tag = tag.prefixed if tag.semantic?
+            rc.build version: tag
+          end
+        else
+          puts 'Not an Origen plugin gem, only COPYING source.'
+          FileUtils.cp_r(gems[gem.to_sym][:location], _session_gem_path)
+        end
+
+        # FileUtils.cp_r(gems[gem.to_sym][:location], _session_gem_path)
+        unless options[:dont_use]
+          Origen.app.session.gems[gem.to_sym] = "#{_local_path_to_gem(gems[gem.to_sym])}"
+        end
+
+        _update_gemfile
+
+        puts "Fetched #{gem} to tmp/gems/#{_gem_basename(gems[gem.to_sym])}"
+        puts ''
+        # puts 'Please add the following to your Gemfile:'
+        # puts ''
+        # puts "gem '#{gem}', path: '#{_local_path_to_gem(gems[gem.to_sym])}'"
+        # puts ''
+      else
+        puts "Error: '#{gem}' is not a currently used gem.  Use 'origen gem' for gem list."
+      end
+    else
+      puts "Error: Must specify gem to be fetched. Use 'origen gem -h' for usage"
+    end
+  # when 'reset'
+  #   gem = ARGV[0]
+  #   if gem
+  #     puts "Resetting #{gem} to Gemfile/gemspec"
+  #   else
+  #     puts "Error: Must specify gem to be cleaned or 'all'"
+  #   end
+  else
+    gem = input
+    if gems.key?(gem.to_sym)
+      a = _local_gems_orig[gem].to_yaml.split(/\n+/)
+      skip = true
+
+      if options[:gem_location] || options[:gem_version]
+        puts '================================================================================='
+        puts "Gem Name: #{gems[gem.to_sym][:name]}"
+        puts "Version:  #{gems[gem.to_sym][:version]}" if options[:gem_version]
+        puts "Location: #{gems[gem.to_sym][:location]}" if options[:gem_location]
+        puts '================================================================================='
+      else
+        puts '================================================================================='
+        puts "Gem Name: #{gems[gem.to_sym][:name]}"
+        puts "Version:  #{gems[gem.to_sym][:version]}"
+        puts "Location: #{gems[gem.to_sym][:location]}"
+        puts '---------------------------------------------------------------------------------'
+        puts 'Details:'
+        a.each do |line|
+          if line =~ /^  (\w+):(.*)$/
+            topic = Regexp.last_match(1)
+            if QUIET_ATTRS.include? topic
+              skip = true
+            else
+              skip = false
+            end
+          end
+          puts "  #{line}" unless skip
+        end
+        puts '---------------------------------------------------------------------------------'
+        puts '================================================================================='
+      end
+    else
+      puts "Error: '#{gem}' not a valid command or gem. Use 'origen gem -h' for usage or 'origen gem' for gem list."
+    end
+  end
+end

data/lib/origen/commands/generate.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -22,9 +23,8 @@ opt_parser = OptionParser.new do |opts|
   opts.on('--nocom', 'No comments in the generated pattern') { options[:no_comments] = true }
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/helpers.rb

@@ -0,0 +1,18 @@
+module Origen
+  module CommandHelpers
+    def self.extend_options(opts, app_opts, options)
+      app_opts.each do |app_option|
+        if app_option.last.is_a?(Proc)
+          ao_proc = app_option.pop
+          if ao_proc.arity == 1
+            opts.on(*app_option) { ao_proc.call(options) }
+          else
+            opts.on(*app_option) { |arg| ao_proc.call(options, arg) }
+          end
+        else
+          opts.on(*app_option) {}
+        end
+      end
+    end
+  end
+end

data/lib/origen/commands/interactive.rb

@@ -6,6 +6,7 @@ begin
 rescue LoadError
   # If not installed simply not available
 end
+require 'origen/commands/helpers'
 
 module Origen
   # Methods available to the command line in a console session, split this to a
@@ -39,9 +40,8 @@ Usage: origen i [options]
     opts.on('-p', '--pry', 'Use Pry for the session (instead of IRB)') { options[:pry] = true }
     opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-    app_options.each do |app_option|
-      opts.on(*app_option) {}
-    end
+    # Apply any application option extensions to the OptionParser
+    Origen::CommandHelpers.extend_options(opts, app_options, options)
     opts.separator ''
     opts.on('-h', '--help', 'Show this message') { puts opts; exit }
   end

data/lib/origen/commands/lint.rb

@@ -1,3 +1,5 @@
+require 'origen/commands/helpers'
+
 options = {}
 
 # App options are options that the application can supply to extend this command
@@ -19,9 +21,8 @@ http://origen.freescale.net/origen/latest/guides/utilities/lint/
   opts.on('-e', '--easy', 'Be less strict, most checks run with this flag enabled can be corrected automatically') { options[:easy] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/lsf.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -55,9 +56,8 @@ Usage: origen lsf [options]
   # opts.on("-e", "--execute", "Execute....") { options[:execute] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/program.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -22,9 +23,8 @@ opt_parser = OptionParser.new do |opts|
   opts.on('-p', '--project NAME', String, 'Specify the LSF project, default is msg.te') { |o| options[:project] = o }
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/rc.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 include Origen::Utility::InputCapture
 
@@ -127,9 +128,8 @@ The following commands are available:
 The following options are available:
   EOT
     opts.on('-h', '--help', 'Show this message') { puts opts; exit }
-    app_options.each do |app_option|
-      opts.on(*app_option) {}
-    end
+    # Apply any application option extensions to the OptionParser
+    Origen::CommandHelpers.extend_options(opts, app_options, options)
     opts.separator ''
     opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }

data/lib/origen/commands/save.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -14,9 +15,8 @@ Usage: origen save TYPE [options]
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/time.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'pathname'
+require 'origen/commands/helpers'
 
 options = {}
 
@@ -28,9 +29,8 @@ Usage: origen time CMD [args] [options]
   opts.on('-d', '--debugger', 'Enable the debugger') {  options[:debugger] = true }
   opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
   opts.on('-f', '--file FILE', String, 'Override the default log file') { |o| options[:log_file] = o }
-  app_options.each do |app_option|
-    opts.on(*app_option) {}
-  end
+  # Apply any application option extensions to the OptionParser
+  Origen::CommandHelpers.extend_options(opts, app_options, options)
   opts.separator ''
   opts.on('-h', '--help', 'Show this message') { puts opts; exit }
 end

data/lib/origen/commands/web.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'pathname'
+require 'origen/commands/helpers'
 
 module Origen
   options = {}
@@ -49,9 +50,8 @@ The following options are available:
     opts.on('-m', '--mode MODE', Origen::Mode::MODES, 'Force the Origen operating mode:', '  ' + Origen::Mode::MODES.join(', ')) { |_m| }
     opts.on('--no-serve', "Don't serve the website after compiling without the remote option") { options[:no_serve] = true }
     opts.on('-c', '--comment COMMENT', String, 'Supply a commit comment when deploying to Git') { |o| options[:comment] = o }
-    app_options.each do |app_option|
-      opts.on(*app_option) {}
-    end
+    # Apply any application option extensions to the OptionParser
+    Origen::CommandHelpers.extend_options(opts, app_options, options)
     opts.separator ''
     opts.on('-h', '--help', 'Show this message') { puts opts; exit }
   end

data/lib/origen/controller.rb

@@ -107,10 +107,21 @@ module Origen
     # next time, this should be faster for repeated lookups of the same method, e.g. reg
     def method_missing(method, *args, &block)
       if model.respond_to?(method)
-        define_singleton_method(method) do |*args, &block|
-          model.send(method, *args, &block)
+        # This method is handled separately since it is important to produce a proxy method
+        # that takes no arguments, otherwise the register address lookup system mistakes it
+        # for a legacy way of calculating the base address whereby the register itself was
+        # given as an argument.
+        if method.to_sym == :base_address
+          define_singleton_method(method) do
+            model.send(method)
+          end
+          base_address
+        else
+          define_singleton_method(method) do |*args, &block|
+            model.send(method, *args, &block)
+          end
+          send(method, *args, &block)
         end
-        send(method, *args, &block)
       else
         super
       end

data/lib/origen/core_ext/array.rb

@@ -20,4 +20,18 @@ class Array
     hash.delete_if { |_k, v| v.size == 1 }
     hash
   end
+
+  def include_hash?
+    each { |e| return true if e.is_a? Hash }
+    false
+  end
+
+  def include_hash_with_key?(key)
+    each do |e|
+      if e.is_a? Hash
+        return e if e.key?(key)
+      end
+    end
+    nil
+  end
 end

data/lib/origen/generator/job.rb

@@ -4,12 +4,14 @@ module Origen
     class Job # :nodoc: all
       attr_accessor :output_file_body, :pattern
       attr_reader :split_counter
+      attr_reader :options
 
       def initialize(pattern, options)
         @testing = options[:testing]
         @options = options
         @requested_pattern = pattern
         @no_comments = options[:no_comments]
+        @output_opt = options[:output]
       end
 
       # Returns true if the job is a test job, will only be true in a test scenario
@@ -66,7 +68,7 @@ module Origen
 
       def output_pattern_directory
         @output_pattern_directory ||= begin
-          dir = Origen.app.config.pattern_output_directory
+          dir = output_override || Origen.app.config.pattern_output_directory
           if tester.respond_to?(:subdirectory)
             dir = File.join(dir, tester.subdirectory)
           end
@@ -100,6 +102,17 @@ module Origen
         '.' + Origen.tester.pat_extension
       end
 
+      def output_override
+        if @output_opt
+          if @output_opt =~ /#{Origen.root}/
+            return @output_opt
+          else
+            return "#{Origen.root}/#{@output_opt}"
+          end
+        end
+        nil
+      end
+
       def split_number
         if split_counter
           "_part#{split_counter}"

data/lib/origen/generator/pattern.rb

@@ -368,7 +368,11 @@ module Origen
 
         if Origen.tester.generate?
           Origen.app.listeners_for(:pattern_generated).each do |listener|
-            listener.pattern_generated(Pathname.new(job.output_pattern))
+            if listener.class.instance_method(:pattern_generated).arity == 1
+              listener.pattern_generated(Pathname.new(job.output_pattern))
+            else
+              listener.pattern_generated(Pathname.new(job.output_pattern), job.options)
+            end
           end
         end
       end

data/lib/origen/parameters/set.rb

@@ -153,6 +153,34 @@ module Origen
         owner._request_live_parameter
         self
       end
+
+      def to_flat_hash(options = {})
+        options = {
+          delimiter: '.'
+        }.update(options)
+        flatten_params(self, options[:delimiter]).first
+      end
+
+      private
+
+      def flatten_params(param_hash, delimiter, name = nil, results_hash = {})
+        param_hash.each do |k, v|
+          if v.is_a? Origen::Parameters::Set
+            name.nil? ? name = k.to_s : name << "#{delimiter}#{k}"
+            (results_hash, name) = flatten_params(v, delimiter, name, results_hash)
+          else
+            if name.nil?
+              results_hash[k] = v
+            else
+              results_hash["#{name}#{delimiter}#{k}"] = v
+              if k == param_hash.keys.last
+                name = nil
+              end
+            end
+          end
+        end
+        [results_hash, name]
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -421,7 +421,9 @@ files:
 - lib/origen/commands/compile.rb
 - lib/origen/commands/environment.rb
 - lib/origen/commands/fetch.rb
+- lib/origen/commands/gem.rb
 - lib/origen/commands/generate.rb
+- lib/origen/commands/helpers.rb
 - lib/origen/commands/interactive.rb
 - lib/origen/commands/lint.rb
 - lib/origen/commands/lsf.rb
@@ -603,7 +605,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit