vanagon 0.13.1 → 0.14.1

data/lib/vanagon/project/dsl.rb

@@ -157,6 +157,20 @@ class Vanagon
         @project.source_artifacts = source_artifacts
       end
 
+      # Generate os-specific packaging artifacts (rpm, deb, etc)
+      #
+      # @param pkg [Boolean] whether or not to output packages
+      def generate_packages(pkg)
+        @project.generate_packages = pkg
+      end
+
+      # Output os-specific archives containing the binary output
+      #
+      # @param archive [Boolean] whether or not to output archives
+      def generate_archives(archive)
+        @project.compiled_archive = archive
+      end
+
       # Sets the version for the project based on a git describe of the
       # directory that holds the configs. Requires that a git tag be present
       # and reachable from the current commit in that repository.
@@ -286,6 +300,15 @@ class Vanagon
         @project.retry_count = retry_count
       end
 
+      # Inherit the settings hash from an upstream project
+      #
+      # @param upstream_project_name [String] The vanagon project to load settings from
+      # @param upstream_git_url [String] The git URL for the vanagon project to load settings from
+      # @param upstream_git_branch [String] The git branch for the vanagon project to load settings from
+      def inherit_settings(upstream_project_name, upstream_git_url, upstream_git_branch)
+        @project.load_upstream_settings(upstream_project_name, upstream_git_url, upstream_git_branch)
+      end
+
       # Set a package override. Will call the platform-specific implementation
       # This will get set in the spec file, deb rules, etc.
       #

data/lib/vanagon/utilities.rb

@@ -52,6 +52,7 @@ class Vanagon
     def http_request(url, type, payload = {}.to_json, header = nil) # rubocop:disable Metrics/AbcSize
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
 
       case type.downcase
       when "get"
@@ -131,7 +132,7 @@ class Vanagon
     # @param timeout [Integer] number of seconds to run the block before timing out
     # @return [true] If the block succeeds, true is returned
     # @raise [Vanagon::Error] if the block fails after the retries are exhausted, an error is raised
-    def retry_with_timeout(tries = 5, timeout = 1, &blk)
+    def retry_with_timeout(tries = 5, timeout = 1, &blk) # rubocop:disable Metrics/AbcSize
       error = nil
       tries.to_i.times do
         Timeout::timeout(timeout.to_i) do
@@ -146,7 +147,9 @@ class Vanagon
       end
 
       message = "Block failed maximum number of #{tries} tries"
-      message += "\n with error #{error.message}" unless error.nil?
+      unless error.nil?
+        message += "\n with error #{error.message}" + "\n#{error.backtrace.join("\n")}"
+      end
       message += "\nExiting..."
       raise error, message unless error.nil?
       raise Vanagon::Error, "Block failed maximum number of #{tries} tries"

data/resources/deb/postinst.erb

@@ -44,6 +44,23 @@ fi
   <%- end -%>
 <%- end -%>
 
+# Run trigger scripts on install if defined
+if [ $1 = triggered ] && [ -z $2 ]; then
+<%- get_interest_triggers("install").each do |trigger| -%>
+<%= trigger.scripts.join("\n") %>
+<%- end -%>
+: # no trigger scripts provided
+fi
+
+# Run trigger scripts on upgrade if defined
+if [ $1 = triggered ]&& [ -n $2 ]; then
+<%- get_interest_triggers("upgrade").each do |trigger| -%>
+  <%= trigger.scripts.join("\n") %>
+<%- end -%>
+: # no trigger scripts provided
+fi
+
+
 # Run postinstall scripts on install if defined
 if [ $1 = configure ] && [ -z $2 ] ; then
   <%= get_postinstall_actions("install") %>

data/resources/deb/triggers.erb

@@ -0,0 +1,11 @@
+<%- get_activate_triggers.each do |trigger| -%>
+activate <%= trigger %>
+<% end -%>
+
+<%- get_interest_triggers("install").each do |trigger| -%>
+interest <%= trigger.interest_name %>
+<% end -%>
+
+<%-	get_interest_triggers("upgrade").each do |trigger| -%>
+interest <%= trigger.interest_name %>
+<% end -%>

