vanagon 0.19.1 → 0.22.0

data/spec/lib/vanagon/component/source/git_spec.rb

@@ -14,8 +14,8 @@ describe "Vanagon::Component::Source::Git" do
 
   # before(:each) blocks are run before each example
   before :each do
-    allow(Git)
-      .to receive(:ls_remote)
+    allow(Vanagon::Component::Source::Git)
+      .to receive(:valid_remote?)
             .and_return(true)
 
     allow(File).to receive(:realpath).and_return(@workdir)
@@ -24,8 +24,8 @@ describe "Vanagon::Component::Source::Git" do
   describe "#initialize" do
     it "raises error on initialization with an invalid repo" do
       # Ensure initializing a repo fails without calling over the network
-      allow(Git)
-        .to receive(:ls_remote)
+      allow(Vanagon::Component::Source::Git)
+        .to receive(:valid_remote?)
               .and_return(false)
 
       expect { @klass.new(@url, ref: @ref_tag, workdir: @workdir) }
@@ -60,6 +60,7 @@ describe "Vanagon::Component::Source::Git" do
       allow(::Git).to receive(:clone).and_return(clone)
       expect(File).to receive(:realpath).and_return(@file_path)
     end
+
     it "repository" do
       git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo")
       expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path)
@@ -72,6 +73,12 @@ describe "Vanagon::Component::Source::Git" do
       expect(::Git).to receive(:clone).with(git_source.url, git_source.dirname, path: @file_path, **expected_clone_options)
       git_source.clone
     end
+
+    it 'uses a custom dirname' do
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: "/tmp/foo", dirname: 'facter-ng')
+      expect(::Git).to receive(:clone).with(git_source.url, 'facter-ng', path: @file_path)
+      git_source.clone
+    end
   end
 
   describe "#dirname" do
@@ -86,6 +93,12 @@ describe "Vanagon::Component::Source::Git" do
       expect(git_source.dirname)
         .to eq('facter')
     end
+
+    it "returns @dirname if is set" do
+      git_source = @klass.new(@url, ref: @ref_tag, workdir: @workdir, dirname: 'facter-ng')
+      expect(git_source.dirname)
+          .to eq('facter-ng')
+    end
   end
 
   describe "#ref" do

data/spec/lib/vanagon/component_spec.rb

@@ -108,6 +108,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 "false"' do
+      allow(ENV).to receive(:[]).with('VANAGON_USE_MIRRORS').and_return('false')
+      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

data/spec/lib/vanagon/platform_spec.rb

@@ -1,6 +1,33 @@
 require 'vanagon/platform'
 
 describe "Vanagon::Platform" do
