origen 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4350de32d0891efe015658e118c9454077395083
-  data.tar.gz: d0326aca835cddce8ca2505ff1675dd71b7669e8
+  metadata.gz: 8ea392fb4ca3c95f6418cbbb4f1efd71bc2256f2
+  data.tar.gz: 638a8ef6429898c0b4d7bc7d56353073af8e408f
 SHA512:
-  metadata.gz: 84fcbbd28d3fd674b559c9da1b23ee409ba5b87e0c45575802185b61c0dba099deeff5a4ed4ade116026fa8d64d8a08667ccc4914163c56426d7afe7372a62c7
-  data.tar.gz: ea3b529d25acddc27a7c639acad1e74afe7c114d5273e59b01da7bbe37b968db1f06e6f968d6c058ac20c56c51ff2b3900a191a25016f52f83a024a0c53525c7
+  metadata.gz: 0d0bbd5acd19642897abfbd080d425819d02cb39e6eae5331102c4924a609f639f8167617fbec75da17687fb7e819871c1017d92d99946937389da95e46615aa
+  data.tar.gz: 8bd6d58099593404cdcb73c96cbf3d5b3d3a27447eefb3f44e4dc25cd38e34704967d1eb36e6a160f775aa527360f7770874f29a58ad44b9f15ebd523cda6477

data/bin/origen

@@ -41,10 +41,18 @@ else
 end
 
 if origen_root
-  # Force everyone to have a consistent way of installing gems with bundler
-  ENV['BUNDLE_GEMFILE'] = File.join(origen_root, "Gemfile")
-  ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
-  ENV['BUNDLE_BIN'] = File.join(origen_root, "lbin")
+  # If it looks like a bundled binstub of origen exists, and we have not been invoked through that,
+  # then run that instead.
+  if Origen.site_config.gem_manage_bundler && File.exist?("#{origen_root}/lbin/origen") && !ENV["BUNDLE_BIN_PATH"] &&
+    File.exist?(Origen.site_config.gem_install_dir)
+    exec Gem.ruby, "#{origen_root}/lbin/origen", *ARGV
+    exit 0
+  else
+    # Force everyone to have a consistent way of installing gems with bundler
+    ENV['BUNDLE_GEMFILE'] = File.join(origen_root, "Gemfile")
+    ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
+    ENV['BUNDLE_BIN'] = File.join(origen_root, "lbin")
+  end
 end
 
 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
           end
         end
         if result
-          puts
-          puts "The required gems have been installed, please re-run the previous command"
+          exec "origen #{ARGV.join(' ')}"
           exit 0
         else
           puts

data/config/version.rb

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

data/source_setup

@@ -14,4 +14,4 @@ set origen_install = `dirname $called_dir/$relative_path`
 set origen_bin = $origen_install/bin      
 
 # Add the origen bin dirs to the user's path as highest priority
-setenv PATH ./lbin\:$origen_bin\:$PATH
+setenv PATH $origen_bin\:$PATH

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Stephen McGinty