data/resources/rpm/project.spec.erb

@@ -149,11 +149,11 @@ install -d %{buildroot}
 <%- end -%>
 
 # Here we turn all dirs in the file-list into %dir entries to avoid duplicate files
-for entry in `cat %{SOURCE1}`; do
+while read entry; do
   if [ -n "$entry" -a -d "$entry" -a ! -L "$entry" ]; then
     PATH=/opt/freeware/bin:$PATH sed -i "s|^\($entry\)\$|%dir \1|g" %{SOURCE1}
   fi
-done
+done < %{SOURCE1}
 
 
 %pre
@@ -185,6 +185,22 @@ if [ "$1" -gt 1 ] ; then
 fi
 
 
+<%- get_all_trigger_pkgs.each do |pkg| %>
+
+%triggerin -- <%= pkg %>
+# Run scripts on install if defined
+[ $2 = 0 ] || exit 0
+if [ "$1" -eq 1 ] ; then
+  <%= get_install_trigger_scripts(pkg) %>
+  : # end line
+fi
+elif ["$1" -gt 1 ] ;
+  <%= get_upgrade_trigger_scripts(pkg) %>
+  : # end line
+fi
+<% end -%>
+
+
 %post
 <%- if @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
 ## EL-4 and AIX RPM don't have %posttrans, so we'll put them here

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

@@ -65,6 +65,10 @@ end" }
   let(:dummy_sha1_sum) { "fdaa03c3f506d7b71635f2c32dfd41b0cc8b904f" }
   let(:dummy_sha256_sum) { "fd9c922702eb2e2fb26376c959753f0fc167bb6bc99c79262fcff7bcc8b34be1" }
   let(:dummy_sha512_sum) { "8feda1e9896be618dd6c65120d10afafce93888df8569c598f52285083c23befd1477da5741939d4eae042f822e45ca2e45d8d4d18cf9224b7acaf71d883841e" }
+  let(:dummy_md5_url) { "http://example.com/example.tar.gz.md5" }
+  let(:dummy_sha1_url) { "http://example.com/example.tar.gz.sha1" }
+  let(:dummy_sha256_url) { "http://example.com/example.tar.gz.sha256" }
+  let(:dummy_sha512_url) { "http://example.com/example.tar.gz.sha512" }
 
   before do
     allow(platform).to receive(:install).and_return('install')
@@ -80,6 +84,13 @@ end" }
       expect(comp._component.options[:sum]).to eq(dummy_md5_sum)
       expect(comp._component.options[:sum_type]).to eq('md5')
     end
+    it "sets md5 url and type correctly" do
+      comp = Vanagon::Component::DSL.new('test-fixture', {}, {})
+      comp.md5sum(dummy_md5_url)
+
+      expect(comp._component.options[:sum]).to eq(dummy_md5_url)
+      expect(comp._component.options[:sum_type]).to eq('md5')
+    end
   end
 
   describe "#sha1sum" do
@@ -90,6 +101,13 @@ end" }
       expect(comp._component.options[:sum]).to eq(dummy_sha1_sum)
       expect(comp._component.options[:sum_type]).to eq('sha1')
     end
+    it "sets sha1 url and type correctly" do
+      comp = Vanagon::Component::DSL.new('test-fixture', {}, {})
+      comp.sha1sum(dummy_sha1_url)
+
+      expect(comp._component.options[:sum]).to eq(dummy_sha1_url)
+      expect(comp._component.options[:sum_type]).to eq('sha1')
+    end
   end
 
   describe "#sha256sum" do
@@ -100,6 +118,13 @@ end" }
       expect(comp._component.options[:sum]).to eq(dummy_sha256_sum)
       expect(comp._component.options[:sum_type]).to eq('sha256')
     end
+    it "sets sha256 url and type correctly" do
+      comp = Vanagon::Component::DSL.new('test-fixture', {}, {})
+      comp.sha256sum(dummy_sha256_url)
+
+      expect(comp._component.options[:sum]).to eq(dummy_sha256_url)
+      expect(comp._component.options[:sum_type]).to eq('sha256')
+    end
   end
 
   describe "#sha512sum" do
@@ -110,6 +135,13 @@ end" }
       expect(comp._component.options[:sum]).to eq(dummy_sha512_sum)
       expect(comp._component.options[:sum_type]).to eq('sha512')
     end
+    it "sets sha512 url and type correctly" do
+      comp = Vanagon::Component::DSL.new('test-fixture', {}, {})
+      comp.sha512sum(dummy_sha512_url)
+
+      expect(comp._component.options[:sum]).to eq(dummy_sha512_url)
+      expect(comp._component.options[:sum_type]).to eq('sha512')
+    end
   end
 
   describe '#load_from_json' do
@@ -337,7 +369,7 @@ end" }
   end
 
   describe '#add_actions' do
-    it 'adds the corect preinstall action to the component' do
+    it 'adds the correct preinstall action to the component' do
       comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
       comp.add_preinstall_action(['install', 'upgrade'], ['chkconfig --list', '/bin/true'])
       comp.add_preinstall_action('install', 'echo "hello, world"')
@@ -365,6 +397,64 @@ end" }
       expect { comp.add_preinstall_action([], '/bin/true') }.to raise_error(Vanagon::Error)
     end
 
+    # trigger spec testing
+    it 'adds the correct trigger action to the component' do
+      comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
+      comp.add_rpm_install_triggers(['install', 'upgrade'], ['chkconfig --list', '/bin/true'], 'puppet-agent')
+      comp.add_rpm_install_triggers('install', 'echo "hello, world"', 'puppet-agent')
+      expect(comp._component.install_triggers.count).to eq(2)
+      expect(comp._component.install_triggers.first.scripts.count).to eq(2)
+      expect(comp._component.install_triggers.first.pkg_state.count).to eq(2)
+      expect(comp._component.install_triggers.first.pkg_state.first).to eq('install')
+      expect(comp._component.install_triggers.first.pkg_state.last).to eq('upgrade')
+      expect(comp._component.install_triggers.first.scripts.first).to eq('chkconfig --list')
+      expect(comp._component.install_triggers.first.scripts.last).to eq('/bin/true')
+      expect(comp._component.install_triggers.first.pkg).to eq ('puppet-agent')
+
+      expect(comp._component.install_triggers.last.scripts.count).to eq(1)
+      expect(comp._component.install_triggers.last.pkg_state.count).to eq(1)
+      expect(comp._component.install_triggers.last.pkg_state.first).to eq('install')
+      expect(comp._component.install_triggers.last.scripts.first).to eq('echo "hello, world"')
+      expect(comp._component.install_triggers.last.pkg).to eq('puppet-agent')
+    end
+
+    it 'fails with bad install trigger action' do
+      comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
+      expect { comp.add_rpm_install_triggers('foo', '/bin/true', 'puppet-agent') }.to raise_error(Vanagon::Error)
+    end
+
+    it 'fails with empty install trigger action' do
+      comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
+      expect { comp.add_rpm_install_triggers([], '/bin/true', 'puppet-agent') }.to raise_error(Vanagon::Error)
+    end
+
+    it 'adds debian interest triggers' do
+      comp = Vanagon::Component::DSL.new('action-test', {}, '')
+      comp.add_debian_interest_triggers(['install', 'upgrade'], ['chkconfig --list', '/bin/true'], 'puppet-agent-interest')
+      comp.add_debian_interest_triggers('install', 'echo "hello, world"', 'puppet-agent-interest')
+      expect(comp._component.interest_triggers.count).to eq(2)
+      expect(comp._component.interest_triggers.first.scripts.count).to eq(2)
+      expect(comp._component.interest_triggers.first.pkg_state.count).to eq(2)
+      expect(comp._component.interest_triggers.first.pkg_state.first).to eq('install')
+      expect(comp._component.interest_triggers.first.pkg_state.last).to eq('upgrade')
+      expect(comp._component.interest_triggers.first.scripts.first).to eq('chkconfig --list')
+      expect(comp._component.interest_triggers.first.scripts.last).to eq('/bin/true')
+      expect(comp._component.interest_triggers.first.interest_name).to eq ('puppet-agent-interest')
+
+      expect(comp._component.interest_triggers.last.scripts.count).to eq(1)
+      expect(comp._component.interest_triggers.last.pkg_state.count).to eq(1)
+      expect(comp._component.interest_triggers.last.pkg_state.first).to eq('install')
+      expect(comp._component.interest_triggers.last.scripts.first).to eq('echo "hello, world"')
+      expect(comp._component.interest_triggers.last.interest_name).to eq('puppet-agent-interest')
+    end
+
+    it 'adds debian activate triggers' do
+      comp = Vanagon::Component::DSL.new('action-test', {}, '')
+      comp.add_debian_activate_triggers('puppet-agent-activate')
+      expect(comp._component.activate_triggers.count).to eq(1)
+      expect(comp._component.activate_triggers.first.activate_name).to eq ('puppet-agent-activate')
+    end
+
     it 'adds the corect postinstall action to the component' do
       comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
       comp.add_postinstall_action(['install', 'upgrade'], ['chkconfig --list', '/bin/true'])
@@ -393,7 +483,7 @@ end" }
       expect { comp.add_postinstall_action([], '/bin/true') }.to raise_error(Vanagon::Error)
     end
 
-    it 'adds the corect preremove action to the component' do
+    it 'adds the correct preremove action to the component' do
       comp = Vanagon::Component::DSL.new('action-test', {}, dummy_platform_sysv)
       comp.add_preremove_action(['removal', 'upgrade'], ['chkconfig --list', '/bin/true'])
       comp.add_preremove_action('removal', 'echo "hello, world"')

data/spec/lib/vanagon/component/rules_spec.rb

@@ -292,4 +292,88 @@ describe Vanagon::Component::Rules do
       expect(rule.recipe).to eq(["[ -d /foo/bar ] && rm -r /foo/bar", "[ -e leatherman-unpack ] && rm leatherman-unpack"])
     end
   end
+
+  describe "With `Vanagon::Component.install_only = true`" do
+    before do
+      component.install_only = true
+    end
+
+    context "the component rule" do
+      it "depends on the component-install rule" do
+        rule = subject.component_rule
+        expect(rule.dependencies).to eq(["leatherman-install"])
+      end
+    end
+
+    context "the install rule" do
+      let(:rule) { subject.install_rule }
+
+      it { expect(rule.dependencies).to be_empty }
+
+      it "does nothing when the install step is empty" do
+        expect(rule.recipe.size).to eq 1
+      end
+
+      it "runs all of the install commands when given" do
+        component.install = ["make install", "make reallyinstall"]
+        expect(rule.recipe.first).to eq(
+          [
+            "make install",
+            "make reallyinstall",
+          ].join(" && \\\n")
+        )
+      end
+
+      it "sets environment variables before running the install steps" do
+        component.install = ["make install", "make reallyinstall"]
+        component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
+        expect(rule.recipe.first).to eq(
+          [
+            'export PATH="/opt/pl-build-tools/bin:$(PATH)"',
+            "make install",
+            "make reallyinstall"
+          ].join(" && \\\n")
+        )
+      end
+
+      it_behaves_like "a rule that touches the target file"
+    end
+
+    context "the clean rule" do
+      let(:rule) { subject.clean_rule }
+
+      it { expect(rule.dependencies).to be_empty }
+
+      it "runs a `make clean` in the build dir" do
+        expect(rule.recipe.first).to eq '[ -d /foo/bar ] && cd /foo/bar && /usr/bin/make clean'
+      end
+
+      it "remotes the touch files for the configure, build, and install steps" do
+        %w[configure build install].each_with_index do |type, i|
+          touchfile = "leatherman-#{type}"
+          expect(rule.recipe[i + 1]).to eq "[ -e #{touchfile} ] && rm #{touchfile}"
+        end
+      end
+    end
+
+    context "the clobber rule" do
+      let(:rule) { subject.clobber_rule }
+
+      it { expect(rule.dependencies).to eq(['leatherman-clean']) }
+
+      it "removes the source directory and unpack touchfile" do
+        expect(rule.recipe).to eq(["[ -d /foo/bar ] && rm -r /foo/bar", "[ -e leatherman-unpack ] && rm leatherman-unpack"])
+      end
+    end
+
+    context "the clobber rule" do
+      let(:rule) { subject.clobber_rule }
+
+      it { expect(rule.dependencies).to eq(['leatherman-clean']) }
+
+      it "removes the source directory and unpack touchfile" do
+        expect(rule.recipe).to eq(["[ -d /foo/bar ] && rm -r /foo/bar", "[ -e leatherman-unpack ] && rm leatherman-unpack"])
+      end
+    end
+  end
 end

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

