origen_app_generators 1.1.4 → 1.2.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 +4 -4
- data/config/shared_commands.rb +7 -5
- data/config/version.rb +2 -2
- data/lib/origen_app_generators/base.rb +19 -1
- data/templates/app_generators/application/Gemfile +5 -2
- data/templates/app_generators/plugin/Gemfile +5 -2
- data/templates/app_generators/test_engineering/stand_alone_application/Gemfile +5 -2
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 95bae33d256bebe0eff06b3bc302cff13ee7727b
|
|
4
|
+
data.tar.gz: fea2484c1f4856809c5ca0a57c02882d30b4409d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0fb24b159af5a507c5f41917b77d6e56e47e75238c9a261cddb4870cf69078c9cbd1ea623212c27da63cdb9d7c6f9932c35dc4074dcfab8a4dd0bc3f666cf2e0
|
|
7
|
+
data.tar.gz: 0b06ca6ae29007200ea68fe670d1333a3e3eaed0307cdefbf2ca3a3bec8e2bbc567c8e566ca262e96f7d80ac6e5a25f07e2de3a64d039d2107b0f2246489990c
|
data/config/shared_commands.rb
CHANGED
|
@@ -41,11 +41,13 @@ END
|
|
|
41
41
|
post_build_operations = post_build_operations.map do |op|
|
|
42
42
|
if op.to_s == 'default'
|
|
43
43
|
target_load_test_required = true
|
|
44
|
-
['origen -v'
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
cmds = ['origen -v']
|
|
45
|
+
# For some reason this command doesn't work in Travis CI, don't know why and
|
|
46
|
+
# couldn't work out how to fix (looks like a Bundler-related issue)
|
|
47
|
+
cmds << 'origen lint --no-correct' unless ENV['TRAVIS']
|
|
48
|
+
cmds << 'bundle exec rake new_app_tests:load_target'
|
|
49
|
+
cmds << 'origen web compile --no-serve'
|
|
50
|
+
cmds
|
|
49
51
|
elsif op.to_s == 'load_target'
|
|
50
52
|
target_load_test_required = true
|
|
51
53
|
'rake new_app_tests:load_target'
|
data/config/version.rb
CHANGED
|
@@ -44,7 +44,25 @@ module OrigenAppGenerators
|
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
def get_lastest_origen_version
|
|
47
|
-
@latest_origen_version
|
|
47
|
+
@latest_origen_version ||= begin
|
|
48
|
+
(Gems.info 'origen')['version']
|
|
49
|
+
rescue
|
|
50
|
+
# If the above fails, e.g. due to an SSL error in the runtime environment, try to fetch the
|
|
51
|
+
# latest Origen version from the Origen website, before finally falling back to the version
|
|
52
|
+
# we are currently running if all else fails
|
|
53
|
+
begin
|
|
54
|
+
require 'httparty'
|
|
55
|
+
response = HTTParty.get('http://origen-sdk.org/origen/release_notes/')
|
|
56
|
+
version = Origen::VersionString.new(response.body.match(/Tag: v(\d+\.\d+.\d+)</).to_a.last)
|
|
57
|
+
if version.valid?
|
|
58
|
+
version
|
|
59
|
+
else
|
|
60
|
+
fail "Can't get the latest version!"
|
|
61
|
+
end
|
|
62
|
+
rescue
|
|
63
|
+
Origen.version
|
|
64
|
+
end
|
|
65
|
+
end
|
|
48
66
|
end
|
|
49
67
|
|
|
50
68
|
protected
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
source 'https://rubygems.org'
|
|
2
1
|
<% if (@audience != :external) && Origen.site_config.gem_server -%>
|
|
3
|
-
|
|
2
|
+
<% Array(Origen.site_config.gem_server).each do |server| -%>
|
|
3
|
+
source '<%= server %>'
|
|
4
|
+
<% end -%>
|
|
5
|
+
<% else %>
|
|
6
|
+
source 'https://rubygems.org'
|
|
4
7
|
<% end -%>
|
|
5
8
|
|
|
6
9
|
gem 'origen', '>= <%= @latest_origen_version %>'
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
source 'https://rubygems.org'
|
|
2
1
|
<% if (@audience != :external) && Origen.site_config.gem_server -%>
|
|
3
|
-
|
|
2
|
+
<% Array(Origen.site_config.gem_server).each do |server| -%>
|
|
3
|
+
source '<%= server %>'
|
|
4
|
+
<% end -%>
|
|
5
|
+
<% else %>
|
|
6
|
+
source 'https://rubygems.org'
|
|
4
7
|
<% end -%>
|
|
5
8
|
|
|
6
9
|
# Only development dependencies (things your plugin needs only when it is running in its own workspace)
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
source 'https://rubygems.org'
|
|
2
1
|
<% if (@audience != :external) && Origen.site_config.gem_server -%>
|
|
3
|
-
|
|
2
|
+
<% Array(Origen.site_config.gem_server).each do |server| -%>
|
|
3
|
+
source '<%= server %>'
|
|
4
|
+
<% end -%>
|
|
5
|
+
<% else %>
|
|
6
|
+
source 'https://rubygems.org'
|
|
4
7
|
<% end -%>
|
|
5
8
|
|
|
6
9
|
gem 'origen', '>= <%= @latest_origen_version %>'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: origen_app_generators
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.2.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:
|
|
11
|
+
date: 2018-07-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: origen
|
|
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
135
135
|
version: 1.8.11
|
|
136
136
|
requirements: []
|
|
137
137
|
rubyforge_project:
|
|
138
|
-
rubygems_version: 2.6.
|
|
138
|
+
rubygems_version: 2.6.14.1
|
|
139
139
|
signing_key:
|
|
140
140
|
specification_version: 4
|
|
141
141
|
summary: Origen application generators
|