origen 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74d6c5e91701aa0a8f1c90b52ae3fc3414b6403
-  data.tar.gz: 5736a47e4479517d364734301c98aa36f099a6a7
+  metadata.gz: 2b03ec3627ba26fc085e2a5302472d6bf13522bb
+  data.tar.gz: e915a39f3b40a64aa4255b13293570b37abdd765
 SHA512:
-  metadata.gz: e5b2083ade87f88644af98ec619de196fd688b49d162c54f89a3af19a71cddcef7a86860e240fd4b07b4ac8c14432991eba7b6b4ed6c845e3760e9552c81bc9f
-  data.tar.gz: dc4cf50f16fab69fe59d6108fb90ed7e5fb840a74d26230f102828820e3c3e83398540f019542368b0b0b32ee68a2c9d896fdee993996bbc89aae0ae1b39f3c2
+  metadata.gz: 958952409ba581f177774cc2dbe23eb42cc018fdf64eca2faa1708f7356c73beebc886678c4cb0fb6e8d7fac726f1fc20979cd7e233ced7d848a7724a8fd92bb
+  data.tar.gz: 5ad6fb24cdf7c84f05bf7cc854c917e63e86c29eb133eee45f6e5ced7ac870ca108be1a0dcc4456af8f0d7f9696cecfe9103a4a76632ffc88eaf7a2a73360cab

data/bin/fix_my_workspace

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+$VERBOSE = nil  # Don't care about world writable dir warnings and the like
+
+if $_fix_my_workspace_version_check
+  $_fix_my_workspace_version = '0.5.0'
+else
+  require 'origen'
+
+  if !Origen.site_config.gem_manage_bundler
+    puts 'Sorry but you have opted to manage Bundler yourself via your Origen site config, and this means'
+    puts 'that I cannot make certain assumptions about how your workspace is configured.'
+    puts 'You will need to either resolve this problem yourself, or else change the value of'
+    puts 'gem_mange_bundler to true.'
+    puts 'See here for more details on how to do that: http://origen-sdk.org/origen/guides/starting/company/'
+
+  else
+    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')
+
+    # Force copy system gems to local gems
+    if Origen.site_config.gem_use_from_system
+      local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
+      gem_dir = Pathname.new(Gem.dir)
+
+      Origen.site_config.gem_use_from_system.each do |gem, version|
+        begin
+          # This will raise an error if the system doesn't have this gem installed, that
+          # will be rescued below
+          spec = Gem::Specification.find_by_name(gem, version)
+
+          local_dir = File.join(local_gem_dir, Pathname.new(spec.gem_dir).relative_path_from(gem_dir))
+          FileUtils.mkdir_p local_dir
+          FileUtils.cp_r("#{spec.gem_dir}/.", local_dir)
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.cache_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.cache_file, local_file)
+
+          if spec.extension_dir && File.exist?(spec.extension_dir)
+            local_dir = File.join(local_gem_dir, Pathname.new(spec.extension_dir).relative_path_from(gem_dir))
+            FileUtils.mkdir_p local_dir
+            FileUtils.cp_r("#{spec.extension_dir}/.", local_dir)
+          end
+
+          local_file = Pathname.new(File.join(local_gem_dir, Pathname.new(spec.spec_file).relative_path_from(gem_dir)))
+          FileUtils.mkdir_p local_file.dirname
+          FileUtils.cp(spec.spec_file, local_file)
+
+        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
+    end
+
+    # Delete lbin
+    FileUtils.rm_rf(ENV['BUNDLE_BIN']) if File.exist?(ENV['BUNDLE_BIN'])
+
+    # Run bundler with correct switches
+    cmd = "bundle install --gemfile #{ENV['BUNDLE_GEMFILE']} --binstubs #{ENV['BUNDLE_BIN']} --path #{ENV['BUNDLE_PATH']}"
+    `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")
+
+    # Try again, this time updating the bundle
+    if system(cmd)
+      fixed = true
+    elsif system 'bundle update'
+      fixed = true
+    end
+
+    `chmod o-w #{ENV['BUNDLE_BIN']}` if File.exist?(ENV['BUNDLE_BIN'])
+
+    system 'origen -v' if fixed
+
+  end
+end

data/bin/origen

@@ -51,34 +51,6 @@ if origen_root
   ENV['BUNDLE_PATH'] = File.expand_path(Origen.site_config.gem_install_dir)
   ENV['BUNDLE_BIN'] = File.join(origen_root, 'lbin')
 
-  if ARGV.first == 'update'
-    ARGV.shift
-    local_gem_dir = "#{ENV['BUNDLE_PATH']}/ruby/#{Pathname.new(Gem.dir).basename}"
-    updater_dir = Dir.glob("#{local_gem_dir}/gems/origen_updater-*").sort.last
-    exe = File.expand_path('../update', __FILE__)
-    require 'bundler'
-
-    args = ARGV.join(' ')
-
-    on_updated_callback = lambda do
-      Bundler.with_clean_env do
-        system "#{exe} #{origen_root} #{updater_dir}/lib/origen_updater/on_updated #{args}"
-      end
-    end
-
-    # This is invoked from an external process so that it can step out of this bundled environment
-    # and have visibility of the system gems
-    Bundler.with_clean_env do
-      system "#{exe} #{origen_root} #{updater_dir}/lib/origen_updater/update #{args}"
-    end
-
-    # Now fall through and act like 'origen -v'
-    while ARGV.size > 0 do
-      ARGV.pop
-    end
-    ARGV << '-v'
-  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'] &&
@@ -157,7 +129,6 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
           end
         end
         if result
-          on_updated_callback.call if on_updated_callback
           exec "origen #{ARGV.join(' ')}"
           exit 0
         else
@@ -171,7 +142,6 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
       Bundler.setup
     end
   end
-  on_updated_callback.call if on_updated_callback
   require 'bundler/setup'
   require 'origen'
 else

data/config/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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,8 +346,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/fix_my_workspace
 - bin/origen
-- bin/update
 - config/application.rb
 - config/boot.rb
 - config/commands.rb

data/bin/update

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-$VERBOSE = nil  # Don't care about world writable dir warnings and the like
-
-require 'pathname'
-#require 'byebug' # Un-comment to debug this file
-
-# Keep a note of the pwd at the time when Origen was first loaded, this is initially used
-# by the site_config lookup.
-$_origen_invocation_pwd ||= Pathname.pwd
-
-load File.expand_path('../../lib/origen/operating_systems.rb', __FILE__)
-load File.expand_path('../../lib/origen/site_config.rb', __FILE__)
-
-origen_root = ARGV.shift
-
-# 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')
-
-require ARGV.shift
-
-