origen 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5515909ec26db7a8a2f402e66f46972f79ff4d62
-  data.tar.gz: f338f5a5fad2f8a92ba5035e7670a692e6bda8c4
+  metadata.gz: fc93f967f28eb0d57d81a0b0d92d6431ef9deb8a
+  data.tar.gz: 9e36b2e5b8a3a5496e90458f13f41d0532996f0d
 SHA512:
-  metadata.gz: 9386d160c9873e09742484e479b5ebde00332a106e20d52a3907a5c8a93ef567ef45e9e7fe2a8c9e5fcb6431de1e52e7dd05f386c1093f53a3bb3d99857ced92
-  data.tar.gz: 74f6309577983523713fc70b08bacc6cd06bba02bb6b8864e803e20b0dd02892a728faec5729c1a84a9d8db3dc97eb110c0b9c3092716110355d8bf4e51bce04
+  metadata.gz: 8cd7a721554cf1228d4456802632a5267f909bb1ce68ee6e80eb82cab17c0444efe9751f3a0c855bc4efb5a9ba491f117d03a376ba750d0c2432c92e66054e1c
+  data.tar.gz: 9ecf9f6883e79dfdb617900505195cfc833d0e48642491f7f495812449e03fc4b06adffbf4b4a8b8b317a782a4d00e70e333bafadf4995569df5593bd692d04a

data/config/version.rb

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

data/lib/origen/regression_manager.rb

@@ -50,7 +50,8 @@ module Origen
       else
         if options[:build_reference]
           @reference_tag = version_to_tag(options[:version] || get_version(options))
-          setup_reference_workspace
+          # passing the options for regression to the setup reference workspace method.
+          setup_reference_workspace(options)
           # Generate the reference files
           save_options(options)
           Origen.with_origen_root(reference_origen_root) do
@@ -58,7 +59,8 @@ module Origen
               Dir.chdir reference_origen_root do
                 Bundler.with_clean_env do
                   system 'rm -rf lbin'
-                  system 'bundle exec origen -v'  # Used to make sure gems install
+                  system 'origen -v'  # Used to make sure gems install
+                  system 'bundle install' # Make sure bundle updates the necessary config/gems required for Origen.
                   Origen.log.info '######################################################'
                   Origen.log.info 'running regression command in reference workspace...'
                   Origen.log.info '######################################################'
@@ -178,11 +180,27 @@ module Origen
       end
     end
 
-    def setup_reference_workspace
+    def setup_reference_workspace(options)
       if ws.reference_workspace_set?
-        @reference_workspace = ws.reference_workspace
+        # If the reference workspace option is true, overwrite the @reference_workspace accessor
+        if options[:reference_workspace]
+          @reference_workspace = options[:reference_workspace]
+          # Build the new reference workspace now.
+          unless File.exist?(@reference_workspace)
+            highlight { Origen.log.info 'Building reference workspace...' }
+            ws.build(@reference_workspace)
+          end
+          ws.set_reference_workspace(@reference_workspace)
+        else
+          @reference_workspace = ws.reference_workspace
+        end
       else
-        @reference_workspace = get_reference_workspace
+        if options[:reference_workspace]
+          # If the reference workspace option is true, overwrite the @reference_workspace accessor
+          @reference_workspace = options[:reference_workspace]
+        else
+          @reference_workspace = get_reference_workspace
+        end
         unless File.exist?(@reference_workspace)
           highlight { Origen.log.info 'Building reference workspace...' }
           ws.build(@reference_workspace)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit