origen 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f23605859c980dd6d2640897a4245aad8906766c
-  data.tar.gz: 2e771418b57f561353455cfff1ae6018124742c5
+  metadata.gz: ed45b25fc195c61acaf99010cbee3f3fe032eb32
+  data.tar.gz: 58dd3f0356d71f526f53c6ae8aabd7c2cfa8f3e4
 SHA512:
-  metadata.gz: 2c4ad2bba1cfbc00dba89d9764f0276d846039286e15378c6cdb11d25c19a25f729057583a6c23c24decbfbd3f75052d8ad5ffa061e0d2d36fb3b11511d57076
-  data.tar.gz: 87b0b8ae625116e81cd673f1e7384d23de2b6be4d5f6195ee11f99f7b3885bed74eb6996e19f09759a32dc159f6a4a832a9f1668098abccae447d5ff83c6f0e5
+  metadata.gz: 11a43e23e9331325d3bf54a447d1bb14f3c1f4a67d981ae11f912c0a41dc631d6981cea479aeabf458e0881ef66bda2714b8a835dedf03aa44aff28541aca4ec
+  data.tar.gz: 6ce6af41232ab71e1f1608f653b07ec181a02aaebff4b787a47f67c38add2972b0c95edff793295d165cad6517bcb85807976968ee98dce76e874fdb0ca3b0db

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 5
-  BUGFIX = 8
+  BUGFIX = 9
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/commands.rb

@@ -169,10 +169,12 @@ end
 # overloading of Origen commands by the application.
 @application_options = []
 @plugin_commands = []
-@application_commands = []
+# Prevent plugins from being able to accidentally override app commands
+# @application_commands = []
 app_id = @application_options.object_id
 plugin_id = @plugin_commands.object_id
-app_cmd_id = @application_commands.object_id
+# Prevent plugins from being able to accidentally override app commands
+# app_cmd_id = @application_commands.object_id
 app_opt_err = false
 plugin_opt_err = false
 app_cmd_err = false
@@ -191,6 +193,8 @@ if File.exist? "#{Origen.root}/config/commands.rb"
     plugin_opt_err = true
   end
 end
+# Only the app can set this, so cache it locally prevent any plugins overriding it
+application_commands = @application_commands || ''
 
 shared_commands = Origen.app.plugins.shared_commands
 if shared_commands && shared_commands.size != 0

data/lib/origen/file_handler.rb

@@ -327,6 +327,8 @@ module Origen
         @reference_directory = relative_to_absolute(options[:reference])
       else
         @reference_directory = Pathname.new(Origen.config.reference_directory)
+        # Create the reference output directory if it does not exist.
+        FileUtils.mkdir_p(@reference_directory) unless @reference_directory.exist?
       end
       if options[:create]
         # Delete any broken symlinks in the top level .ref

data/lib/origen/regression_manager.rb

@@ -77,6 +77,11 @@ module Origen
         yield options
         wait_for_completion(options) if options[:uses_lsf]
         summarize_results(options)
+
+        # call exit code false to force process fail
+        unless Origen.app.stats.clean_run?
+          exit 1
+        end
       end
     end
 
@@ -225,7 +230,12 @@ module Origen
         puts "Valid values are 'latest', 'last' (production release), or a tag."
       end
       puts ''
-      get_text(default: Origen.app.version, single: true)
+      v = VersionString.new(get_text(default: Origen.app.version, single: true))
+      if v.semantic?
+        v.prefixed
+      else
+        v
+      end
     end
 
     def version_to_tag(version)

data/lib/origen/revision_control/git.rb

@@ -238,7 +238,10 @@ module Origen
         else
           rem = remote
         end
-        !git("ls-remote --heads #{rem} #{str}", verbose: false).empty?
+        # check if matches 40 digit hex string followed by branch name
+        git("ls-remote --heads #{remote} #{str}", verbose: false).any? do |line|
+          line =~ /^[0-9a-f]{40}\s+[a-zA-Z]/
+        end
       end
 
       def initialized?

data/lib/origen/specs.rb

