origen_doc_helpers 0.7.2 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d338032f14e42458a138b9b188701a0b5914ee3e9ab5ff8990d683911ffffcf
-  data.tar.gz: f0613005c722f92600e8633b8ede68a638dcf68b5361cbd2c8f12c98fc616564
+  metadata.gz: 8be9c5912f22281328dbe445399a4c394e028c3a10a68b107f8feccd73b46adb
+  data.tar.gz: f75142d4ea1e47002fb66463ff2f66ca34a0d408a0759259a4b4e3db800dfea1
 SHA512:
-  metadata.gz: e413e7c44118ac002618c54dbd7e926c49aec0602e2af86cf0f6eaa4f8182cb934c400b8a245b6576e9452da56454b0a17a4ac83c350e209c29b36ac4007ba47
-  data.tar.gz: b69b7a92e04b5b2ac0030998ffa9aca87e784050da0d9f798fb7b97114c28f21102d081840cd4b0d779bce7f402c52622d45455087b2758c486d8d5fdf21c7ba
+  metadata.gz: ef308ae1289cc4d23405fba1146b9b349f17ed13cdb0d26a9330eaa45d68904e444ea60623aa8015711a2bf84c374831c101ee639bc947c1f0640c24cef40b01
+  data.tar.gz: 7be71f335ea1d0e6a3820abbab497c17ff346051ce0d79758806c6c2b2ae09e355f58ba8221ba42d5ba0e5075900766341c5aa541339a97736d22623031e1ba3

data/config/application.rb

@@ -8,7 +8,7 @@ class OrigenDocHelpersApplication < Origen::Application
   # To enable deployment of your documentation to a web server (via the 'origen web'
   # command) fill in these attributes.
   config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/doc_helpers"
-  config.web_domain = "http://origen-sdk.org/doc_helpers"
+  config.web_domain = "https://origen-sdk.org/doc_helpers"
   config.disqus_shortname = "origen-sdk"
 
   config.semantically_version = true

data/config/version.rb

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

data/lib/origen_doc_helpers/flow_page_generator.rb

@@ -44,7 +44,11 @@ module OrigenDocHelpers
       end
 
       def index_page_template
-        @index_page_template ||= "#{Origen.root!}/templates/flow_index.md.erb"
+        if File.exist?("#{Origen.root}/app/")
+          @index_page_template ||= "#{Origen.root!}/app/templates/flow_index.md.erb"
+        else
+          @index_page_template ||= "#{Origen.root!}/templates/flow_index.md.erb"
+        end
       end
     end
 
@@ -100,11 +104,19 @@ module OrigenDocHelpers
     end
 
     def flow_page_template
-      @flow_page_template ||= "#{Origen.root!}/templates/flow_page.md.erb"
+      if File.exist?("#{Origen.root}/app/")
+        @flow_page_template ||= "#{Origen.root!}/app/templates/flow_page.md.erb"
+      else
+        @flow_page_template ||= "#{Origen.root!}/templates/flow_page.md.erb"
+      end
     end
 
     def flow_template
-      @flow_template ||= "#{Origen.root!}/templates/shared/test/_flow.md.erb"
+      if File.exist?("#{Origen.root}/app/")
+        @flow_template ||= "#{Origen.root!}/app/templates/shared/test/_flow.md.erb"
+      else
+        @flow_template ||= "#{Origen.root!}/templates/shared/test/_flow.md.erb"
+      end
     end
   end
 end

data/lib/origen_doc_helpers/guide_index.rb

@@ -1,7 +1,7 @@
 module OrigenDocHelpers
   # Provides an API to programatically construct an index hash as used
   # by the Searchable Documents helper -
-  # http://origen-sdk.org/doc_helpers/helpers/searchable/intro/#The_Document_Index
+  # https://origen-sdk.org/doc_helpers/helpers/searchable/intro/#The_Document_Index
   class GuideIndex
     def initialize
       @index = {}

data/lib/origen_doc_helpers/helpers.rb

@@ -257,7 +257,11 @@ END
             @_doc_root_dirs ||= {}
             return @_doc_root_dirs[f] if @_doc_root_dirs[f]
             unless File.exist?(f)
-              f = Pathname.new("#{Origen.root}/templates/web/#{f}")
+              if File.exist?("#{Origen.root}/app/")
+                f = Pathname.new("#{Origen.root}/app/templates/web/#{f}")
+              else
+                f = Pathname.new("#{Origen.root}/templates/web/#{f}")
+              end
               unless f.exist?
                 fail "#{options[:root]} does not exist!"
               end
@@ -272,7 +276,11 @@ END
             if options[:tab]
               options[:tab]
             else
-              rel = options[:top_level_file].relative_path_from(_doc_root_dir(options)).sub_ext('').sub_ext('').to_s
+              rel = begin
+                  options[:top_level_file].relative_path_from(_doc_root_dir(options)).sub_ext('').sub_ext('').to_s
+                rescue
+                  '..'
+                end
               # If the file lives outside of the current app (e.g. it comes from a plugin), then the above approach
               # doesn't work, so let's just take the last dirname and the filename
               if rel =~ /\.\./
@@ -285,7 +293,11 @@ END
           end
 
           def _root_path(options)
-            root = Pathname.new("#{Origen.root}/templates/web")
+            if File.exist?("#{Origen.root}/app/templates/web")
+              root = Pathname.new("#{Origen.root}/app/templates/web")
+            else
+              root = Pathname.new("#{Origen.root}/templates/web")
+            end
             _doc_root_dir(options).relative_path_from(root)
           end
         end

data/lib/origen_doc_helpers/html_flow_formatter.rb

@@ -1,7 +1,11 @@
-require 'atp'
+begin
+  require 'origen_testers/atp'
+rescue LoadError
+  require 'atp'
+end
 require 'kramdown'
 module OrigenDocHelpers
-  class HtmlFlowFormatter < ATP::Formatter
+  class HtmlFlowFormatter < (defined?(OrigenTesters::ATP) ? OrigenTesters::ATP::Formatter : ATP::Formatter)
     include Origen::Generator::Compiler::DocHelpers::TestFlowHelpers
 
     attr_reader :html

data/lib/origen_doc_helpers/list_flow_formatter.rb

@@ -1,6 +1,10 @@
-require 'atp'
+begin
+  require 'origen_testers/atp'
+rescue LoadError
+  require 'atp'
+end
 module OrigenDocHelpers
-  class ListFlowFormatter < ATP::Formatter
+  class ListFlowFormatter < (defined?(OrigenTesters::ATP) ? OrigenTesters::ATP::Formatter : ATP::Formatter)
     attr_reader :html
 
     def format(node, options = {})

data/lib/origen_doc_helpers/model_page_generator.rb

@@ -43,7 +43,11 @@ module OrigenDocHelpers
       end
 
       def index_page_template
-        @index_page_template ||= "#{Origen.root!}/templates/model_index.md.erb"
+        if File.exist?("#{Origen.root}/app/")
+          @index_page_template ||= "#{Origen.root!}/app/templates/model_index.md.erb"
+        else
+          @index_page_template ||= "#{Origen.root!}/templates/model_index.md.erb"
+        end
       end
     end
 
@@ -156,7 +160,11 @@ module OrigenDocHelpers
     end
 
     def model_page_template
-      @model_page_template ||= "#{Origen.root!}/templates/model_page.md.erb"
+      if File.exist?("#{Origen.root}/app/")
+        @model_page_template ||= "#{Origen.root!}/app/templates/model_page.md.erb"
+      else
+        @model_page_template ||= "#{Origen.root!}/templates/model_page.md.erb"
+      end
     end
   end
 end

data/lib/origen_doc_helpers/pdf.rb

@@ -25,7 +25,11 @@ module OrigenDocHelpers
       @index = options[:index]
       @root = Pathname.new(options[:root])
       if @root.absolute?
-        @root = @root.relative_path_from(Pathname.new("#{Origen.root}/templates/web"))
+        if File.exist?("#{Origen.root}/app/")
+          @root = @root.relative_path_from(Pathname.new("#{Origen.root}/app/templates/web"))
+        else
+          @root = @root.relative_path_from(Pathname.new("#{Origen.root}/templates/web"))
+        end
       end
       require 'nokogiri'
     end
@@ -116,7 +120,11 @@ module OrigenDocHelpers
     end
 
     def topic_wrapper_string
-      @topic_wrapper_string ||= File.read("#{Origen.root!}/templates/pdf/topic_wrapper.html")
+      if File.exist?("#{Origen.root}/app/")
+        @topic_wrapper_string ||= File.read("#{Origen.root!}/app/templates/pdf/topic_wrapper.html")
+      else
+        @topic_wrapper_string ||= File.read("#{Origen.root!}/templates/pdf/topic_wrapper.html")
+      end
     end
   end
 end

data/lib/origen_doc_helpers_dev/dut.rb

@@ -79,18 +79,23 @@ module OrigenDocHelpersDev
           bit 31..0, :placeholder, reset: 0b0, access: :rw
         end
         reg :msb0_debug, 0xf58, 32, bit_order: 'msb0', ip_base_address: 0x1080000, description: '' do
-          bit 31..0, :placeholder, reset: 0b0, access: :rw
+          # placeholder field description
+          bit 31..1, :placeholder, reset: 0b0, access: :rw
+          # single bit
+          bit 0,     :single_bit, reset: 1, access: :rw
         end
         reg :lsb0_non_byte_aligned, 0xf5c, 9, bit_order: 'lsb0', ip_base_address: 0x1080000, description: '' do
           bit 8..0, :placeholder, reset: 0b0, access: :rw
         end
         reg :msb0_non_byte_aligned, 0xf60, 9, bit_order: :msb0, ip_base_address: 0x1080000, description: '' do
+          # placeholder field description
           bit 8..0, :placeholder, reset: 0b0, access: :rw
         end
         reg :lsb0_tiny, 0xf64, 3, bit_order: :lsb0, ip_base_address: 0x1080000, description: '' do
           bit 2..0, :placeholder, reset: 0b0, access: :rw
         end
         reg :msb0_tiny, 0xf68, 3, bit_order: :msb0, ip_base_address: 0x1080000, description: '' do
+          # placeholder field description
           bit 2..0, :placeholder, reset: 0b0, access: :rw
         end
       end

data/templates/model_index.md.erb

@@ -3,7 +3,7 @@
 
 <div class="row" style="margin-top: 10px; margin-bottom: 15px;">
   <div class="col-md-9">
-    <img src="http://origen-sdk.org/img/origen-device.png" style="float: left; height:50px; width: 50px; margin-top: 14px;">
+    <img src="https://origen-sdk.org/img/origen-device.png" style="float: left; height:50px; width: 50px; margin-top: 14px;">
     <h1 style="float: left; margin-left: 10px;">Models</h1>
   </div>
 </div>

data/templates/model_page.md.erb

@@ -20,7 +20,7 @@
 
 <div class="row" style="margin-top: 10px; margin-bottom: 15px;">
   <div class="col-md-9">
-    <img src="http://origen-sdk.org/img/origen-device.png" style="float: left; height:50px; width: 50px; margin-top: 14px;">
+    <img src="https://origen-sdk.org/img/origen-device.png" style="float: left; height:50px; width: 50px; margin-top: 14px;">
     <h1 style="float: left; margin-left: 10px;"><%= opts[:heading] %></h1>
   </div>
 % if opts[:search_box]

data/templates/shared/_register.html.erb

@@ -19,6 +19,7 @@
 <h4>0x<%= reg.address.to_s(16).upcase %> - <%= reg_path %></h4>
 % end
 </a>
+
 % if options[:current_value]
 %   if reg.size <= 8
 <h4><font style="background-color: #66FF66">Current Value: <%= sprintf("0x%02X",reg.value) %></font></h4>
@@ -41,33 +42,43 @@
 </div>
 % end
 
+% if !order_is_lsb0
+<table class="reg table table-condensed ljust" style="margin-bottom: 0; table-layout: fixed;">
+  <thead>
+    <tr class="bit-positions">
+      <b><tr class = "heading"><%= reg_path%> <span class="msb0_specific" style="color:gray;">(<%= reg_path %>.with_msb0)</span></tr></b>
+    </tr>
+  </thead>
+</table>
+% end
+
 % num_bytes = (reg.size / 8.0).ceil
 % num_bytes.times do |byte_index|
 %   # Need to add support for little endian regs here?
 %   byte_number = num_bytes - byte_index
-%   if order_is_lsb0
-%     max_bit = (byte_number * 8) - 1
-%     min_bit = max_bit - 8 + 1
-%   else
-%     min_bit = (byte_index * 8)
-%     max_bit = min_bit + 7
-%   end
+%   max_bit = (byte_number * 8) - 1
+%   min_bit = max_bit - 8 + 1
 %   partial_byte = max_bit > (reg.size - 1)
 
-<table class="reg table table-condensed <%= order_is_lsb0 ? 'rjust' : 'ljust' %><%= partial_byte ? ' partial' : '' %>" style="margin-bottom: 0; table-layout: fixed;">
+<table class="reg table table-condensed <%= 'rjust' %><%= partial_byte ? ' partial' : '' %>" style="margin-bottom: 0; table-layout: fixed;">
   <thead>
     <tr class="bit-positions">
+% if order_is_lsb0
       <th class="spacer"></th>
+% else
+      <td class="heading">LSB0<span class="msb0_specific" style="color:gray;"> (MSB0)</span></td>
+% end
+
 % 8.times do |i|
-%   if order_is_lsb0
-%     bit_num = (byte_number * 8) - i - 1
-%   else
-%     bit_num = (byte_index * 8) + i
-%   end
+%   bit_num = (byte_number * 8) - i - 1
 %   if bit_num > reg.size - 1
       <th class="spacer"></th>
 %   else
-      <th class="bit-position<%= !order_is_lsb0 && bit_num == reg.size - 1 ? ' last' : '' %>"><%= bit_num %></th>
+%     if order_is_lsb0
+      <th class="bit-position"><%= bit_num %></th>
+%     else
+      <th class="bit-position"><%= bit_num %><span class="msb0_specific" style="color:gray;"> (<%= reg.size - bit_num -1%>)</span></th>
+%     end
 %   end
 % end
     </tr>
@@ -78,8 +89,13 @@
 %#  Read Row
 %#############################################    
     <tr class="read">
+% if order_is_lsb0
       <td class="heading">R</td>
-% alignment_done = !order_is_lsb0
+% else
+      <td class="heading"><span class="msb0_specific" style="color:gray;">[LSB0] </span>R</td>
+% end
+
+% alignment_done = false
 % reg.named_bits :include_spacers => true do |name, bit|
 %  if _bit_in_range?(bit, max_bit, min_bit)
 %   if max_bit > (reg.size - 1) && !alignment_done
@@ -145,7 +161,7 @@
 %#############################################    
     <tr class="write">
       <td class="heading">W</td>
-% alignment_done = !order_is_lsb0
+% alignment_done = false
 % reg.named_bits :include_spacers => true do |name, bit|
 %  if _bit_in_range?(bit, max_bit, min_bit)
 %   if max_bit > (reg.size - 1) && !alignment_done
@@ -246,7 +262,7 @@
 %#############################################    
     <tr class="reset">
       <td class="heading">Reset</td>
-%   alignment_done = !order_is_lsb0
+%   alignment_done = false
 %   reg.named_bits :include_spacers => true do |name, bit|
 %   if _bit_in_range?(bit, max_bit, min_bit)
 %     if max_bit > (reg.size - 1) && !alignment_done
@@ -304,16 +320,16 @@
         <p>
           <a class="anchor" name="<%= "#{reg.name}_#{name}_#{bits.position}" %>"></a>
 % if bits.size == 1        
-          <%= bits.position %>
+          <%= bits.position %><%= order_is_lsb0 ? '' : "<span class=\"msb0_specific\" style=\"color:gray;\"> (#{reg.size - bits.position - 1})</span>" %>
 % else
-          <%= bits.position + bits.size - 1 %>-<%= bits.position %>
+          <%= bits.position + bits.size - 1 %>-<%= bits.position %><%= order_is_lsb0 ? '' : "<span class=\"msb0_specific\" style=\"color:gray;\"> (#{reg.size - bits.position - bits.size}-#{reg.size - bits.position - 1})</span>" %>
 % end
         </p>
         <p>
 % if bits.size == 1        
           <%= name %>
 % else
-          <%= name %>[<%= bits.size - 1 %>:0]
+          <%= name %>[<%= bits.size - 1 %>:0]<%= order_is_lsb0 ? '' : "<span class=\"msb0_specific\" style=\"color:gray;\"> ([0:#{bits.size - 1}])</span>" %>
 % end
         </p>
       </td>

data/templates/web/helpers.md.erb

@@ -16,7 +16,7 @@ These helpers will generate complete web pages for you.
 
 The following are components that you can embed within your own web pages.
 
-| [Searchable Documents](<%= path "/helpers/searchable/intro" %>) | Provides a layout for a guides section of your website, complete with search box (the [Origen Guides](http://origen-sdk.org/guides) uses this)
+| [Searchable Documents](<%= path "/helpers/searchable/intro" %>) | Provides a layout for a guides section of your website, complete with search box (the [Origen Guides](https://origen-sdk.org/guides) uses this)
 | [Register Descriptions](<%= path "/helpers/register" %>)        | Create a tabular register view, similar to that used in device reference manuals
 | [Yammer Comments](<%= path "/helpers/yammer" %>)                | Embed a comments section at the bottom of your page using Yammer
 | [Disqus Comments](<%= path "/helpers/disqus" %>)                | Embed a comments section at the bottom of your page using Disqus

data/templates/web/helpers/model.md.erb

@@ -5,9 +5,9 @@
 This helper will build a collection of web pages that document a model's attributes,
 currently this includes its sub-blocks and registers.
 
-[Here is an example](http://origen-sdk.org/link_demo/models/linkdemo_toplevel/).
+[Here is an example](https://origen-sdk.org/link_demo/models/linkdemo_toplevel/).
 
-Multiple models can be supplied and an [index page like this](http://origen-sdk.org/link_demo/models)
+Multiple models can be supplied and an [index page like this](https://origen-sdk.org/link_demo/models)
 is generated to help locate the documentation for a given model.
 
 The collection of pages associated with a particular model is also fully searchable via

data/templates/web/helpers/register.md.erb

@@ -2,7 +2,7 @@
 
 # Register Helpers
 
-Use the [Origen register API](http://origen-sdk.org/origen/guides/models/registers)
+Use the [Origen register API](https://origen-sdk.org/origen/guides/models/registers)
 to define registers in the normal way,
 all of the examples are here are based on this register definition:
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_doc_helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.4
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -31,7 +31,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/fix_my_workspace
 - config/application.rb
 - config/boot.rb
 - config/commands.rb
@@ -57,7 +56,6 @@ files:
 - templates/model_page.md.erb
 - templates/pdf/topic_wrapper.html
 - templates/shared/_register.html.erb
-- templates/shared/_register.html.erb~
 - templates/shared/_searchable.html.erb
 - templates/shared/_spec.html.erb
 - templates/shared/test/_flow.md.erb
@@ -78,7 +76,7 @@ files:
 - templates/web/layouts/_helpers.html.erb
 - templates/web/partials/_navbar.html.erb
 - templates/web/release_notes.md.erb
-homepage: http://origen-sdk.org/doc_helpers
+homepage: https://origen-sdk.org/doc_helpers
 licenses:
 - MIT
 metadata: {}
@@ -97,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Snippets and helpers for creating Origen web documents

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/templates/shared/_register.html.erb~

@@ -1,349 +0,0 @@
-% reg = options[:reg]
-% include_data = false
-
-<div class="register">
-<a class="anchor" name="<%= "#{reg.name}" %>"></a>
-
-<a href='#<%= reg.name %>'>
-% if options[:origen_path] && !options[:origen_path].empty?
-%   reg_path = options[:origen_path] + "." + reg.name.to_s
-%   reg_path = "#{reg.name} - #{reg_path}"
-% else
-%   reg_path = reg.name
-% end
-% if reg.full_name
-<h4>0x<%= reg.address.to_s(16).upcase %> - <%= reg.full_name %> (<%= reg_path %>)</h4>
-% else
-<h4>0x<%= reg.address.to_s(16).upcase %> - <%= reg_path %></h4>
-% end
-</a>
-% if options[:current_value]
-%   if reg.size <= 8
-<h4><font style="background-color: #66FF66">Current Value: <%= sprintf("0x%02X",reg.value) %></font></h4>
-%   elsif reg.size <= 16
-<h4><font style="background-color: #66FF66">Current Value: <%= sprintf("0x%04X",reg.value) %></font></h4>
-%   elsif reg.size <= 24
-<h4><font style="background-color: #66FF66">Current Value: <%= sprintf("0x%06X",reg.value) %></font></h4>
-%   elsif reg.size <= 32
-<h4><font style="background-color: #66FF66">Current Value: <%= sprintf("0x%08X",reg.value) %></font></h4>
-%   end
-% end
-
-% if options[:descriptions]
-<div markdown="1" style="margin: 0 0 20px 0">
-
-% reg.description(:include_name => false).each do |line|
-<%= line.gsub("\\'", "'") %>
-% end
-
-</div>
-% end
-
-% num_bytes = (reg.size / 8.0).ceil
-% num_bytes.times do |byte_index|
-%   # Need to add support for little endian regs here?
-%   byte_number = num_bytes - byte_index
-%   if reg.bit_order == :lsb0
-%     max_bit = (byte_number * 8) - 1
-%     min_bit = max_bit - 8 + 1
-%   else
-%     min_bit = (byte_index * 8)
-%     max_bit = min_bit + 7
-%   end
-
-<table class="reg table table-condensed" style="margin-bottom: 0; table-layout: fixed;">
-  <thead>
-    <tr class="bit-positions">
-      <th class="spacer"></th>
-% 8.times do |i|
-%   if reg.bit_order == :lsb0
-%     bit_num = (byte_number * 8) - i - 1
-%   else
-%     bit_num = (byte_index * 8) + i
-%   end
-%   if bit_num > reg.size - 1
-      <th class="spacer"></th>
-%   else
-      <th class="bit-position"><%= bit_num %></th>
-%   end
-% end
-    </tr>
-  </thead>
-  <tbody>
-
-%#############################################    
-%#  Read Row
-%#############################################    
-    <tr class="read">
-      <td class="heading">R</td>
-% alignment_done = reg.bit_order == :lsb0 ? false : true
-% reg.named_bits :include_spacers => true do |name, bit|
-%  if _bit_in_range?(bit, max_bit, min_bit)
-%   if max_bit > (reg.size - 1) && !alignment_done
-%     (max_bit - (reg.size - 1)).times do
-        <td class="spacer"></td>
-%     end
-%     alignment_done = true
-%   end
-%   if bit.size > 1
-%     if name
-%       if bit.readable?
-%         bit_name = "#{name}[#{bit.size - 1}:0]"
-      <td class="<%= _bit_rw(bit) %>" colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">
-% if options[:descriptions] && !bit.description.empty?
-         <span title="<%= name %>"><a href="#<%= "#{reg.name}_#{name}_#{bit.position}" %>"><%= bit_name %></a></span>
-% else
-         <span title="<%= name %>"><%= bit_name %></span>
-% end
-      </td>
-%       else
-%         if bit.access == :worz
-      <td class="<%= _bit_rw(bit) %>" colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">
-         <span>0</span>
-      </td>
-%         else
-      <td class="<%= _bit_rw(bit) %>" colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>"></td>
-%         end
-%       end
-%     else
-%       bit.shift_out_left do |bit|
-%         if _index_in_range?(bit.position, max_bit, min_bit)
-      <td>0</td> 
-%         end
-%       end
-%     end
-%   else
-%     if name
-%       if bit.readable?
-%         if name.size > 10
-%           bit_name = "#{name[0..2]}...#{name[-3..-1]}"
-%#           bit_name = "bit#{bit.position}*"
-%         else
-%           bit_name = name
-%         end
-%         if options[:descriptions] && !bit.description.empty?
-      <td class="<%= _bit_rw(bit) %>"><span title="<%= name %>"><a href="#<%= "#{reg.name}_#{name}_#{bit.position}" %>"><%= bit_name %></a></span></td>
-%         else
-      <td class="<%= _bit_rw(bit) %>"><span title="<%= name %>"><%= bit_name %></span></td>
-%         end
-%       else
-      <td class="<%= _bit_rw(bit) %>"></td>
-%       end
-%     else
-      <td>0</td> 
-%     end
-%   end
-%  end
-% end
-    </tr>
-
-%#############################################    
-%#  Write Row
-%#############################################    
-    <tr class="write">
-      <td class="heading">W</td>
-% alignment_done = reg.bit_order == :lsb0 ? false : true
-% reg.named_bits :include_spacers => true do |name, bit|
-%  if _bit_in_range?(bit, max_bit, min_bit)
-%   if max_bit > (reg.size - 1) && !alignment_done
-%     (max_bit - (reg.size - 1)).times do
-      <td class="spacer"></td>
-%     end
-%     alignment_done = true
-%   end
-%   if bit.size > 1
-%     if name
-%       if !bit.readable?
-%         bit_name = "#{name}[#{bit.size - 1}:0]"
-      <td class="<%= _bit_rw(bit) %>" colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">
-% if options[:descriptions] && !bit.description.empty?
-         <span title="<%= name %>"><a href="#<%= "#{reg.name}_#{name}_#{bit.position}" %>"><%= bit_name %></a></span>
-% else
-         <span title="<%= name %>"><%= bit_name %></span>
-% end
-      </td>
-%       else
-      <td class="<%= _bit_rw(bit) %>" colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>"></td>
-%       end
-%     else
-%       bit.shift_out_left do |bit|
-%         if _index_in_range?(bit.position, max_bit, min_bit)
-      <td class="not-writable"></td> 
-%         end
-%       end
-%     end
-%   else
-%     if name
-%       if !bit.readable?
-%         if name.size > 10
-%           bit_name = "#{name[0..2]}...#{name[-3..-1]}"
-%#           bit_name = "bit#{bit.position}*"
-%         else
-%           bit_name = name
-%         end
-%         if options[:descriptions] && !bit.description.empty?
-      <td class="<%= _bit_rw(bit) %>"><span title="<%= name %>"><a href="#<%= "#{reg.name}_#{name}_#{bit.position}" %>"><%= bit_name %></a></span></td>
-%         else
-      <td class="<%= _bit_rw(bit) %>"><span title="<%= name %>"><%= bit_name %></span></td>
-%         end
-%       else
-      <td class="<%= _bit_rw(bit) %>"></td>
-%       end
-%     else
-      <td class="not-writable"></td> 
-%     end
-%   end
-%  end
-% end
-    </tr>
-
-% if options[:current_value]
-    <tr class="current_value">
-      <td class="heading">Current Value (Hex)</td>
-%   alignment_done = reg.bit_order == :lsb0 ? false : true
-%   reg.named_bits :include_spacers => true do |name, bit|
-%     if _bit_in_range?(bit, max_bit, min_bit)
-%       if max_bit > (reg.size - 1) && !alignment_done
-%         (max_bit - (reg.size - 1)).times do
-      <td class="spacer"></td>
-%       end
-%       alignment_done = true
-%     end
-%     if bit.size > 1
-%       if name
-%         if bit.nvm_dep != 0 || bit.data == :memory
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">M</td>
-%         elsif bit.data == :undefined
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">X</td>
-%         else
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>"><%= bit.data[_max_bit_in_range(bit, max_bit, min_bit).._min_bit_in_range(bit, max_bit, min_bit)].to_s(16).upcase %></td>
-%         end
-%       else
-%         bit.shift_out_left do |bit|
-%           if _index_in_range?(bit.position, max_bit, min_bit)
-      <td></td> 
-%           end
-%         end
-%       end
-%     else
-%       if bit.nvm_dep != 0 || bit.reset_val == :memory
-        <td>M</td>
-%       elsif bit.data == :undefined
-        <td>X</td>
-%       else
-        <td><%= bit.data.to_s(16).upcase %></td>
-%       end
-%     end
-%    end
-%   end
-    </tr>
-% else
-%#############################################    
-%#  Reset Row
-%#############################################    
-    <tr class="reset">
-      <td class="heading">Reset</td>
-%   alignment_done = reg.bit_order == :lsb0 ? false : true
-%   reg.named_bits :include_spacers => true do |name, bit|
-%   if _bit_in_range?(bit, max_bit, min_bit)
-%     if max_bit > (reg.size - 1) && !alignment_done
-%       (max_bit - (reg.size - 1)).times do
-      <td class="spacer"></td>
-%       end
-%       alignment_done = true
-%     end
-%     if bit.size > 1
-%       if name
-%         if bit.nvm_dep != 0 || bit.reset_val == :memory
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">M</td>
-%         elsif bit.reset_val == :undefined
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>">X</td>
-%         else
-            <td colspan="<%= _num_bits_in_range(bit, max_bit, min_bit) %>"><%= bit.reset_val[_max_bit_in_range(bit, max_bit, min_bit).._min_bit_in_range(bit, max_bit, min_bit)].to_s(16).upcase %></td>
-%         end
-%       else
-%         bit.shift_out_left do |bit|
-%           if _index_in_range?(bit.position, max_bit, min_bit)
-      <td></td> 
-%           end
-%         end
-%       end
-%     else
-%       if bit.nvm_dep != 0 || bit.reset_val == :memory
-        <td>M</td>
-%       elsif bit.reset_val == :undefined
-        <td>X</td>
-%       else
-        <td><%= bit.reset_val.to_s(16).upcase %></td>
-%       end
-%     end
-%    end
-% end
-    </tr>
-% end
-  </tbody>
-</table>
-
-% end # Byte index loop
-
-% if options[:descriptions] && reg.named_bits.any? { |name, bits| !bits.description.empty? }
-<table class="bit-descriptions table table-condensed table-bordered" style="margin: 20px 0 0 0">
-  <thead>
-    <tr>
-      <th>Bit</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-% reg.named_bits do |name, bits| 
-    <tr>
-      <td>
-        <p>
-          <a class="anchor" name="<%= "#{reg.name}_#{name}_#{bits.position}" %>"></a>
-% if bits.size == 1        
-          <%= bits.position %>
-% else
-          <%= bits.position + bits.size - 1 %>-<%= bits.position %>
-% end
-        </p>
-        <p>
-% if bits.size == 1        
-          <%= name %>
-% else
-          <%= name %>[<%= bits.size - 1 %>:0]
-% end
-        </p>
-      </td>
-<td markdown="1">
-% bit_val_str = ''
-% start_bit = bits.position
-% end_bit = bits.position + bits.size - 1
-% (start_bit..end_bit).each do |b|
-%  bit_val_str << reg.bits[b].data.to_s
-% end
-% bit_val_str.reverse!
-% bits.description.each do |line|
-%   if options[:current_value]
-%     if line =~ /^\d{#{bit_val_str.length}}/ 
-%       if line =~ /^#{bit_val_str}/
-<span style="background-color: #66FF66"> <%=        line.gsub("\\'", "'") %>
-</span><br/>
-%       else
-<%=        line.gsub("\\'", "'") %><br/>
-%       end
-%     else
-<%=        line.gsub("\\'", "'") %>
-%     end
-%   else
-<%= line.gsub("\\'", "'") %>
-%   end
-% end
-
-</td>
-    </tr>  
-% end
-  </tbody>
-</table>  
-% end    
-
-</div>