@@ -1,7 +1,7 @@
 require 'vanagon/component/source/git'
 
 describe "Vanagon::Component::Source::Http" do
-  let (:base_url) { 'http://buildsources.delivery.puppetlabs.net' }
+  let (:base_url) { 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/buildsources/' }
   let (:file_base) { 'thing-1.2.3' }
   let (:tar_filename) { 'thing-1.2.3.tar.gz' }
   let (:tar_url) { "#{base_url}/#{tar_filename}" }

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

@@ -2,6 +2,8 @@ require 'vanagon/component/source'
 
 describe "Vanagon::Component::Source::Rewrite" do
   let(:klass) { Vanagon::Component::Source::Rewrite }
+  let(:artifactory_url) { "https://artifactory.delivery.puppetlabs.net/artifactory" }
+  let(:buildsources_url) { "#{artifactory_url}/generic/buildsources" }
   before(:each) { klass.rewrite_rules.clear }
 
   describe ".parse_and_rewrite" do
@@ -14,10 +16,10 @@ describe "Vanagon::Component::Source::Rewrite" do
     end
 
     it 'replaces the first section of a url with a string if string is given' do
-      klass.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net')
+      klass.register_rewrite_rule('http', buildsources_url)
 
       expect(klass.rewrite('http://things.and.stuff/foo.tar.gz', 'http'))
-        .to eq('http://buildsources.delivery.puppetlabs.net/foo.tar.gz')
+        .to eq("#{buildsources_url}/foo.tar.gz")
     end
 
     it 'applies the rule to the url if a proc is given as the rule' do
@@ -46,10 +48,10 @@ describe "Vanagon::Component::Source::Rewrite" do
         .to raise_error Vanagon::Error
     end
 
-    before { klass.register_rewrite_rule('http', 'http://buildsources.delivery.puppetlabs.net') }
+    before { klass.register_rewrite_rule('http', buildsources_url) }
     it 'registers the rule for the given protocol' do
       expect(klass.rewrite_rules)
-        .to eq({'http' => 'http://buildsources.delivery.puppetlabs.net'})
+        .to eq({'http' => buildsources_url})
     end
   end
 end

data/spec/lib/vanagon/component/source_spec.rb

@@ -70,21 +70,26 @@ describe "Vanagon::Component::Source" do
 
     context "takes a HTTP/HTTPS file" do
       before do
-        allow_any_instance_of(Vanagon::Component::Source::Http)
-          .to receive(:valid_url?)
-          .and_return(true)
-
         allow(Vanagon::Component::Source::Http)
           .to receive(:valid_url?)
-          .and_return(true)
+          .with(sum)
+          .and_return(false)
       end
 
       it "returns an object of the correct type for http:// URLS" do
+        allow(Vanagon::Component::Source::Http)
+          .to receive(:valid_url?)
+          .with(http_url)
+          .and_return(true)
         expect(klass.source(http_url, sum: sum, workdir: workdir, sum_type: "md5").class)
           .to equal(Vanagon::Component::Source::Http)
       end
 
       it "returns an object of the correct type for https:// URLS" do
+        allow(Vanagon::Component::Source::Http)
+          .to receive(:valid_url?)
+          .with(https_url)
+          .and_return(true)
         expect(klass.source(https_url, sum: sum, workdir: workdir, sum_type: "md5").class)
           .to equal(Vanagon::Component::Source::Http)
       end