@@ -14,7 +14,11 @@ module Origen
 
     attr_accessor :_specs, :_notes, :_exhibits, :_doc_resources, :_overrides, :_power_supplies, :_mode_selects, :_version_history, :_creation_info
 
-    SPEC_TYPES = [:dc, :ac, :temperature, :supply]
+    # Detailed description for the ip block
+    attr_accessor :description
+
+    # Added :impedance and :power to the spec types
+    SPEC_TYPES = [:dc, :ac, :temperature, :supply, :impedance, :power]
 
     NOTE_TYPES = [:spec, :doc, :mode, :feature, :sighting]
 
@@ -158,10 +162,10 @@ module Origen
       @_power_supplies[gen][act] = Power_Supply.new(gen, act)
     end
 
-    def mode_select(blk, use, mode_ref, support, loc)
+    def mode_select(block_information, mode_usage, power_information)
       _mode_selects
-      if use
-        @_mode_selects[blk][mode_ref] = Mode_Select.new(blk, use, mode_ref, support, loc)
+      if block_information[:usage]
+        @_mode_selects[block_information[:name]][mode_usage[:mode]] = Mode_Select.new(block_information, mode_usage, power_information)
       end
     end
 
@@ -421,7 +425,7 @@ module Origen
       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)]'
+        when String then 'k[Regexp.new(filter)] && k.length == filter.length'
         when (Fixnum || Integer || Float || Numeric) then "k[Regexp.new('#{filter}')]"
         when Regexp then 'k[filter]'
         when Symbol then

data/lib/origen/specs/creation_info.rb

@@ -2,7 +2,7 @@ module Origen
   module Specs
     # Ruby Data Class that contains Creation Information for the IP Block
     class Creation_Info
-      attr_accessor :author, :date, :revision, :source, :tool, :tool_version, :ip_version
+      attr_accessor :author, :date, :revision, :source, :tool, :tool_version, :ip_version, :ip_block_name
 
       # Initialize the Creation Info block to store data for latest version of the file.
       #
@@ -12,8 +12,9 @@ module Origen
       # * date      # Date that the File was released to Downstream Audiences
       # ==== Source Information
       #
-      # * :revision # Revision Information
-      # * :source   # Where the Information came from
+      # * :revision      # Revision Information
+      # * :source        # Where the Information came from
+      # * :ip_block_name # Block Name for the IP. e.g. DDR for DDRC1, DDRC2; I2C for I2C1, I2C2
       #
       # ==== Tool Info
       #
@@ -29,6 +30,7 @@ module Origen
         @ip_version = ip_version
         @revision = src_info[:revision]
         @source = src_info[:source]
+        @ip_block_name = src_info[:ip_block_name]
         @tool = tool_info[:tool]
         @tool_version = tool_info[:version]
       end

data/lib/origen/specs/doc_resource.rb

@@ -132,7 +132,7 @@ module Origen
             end # unless @before_table.nil? && @after_table.nil?
           end # xml.doc_resource
         end # doc_resource_ml = Nokogiri::
-        doc_resource_ml
+        doc_resource_ml.doc.at_xpath('doc_resource').to_xml
       end  # to_xml
     end
   end

data/lib/origen/specs/mode_select.rb

@@ -2,14 +2,58 @@ module Origen
   module Specs
     # This class is used to store mode select for IP
     class Mode_Select
-      attr_accessor :block, :usage, :mode, :supported, :location
-
-      def initialize(blk, use, mode_ref, support, loc)
-        @block = blk
-        @usage = use
-        @mode = mode_ref
-        @supported = support
-        @location = loc
+      # Block Name at the SoC (e.g. DDRC1, DDRC2, DDRC3)
+      attr_accessor :block
+
+      # Data Sheet Header/Group Name
+      attr_accessor :ds_header
+
+      # Block Use at the SoC Level
+      attr_accessor :usage
+
+      # Mode Reference Name
+      attr_accessor :mode
+
+      # SoC Supports this mode?
+      attr_accessor :supported
+
+      # SoC Supply List
+      attr_accessor :supply
+
+      # SoC Supply Voltage Level
+      attr_accessor :supply_level
+
+      # Use Information from different data source
+      attr_accessor :diff_loc
+
+      # Location of the block to read
+      attr_accessor :location
+
+      # There are three sub-blocks of information in Mode Select
+      # * block_information:
+      # ** name : The name of the block as instiniated in the SoC
+      # ** ds_header:  Data Sheet Header/Group.  Allows for multiple instantation to be grouped under one header in datasheet or allows for them to broken out
+      # ** usage:  Block is used in this SoC {Could be starting point for license plate support}
+      # ** location:  File path to the specml location
+      #
+      # * mode_usage:
+      # ** mode: The mode name at the IP Level
+      # ** usage: Does this IP in this SoC support this mode?
+      #
+      # * power_information:
+      # ** supply:  Name of the supply for that Interface.
+      # ** voltage_level:  Array of the possible values for this supply e.g. [1.8, 2.5, 3.3] or [1.8]
+      # ** use_diff:  Use information from a different location
+      def initialize(block_information, mode_usage, power_information)
+        @block = block_information[:name]
+        @ds_header = block_information[:ds_header]
+        @usage = block_information[:usage]
+        @location = block_information[:location]
+        @mode = mode_usage[:mode]
+        @supported = mode_usage[:supported]
+        @supply = power_information[:supply]
+        @supply_level = power_information[:voltage_level]
+        @diff_loc = power_information[:use_diff]
       end
     end
   end

data/lib/origen/specs/power_supply.rb

@@ -2,11 +2,45 @@ module Origen
   module Specs
     # This class is used to store Power Supply Information at the SoC Level
     class Power_Supply
-      attr_accessor :generic, :actual
+      # Generic Power Supply Name.  For example:
+      # *  GVDD
+      # *  DVDD
+      # *  TVDD
+      # *  EVDD
+      attr_accessor :generic
 
+      # The Actual Power Supply Name.  For example, GVDD could be the generic name and actual names can be G1VDD and G2VDD.
+      # GVDD ==> {G1VDD, G2VDD, G3VDD}
+      # DVDD ==> {D1VDD, D2VDD}
+      attr_accessor :actual
+
+      # Voltages for the power supply.  Needs to be supplied by a different source
+      # Voltages is an array for all possible values for that power supply
+      # DVDD ==>
+      #   * 1.8 V
+      #   * 3.3 V
+      attr_accessor :voltages
+
+      # Display Name for the Voltage.  Will be in html/dita code
+      # G1VDD -->  G1V<sub>DD</sub>
+      attr_accessor :display_name
+
+      # Input Display Name for the Voltage
+      # G1VDD --> G1V<sub>IN</sub>
+      attr_accessor :input_display_name
+
+      # Output Displat Name for the Voltage
+      # G1VDD --> G1V<sub>OUT</sub>
+      attr_accessor :output_display_name
+
+      # Initialize the variables
       def initialize(gen, act)
         @generic = gen
         @actual = act
+        @voltages = []
+        @display_name = ''
+        @input_display_name = ''
+        @output_display_name = ''
       end
     end
   end

data/lib/origen/specs/version_history.rb

@@ -9,6 +9,6 @@ module Origen
         @author = author
         @changes = changes
       end
-    end
-  end
-end
+    end # class Version History
+  end # module Specs
+end # module Origen

data/lib/origen/users/ldap.rb

@@ -57,7 +57,7 @@ module Origen
       def service
         @service ||= Net::LDAP.new host:       HOST,
                                    port:       PORT,
-                                   encryption: :simple_tls,
+                                   encryption: { method: :simple_tls },
                                    auth:       { method: :simple, username: SERVICE_ACCOUNT, password: SERVICE_PASS }
       end
     end

data/lib/origen/version_string.rb

@@ -3,6 +3,12 @@ module Origen
     include Utility::TimeAndDate
     require 'date'
 
+    # returns version number string but strips out prefix
+    def initialize(version, prefix = 'v')
+      version.gsub!(/^#{prefix}/, '')  # remove leading prefix
+      super(version)
+    end
+
     # Returns a new production timestamp version string
     def self.production_timestamp
       VersionString.new("Rel#{time_now(format: :universal, include_time: false)}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-08 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement