origen 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc93f967f28eb0d57d81a0b0d92d6431ef9deb8a
-  data.tar.gz: 9e36b2e5b8a3a5496e90458f13f41d0532996f0d
+  metadata.gz: 9c364ae7c1293812d927894e5042f043e2193239
+  data.tar.gz: 6e82db6660eb123f319c0881067137241f4248c1
 SHA512:
-  metadata.gz: 8cd7a721554cf1228d4456802632a5267f909bb1ce68ee6e80eb82cab17c0444efe9751f3a0c855bc4efb5a9ba491f117d03a376ba750d0c2432c92e66054e1c
-  data.tar.gz: 9ecf9f6883e79dfdb617900505195cfc833d0e48642491f7f495812449e03fc4b06adffbf4b4a8b8b317a782a4d00e70e333bafadf4995569df5593bd692d04a
+  metadata.gz: bbb1240b5fd303bd0b13b597ba69680cf2eda70a68637256037967123dd0c61b492edb084c584a4ee59d96e8ea78e839118ae73ff8afd57a434b6130c6b16247
+  data.tar.gz: c94692a764b48cc68b3e50ee3e2962205c31023a5e70856a80d4eec852e46597bc9591f1067b76b233979a06786f4c7f87a53dca299241c7d2af4a23fb2e0243

data/bin/origen

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
-$VERBOSE=nil  # Don't care about world writable dir warnings and the like
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
 
-require "pathname"
-require "fileutils"
+require 'pathname'
+require 'fileutils'
 
 class OrigenBootError < StandardError
 end
 
-ORIGEN_MIN_GCC_VERSION = "4.6.3"
+ORIGEN_MIN_GCC_VERSION = '4.6.3'
 
 # Keep a note of the pwd at the time when Origen was first loaded, this is initially used
 # by the site_config lookup.
@@ -20,12 +20,12 @@ load File.expand_path('../../lib/origen/site_config.rb', __FILE__)
 # the process is different than the one that actually runs under bundler
 $origen_launch_root = Pathname.new(File.dirname(__FILE__)).parent
 
-# Override any influence from $LANG in the users environment 
+# Override any influence from $LANG in the users environment
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 ENV['LC_ALL'] = nil
 ENV['LANG'] = nil
-ENV['LANG'] = 'en_US.UTF-8' 
+ENV['LANG'] = 'en_US.UTF-8'
 
 # Work out what Origen.root is if we are running inside an Origen application, this will be
 # later used to execute from that app's bundle even if the origen executable lives somewhere
@@ -47,15 +47,15 @@ end
 if origen_root
   # 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?(File.expand_path(Origen.site_config.gem_install_dir))
