origen 0.55.1 → 0.55.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 51a69dd9a87393aab955d52811375f4c601673ec38666a6dce21101eba2b56ca
-  data.tar.gz: 710cf69a1ecfdca6c6bd7cb9e8124acae115c3a09cca274f55c7227545ac25d7
+SHA1:
+  metadata.gz: 5cf8ef1db0f389fbc583bff6c1b08c1758b3e83e
+  data.tar.gz: d813e05d000eafc086a6622667775f12fb21a00d
 SHA512:
-  metadata.gz: 5c3433290d16e6b279d335e3ff5fd8bcb494a1ca36c842870d7aa1e6e76c94912e519bb5144afddd205074493e4e97d960116cdaa9352383b43d1bf20189c6ba
-  data.tar.gz: bc81251777e59c3d23ae98167d81a1b99d62f0d31d344a828511c5a13b5dccf088a6a55b88165b97fbb0a0edcda8e5c158681c645402110691f6d1c6ae76a368
+  metadata.gz: 7b8a52639b9294d8710786e7f310b978c4fa4170d05880cbf60316914c1ecba3418da55921b54c4fbb17dd934ab4e98e6f99830a7655e1587f5ca0f08d276d57
+  data.tar.gz: 7228e9ffd9d73d7fc5c73b767fee9201c370d71a3c72bab1237ff644876cd534338267823127eaa840a6633167f9e08d811332ef9ef8d7d0ab5bb9a79ba74314

data/config/version.rb

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

data/lib/origen/application/release.rb

@@ -321,7 +321,7 @@ Your workspace has local modifications that are preventing the requested action
             file.puts ''
           end
           file.puts ''
-          file.puts note.escape_underscores
+          file.puts note.escape_underscores(smartly = true)
           file.puts ''
           file.puts text
         end

data/lib/origen/core_ext/string.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/string/inflections'
+require 'uri'
 begin
   require 'scrub_rb'
 rescue LoadError
@@ -19,11 +20,84 @@ class String
     end
   end
 
-  def escape_underscores
-    gsub('_', '\_')
+  def escape_underscores(smartly = false)
+    if smartly
+      # Need to make sub-string ranges where the URLs are located
+      urls = URI.extract(self, %w(http https ssh))
+      url_matches = [].tap do |new_ary|
+        urls.each do |url|
+          scan(/#{Regexp.escape(url)}/) do |c|
+            indices = ($LAST_MATCH_INFO.offset(0).first..($LAST_MATCH_INFO.offset(0).first + c.size - 1))
+            new_ary << [indices, c]
+          end
+        end
+      end
+      # This order is because a better single regex is not yet found
+      italic_regex = [/^(\_\w+\_)\s+/, /(\_\w+\_)$/, /\s*(\_\w+\_)\s+/]
+      italic_matches = [].tap do |new_ary|
+        italic_regex.each_with_index do |regex, i|
+          scan(regex) do |c|
+            offset = c.first.size - 1
+            if i == 0
+              indices = (0..offset)
+            elsif i == 1
+              indices = (size - 1 - offset..size - 1)
+            else
+              indices = ($LAST_MATCH_INFO.offset(0).first..($LAST_MATCH_INFO.offset(0).first + c.first.size - 1))
+            end
+            new_ary << [indices, c]
+          end
+        end
+      end
+      # Make sure there are no italic matches within the URL ranges
+      filtered_italic_matches = [].tap do |new_ary|
+        url_matches.each do |url_ary|
+          url_range = url_ary.first
+          italic_matches.each do |italic_ary|
+            italic_range = italic_ary.first
+            # Ruby 2.6 has the Range#cover method but until then
+            unless ranges_overlap?(url_range, italic_range)
+              new_ary << italic_ary unless new_ary.include?(italic_ary)
+            end
+          end
+        end
+      end
+      italic_ranges = [].tap do |new_ary|
+        filtered_italic_ranges = filtered_italic_matches.map(&:first)
+        italic_range_mins = filtered_italic_matches.map(&:first).map(&:min).sort
+        italic_range_mins.each_with_index do |range_min, i|
+          filtered_italic_ranges.each do |r|
+            new_ary << r if r.min == range_min
+          end
+        end
+      end
+      str = dup
+      inc = 0
+      italic_ranges.each do |r|
+        str[r.first + inc] = '\_'
+        inc += 1
+        str[r.last + inc] = '\_'
+        inc += 1
+      end
+      str
+    else
+      gsub('_', '\_')
+    end
   end
   alias_method :escape_underscore, :escape_underscores
 
+  def match_all(regex)
+    match_str = self
+    matches = []
+    while match_str.length > 0
+      md = match_str.match(regex)
+      break unless md
+      matches << md
+      match_str = md.post_match
+    end
+    matches
+  end
+
   def camel_case
     Origen.deprecate "String#camel_case! is deprecated, use String#camelcase instead, or if you want to get rid of spaces: my_string.gsub(' ', '_').camelcase"
     gsub(/\s+/, '_').split('_').map(&:capitalize).join
@@ -167,6 +241,10 @@ class String
 
   private
 
+  def ranges_overlap?(r1, r2)
+    !(r1.first > r2.last || r1.last < r2.first)
+  end
+
   # Convert a verilog number string to an integer
   def verilog_to_dec
     verilog_hash = parse_verilog_number

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2019-09-13"
+  s.date = "2020-01-29"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "2.7.7".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "2.7.7" if s.respond_to? :installed_by_version
+  s.installed_by_version = "2.6.12" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.55.1
+  version: 0.55.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -226,14 +226,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.17'
+- !ruby/object:Gem::Dependency
+  name: simplecov-html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: scrub_rb
   requirement: !ruby/object:Gem::Requirement
@@ -736,7 +750,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit