origen 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33946b9e75374a0ba93e52a3923251d6c16e6a43
-  data.tar.gz: 37fe2e0d1c5881fe7f2ec06374d23febf07c16f7
+  metadata.gz: 6a2ffd1baf04606a1952e522d9190b9c9c0e038a
+  data.tar.gz: a27a278c0fdb4f16281b1d5db83e91c52e1c08e0
 SHA512:
-  metadata.gz: 377a04b40b24eb727493cbfa2783fd29815ac116a18aaa906bb2f1909f6ba8034e61595fc885979fbd6b6c54c495e5440d387b8207fcace71b3769aa85d4e96e
-  data.tar.gz: 0e3855b23ad1d6767f7d5547cf365b94d6b1e7e91b0c506f11a7d6b46bff0f9bd6ca1fe1f4b0a54d8e51e96971190e1d0a33533cee761a1899f621ba92138249
+  metadata.gz: f79c467226a03fcd2fe8a386d655e6d34601d5f0176de6fdbd96da5d3fead88c560a3443c57ed2c883acb1a775b246fd33c9ed506ae7edf9dc96825f024ea76e
+  data.tar.gz: cc795d2f261f34a84ac224fa4e0582cfc64fa21d49be533fb0dadbbe61878922ecbd6b28d6ebb08aea49520b8ddb5abdcbcb7c618ecfd79b8a067acb01d869e0

data/bin/origen

@@ -121,6 +121,8 @@ 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.
@@ -134,16 +136,29 @@ if origen_root && File.exist?(ENV['BUNDLE_GEMFILE']) && Origen.site_config.gem_m
                   (spec.executables || []).each do |bin|
                     FileUtils.cp("#{spec.bin_dir}/#{bin}", "#{local_gem_dir}/bin")
                   end
-                  FileUtils.cp(spec.cache_file, "#{local_gem_dir}/cache")
+                  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
                     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
                   end
-                  FileUtils.cp_r(spec.gem_dir, "#{local_gem_dir}/gems")
-                  FileUtils.cp(spec.spec_file, "#{local_gem_dir}/specifications")
+ 
+                   # If the file exists in the gem directory, skip copying it over.
+                   if !File.exist?(spec.gem_dir)
+                    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)
+                    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

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 12
+  BUGFIX = 13
   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.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-02 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.6.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit