vanagon 0.11.3 → 0.12.0

data/spec/lib/vanagon/component_spec.rb

@@ -44,6 +44,55 @@ describe "Vanagon::Component" do
     end
   end
 
+  describe "#get_source" do
+    before :each do
+      @workdir = Dir.mktmpdir
+      @fake_tar = "file://spec/fixtures/files/fake_file.txt.tar.gz"
+    end
+
+    subject do
+      # Initialize a new instance of Vanagon::Component and define a
+      # new secondary source that's *uncompressed*. We can now reason about
+      # this instance and test behavior for retrieving secondary sources.
+      Vanagon::Component.new('build-dir-test', {}, {}).tap do |comp|
+        comp.url = @fake_tar
+      end
+    end
+
+    before do
+      allow(subject)
+        .to receive(:source)
+        .and_return(OpenStruct.new(verify: true))
+    end
+
+    it "attempts to retrieve from a mirror before a canonical URI" do
+      allow(subject)
+        .to receive(:fetch_url)
+        .and_return(false)
+
+      allow(subject)
+        .to receive(:fetch_mirrors)
+        .and_return(true)
+
+      expect(subject).to receive(:fetch_mirrors)
+      expect(subject).not_to receive(:fetch_url)
+
+      subject.get_source(@workdir)
+    end
+
+    it "retrieves from a canonical URI if mirrors are unavailable" do
+      allow(subject)
+        .to receive(:fetch_url)
+        .and_return(true)
+
+      # We expect #get_source to attempt to use a mirror...
+      expect(subject).to receive(:fetch_mirrors).and_return(false)
+      # But we also expect it to fail when it tries #mirrors.
+      expect(subject).to receive(:fetch_url)
+      subject.get_source(@workdir)
+    end
+  end
+
   describe "#get_sources" do
     before :each do
       @workdir = Dir.mktmpdir
@@ -55,17 +104,18 @@ describe "Vanagon::Component" do
 
     subject do
       # Initialize a new instance of Vanagon::Component and define a
-      # new secondary source that's *uncompressed*. We can now reason about 
+      # new secondary source that's *uncompressed*. We can now reason about
       # this instance and test behavior for retrieving secondary sources.
       Vanagon::Component.new('build-dir-test', {}, {}).tap do |comp|
         comp.sources << OpenStruct.new(url: @fake_file)
+        comp.mirrors << @fake_tar
       end
-    end  
+    end
 
     it "copies uncompressed secondary sources into the workdir" do
       subject.get_sources(@workdir)
       expect(File.exist?(File.join(@workdir, @file_name))).to be true
-    end  
+    end
 
     subject do
       # Initialize a new instance of Vanagon::Component and define a

data/spec/lib/vanagon/platform/rpm_spec.rb

@@ -26,6 +26,12 @@ describe 'Vanagon::Platform::RPM' do
         end
       end
 
+      describe '#source_output_dir' do
+        it "includes 'SRPMS'" do
+          expect(subject.source_output_dir).to include('SRPMS')
+        end
+      end
+
       describe "#dist" do
         it "uses explicit values when available" do
           expect(subject.dist).to eq(derived_dist) unless platform[:dist]

data/spec/lib/vanagon/platform_spec.rb

@@ -4,41 +4,51 @@ describe "Vanagon::Platform" do
   let(:platforms) do
     [
       {
-        :name                    => "debian-6-i386",
-        :os_name                 => "debian",
-        :os_version              => "6",
-        :architecture            => "i386",
-        :output_dir              => "deb/lucid/",
-        :output_dir_with_target  => "deb/lucid/thing",
-        :output_dir_empty_string => "deb/lucid/",
-        :block                   => %Q[
+        :name                           => "debian-6-i386",
+        :os_name                        => "debian",
+        :os_version                     => "6",
+        :architecture                   => "i386",
+        :output_dir                     => "deb/lucid/",
+        :output_dir_with_target         => "deb/lucid/thing",
+        :output_dir_empty_string        => "deb/lucid/",
+        :source_output_dir              => "deb/lucid/",
+        :source_output_dir_with_target  => "deb/lucid/thing",
+        :source_output_dir_empty_string => "deb/lucid/",
+        :block                          => %Q[
           platform "debian-6-i386" do |plat|
             plat.codename "lucid"
           end ],
       },
       {
-        :name                    => "el-5-i386",
-        :os_name                 => "el",
-        :os_version              => "5",
-        :architecture            => "i386",
-        :output_dir              => "el/5/products/i386",
-        :output_dir_with_target  => "el/5/thing/i386",
-        :output_dir_empty_string => "el/5/i386",
-        :block                   => %Q[ platform "el-5-i386" do |plat| end ],
+        :name                           => "el-5-i386",
+        :os_name                        => "el",
+        :os_version                     => "5",
+        :architecture                   => "i386",
+        :output_dir                     => "el/5/products/i386",
+        :output_dir_with_target         => "el/5/thing/i386",
+        :output_dir_empty_string        => "el/5/i386",
+        :source_output_dir              => "el/5/products/SRPMS",
+        :source_output_dir_with_target  => "el/5/thing/SRPMS",
+        :source_output_dir_empty_string => "el/5/SRPMS",
+        :block                          => %Q[ platform "el-5-i386" do |plat| end ],
       },
       {
-        :name                    => "debian-6-i386",
-        :os_name                 => "debian",
-        :os_version              => "6",
-        :codename                => "lucid",
-        :architecture            => "i386",
-        :output_dir              => "updated/output",
-        :output_dir_with_target  => "updated/output",
-        :output_dir_empty_string => "updated/output",
-        :block                   => %Q[
+        :name                           => "debian-6-i386",
+        :os_name                        => "debian",
+        :os_version                     => "6",
+        :codename                       => "lucid",
+        :architecture                   => "i386",
+        :output_dir                     => "updated/output",
+        :output_dir_with_target         => "updated/output",
+        :output_dir_empty_string        => "updated/output",
+        :source_output_dir              => "updated/sources",
+        :source_output_dir_with_target  => "updated/sources",
+        :source_output_dir_empty_string => "updated/sources",
+        :block                          => %Q[
           platform "debian-6-i386" do |plat|
             plat.codename "lucid"
             plat.output_dir "updated/output"
+            plat.source_output_dir "updated/sources"
           end ],
       },
     ]
@@ -88,6 +98,33 @@ describe "Vanagon::Platform" do
     end
   end
 
+  describe "#source_output_dir" do
+    it "returns correct source dir" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.source_output_dir).to eq(plat[:source_output_dir])
+      end
+    end
+
+    it "adds the target repo in the right way" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.source_output_dir('thing')).to eq(plat[:source_output_dir_with_target])
+      end
+    end
+
+    it "does the right thing with empty strings" do
+      platforms.each do |plat|
+        cur_plat = Vanagon::Platform::DSL.new(plat[:name])
+        cur_plat.instance_eval(plat[:block])
+        expect(cur_plat._platform.source_output_dir('')).to eq(plat[:source_output_dir_empty_string])
+      end
+    end
+  end
+
+
   describe "#architecture" do
     it "returns the architecture for the platform" do
       platforms.each do |plat|

data/spec/lib/vanagon/project/dsl_spec.rb

@@ -142,6 +142,28 @@ end" }
     end
   end
 
+  describe '#generate_source_artifacts' do
+    it 'defaults to false' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      expect(proj._project.source_artifacts).to eq(false)
+    end
+
+    it 'sets source_artifacts to true' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      proj.generate_source_artifacts true
+      expect(proj._project.source_artifacts).to eq(true)
+    end
+
+    it 'sets source_artifacts to false' do
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+      proj.generate_source_artifacts false
+      expect(proj._project.source_artifacts).to eq(false)
+    end
+  end
+
   describe '#identifier' do
     it 'sets the identifier for the project' do
       proj = Vanagon::Project::DSL.new('test-fixture', {})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.12.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-12 00:00:00.000000000 Z
+date: 2017-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -88,6 +88,7 @@ files:
 - lib/vanagon/component/source/git.rb
 - lib/vanagon/component/source/http.rb
 - lib/vanagon/component/source/local.rb
+- lib/vanagon/component/source/rewrite.rb
 - lib/vanagon/driver.rb
 - lib/vanagon/engine/always_be_scheduling.rb
 - lib/vanagon/engine/base.rb
@@ -190,6 +191,7 @@ files:
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/driver_spec.rb
@@ -237,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
@@ -250,6 +252,7 @@ test_files:
 - spec/lib/vanagon/component/source/git_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/driver_spec.rb