origen 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5afcd7f71e51997df636ad0b74093dd23b8b03f1
-  data.tar.gz: cbbc0db307f8cf931afe7265a371e70de507b37c
+  metadata.gz: 34175eaa19e94919e00157128ce1875e61b8e105
+  data.tar.gz: 18ca9f6c79f0d3de7896830e695956111ce4b2e6
 SHA512:
-  metadata.gz: 7255a4de2df19ef8751fbefd7ed6967527a863814b2080728c78aca3b5b8a18205e3c0d2b3c8f28b18149a5dacdad69cded05701f77347eb7fd595571829de50
-  data.tar.gz: cd99fc87b5b56defef22d49dd07688d53d4692256a83a7127a9a984eb820f15f25c5e400044ddab2dd3e46cb259c0b4c1f496fefc0943a150cad02f127f6abc8
+  metadata.gz: 4e6343655c86b9f9a326c05df084eaae136a883cf9fe09cc949051de9b5856a32123b294f8161ce0c99a1739bf76105f5000ba7206b02748badd9c9794b6ff4c
+  data.tar.gz: 476933ca8901cef3184d1b61b9d82f4ad9cf55309095bb352039c6e36c1c83bacfb594544202b2643005adb9be0917014c603c2549f881386d9ac52cfab2dff7

data/bin/origen

@@ -200,17 +200,26 @@ begin
 rescue Exception => e
   unless e.is_a?(SystemExit) && e.status == 0
     puts
-    puts e.message
+    puts e.message unless e.is_a?(SystemExit)
     if Origen.app_loaded?
       # Only print out the application stack trace by default, if verbose logging is
       # enabled then output the full thing
       e.backtrace.each do |line|
         path = Pathname.new(line)
-        puts line if !path.absolute? || Origen.log.level == :verbose
+        if path.absolute?
+          puts line if Origen.log.level == :verbose
+        else
+          if Origen.log.level == :verbose
+            puts line
+          else
+            puts line unless line =~ /^.\/lbin/
+          end
+        end
       end
     else
       puts e.backtrace
     end
+    exit 1
   end
 ensure
   if Origen.app_loaded?

data/config/version.rb

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

data/lib/origen/commands/lint.rb

@@ -63,20 +63,5 @@ if result == true
 elsif result == false
   exit 1
 else
-  begin
-    if gem 'rubocop'
-      if Origen.running_on_linux? && !File.exist?("#{Origen.top}/.bin/rubocop")
-        puts ''
-        puts 'It looks like you need to update your toolset to fix the above error, try running these commands before trying again:'
-        puts ''
-        puts "  pushd #{Origen.top}"
-        puts '  source source_setup update'
-        puts '  popd'
-        puts ''
-      end
-    end
-  rescue Gem::LoadError
-    require_gem 'rubocop', version: '0.20.1'
-  end
   exit 1
 end

metadata

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