origen 0.0.8 → 0.0.9
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/bin/origen +13 -6
- data/config/version.rb +1 -1
- data/source_setup +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8ea392fb4ca3c95f6418cbbb4f1efd71bc2256f2
|
|
4
|
+
data.tar.gz: 638a8ef6429898c0b4d7bc7d56353073af8e408f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0d0bbd5acd19642897abfbd080d425819d02cb39e6eae5331102c4924a609f639f8167617fbec75da17687fb7e819871c1017d92d99946937389da95e46615aa
|
|
7
|
+
data.tar.gz: 8bd6d58099593404cdcb73c96cbf3d5b3d3a27447eefb3f44e4dc25cd38e34704967d1eb36e6a160f775aa527360f7770874f29a58ad44b9f15ebd523cda6477
|
data/bin/origen
CHANGED
|
@@ -41,10 +41,18 @@ else
|
|
|
41
41
|
end
|
|
42
42
|
|
|
43
43
|
if origen_root
|
|
44
|
-
#
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
44
|
+
# If it looks like a bundled binstub of origen exists, and we have not been invoked through that,
|
|
45
|
+
# then run that instead.
|
|
46
|
+
if Origen.site_config.gem_manage_bundler && File.exist?("#{origen_root}/lbin/origen") && !ENV["BUNDLE_BIN_PATH"] &&
|
|
47
|
+
File.exist?(Origen.site_config.gem_install_dir)
|
|
48
|
+
exec Gem.ruby, "#{origen_root}/lbin/origen", *ARGV
|
|
49
|
+
exit 0
|
|
50
|
+
else
|
|
51
|
+
# Force everyone to have a consistent way of installing gems with bundler
|
|
52
|
+
ENV['BUNDLE_GEMFILE'] = File.join(origen_root, "Gemfile")
|
|
53
|
+
ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
|
|
54
|
+
ENV['BUNDLE_BIN'] = File.join(origen_root, "lbin")
|
|
55
|
+
end
|
|
48
56
|
end
|
|
49
57
|
|
|
50
58
|
if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_manage_bundler
|
|
@@ -156,8 +164,7 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
|
|
|
156
164
|
end
|
|
157
165
|
end
|
|
158
166
|
if result
|
|
159
|
-
|
|
160
|
-
puts "The required gems have been installed, please re-run the previous command"
|
|
167
|
+
exec "origen #{ARGV.join(' ')}"
|
|
161
168
|
exit 0
|
|
162
169
|
else
|
|
163
170
|
puts
|
data/config/version.rb
CHANGED
data/source_setup
CHANGED