origen 0.54.6 → 0.55.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 18ab3cbe3a67135fee68e2c9a07b3eb2d008745b581eacd38d0020d5fc5b8832
-  data.tar.gz: 536c15ce790b6d9338b7e3775ef3796836696fd1c65854a7f2500f4d9a046ba2
+SHA1:
+  metadata.gz: c7920459ec573f764cd17fa9279a5e3eed718ebd
+  data.tar.gz: 71e6a8c44a13d3e79b0f51092646a6436db1b5a9
 SHA512:
-  metadata.gz: eb0f1411e7b68e05ea00ebaafc4c59d34447e08d4c8ee08fd673c642fb0e332412d8c07f90dd92d462344f33752e6e23ded76e32cba80b6f59f2a3d10a43cebb
-  data.tar.gz: 2b9c4171f9943c423bdd87eedac9e5c3b217fd5e6799fcfd7df4f3312816c88c4a6c6b8ffb3f1185fb3493cf22427ee8caa2ec38f2c2c4c0338229b5b4d84f50
+  metadata.gz: 3d4cd907902c958255972f1657766ca5461910861bb58a7b5d61a9d5a65675bc8b8705d9a3f930361289156ef819ac662fad34c0b9e1baae9e1b17f28be78416
+  data.tar.gz: 33a974f962d82778a40274790d3256a854658b124b51b428f7b29d07c5f5a30f2e180eb2dcd4528ba0772dd39a30fc017b229c69f608c370f4ab8913be7bdf4f

data/config/version.rb

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

data/lib/origen/application/configuration.rb

@@ -20,7 +20,7 @@ module Origen
                     :strict_errors, :unmanaged_dirs, :unmanaged_files, :remotes,
                     :external_app_dirs, :lint_test, :shared, :yammer_group, :rc_url, :rc_workflow,
                     :user_aliases, :release_externally, :gem_name, :disqus_shortname,
-                    :default_plugin
+                    :default_plugin, :rc_tag_prepend_v
 
       # Mark any attributes that are likely to depend on properties of the target here,
       # this will raise an error if they are ever accessed before the target has been
@@ -99,6 +99,7 @@ module Origen
         @remotes = []
         @lint_test = {}
         @user_aliases = {}
+        @rc_tag_prepend_v = true
       end
 
       # This defines an enhanced accessor for these attributes that allows them to be assigned

data/lib/origen/application/release.rb

@@ -6,6 +6,7 @@ module Origen
       include Users
       include Utility::TimeAndDate
       include Utility::InputCapture
+      include Utility
 
       def initialize
         @mailer = Utility::Mailer.new
@@ -30,6 +31,7 @@ module Origen
         @options = options
         if authorized?
           Origen.app.plugins.validate_production_status(true)
+          fail 'No revision control configured for this application, cannot release a new version' if Origen.app.rc.nil?
           unless Origen.app.rc.local_modifications.empty?
             puts <<-EOT
 Your workspace has local modifications that are preventing the requested action
@@ -291,7 +293,7 @@ Your workspace has local modifications that are preventing the requested action
       def tag
         tag = Origen.app.version
         if tag =~ /^\d/
-          "v#{tag}"
+          Origen.app.config.rc_tag_prepend_v ? "v#{tag}" : tag
         else
           tag
         end

data/lib/origen/parameters/set.rb

@@ -65,7 +65,7 @@ module Origen
             super
           else
             if !key?(method)
-              super
+              nil
             else
               val = self[method]
               if val.is_a?(Set)
@@ -86,21 +86,9 @@ module Origen
         end
       end
 
-      OVERRIDE_METHODS.each do |method|
+      (OVERRIDE_METHODS + OVERRIDE_HASH_METHODS).each do |method|
         define_method method do
-          if self[method]
-            method_missing(method)
-          end
-        end
-      end
-
-      OVERRIDE_HASH_METHODS.each do |method|
-        define_method method do
-          if self[method]
-            method_missing(method)
-          else
-            super
-          end
+          method_missing(method)
         end
       end
 

data/lib/origen/utility.rb

@@ -100,5 +100,17 @@ module Origen
     def self.collector(options = {}, &block)
       Origen::Utility::Collector.new(options, &block)
     end
+
+    # https://stackoverflow.com/a/5471032/8511822
+    def which(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each do |ext|
+          exe = File.join(path, "#{cmd}#{ext}")
+          return exe if File.executable?(exe) && !File.directory?(exe)
+        end
+      end
+      nil
+    end
   end
 end

data/lib/origen/version_string.rb

@@ -369,10 +369,14 @@ module Origen
     # Returns the version prefixed with the given value ('v' by default) if not
     # already present
     def prefixed(str = 'v')
-      if self =~ /^#{str}/
-        to_s
+      if Origen.config.app.config.rc_tag_prepend_v
+        if self =~ /^#{str}/
+          to_s
+        else
+          "#{str}#{self}"
+        end
       else
-        "#{str}#{self}"
+        self
       end
     end
   end

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-11-23"
+  s.date = "2019-11-25"
   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 = "3.0.3".freeze
+  s.rubygems_version = "2.6.12".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.0.3" 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.54.6
+  version: 0.55.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -735,7 +735,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit