origen 0.60.7 → 0.60.9

data/lib/origen/boot/app.rb

@@ -229,7 +229,7 @@ end
 
       def setup_bundler(origen_root)
         bundle_path = nil
-        eval BUNDLER_SETUP  # Will update bundle_path
+        eval BUNDLER_SETUP # Will update bundle_path
         bundle_path
       end
 
@@ -239,43 +239,41 @@ end
           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)
+            # 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)
 
-              # If the spec has returned a handle to a system installed gem. If this script has been invoked through
-              # Bundler then it could point to some other gem dir. The only time this should occur is when switching
-              # from the old system to the new system, but can't work out how to fix it so just disabling in that case.
-              if spec.gem_dir =~ /#{gem_dir}/
+            # If the spec has returned a handle to a system installed gem. If this script has been invoked through
+            # Bundler then it could point to some other gem dir. The only time this should occur is when switching
+            # from the old system to the new system, but can't work out how to fix it so just disabling in that case.
+            if spec.gem_dir =~ /#{gem_dir}/
 
-                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)
+              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)
 
-                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.cache_file).relative_path_from(gem_dir)))
+              FileUtils.mkdir_p local_file.dirname
+              FileUtils.cp(spec.cache_file, local_file)
 
-                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)
+              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
 
-                puts "Copied #{gem} #{version} from the system into #{bundle_path}"
+              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)
 
-              end
+              puts "Copied #{gem} #{version} from the system into #{bundle_path}"
 
-            rescue Exception # Gem::LoadError  # Rescue everything here, this is a try-our-best operation, better to
-              # continue and try and install the gem if this fails rather than crash
-              # 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
+
+          rescue Exception # Gem::LoadError  # Rescue everything here, this is a try-our-best operation, better to
+            # continue and try and install the gem if this fails rather than crash
+            # 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

data/lib/origen/boot.rb

@@ -140,6 +140,7 @@ elsif Origen.site_config.gem_manage_bundler && (Origen.site_config.user_install_
       if STDOUT.tty?
         begin
           fail OrigenBootError unless File.exist?(ENV['BUNDLE_BIN'])
+
           Bundler.setup
           fail OrigenBootError unless File.exist?(ENV['BUNDLE_BIN'])
         rescue Gem::LoadError, Bundler::BundlerError, OrigenBootError => e

data/lib/origen/bugs.rb

@@ -2,7 +2,7 @@ module Origen
   module Bugs
     extend ActiveSupport::Concern
 
-    autoload :Bug,           'origen/bugs/bug'
+    autoload :Bug, 'origen/bugs/bug'
 
     module ClassMethods # :nodoc:
       # Define a bug on the given IP
@@ -23,7 +23,7 @@ module Origen
     # Returns true if the version of the IP represented by the object has the bug of the
     # given name
     def has_bug?(name, _options = {})
-      unless self.respond_to?(:version) && version
+      unless respond_to?(:version) && version
         puts 'To test for the presence of a bug the object must implement an attribute'
         puts "called 'version' which returns the IP version represented by the the object."
         fail 'Version undefined!'

data/lib/origen/chip_mode.rb

@@ -4,12 +4,14 @@ module Origen
     attr_accessor :brief_description
     attr_accessor :description
     attr_writer :name
-    attr_accessor :data_rate
+    attr_writer :data_rate
     attr_accessor :data_rate_unit
     attr_accessor :minimum_version_enabled
+
     alias_writer :min_ver_enabled, :minimum_version_enabled
     alias_writer :min_version_enabled, :minimum_version_enabled
     attr_accessor :audience
+
     alias_writer :full_name, :name
     # Returns the object that owns the mode (the SoC instance usually)
     attr_accessor :owner
@@ -47,15 +49,15 @@ module Origen
           # in theory but should still check if it returns a numeric
           value = @data_rate.send(@data_rate_unit.to_sym)
           if value.is_a?(Numeric)
-            return value
+            value
           else
             Origen.log.error "@data_rate '#{@data_rate}' conversion using @data_rate_unit '#{@data_rate_unit}' did not product a Numeric, exiting..."
           end
         else
-          return @data_rate
+          @data_rate
         end
       else
-        return @data_rate
+        @data_rate
       end
     end
 
@@ -82,6 +84,7 @@ module Origen
           instance_variable_get(ivar)
         end
       end
+
       send(method_name, *arguments, &block)
     end
 

data/lib/origen/chip_package.rb

@@ -6,7 +6,7 @@ module Origen
     attr_accessor :number_of_rows
     attr_accessor :number_of_columns
     attr_accessor :interconnects
-    attr_accessor :types
+    attr_writer :types
     attr_reader :upper_axes
     attr_reader :lower_axes
     attr_reader :rows
@@ -14,10 +14,11 @@ module Origen
     attr_reader :field
     attr_reader :obj
     attr_reader :groups
-    attr_reader :group_list
+    # attr_reader :group_list       # method is redefined further down
     attr_reader :last_empty_char
     attr_reader :plottable
     attr_writer :name
+
     alias_writer :full_name, :name
     # Returns the owner that $owns the mode (the SoC instance usually)
     attr_accessor :owner
@@ -57,7 +58,7 @@ module Origen
     #
     def prepare_plot
       @plottable = types.any? { |x| /BGA/i =~ x }
-      if  @plottable
+      if @plottable
         @last_empty_char = '.'
         @field = []
         @groups = []
@@ -69,7 +70,7 @@ module Origen
         (1..@number_of_columns).map { |item| @columns << item }
         @upper_axes = []
         @lower_axes = []
-        @columns.each_with_index do|column, index|
+        @columns.each_with_index do |column, index|
           # if index % 2 == 0
           if index.even?
             temp = column.to_s
@@ -96,20 +97,20 @@ module Origen
     #    2. It concatenates the array elements into printable rows, and prints
     #       them.
     #
-    def generate_field(emptyChar = @last_empty_char)
+    def generate_field(empty_char = @last_empty_char)
       if plottable
         new_field = []
         @field.each do |rows|
           rows.each do |items|
             if items.length == 0
-              items.insert(0, "#{emptyChar} ")
-            elsif emptyChar != @last_empty_char && items == ["#{last_empty_char} "]
-              items[0] = "#{emptyChar} "
+              items.insert(0, "#{empty_char} ")
+            elsif empty_char != @last_empty_char && items == ["#{last_empty_char} "]
+              items[0] = "#{empty_char} "
             end
           end
           new_field.insert(-1, rows.join(''))
         end
-        @last_empty_char = emptyChar
+        @last_empty_char = empty_char
         package = (owner.package.nil?) ? 'No package chosen.' : owner.package.to_s
         puts "\nPin field: #{package}\n\n"
         group_display = @groups.join("\n")
@@ -129,13 +130,12 @@ module Origen
         @groups << "#{marker} - Power"
         pin_list.each do |item|
           # puts items,owner.pins[items].location
-          begin
-            coordinates = coordinate(item.location)
-            @field[coordinates[0]][coordinates[1]] = [marker.red + ' ']
-          rescue
-            puts "#{item} doesn't appear to have a physical location in this configuration."
-            puts "Current package = #{owner.package}"
-          end
+
+          coordinates = coordinate(item.location)
+          @field[coordinates[0]][coordinates[1]] = [marker.red + ' ']
+        rescue
+          puts "#{item} doesn't appear to have a physical location in this configuration."
+          puts "Current package = #{owner.package}"
         end
         generate_field
       end
@@ -151,12 +151,10 @@ module Origen
         pin_list = owner.ground_pins.map { |_ken, pin| pin }
         @groups << "#{marker} - Ground"
         pin_list.each do |item|
-          begin
-            coordinates = coordinate(item.location)
-            @field[coordinates[0]][coordinates[1]] = [marker.green + ' ']
-          rescue
-            puts "#{item} doesn't appear to have a physical location in this configuration."
-          end
+          coordinates = coordinate(item.location)
+          @field[coordinates[0]][coordinates[1]] = [marker.green + ' ']
+        rescue
+          puts "#{item} doesn't appear to have a physical location in this configuration."
         end
         generate_field
       end
@@ -183,16 +181,16 @@ module Origen
       if plottable
         puts "\nPLOTTING GROUPS:"
         puts '$dut.package.list_groups <-- to see available group names'
-        puts "$dut.package.plot(\"ddr_interface_1\")"
+        puts '$dut.package.plot("ddr_interface_1")'
         puts "$dut.package.plot_group(\"serdes_1\",'Z') <--denotes custom legend marker, Z"
         puts "\nPLOTTING INDIVIDUAL PINS:"
-        puts "$dut.package.plot(\"d1_mdqs00\")"
+        puts '$dut.package.plot("d1_mdqs00")'
         puts "\nPLOTTING WITH REGEXP:"
-        puts "$dut.package.plot(\"d1_mdqs\") <-- Plot all controller 1 DQS pins."
-        puts "$dut.package.plot(\"d1_mdqs0[0-9]\") <-- Plot d1_mdqs00 - d1_mdqs09."
+        puts '$dut.package.plot("d1_mdqs") <-- Plot all controller 1 DQS pins.'
+        puts '$dut.package.plot("d1_mdqs0[0-9]") <-- Plot d1_mdqs00 - d1_mdqs09.'
         puts "\nADDING POWER/GROUND:"
-        puts "$dut.package.plot(\"grounds\")"
-        puts "$dut.package.plot(\"power\")"
+        puts '$dut.package.plot("grounds")'
+        puts '$dut.package.plot("power")'
         puts "\nVIEW CURRENT PLOT\n"
         puts '$dut.package.show'
       else
@@ -206,7 +204,7 @@ module Origen
       grps = owner.pins.map { |_key, val| val.group }
       grps.uniq!
     rescue
-      return []
+      []
     end
     alias_method :group_list, :list_groups
 
@@ -216,7 +214,7 @@ module Origen
       pin_list[0].compact!
       puts 'No pins found under that group name.' unless pin_list.any?
     rescue
-      return []
+      []
     end
 
     # ##############################################################
@@ -235,6 +233,7 @@ module Origen
       row = location[0..split_index]
       column = location[split_index + 1..-1]
       fail ArgumentError, error unless row.length > 0 && column.length > 0
+
       ## Now convert alphanumeric row to jedec equiv' with to_row() method
       # and return coordinates.
       coordinates = [to_row(row), column.to_i - 1]
@@ -264,48 +263,46 @@ module Origen
     #    $dut.package.plot("d1_mdq37","$") # plots controller 1 mdq 37, and uses $ as a legend marker
     #    $dut.package.plot("d2_mdq[3-6]0) # plots d2_mdq30, d2_mdq40, d2_md520, and d2_md620
     #
-    def plot(pinName, marker = nil)
+    def plot(pin_name, marker = nil)
       prepare_plot if field.nil?
-      if plottable && pinName.is_a?(String) && /ground/ =~ pinName.downcase
+      if plottable && pin_name.is_a?(String) && /ground/ =~ pin_name.downcase
         add_grounds('G')
-      elsif plottable && pinName.is_a?(String) && /power/ =~ pinName.downcase
+      elsif plottable && pin_name.is_a?(String) && /power/ =~ pin_name.downcase
         add_power('P')
-      elsif plottable && pinName.is_a?(String)
+      elsif plottable && pin_name.is_a?(String)
         found_pins = []
-        owner.pins.map { |pin| found_pins << pin[1] if /#{pinName}/ =~ pin[1].name.to_s || /#{pinName}/ =~ pin[1].group.to_s }
+        owner.pins.map { |pin| found_pins << pin[1] if /#{pin_name}/ =~ pin[1].name.to_s || /#{pin_name}/ =~ pin[1].group.to_s }
         if found_pins.size == 1 && marker.nil?
-          marker = initial(pinName.to_s)
-          while @groups.index { |grpName| grpName =~ /#{marker} -/ }
+          marker = initial(pin_name.to_s)
+          while @groups.index { |grp_name| grp_name =~ /#{marker} -/ }
             marker.next!
             marker = '0' unless marker.size < 2
           end
           coordinates = coordinate(found_pins[0].location)
           @field[coordinates[0]][coordinates[1]] = [marker.white_on_blue + ' ']
-          @groups.delete_if { |group| /#{pinName.to_s}/ =~ group }
+          @groups.delete_if { |group| /#{pin_name}/ =~ group }
           @groups << "#{marker} - #{found_pins[0].name} - #{found_pins[0].location}"
         elsif found_pins.size == 1
           coordinates = coordinate(found_pins[0].location)
           @field[coordinates[0]][coordinates[1]] = [marker.white_on_blue + ' ']
-          @groups.delete_if { |group| /#{pinName.to_s}/ =~ group }
+          @groups.delete_if { |group| /#{pin_name}/ =~ group }
           @groups << "#{marker} - #{found_pins[0].name} - #{found_pins[0].location}"
         else
           if marker.nil?
-            marker = initial(pinName.to_s)
-            while @groups.index { |grpName| grpName =~ /#{marker} -/ }
+            marker = initial(pin_name.to_s)
+            while @groups.index { |grp_name| grp_name =~ /#{marker} -/ }
               marker.next!
               marker = '0' unless marker.size < 2
             end
           end
-          reg_state = quote_regex(pinName)
+          reg_state = quote_regex(pin_name)
           found_pins.each do |item|
-            begin
-              coordinates = coordinate(item.location)
-              @field[coordinates[0]][coordinates[1]] = [marker + ' ']
-              @groups.delete_if { |group| "#{marker} - \"#{reg_state}\"" == group }
-              @groups << "#{marker} - \"#{pinName}\""
-            rescue
-              raise "\n#{item} doesn't appear to have a physical location in this configuration."
-            end
+            coordinates = coordinate(item.location)
+            @field[coordinates[0]][coordinates[1]] = [marker + ' ']
+            @groups.delete_if { |group| "#{marker} - \"#{reg_state}\"" == group }
+            @groups << "#{marker} - \"#{pin_name}\""
+          rescue
+            raise "\n#{item} doesn't appear to have a physical location in this configuration."
           end
         end
         generate_field
@@ -328,20 +325,20 @@ module Origen
           owner.pins.map { |pin| found_pins << pin[1] if coord == pin[1].location.to_s }
           if marker.nil?
             marker = initial(coord.to_s)
-            while @groups.index { |grpName| grpName =~ /#{marker} -/ }
+            while @groups.index { |grp_name| grp_name =~ /#{marker} -/ }
               marker.next!
               marker = '0' unless marker.size < 2
             end
             found_pins.each do |pin|
               coordinates = coordinate(pin.location)
               @field[coordinates[0]][coordinates[1]] = [marker.white_on_blue + ' ']
-              @groups.delete_if { |group| /#{coord.to_s}/ =~ group }
+              @groups.delete_if { |group| /#{coord}/ =~ group }
               @groups << "#{marker} - #{found_pins[0].name} - #{found_pins[0].location}"
             end
           else
             coordinates = coordinate(found_pins[0].location)
             @field[coordinates[0]][coordinates[1]] = [marker.white_on_blue + ' ']
-            @groups.delete_if { |group| /#{coord.to_s}/ =~ group }
+            @groups.delete_if { |group| /#{coord}/ =~ group }
             @groups << "#{marker} - #{found_pins[0].name} - #{found_pins[0].location}"
           end
           if found_pins.size > 0

data/lib/origen/chips/chip.rb

@@ -70,11 +70,11 @@ module Origen
           end
         end
         if notes_found.empty?
-          return nil
+          nil
         elsif notes_found.size == 1
           notes_found.values.first.values.first
         else
-          return notes_found
+          notes_found
         end
       end
 
@@ -122,6 +122,8 @@ module Origen
 
       private
 
+      # rubocop:disable Lint/DuplicateMethods
+
       # Two-dimensional hash with note id and type as the keys
       def _notes
         @_notes ||= Hash.new do |h, k|
@@ -143,9 +145,12 @@ module Origen
         end
       end
 
+      # rubocop:enable Lint/DuplicateMethods
+
       # Return a hash based on the filter provided
       def filter_hash(hash, filter)
         fail 'Hash argument is not a Hash!' unless hash.is_a? Hash
+
         filtered_hash = {}
         select_logic = case filter
           when String then 'k[Regexp.new(filter)]'
@@ -155,8 +160,7 @@ module Origen
             'k == filter'
           when NilClass then true # Return all specs if a filter is set to nil (i.e. user doesn't care about this filter)
           else true
-        end
-        # rubocop:disable UnusedBlockArgument
+                       end
         filtered_hash = hash.select do |k, v|
           [TrueClass, FalseClass].include?(select_logic.class) ? select_logic : eval(select_logic)
         end

data/lib/origen/chips.rb

@@ -37,13 +37,13 @@ module Origen
       }.update(options || {})
       _chips
       if s.nil?
-        return show_chips(options)
+        show_chips(options)
       elsif s.is_a? Hash
         options.update(s)
-        return show_chips(options)
+        show_chips(options)
       else
         options[:chip] = s
-        return show_chips(options)
+        show_chips(options)
       end
     end
 
@@ -61,6 +61,7 @@ module Origen
       if has_chip?(name, group: group, family: family, performance: performance, creating_chip: true)
         fail "Chip already exists for chip: #{name}, group: #{group}, family: #{family} for object #{self}"
       end
+
       @_chips[group][family][performance][name] = chip_holder
     end
 
@@ -76,9 +77,9 @@ module Origen
         creating_chip: false
       }.update(options)
       if @_chips.nil? || @_chips == {}
-        return false
+        false
       else
-        return !!show_chips(options)
+        !!show_chips(options)
       end
     end
 
@@ -127,11 +128,11 @@ module Origen
         end
       end
       if notes_found.empty?
-        return nil
+        nil
       elsif notes_found.size == 1
         notes_found.values.first.values.first
       else
-        return notes_found
+        notes_found
       end
     end
 
@@ -184,6 +185,8 @@ module Origen
 
     private
 
+    # rubocop:disable Lint/DuplicateMethods
+
     def _chips
       # 4D hash with group, family, and performance
       @_chips ||= Hash.new do |h, k|
@@ -215,10 +218,12 @@ module Origen
         h[k] = {}
       end
     end
+    # rubocop:enable Lint/DuplicateMethods
 
     # Return a hash based on the filter provided
     def filter_hash(hash, filter)
       fail 'Hash argument is not a Hash!' unless hash.is_a? Hash
+
       filtered_hash = {}
       select_logic = case filter
         when String then 'k[Regexp.new(filter)]'
@@ -228,8 +233,7 @@ module Origen
           'k == filter'
         when NilClass then true # Return all specs if a filter is set to nil (i.e. user doesn't care about this filter)
         else true
-      end
-      # rubocop:disable UnusedBlockArgument
+                     end
       filtered_hash = hash.select do |k, v|
         [TrueClass, FalseClass].include?(select_logic.class) ? select_logic : eval(select_logic)
       end
@@ -268,13 +272,13 @@ module Origen
           return show_chips(options)
         end
         Origen.log.debug "Returning no chips for options #{options}"
-        return nil
+        nil
       elsif chips_to_be_shown.size == 1
         Origen.log.debug "returning one spec #{chips_to_be_shown.first.part_name}"
-        return chips_to_be_shown.first
+        chips_to_be_shown.first
       else
         Origen.log.debug "returning an array of specs during initial search: #{chips_to_be_shown}"
-        return chips_to_be_shown
+        chips_to_be_shown
       end
     end
   end

data/lib/origen/client.rb

@@ -54,6 +54,7 @@ module Origen
     # Returns an array of data packets for all plugins
     def plugins
       return @plugins if @plugins
+
       response = get('plugins')
       @plugins = JSON.parse(response.body, symbolize_names: true)[:plugins]
     end

data/lib/origen/clocks/clock.rb

@@ -1,7 +1,8 @@
 module Origen
   module Clocks
     class Clock
-      attr_accessor :id, :owner, :users, :freq_target, :freq_range, :setpoint, :instantiate_users
+      attr_accessor :id, :owner, :instantiate_users
+      attr_writer :users, :freq_target, :freq_range
 
       def initialize(id, owner, options = {}, &block)
         @id = id
@@ -37,17 +38,17 @@ module Origen
         val = @setpoint if val.nil?
         if @freq_range == :fixed
           if val == @freq_target
-            return true
+            true
           else
             Origen.log.warn("Clock '#{id}' is a fixed clock with a target frequency of #{@freq_target.as_Hz}")
-            return false
+            false
           end
         else
           if @freq_range.include?(val)
-            return true
+            true
           else
             Origen.log.warn("Setpoint (#{setpoint_string(val)}) for clock '#{id}' is not within the frequency range (#{freq_range_string})")
-            return false
+            false
           end
         end
       end
@@ -100,10 +101,10 @@ module Origen
       def users_defined?
         undefined_ips = ips - Origen.all_sub_blocks
         if undefined_ips.empty?
-          return true
+          true
         else
           Origen.log.warn("Clock '#{id}' has the following IP undefined: #{undefined_ips}")
-          return false
+          false
         end
       end
 

data/lib/origen/clocks/clocks_collection.rb

@@ -18,6 +18,7 @@ module Origen
               attr_getter = attr.to_s[/\@(\S+)/, 1].to_sym
               attr_val = clk.send attr_getter
               next unless [String, Numeric, Float, Integer, Symbol, Range].include? attr_val.class
+
               headers << attr_getter unless headers.include?(attr_getter)
               str = case attr_val
               when Numeric
@@ -29,7 +30,7 @@ module Origen
                 "#{start_frequency.as_Hz}\.\.#{end_frequency.as_Hz}"
               else
                 attr_val.to_s
-              end
+                    end
               curr_longest = [attr_getter, str].max_by(&:length).size + 2 # Add 2 for the whitespace
               if colhash[attr].nil? || (colhash[attr] < curr_longest)
                 colhash[attr] = curr_longest

data/lib/origen/code_generators/actions.rb

@@ -354,7 +354,7 @@ module Origen
         # done of the name and it is assumed that it is a valid class name including the application namespace.
         def class_name_to_blocks_dir(name)
           name = name.split('::')
-          name.shift  # Drop the application name
+          name.shift # Drop the application name
           dir = Origen.root.join('app', 'blocks')
           name.each_with_index do |n, i|
             if i == 0

data/lib/origen/code_generators/base.rb

@@ -40,7 +40,7 @@ module Origen
 
       # Cache source root and add lib/generators/base/generator/templates to
       # source paths.
-      def self.inherited(base) #:nodoc:
+      def self.inherited(base) # :nodoc:
         super
         if base.name && base.name !~ /Base$/
           if base.namespace == 'origen'

data/lib/origen/code_generators.rb

@@ -28,6 +28,7 @@ module Origen
 
     def self.load_generators
       return if @generators_loaded
+
       # Load Origen's generators
       require_relative 'code_generators/block_common'
       require_relative 'code_generators/dut'
@@ -43,6 +44,7 @@ module Origen
     # Loaded separately so as not to pollute the generated list of generators available to users
     def self.load_internal_generators
       return if @internal_generators_loaded
+
       require_relative 'code_generators/semver'
       require_relative 'code_generators/timever'
       @internal_generators_loaded = true
@@ -121,6 +123,7 @@ END
       end
       plugin_generators.each do |namespace, generators|
         next if namespace.to_s == 'origen_app_generators'
+
         puts
         generators.each do |_name, gen|
           puts "#{namespace}:#{gen}"

data/lib/origen/commands/archive.rb

@@ -16,7 +16,7 @@ opt_parser.parse! ARGV
 
 origen_binstub = File.join(Origen.root, 'lbin', 'origen')
 
-unless  File.exist?(origen_binstub) && File.read(origen_binstub) =~ /This file was generated by Origen/
+unless File.exist?(origen_binstub) && File.read(origen_binstub) =~ /This file was generated by Origen/
   puts 'An archive can only be created after your application is running the latest Origen boot system,'
   puts 'run the following command to update your application and then try again:'
   puts