origen 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed980dcd18e1d53defcd27928d2fae2b5c6fe53
-  data.tar.gz: c9d7b163c3c5d219ea8b81f0b624938cf5049877
+  metadata.gz: f06ba92ddb653da06e04e5d11ae538df9160a524
+  data.tar.gz: 6330aedcfda4aaaea9bc0896cc614d9c6c81ccb8
 SHA512:
-  metadata.gz: 540490e6a49ea8c7acef2f18d56eec937a14fe826b91f48fc0344a52ee9027d6310ed9546a77f1d2a95a484123feac4ca366228b8b8c01bfa79ed1f575f7ac5a
-  data.tar.gz: 83801037183ae53aa780c1c06c4a15bc9976361e2a552011195176eb8004353a69a1b58b525de23ec4373906dc6ad7b8c4b395aec07a65c300e469fc7728ae22
+  metadata.gz: 882c0a347492a5732f9ffd899d37cd695caee042a2c591839557974eb89057f4e351d249eb8823f5e937cb569c0d33b6171a686251f1bd09088b9662085f0ced
+  data.tar.gz: c685c4ad3c3bc97747cd2d74b80a3f2026a1d40e4ba058f942dd113fd19bf681c01980c31441a0451ef09e1ce4d0eaef5d4b4f7d472316498f6e876a550a02cc

data/bin/copy_system_gems

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
+#require 'byebug' # Un-comment to debug this file
+require 'fileutils'
+require 'pathname'
+
+local_gem_dir = ARGV.shift
+
+unless ARGV.empty?
+  %w(bin cache extensions gems specifications).each do |subdir|
+    d = "#{local_gem_dir}/#{subdir}"
+    FileUtils.mkdir_p(d) unless File.exist?(d)
+  end
+end
+
+ARGV.each_slice(2) do |gem, version|
+  begin
+    spec = Gem::Specification.find_by_name(gem, version)
+    begin
+      (spec.executables || []).each do |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 spec.extension_dir && File.exist?(spec.extension_dir)
+        spec.extension_dir =~ /.*extensions(.*)/
+        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.
+        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.
+      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.
+      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
+    rescue
+      puts "Had problems installing #{spec.name} from your system Ruby, proceeding with fingers crossed..."
+    end
+
+  rescue Gem::LoadError
+    # This just means that one of the gems that should be copied from the system
+    # was not actually installed in the system, so nothing we can do about that here
+  end
+end

data/bin/origen

@@ -3,6 +3,7 @@ $VERBOSE = nil  # Don't care about world writable dir warnings and the like
 
 require 'pathname'
 require 'fileutils'
+#require 'byebug' # Un-comment to debug this file
 
 class OrigenBootError < StandardError
 end
@@ -45,33 +46,36 @@ 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')
+
+  # Ensure that system gems are copied to the local gem dir every time, this might waste a little bit
+  # of time, but it ensures that any updates to the system gem list are automatically applied which
+  # is helpful in a corporate environment with no sudo access to the Ruby installation
+  #
+  # This is invoked from an external process so that it can step out of this bundled environment
+  # and have visibility of the system gems
+  if Origen.site_config.gem_manage_bundler && Origen.site_config.gem_use_from_system
+    exe = File.expand_path('../copy_system_gems', __FILE__)
+    gems = Origen.site_config.gem_use_from_system.map { |g,v| "#{g} #{v}" }.join(' ')
+    local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
+    Bundler.with_clean_env do
+      system "#{exe} #{local_gem_dir} #{gems}"
+    end
+  end
+
   # 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))
     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
-  # Retrieve any system gem specs that might be required before we enter the clean env
-  if Origen.site_config.gem_manage_bundler && Origen.site_config.gem_use_from_system
-    system_gem_specs = Origen.site_config.gem_use_from_system.map do |gem, version|
-      begin
-        Gem::Specification.find_by_name(gem, version)
-      rescue Gem::LoadError
-      end
-    end
-  else
-    system_gem_specs = []
-  end
-
   # Overriding bundler here so that bundle install can be automated as required
   require 'bundler/shared_helpers'
   if Bundler::SharedHelpers.in_bundle?
@@ -91,9 +95,6 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
         `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
-        local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
-
         Bundler.with_clean_env do
           if Origen.os.unix?
             if Origen.site_config.gem_build_switches
@@ -121,55 +122,6 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
             else
               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!
-            # Some gems (particularly those with C extensions that need to be built), can be hard to install reliably
-            # across a large user base. Initially seed the user's local gem area with the system-installed gems,
-            # this means that the system Ruby owner can provide an installation for these hard-to-install gems.
-            unless system_gem_specs.empty?
-              %w(bin cache extensions gems specifications).each do |subdir|
-                d = "#{local_gem_dir}/#{subdir}"
-                FileUtils.mkdir_p(d) unless File.exist?(d)
-              end
-              system_gem_specs.each do |spec|
-                begin
-                  (spec.executables || []).each do |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 spec.extension_dir && File.exist?(spec.extension_dir)
-                    spec.extension_dir =~ /.*extensions(.*)/
-                    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.
-                    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.
-                  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.
-                  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
-                rescue
-                  puts "Had problems installing #{spec.name} from your system Ruby, proceeding with fingers crossed..."
-                end
-              end
-            end
           end
           result = system(cmd)
         end

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 8
+  MINOR = 9
   BUGFIX = 0
   DEV = nil
 

data/lib/origen/site_config.rb

@@ -49,6 +49,8 @@ module Origen
         # Add any site_configs from where we are currently running from, i.e. the application
         # directory area
         until path.root?
+          file = File.join(path, 'config', 'origen_site_config.yml')
+          configs << YAML.load_file(file) if File.exist?(file)
           file = File.join(path, 'origen_site_config.yml')
           configs << YAML.load_file(file) if File.exist?(file)
           path = path.parent

data/origen_site_config.yml

@@ -13,8 +13,9 @@ gem_install_dir: ~/.origen/gems
 # it fresh for each user.
 # Note that this option will only be applied if gem_manage_bundler is set to true.
 gem_use_from_system:
-  - [nokogiri, 1.6.4.1] # Only required for early versions of Origen
-  - [nokogiri, 1.6.7.2]
+  - [nokogiri, 1.6.4.1] # Only required for earlier versions of Origen
+  - [nokogiri, 1.6.7.2] # Only required for earlier versions of Origen
+  - [nokogiri, 1.7.2]
 # Additionally any build switches/options that are required to build specific gems
 # in your user environment can be defined here.
 #gem_build_switches:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Stephen McGinty
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7.2
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/copy_system_gems
 - bin/origen
 - config/application.rb
 - config/boot.rb
@@ -582,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit