origen 0.54.6 → 0.55.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 18ab3cbe3a67135fee68e2c9a07b3eb2d008745b581eacd38d0020d5fc5b8832
4
- data.tar.gz: 536c15ce790b6d9338b7e3775ef3796836696fd1c65854a7f2500f4d9a046ba2
2
+ SHA1:
3
+ metadata.gz: c7920459ec573f764cd17fa9279a5e3eed718ebd
4
+ data.tar.gz: 71e6a8c44a13d3e79b0f51092646a6436db1b5a9
5
5
  SHA512:
6
- metadata.gz: eb0f1411e7b68e05ea00ebaafc4c59d34447e08d4c8ee08fd673c642fb0e332412d8c07f90dd92d462344f33752e6e23ded76e32cba80b6f59f2a3d10a43cebb
7
- data.tar.gz: 2b9c4171f9943c423bdd87eedac9e5c3b217fd5e6799fcfd7df4f3312816c88c4a6c6b8ffb3f1185fb3493cf22427ee8caa2ec38f2c2c4c0338229b5b4d84f50
6
+ metadata.gz: 3d4cd907902c958255972f1657766ca5461910861bb58a7b5d61a9d5a65675bc8b8705d9a3f930361289156ef819ac662fad34c0b9e1baae9e1b17f28be78416
7
+ data.tar.gz: 33a974f962d82778a40274790d3256a854658b124b51b428f7b29d07c5f5a30f2e180eb2dcd4528ba0772dd39a30fc017b229c69f608c370f4ab8913be7bdf4f
@@ -1,7 +1,7 @@
1
1
  module Origen
2
2
  MAJOR = 0
3
- MINOR = 54
4
- BUGFIX = 6
3
+ MINOR = 55
4
+ BUGFIX = 0
5
5
  DEV = nil
6
6
  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
7
7
  end
@@ -20,7 +20,7 @@ module Origen
20
20
  :strict_errors, :unmanaged_dirs, :unmanaged_files, :remotes,
21
21
  :external_app_dirs, :lint_test, :shared, :yammer_group, :rc_url, :rc_workflow,
22
22
  :user_aliases, :release_externally, :gem_name, :disqus_shortname,
23
- :default_plugin
23
+ :default_plugin, :rc_tag_prepend_v
24
24
 
25
25
  # Mark any attributes that are likely to depend on properties of the target here,
26
26
  # this will raise an error if they are ever accessed before the target has been
@@ -99,6 +99,7 @@ module Origen
99
99
  @remotes = []
100
100
  @lint_test = {}
101
101
  @user_aliases = {}
102
+ @rc_tag_prepend_v = true
102
103
  end
103
104
 
104
105
  # This defines an enhanced accessor for these attributes that allows them to be assigned
@@ -6,6 +6,7 @@ module Origen
6
6
  include Users
7
7
  include Utility::TimeAndDate
8
8
  include Utility::InputCapture
9
+ include Utility
9
10
 
10
11
  def initialize
11
12
  @mailer = Utility::Mailer.new
@@ -30,6 +31,7 @@ module Origen
30
31
  @options = options
31
32
  if authorized?
32
33
  Origen.app.plugins.validate_production_status(true)
34
+ fail 'No revision control configured for this application, cannot release a new version' if Origen.app.rc.nil?
33
35
  unless Origen.app.rc.local_modifications.empty?
34
36
  puts <<-EOT
35
37
  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
291
293
  def tag
292
294
  tag = Origen.app.version
293
295
  if tag =~ /^\d/
294
- "v#{tag}"
296
+ Origen.app.config.rc_tag_prepend_v ? "v#{tag}" : tag
295
297
  else
296
298
  tag
297
299
  end
@@ -65,7 +65,7 @@ module Origen
65
65
  super
66
66
  else
67
67
  if !key?(method)
68
- super
68
+ nil
69
69
  else
70
70
  val = self[method]
71
71
  if val.is_a?(Set)
@@ -86,21 +86,9 @@ module Origen
86
86
  end
87
87
  end
88
88
 
89
- OVERRIDE_METHODS.each do |method|
89
+ (OVERRIDE_METHODS + OVERRIDE_HASH_METHODS).each do |method|
90
90
  define_method method do
91
- if self[method]
92
- method_missing(method)
93
- end
94
- end
95
- end
96
-
97
- OVERRIDE_HASH_METHODS.each do |method|
98
- define_method method do
99
- if self[method]
100
- method_missing(method)
101
- else
102
- super
103
- end
91
+ method_missing(method)
104
92
  end
105
93
  end
106
94
 
@@ -100,5 +100,17 @@ module Origen
100
100
  def self.collector(options = {}, &block)
101
101
  Origen::Utility::Collector.new(options, &block)
102
102
  end
103
+
104
+ # https://stackoverflow.com/a/5471032/8511822
105
+ def which(cmd)
106
+ exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
107
+ ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
108
+ exts.each do |ext|
109
+ exe = File.join(path, "#{cmd}#{ext}")
110
+ return exe if File.executable?(exe) && !File.directory?(exe)
111
+ end
112
+ end
113
+ nil
114
+ end
103
115
  end
104
116
  end
@@ -369,10 +369,14 @@ module Origen
369
369
  # Returns the version prefixed with the given value ('v' by default) if not
370
370
  # already present
371
371
  def prefixed(str = 'v')
372
- if self =~ /^#{str}/
373
- to_s
372
+ if Origen.config.app.config.rc_tag_prepend_v
373
+ if self =~ /^#{str}/
374
+ to_s
375
+ else
376
+ "#{str}#{self}"
377
+ end
374
378
  else
375
- "#{str}#{self}"
379
+ self
376
380
  end
377
381
  end
378
382
  end
@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
9
9
  s.require_paths = ["lib".freeze]
10
10
  s.authors = ["Stephen McGinty".freeze]
11
- s.date = "2019-11-23"
11
+ s.date = "2019-11-25"
12
12
  s.email = ["stephen.f.mcginty@gmail.com".freeze]
13
13
  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]
14
14
  s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
15
15
  s.licenses = ["MIT".freeze]
16
16
  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
17
- s.rubygems_version = "3.0.3".freeze
17
+ s.rubygems_version = "2.6.12".freeze
18
18
  s.summary = "Origen application generators".freeze
19
19
 
20
- s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version
20
+ s.installed_by_version = "2.6.12" if s.respond_to? :installed_by_version
21
21
 
22
22
  if s.respond_to? :specification_version then
23
23
  s.specification_version = 4
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: origen
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.54.6
4
+ version: 0.55.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen McGinty
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-11-23 00:00:00.000000000 Z
11
+ date: 2019-11-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -735,7 +735,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
735
735
  - !ruby/object:Gem::Version
736
736
  version: 1.8.11
737
737
  requirements: []
738
- rubygems_version: 3.0.3
738
+ rubyforge_project:
739
+ rubygems_version: 2.6.12
739
740
  signing_key:
740
741
  specification_version: 4
741
742
  summary: The Semiconductor Developer's Kit