+  let(:deb_platform_just_servicedir) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicedir '/etc/init.d'
+                                       end
+                                       "}
+  let(:deb_platform_just_servicetype) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv'
+                                       end
+                                       "}
+  let(:deb_platform_multi_servicetypes) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                                       plat.servicetype 'systemd', servicedir: '/lib/systemd/system'
+                                       end
+                                       "}
+  let(:deb_platform_no_service) { "platform 'debian-test-fixture' do |plat|
+                                       end
+                                       "}
+  let(:deb_platform_servicetype) { "platform 'debian-test-fixture' do |plat|
+                                       plat.servicetype 'sysv'
+                                       plat.servicedir '/etc/init.d'
+                                       end
+                                       "}
+  let(:deb_platform_bad_servicedir_block) { "platform 'debian-test-fixture' do |plat|
+                                            plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                                            plat.servicetype 'sysv', servicedir: '/etc/rc.d'
+                                            end
+                                            "}
+
   let(:platforms) do
     [
       {
@@ -172,4 +199,57 @@ describe "Vanagon::Platform" do
       end
     end
   end
+
+  describe "#get_service_type" do
+    it "returns plat.servicetype if that's the only thing set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_just_servicetype)
+      expect(plat._platform.get_service_types).to include('sysv')
+    end
+
+    it "returns from servicetypes if that's set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_servicetype)
+      expect(plat._platform.get_service_types).to include('sysv')
+    end
+
+    it "returns multiples if there's more than one" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_multi_servicetypes)
+      expect(plat._platform.get_service_types).to include('sysv')
+      expect(plat._platform.get_service_types).to include('systemd')
+    end
+
+    it "returns an empty array if nothing is set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_no_service)
+      expect(plat._platform.get_service_types.size).to eq(0)
+    end
+  end
+
+  describe "#get_service_dir" do
+    it "returns plat.servicedir if that's the only thing set" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_just_servicedir)
+      expect(plat._platform.get_service_dir).to eq('/etc/init.d')
+    end
+
+    it "returns servicedirs set via servicetype" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_servicetype)
+      expect(plat._platform.get_service_dir).to eq('/etc/init.d')
+    end
+
+    it "returns the servicedir based on servicetype" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_multi_servicetypes)
+      expect(plat._platform.get_service_dir('systemd')).to eq('/lib/systemd/system')
+    end
+
+    it "fails if there are >1 servicedir for a service type" do
+      plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+      plat.instance_eval(deb_platform_bad_servicedir_block)
+      expect { plat._platform.get_service_dir('sysv') }.to raise_error(Vanagon::Error)
+    end
+  end
 end

data/spec/lib/vanagon/utilities/extra_files_signer_spec.rb

@@ -0,0 +1,123 @@
+require 'vanagon/platform'
+require 'vanagon/project'
+require 'vanagon/utilities/extra_files_signer'
+
+describe Vanagon::Utilities::ExtraFilesSigner do
+  let(:platform_block) do
+    %( platform "osx-11-x86_64" do |plat|
+    end
+    )
+  end
+  let (:project_block) do
+    <<-HERE.undent
+      project 'test-fixture' do |proj|
+        proj.version '0.0.0'
+      end
+    HERE
+  end
+  let(:configdir) { '/a/b/c' }
+  let(:platform) { Vanagon::Platform::DSL.new('osx-11-x86_64') }
+  let(:project) do
+    Vanagon::Project::DSL.new('test-fixture', configdir, platform._platform, [])
+  end
+  let(:mktemp) { '/tmp/xyz' }
+  let(:source_dir) { '/dir/source_dir' }
+
+  before do
+    allow(VanagonLogger).to receive(:error)
+    platform.instance_eval(platform_block)
+    project.instance_eval(project_block)
+    allow(Vanagon::Utilities).to receive(:remote_ssh_command).and_return(mktemp)
+  end
+
+  describe '.commands' do
+    context 'without extra files to sign' do
+      it 'returns empty array' do
+        commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+        expect(commands).to eql([])
+      end
+    end
+
+    context 'with extra files to sign' do
+      let (:project_block) do
+        <<-HERE.undent
+          project 'test-fixture' do |proj|
+            proj.version '0.0.0'
+            proj.extra_file_to_sign '/test1/a.rb'
+            proj.extra_file_to_sign '/test2/b.rb'
+            proj.signing_hostname('abc')
+            proj.signing_username('test')
+             proj.signing_command('codesign')
+          end
+        HERE
+      end
+
+      context 'when it cannot connect to signing hostname' do
+        before do
+          allow(Vanagon::Utilities).to receive(:remote_ssh_command)
+            .with('test@abc', '/tmp/xyz 2>/dev/null', return_command_output: true)
+            .and_raise RuntimeError
+        end
+
+        it 'returns empty array' do
+          commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          expect(commands).to eql([])
+        end
+
+        it 'logs error' do
+          Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          expect(VanagonLogger).to have_received(:error).with(/Unable to connect to test@abc/)
+        end
+
+        it 'fails the build if VANAGON_FORCE_SIGNING is set' do
+          allow(ENV).to receive(:[]).with('VANAGON_FORCE_SIGNING').and_return('true')
+          expect {
+            Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+          }.to raise_error(RuntimeError)
+        end
+      end
+
+      context 'when success' do
+        context 'when macos' do
+          it 'generates signing commands for each file using --extended-attributes' do
+            commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+            expect(commands).to match(
+              [
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group --extended-attributes test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+              ]
+            )
+          end
+        end
+
+        context 'when other platform' do
+          let(:platform_block) do
+            %( platform "windows-2012r2-x86_64" do |plat|
+            end
+            )
+          end
+
+          let(:platform) { Vanagon::Platform::DSL.new('windows-2012r2-x86_64') }
+
+          it 'generates signing commands for each file' do
+            commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
+            expect(commands).to match(
+              [
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test1/a.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/a.rb $(tempdir)/dir/source_dir/test1/a.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  $(tempdir)/dir/source_dir/test2/b.rb test@abc:/tmp/xyz",
+                "/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc codesign /tmp/xyz/b.rb",
+                "rsync -e '/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group  test@abc:/tmp/xyz/b.rb $(tempdir)/dir/source_dir/test2/b.rb"
+              ]
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/spec/lib/vanagon/utilities_spec.rb

@@ -72,12 +72,15 @@ describe "Vanagon::Utilities" do
   describe '#local_command' do
     it 'runs commands in an unpolluted environment' do
       cmd = lambda { |arg| %(echo 'if [ "$#{arg}" = "" ]; then exit 0; else exit 1; fi' | /bin/sh) }
-      vars = %w(BUNDLE_BIN_PATH BUNDLE_GEMFILE)
+      vars = %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE]
       vars.each do |var|
         Vanagon::Utilities.local_command(cmd.call(var))
         expect($?.exitstatus).to eq(0)
       end
     end
+    it 'raises a RuntimeError when given a bad thing' do
+      expect { Vanagon::Utilities.local_command('__bogus__comand__') }.to raise_error(RuntimeError)
+    end
   end
 
   describe '#ssh_command' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: fustigit
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,35 @@ files:
 - lib/vanagon/patch.rb
 - lib/vanagon/platform.rb
 - lib/vanagon/platform/deb.rb
+- lib/vanagon/platform/defaults/debian-10-amd64.rb
+- lib/vanagon/platform/defaults/debian-11-amd64.rb
+- lib/vanagon/platform/defaults/debian-8-amd64.rb
+- lib/vanagon/platform/defaults/debian-8-i386.rb
+- lib/vanagon/platform/defaults/debian-9-amd64.rb
+- lib/vanagon/platform/defaults/debian-9-i386.rb
+- lib/vanagon/platform/defaults/el-6-i386.rb
+- lib/vanagon/platform/defaults/el-6-x86_64.rb
+- lib/vanagon/platform/defaults/el-7-aarch64.rb
+- lib/vanagon/platform/defaults/el-7-x86_64.rb
+- lib/vanagon/platform/defaults/el-8-aarch64.rb
+- lib/vanagon/platform/defaults/el-8-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-30-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-31-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-32-x86_64.rb
+- lib/vanagon/platform/defaults/fedora-34-x86_64.rb
+- lib/vanagon/platform/defaults/osx-10.14-x86_64.rb
+- lib/vanagon/platform/defaults/osx-10.15-x86_64.rb
+- lib/vanagon/platform/defaults/osx-11-x86_64.rb
+- lib/vanagon/platform/defaults/redhatfips-7-x86_64.rb
+- lib/vanagon/platform/defaults/sles-12-x86_64.rb
+- lib/vanagon/platform/defaults/sles-15-x86_64.rb
+- lib/vanagon/platform/defaults/solaris-11-i386.rb
+- lib/vanagon/platform/defaults/solaris-11-sparc.rb
+- lib/vanagon/platform/defaults/ubuntu-16.04-amd64.rb
+- lib/vanagon/platform/defaults/ubuntu-16.04-i386.rb
+- lib/vanagon/platform/defaults/ubuntu-18.04-amd64.rb
+- lib/vanagon/platform/defaults/ubuntu-20.04-aarch64.rb
+- lib/vanagon/platform/defaults/ubuntu-20.04-amd64.rb
 - lib/vanagon/platform/dsl.rb
 - lib/vanagon/platform/osx.rb
 - lib/vanagon/platform/rpm.rb
@@ -165,6 +194,7 @@ files:
 - lib/vanagon/project.rb
 - lib/vanagon/project/dsl.rb
 - lib/vanagon/utilities.rb
+- lib/vanagon/utilities/extra_files_signer.rb
 - lib/vanagon/utilities/shell_utilities.rb
 - resources/Makefile.erb
 - resources/deb/changelog.erb
@@ -266,6 +296,7 @@ files:
 - spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
 - spec/spec_helper.rb
@@ -293,41 +324,42 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
 - spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/component_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
 - spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/driver_spec.rb