+  if Origen.site_config.gem_manage_bundler && File.exist?("#{origen_root}/lbin/origen") && !ENV['BUNDLE_BIN_PATH'] &&
+     File.exist?(File.expand_path(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_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")
+    ENV['BUNDLE_BIN'] = File.join(origen_root, 'lbin')
   end
 end
 
@@ -82,16 +82,16 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
         Bundler.setup
         fail OrigenBootError unless File.exist?(ENV['BUNDLE_BIN'])
       rescue Gem::LoadError, Bundler::BundlerError, OrigenBootError => e
-        cmd = "bundle install --gemfile #{ENV["BUNDLE_GEMFILE"]} --binstubs #{ENV["BUNDLE_BIN"]} --path #{ENV["BUNDLE_PATH"]}"
-        #puts cmd
-        puts "Installing required gems..."
+        cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
+        # puts cmd
+        puts 'Installing required gems...'
         puts
         `chmod o-w #{origen_root}` # Stops some annoying world writable warnings during install
         `chmod o-w #{origen_root}/bin` if File.exist?("#{origen_root}/bin")
         `chmod o-w #{origen_root}/.bin` if File.exist?("#{origen_root}/.bin")
         result = false
 
-        # Set this here since the clean environment will not have access to the ENV variable  
+        # Set this here since the clean environment will not have access to the ENV variable
         local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
 
         Bundler.with_clean_env do
@@ -102,15 +102,15 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
               end
             end
             gcc_version = begin
-              begin              
-                line = %x[gcc --version].split("\n").first
+              begin
+                line = `gcc --version`.split("\n").first
               rescue
                 puts "You don't seem to have gcc available, make sure you following the Origen installation instructions:"
-                puts "http://origen-sdk.org/origen/latest/guides/starting/installing/"
+                puts 'http://origen-sdk.org/origen/latest/guides/starting/installing/'
                 exit 1
               end
               if line =~ /(\d+\.\d+\.\d+)/
-                $1
+                Regexp.last_match(1)
               end
             end
             if gcc_version
@@ -119,7 +119,7 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
                 exit 1
               end
             else
-              puts "Unable to determine gcc version, proceeding with fingers crossed..."
+              puts 'Unable to determine gcc version, proceeding with fingers crossed...'
             end
             # Need to compact the system gem specs array to remove reference to any nil elements which will cause an error below.
             system_gem_specs.compact!
@@ -134,31 +134,37 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
               system_gem_specs.each do |spec|
                 begin
                   (spec.executables || []).each do |bin|
-                    FileUtils.cp("#{spec.bin_dir}/#{bin}", "#{local_gem_dir}/bin")
+                    unless File.exist?("#{local_gem_dir}/bin/#{bin}")
+                      FileUtils.cp("#{spec.bin_dir}/#{bin}", "#{local_gem_dir}/bin")
+                    end
+                  end
+                  p = Pathname.new(spec.cache_file)
+                  unless File.exist?("#{local_gem_dir}/cache/#{p.basename}")
+                    FileUtils.cp(spec.cache_file, "#{local_gem_dir}/cache")
                   end
-                  if !File.exist(spec.cache_file)
-                   FileUtils.cp(spec.cache_file, "#{local_gem_dir}/cache")
-                  end 
                   if spec.extension_dir && File.exist?(spec.extension_dir)
                     spec.extension_dir =~ /.*extensions(.*)/
-                    sub_dir = Pathname.new($1).dirname.to_s
+                    sub_dir = Pathname.new(Regexp.last_match(1)).dirname.to_s
                     local_ext_dir = "#{local_gem_dir}/extensions/#{sub_dir}"
                     FileUtils.mkdir_p(local_ext_dir) unless File.exist?(local_ext_dir)
 
-                   # If the file exists in the extensions directory, skip copying it over.                   
-                   if !File.exist?(spec.extension_dir)
-                    FileUtils.cp_r(spec.extension_dir, local_ext_dir)
-                   end
+                    # If the file exists in the extensions directory, skip copying it over.
+                    p = Pathname.new(spec.extension_dir)
+                    unless File.exist?("#{local_ext_dir}/#{p.basename}")
+                      FileUtils.cp_r(spec.extension_dir, local_ext_dir)
+                    end
                   end
- 
-                   # If the file exists in the gem directory, skip copying it over.
-                   if !File.exist?(spec.gem_dir)
+
+                  # If the file exists in the gem directory, skip copying it over.
+                  p = Pathname.new(spec.gem_dir)
+                  unless File.exist?("#{local_gem_dir}/gems/#{p.basename}")
                     FileUtils.cp_r(spec.gem_dir, "#{local_gem_dir}/gems")
-                   end
-                   # If the file exists in the specifications directory, skip copying it over.
-                   if !File.exist?(spec.spec_file)
+                  end
+                  # If the file exists in the specifications directory, skip copying it over.
+                  p = Pathname.new(spec.spec_file)
+                  unless File.exist?("#{local_gem_dir}/specifications/#{p.basename}")
                     FileUtils.cp(spec.spec_file, "#{local_gem_dir}/specifications")
-                   end
+                  end
                 rescue
                   puts "Had problems installing #{spec.name} from your system Ruby, proceeding with fingers crossed..."
                 end
@@ -167,7 +173,7 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
           end
           result = system(cmd)
         end
-        `chmod o-w #{ENV["BUNDLE_BIN"]}`
+        `chmod o-w #{ENV['BUNDLE_BIN']}`
         # Make .bat versions of all executables, Bundler should really be doing this when running
         # on windows
         if Origen.os.windows?
@@ -181,15 +187,15 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
             end
           end
           if !bat_present && !result
-            puts "Some Windows specific updates to your workspace were required, please re-run the last command"
+            puts 'Some Windows specific updates to your workspace were required, please re-run the last command'
             exit 0
           end
         end
         if result
           # This is a shim to help NXP run regression tests between an old version of an app running
           # RGen and a new version running Origen
-          origen = File.join(ENV['BUNDLE_BIN'], "origen")
-          rgen = File.join(ENV['BUNDLE_BIN'], "rgen")
+          origen = File.join(ENV['BUNDLE_BIN'], 'origen')
+          rgen = File.join(ENV['BUNDLE_BIN'], 'rgen')
           if File.exist?(rgen) && !File.exist?(origen) && Origen.os.linux?
             exec "ln -s #{rgen} #{origen}"
           end
@@ -206,18 +212,18 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
       Bundler.setup
     end
   end
-  require "bundler/setup"
-  require "origen"
+  require 'bundler/setup'
+  require 'origen'
 else
   $LOAD_PATH.unshift "#{File.expand_path(File.dirname(__FILE__))}/../lib"
-  require "origen"
+  require 'origen'
 end
 
 # This is a shim to help NXP run regression tests between an old version of an app running
 # RGen and a new version running Origen
 # If RGen < 3 is present then abort the process here and execute the rgen bin file instead
 begin
-  require "rgen"
+  require 'rgen'
   if RGen.version.major == 2
     exec Gem.ruby, "#{RGen.top}/bin/rgen", *ARGV
     exit 0
@@ -231,22 +237,22 @@ begin
   # up all commands, if not then only allow the command to create a new Origen
   # application.
   if origen_root
-    require "origen/commands"
+    require 'origen/commands'
   else
-    require "origen/commands_global"
+    require 'origen/commands_global'
   end
 rescue Exception => e
   unless e.is_a?(SystemExit) && e.status == 0
     puts
     if Origen.app_loaded?
-      puts "COMPLETE CALL STACK"
-      puts "-------------------"
+      puts 'COMPLETE CALL STACK'
+      puts '-------------------'
       puts e.message unless e.is_a?(SystemExit)
       puts e.backtrace
 
       puts
-      puts "APPLICATION CALL STACK"
-      puts "----------------------"
+      puts 'APPLICATION CALL STACK'
+      puts '----------------------'
       puts e.message unless e.is_a?(SystemExit)
       # Only print out the application stack trace by default, if verbose logging is
       # enabled then output the full thing
@@ -254,15 +260,15 @@ rescue Exception => e
         path = Pathname.new(line)
         if path.absolute?
           if line =~ /^#{Origen.root}/ && line !~ /^#{Origen.root}\/lbin/
-            puts line 
+            puts line
           end
         else
           puts line unless line =~ /^.\/lbin/
         end
       end
     else
-      puts "COMPLETE CALL STACK"
-      puts "-------------------"
+      puts 'COMPLETE CALL STACK'
+      puts '-------------------'
       puts e.message unless e.is_a?(SystemExit)
       puts e.backtrace
     end
@@ -270,9 +276,7 @@ rescue Exception => e
   end
 ensure
   if Origen.app_loaded?
-    Origen.app.listeners_for(:on_origen_shutdown).each do |listener|
-      listener.on_origen_shutdown
-    end
+    Origen.app.listeners_for(:on_origen_shutdown).each(&:on_origen_shutdown)
     Origen.app.runner.shutdown
   end
 end

data/config/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - Stephen McGinty
@@ -324,90 +324,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.4
-- !ruby/object:Gem::Dependency
-  name: stackprof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: origen_core_support
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: origen_doc_helpers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: loco
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: origen_testers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: origen_debuggers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -652,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit