vanagon 0.15.15 → 0.15.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a479ccb554a2a480e5a1f7f7cd9f7e89a5ae5635
-  data.tar.gz: 64f0995acc0459921a607f17d3ebb0b825f0989f
+  metadata.gz: 1b603b93508df9cf3db7210c0117177e3118daf5
+  data.tar.gz: 8f474685a3f839083f73bc376554b189dc19bc1f
 SHA512:
-  metadata.gz: d7eb69451fccf9045fbe6f6cafe82a7339b24eed72c71bf517858c87db94eff2441f0addec52ba30149addf2fe7affc9ff300ccfb17f20b8362b724f813112ef
-  data.tar.gz: 9adf6c7d19853763c218fa9a88f11a177394742821ec148e38c02ceed7bac84f27f52846b4fd70045beb81831a2811beacb4edcaff4c93bf58396cc16b01ebc1
+  metadata.gz: 8f724892ba32a35bacbe178a070577769f91b9dde5b8c773d79d1c04813896d2cf925c35052ea41749cda78b8291e34e634fae85b2b734f97ff4faba50518742
+  data.tar.gz: 4cfffe0d845bc0d1a0fe4a7c49f59c79863036e09ce4d76da0f4dcbd2ebdd5fb0a39deae9625a70012f2f5753dbd2e22a8bd97078c152e3c13c59f7dde2e11f2

data/README.md

@@ -176,6 +176,13 @@ when using the hardware engine. It defaults to *redis*, with no domain.
 ##### `LOCK_MANAGER_PORT`
 Port of the system where redis is running. Defaults to *6379*.
 
+##### `VANAGON_USE_MIRRORS`
+Controls whether component sources are downloaded directly from upstream URLs
+or from configured mirrors. Most Puppet projects using Vanagon default to
+fetching components from internal mirrors. Set this variable to `n` when
+building outside of the Puppet private network to download directly from
+upstream sources.
+
 ##### `VANAGON_RETRY_COUNT`
 Some phases of compilation support retries. The default value is *1* but
 setting to any integer value greater than 1 will causes these components

data/lib/vanagon/component.rb

@@ -284,7 +284,11 @@ class Vanagon
     def get_source(workdir) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
       opts = options.merge({ workdir: workdir })
       if url || !mirrors.empty?
-        fetch_mirrors(opts) || fetch_url(opts)
+        if ENV['VANAGON_USE_MIRRORS'] == 'n'
+          fetch_url(opts)
+        else
+          fetch_mirrors(opts) || fetch_url(opts)
+        end
         source.verify
         extract_with << source.extract(platform.tar) if source.respond_to? :extract
 

data/resources/solaris/11/p5m.erb

@@ -26,13 +26,6 @@ depend fmri=pkg:/<%= requirement %> type=require
 <transform dir path=usr$ -> drop>
 <transform dir path=var$ -> drop>
 
-# (CPR-251) In solaris 11, /var/run is a symlink to /system/volatile, which
-# causes conflicts during package installation. To avoid this, we transform any
-# directory under /var/run to repoint under /system/volatile and drop
-# /system/volatile itself to avoid conflicts.
-<transform dir -> edit path var/run system/volatile>
-<transform dir path=system/volatile$ -> drop>
-
 <%- get_root_directories.each do |dir| -%>
 <transform dir path=<%= strip_and_escape(dir.split('/')[0..-2].join('/')) %>$ -> drop>
 <%- end -%>

data/spec/lib/vanagon/component_spec.rb

@@ -95,6 +95,18 @@ describe "Vanagon::Component" do
       expect(subject).to receive(:fetch_url)
       subject.get_source(@workdir)
     end
+
+    it 'retrieves from a canonical URI if VANAGON_USE_MIRRORS is set to "n"' do
+      allow(ENV).to receive(:[]).with('VANAGON_USE_MIRRORS').and_return('n')
+      allow(subject)
+        .to receive(:fetch_url)
+        .and_return(true)
+
+      # We expect #get_source to skip mirrors
+      expect(subject).not_to receive(:fetch_mirrors)
+      expect(subject).to receive(:fetch_url)
+      subject.get_source(@workdir)
+    end
   end
 
   describe "#get_sources" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.15
+  version: 0.15.16
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.