vanagon 0.10.0 → 0.11.0

data/resources/Makefile.erb

@@ -1,4 +1,4 @@
-SHELL = $(PWD)/profiling_shell.sh
+SHELL = <%=  @platform.shell %>
 
 <%- merged_environment.to_a(" := ").each do |var| -%>
 export <%= var %>
@@ -9,7 +9,6 @@ workdir := $(PWD)
 
 all: file-list-before-build <%= package_name %>
 
-<%= package_name %>: export VANAGON_TARGET := create-package
 <%= package_name %>: <%= @name %>-<%= @version %>.tar.gz
 	<%= generate_package.join("\n\t") %>
 
@@ -17,14 +16,14 @@ file-list-before-build:
 <%- if dirnames.empty? -%>
 	touch file-list-before-build
 <%- else -%>
-	(<%= @platform.find %> -L "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" -follow 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-before-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-before-build
 <%- end -%>
 
 file-list-after-build: <%= @components.map {|comp| comp.name }.join(" ") %>
 <%- if dirnames.empty? -%>
 	touch file-list-after-build
 <%- else -%>
-	(<%= @platform.find %> -L "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" -follow 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-after-build
+	(<%= @platform.find %> -H "<%= dirnames.join('" "') %>" 2>/dev/null || <%= @platform.find %> "<%= dirnames.join('" "') %>" 2>/dev/null) | <%= "xargs -I[] cygpath --mixed --long-name --absolute [] |" if @platform.is_windows? %> <%= @platform.sort %> | uniq > file-list-after-build
 <%- end -%>
 
 <%= @name %>-<%= @version %>.tar.gz: file-list <%= @cleanup ? 'cleanup-components' : '' %>

data/resources/deb/rules.erb

@@ -2,6 +2,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+<% @package_overrides.each do |var| %>
+<%= var %>
+<% end -%>
+
 override_dh_auto_install:
 	install -d debian/tmp
 	# Copy each directory into place

data/resources/rpm/project.spec.erb

@@ -25,6 +25,10 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-strip-static-archive[[:space:]].*$!!g')
 <% end -%>
 
+<% @package_overrides.each do |var| %>
+<%= var %>
+<% end -%>
+
 Name:           <%= @name %>
 Version:        <%= @version %>
 Release:        <%= @release %>%{?dist}
@@ -48,15 +52,22 @@ Autoreq: 0
 <%- get_requires.each do |requires| -%>
 Requires:  <%= requires %>
 <%- end -%>
+
 # All rpm packages built by vanagon have the pre-/post-install script
 # boilerplates (defined below). These require `mkdir` and `touch` but previously
 # did not specify a dependency on these.
 # In the future, we will supress pre/post scripts completely if there's nothing
 # specified by the project or the components.
+<%- if @platform.is_aix? -%>
+Requires: /bin/mkdir
+Requires: /bin/touch
+<%- else -%>
 Requires(pre): /bin/mkdir
 Requires(pre): /bin/touch
 Requires(post): /bin/mkdir
 Requires(post): /bin/touch
+<%- end -%>
+
 <%- if has_services? -%>
   <%- if @platform.servicetype == "systemd" -%>
     <%- if @platform.is_sles? -%>
@@ -142,7 +153,7 @@ install -d %{buildroot}
 
 # Here we turn all dirs in the file-list into %dir entries to avoid duplicate files
 for entry in `cat %{SOURCE1}`; do
-  if [ -n "$entry" -a -d "$entry" ]; then
+  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

data/resources/windows/nuget/project.nuspec.erb

@@ -7,8 +7,8 @@
     <authors><%= @vendor.match(/^(.*) <.*>$/)[1] %></authors>
     <owners><%= @vendor.match(/^(.*) <.*>$/)[1] %></owners>
     <projectUrl><%= @homepage %></projectUrl>
-    <packageSourceUrl><%= "https://github.com/puppetlabs/#{project}-vanagon" %></packageSourceUrl>
-    <projectSourceUrl><%= "https://github.com/puppetlabs/#{project}" %></projectSourceUrl>
+    <packageSourceUrl><%= @homepage %></packageSourceUrl>
+    <projectSourceUrl><%= @homepage %></projectSourceUrl>
     <docsUrl><%= @homepage %></docsUrl>
     <mailingListUrl><%= @homepage %></mailingListUrl>
     <bugTrackerUrl><%= @homepage %></bugTrackerUrl>

data/spec/lib/makefile_spec.rb

@@ -5,7 +5,7 @@ describe Makefile::Rule do
     subject { described_class.new("empty") }
 
     it "creates an empty rule" do
-      expect(subject.format).to eq "empty: export VANAGON_TARGET := empty\nempty:\n"
+      expect(subject.format).to eq "empty:\n"
     end
   end
 
@@ -13,7 +13,7 @@ describe Makefile::Rule do
     subject { described_class.new("simple", recipe: ["touch simple"]) }
 
     it "creates the rule with the recipe" do
-      expect(subject.format).to eq "simple: export VANAGON_TARGET := simple\nsimple:\n\ttouch simple\n"
+      expect(subject.format).to eq "simple:\n\ttouch simple\n"
     end
   end
 
@@ -21,7 +21,7 @@ describe Makefile::Rule do
     subject { described_class.new("depends", dependencies: ["mydeps"]) }
 
     it "creates the rule with the recipe" do
-      expect(subject.format).to eq "depends: export VANAGON_TARGET := depends\ndepends: mydeps\n"
+      expect(subject.format).to eq "depends: mydeps\n"
     end
   end
 
@@ -29,7 +29,7 @@ describe Makefile::Rule do
     subject { described_class.new("deluxe", recipe: ["touch deluxe"], dependencies: ["mydeps"]) }
 
     it "creates the rule with the recipe" do
-      expect(subject.format).to eq "deluxe: export VANAGON_TARGET := deluxe\ndeluxe: mydeps\n\ttouch deluxe\n"
+      expect(subject.format).to eq "deluxe: mydeps\n\ttouch deluxe\n"
     end
   end
 
@@ -44,7 +44,7 @@ describe Makefile::Rule do
     end
 
     it "inserts tabs after each newline in the recipe" do
-      expect(subject.format).to eq "multiline: export VANAGON_TARGET := multiline\nmultiline:\n\t[ -d build ] || mkdir -p build\n\tcd build &&\n\tcmake .. &&\n\tmake &&\n\tmake install\n"
+      expect(subject.format).to eq "multiline:\n\t[ -d build ] || mkdir -p build\n\tcd build &&\n\tcmake .. &&\n\tmake &&\n\tmake install\n"
     end
   end
 end

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

@@ -587,7 +587,14 @@ end" }
         it 'adds the file to the configfiles list' do
           comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
           comp.install_configfile('thing1', 'place/to/put/thing1')
-          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1'))
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1', mode: '0644'))
+          expect(comp._component.files).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
+        end
+
+        it 'sets owner, group, and mode for the configfiles' do
+          comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
+          comp.install_configfile('thing1', 'place/to/put/thing1', owner: 'bob', group: 'timmy', mode: '0022')
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1', mode: '0022', group: 'timmy', owner: 'bob'))
           expect(comp._component.files).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
         end
       end
@@ -617,7 +624,7 @@ end" }
         it 'adds the file to the configfiles list' do
           comp = Vanagon::Component::DSL.new('install-config-file-test', {}, platform)
           comp.install_configfile('thing1', 'place/to/put/thing1')
-          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1.pristine'))
+          expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('place/to/put/thing1.pristine', mode: '0644'))
           expect(comp._component.configfiles).not_to include(Vanagon::Common::Pathname.file('place/to/put/thing1'))
         end
       end

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

@@ -48,10 +48,10 @@ describe Vanagon::Component::Rules do
 
     it "sets environment variables before running the unpack steps" do
       component.extract_with = "/usr/bin/tar"
-      component.environment = {"PATH" => "/opt/pl-build-tools/bin:$$PATH"}
-      expect(rule.recipe.first).to eq(
-        [ "/usr/bin/tar" ].join(" && ")
-      )
+      component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
+
+      expect(rule.recipe.first)
+        .to eq %(export PATH="/opt/pl-build-tools/bin:$(PATH)" && \\\n/usr/bin/tar)
     end
 
     it_behaves_like "a rule that touches the target file"
@@ -113,9 +113,10 @@ describe Vanagon::Component::Rules do
 
     it "sets environment variables before running the configure steps" do
       component.configure = ["./configure", "cmake .."]
-      component.environment = {"PATH" => "/opt/pl-build-tools/bin:$$PATH"}
+      component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
       expect(rule.recipe[1]).to eq(
         [
+          'export PATH="/opt/pl-build-tools/bin:$(PATH)"', 
           "cd /foo/bar",
           "./configure",
           "cmake .."
@@ -148,9 +149,10 @@ describe Vanagon::Component::Rules do
 
     it "sets environment variables before running the build steps" do
       component.build = ["make", "make test"]
-      component.environment = {"PATH" => "/opt/pl-build-tools/bin:$$PATH"}
+      component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
       expect(rule.recipe.first).to eq(
         [
+          'export PATH="/opt/pl-build-tools/bin:$(PATH)"',
           "cd /foo/bar",
           "make",
           "make test"
@@ -189,9 +191,10 @@ describe Vanagon::Component::Rules do
 
     it "sets environment variables before running the check steps" do
       component.check = ["make cpplint", "make test"]
-      component.environment = {"PATH" => "/opt/pl-build-tools/bin:$$PATH"}
+      component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
       expect(rule.recipe.first).to eq(
         [
+          'export PATH="/opt/pl-build-tools/bin:$(PATH)"',
           "cd /foo/bar",
           "make cpplint",
           "make test"
@@ -224,9 +227,10 @@ describe Vanagon::Component::Rules do
 
     it "sets environment variables before running the install steps" do
       component.install = ["make install", "make reallyinstall"]
-      component.environment = {"PATH" => "/opt/pl-build-tools/bin:$$PATH"}
+      component.environment.merge({"PATH" => "/opt/pl-build-tools/bin:$(PATH)"})
       expect(rule.recipe.first).to eq(
         [
+          'export PATH="/opt/pl-build-tools/bin:$(PATH)"',
           "cd /foo/bar",
           "make install",
           "make reallyinstall"

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

@@ -5,7 +5,7 @@ describe "Vanagon::Component::Source::Git" do
   let(:url) { 'git://github.com/puppetlabs/facter' }
   let(:ref_tag) { 'refs/tags/2.2.0' }
   let(:bad_sha) { 'FEEDBEEF' }
-  let(:workdir) { ENV["TMPDIR"] || "/tmp" }
+  let(:workdir) { ENV["TMPDIR"] || '/tmp' }
 
   after(:each) { %x(rm -rf #{workdir}/facter) }
 

data/spec/lib/vanagon/component_spec.rb

@@ -1,25 +1,29 @@
 require 'vanagon/component'
+require 'vanagon/platform'
 
 describe "Vanagon::Component" do
   describe "#get_environment" do
     subject { Vanagon::Component.new('env-test', {}, {}) }
 
-    it "prints a deprecation warning to STDERR" do    
+    it "prints a deprecation warning to STDERR" do
       expect { subject.get_environment }.to output(/deprecated/).to_stderr
     end
 
     it "returns a makefile compatible environment" do
-      subject.environment = {'PATH' => '/usr/local/bin'}
-      expect(subject.get_environment).to eq %(export PATH="/usr/local/bin")
+      subject.environment = {'PATH' => '/usr/local/bin', 'CFLAGS' => '-O3'}
+      expect(subject.get_environment)
+        .to eq [%(export PATH="/usr/local/bin"), %(export CFLAGS="-O3")]
     end
 
     it 'merges against the existing environment' do
       subject.environment = {'PATH' => '/usr/bin', 'CFLAGS' => '-I /usr/local/bin'}
-      expect(subject.get_environment).to eq %(export PATH="/usr/bin" CFLAGS="-I /usr/local/bin")
+      expect(subject.get_environment)
+        .to eq [%(export PATH="/usr/bin"), %(export CFLAGS="-I /usr/local/bin")]
     end
 
     it 'returns : for an empty environment' do
-      expect(subject.get_environment).to eq %(: no environment variables defined)
+      expect(subject.get_environment)
+        .to eq %(: no environment variables defined)
     end
   end
 
@@ -45,20 +49,44 @@ describe "Vanagon::Component" do
       @workdir = Dir.mktmpdir
       @file_name = 'fake_file.txt'
       @fake_file = "file://spec/fixtures/files/#{@file_name}"
+      @fake_dir = 'fake_dir'
+      @fake_tar = "file://spec/fixtures/files/#{@fake_dir}.tar.gz"
     end
 
     subject do
       # Initialize a new instance of Vanagon::Component and define a
-      # new secondary source. We can now reason about this instance and
-      # test behavior for retrieving secondary sources.
+      # 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)
       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  
+
+    subject do
+      # Initialize a new instance of Vanagon::Component and define a
+      # new secondary source that's *compressed*. We can now reason about
+      # this instance and test behavior for retrieving secondary sources.
+      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @platform = plat._platform
+
+      comp = Vanagon::Component::DSL.new('build-dir-test', {}, @platform)
+      comp.add_source @fake_file
+      comp.add_source @fake_tar
+      comp._component
     end
 
-    it "copies secondary sources into the workdir" do
+    it "copies compressed secondary sources into the workdir" do
       subject.get_sources(@workdir)
       expect(File.exist?(File.join(@workdir, @file_name))).to be true
+      # make sure that our secondary source(s) made it into the workdir
+      expect(File.exist?(File.join(@workdir, "#{@fake_dir}.tar.gz"))).to be true
+      expect(subject.extract_with.join(" && ")).to match "#{@fake_dir}.tar.gz"
     end
   end
 end

data/spec/lib/vanagon/driver_spec.rb

@@ -30,7 +30,7 @@ describe 'Vanagon::Driver' do
   end
 
   describe 'when resolving build host info' do
-    it 'uses an expicitly specified workdir if provided' do
+    it 'uses an explicitly specified workdir if provided' do
       derived = create_driver(redhat)
       explicit = create_driver(redhat, workdir: explicit_workdir)
 
@@ -38,9 +38,9 @@ describe 'Vanagon::Driver' do
       expect(explicit.workdir).not_to eq(derived.workdir)
     end
 
-    it 'uses an expicitly specified remote workdir if provided' do
+    it 'uses an explicitly specified remote workdir if provided' do
       derived = create_driver(redhat)
-      explicit = create_driver(redhat, remote_workdir: explicit_remote_workdir)
+      explicit = create_driver(redhat, :"remote-workdir" => explicit_remote_workdir)
 
       expect(explicit.remote_workdir).to eq(explicit_remote_workdir)
       expect(explicit.remote_workdir).not_to eq(derived.remote_workdir)

data/spec/lib/vanagon/environment_spec.rb

@@ -4,26 +4,20 @@ describe "Vanagon::Environment" do
   before :all do
     @good_names = %w(name _name NAME _NAME NAME123 _123NAME)
     @bad_names = ['no-name', '!name', '.name', '123name_', 1, '-name']
+
+    # All environment variables will be cast to Strings, regardless
+    # of whether or not they were Integers or Strings on the way in.
+
     @good_values =[
       'valuable',
       'most\ valuable',
       'extremely-valuable',
       'VALUE_BEYOND_MEASURE',
-      2004,
-      2007,
-    ]
-    @bad_values = [
-      %w(an array of strings),
-      19.81,
-      Object.new,
-      Tempfile.new('captain_planet'),
-      lambda { |x| "#{x}" }
+      '2004',
+      '2007',
     ]
 
-    @good_hash = @good_names.zip(@good_values.shuffle).to_h
-    @bad_hash = @bad_names.zip(@bad_values.shuffle).to_h
-
-    @good_names_bad_values = @good_names.zip(@bad_values.shuffle).to_h
+    @good_names_good_values = @good_names.zip(@good_values.shuffle).to_h
     @bad_names_good_values = @bad_names.zip(@good_values.shuffle).to_h
   end
 
@@ -46,7 +40,7 @@ describe "Vanagon::Environment" do
 
   describe "#[]=" do
     it "accepts and assigns valid keys and values" do
-      @good_hash.each_pair do |key, value|
+      @good_names_good_values.each_pair do |key, value|
         expect { @local_env[key] = value }
             .to_not raise_error
       end
@@ -58,18 +52,11 @@ describe "Vanagon::Environment" do
             .to raise_error(ArgumentError)
       end
     end
-
-    it "raises an ArgumentError for invalid values" do
-      @good_names_bad_values.each_pair do |key, value|
-          expect { @local_env[key] = value }
-            .to raise_error(ArgumentError)
-      end
-    end
   end
 
   describe "#keys" do
     before do
-      @good_hash.each_pair do |key, value|
+      @good_names_good_values.each_pair do |key, value|
         @local_env[key] = value
       end
     end
@@ -89,7 +76,7 @@ describe "Vanagon::Environment" do
 
   describe "#values" do
     before do
-      @good_hash.each_pair do |key, value|
+      @good_names_good_values.each_pair do |key, value|
         @local_env[key] = value
       end
     end

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

@@ -1,6 +1,7 @@
 require 'vanagon/project/dsl'
 require 'vanagon/driver'
 require 'vanagon/common'
+require 'vanagon/platform'
 
 describe 'Vanagon::Project::DSL' do
   let (:project_block) {
@@ -52,6 +53,59 @@ end" }
     end
   end
 
+  describe '#version_from_branch' do
+    it 'parses out versions from branch names' do
+      branches = {
+        'maint/3.8.x/fix-bugs' => '3.8',
+        '2017.1.2.3-prep' => '2017.1.2.3',
+        '3.8' => '3.8',
+      }
+
+      expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+
+      branches.each do |branch, version|
+        repo = double("repo")
+        expect(::Git)
+          .to receive(:open)
+          .and_return(repo)
+
+        allow(repo)
+          .to receive(:current_branch)
+          .and_return(branch)
+
+        expect(proj.version_from_branch).to eq(version)
+      end
+    end
+
+    it 'fails if there is none' do
+      branches = [
+        'PUP-12345',
+        '200',
+        'just-a-branch-name'
+      ]
+
+      expect(Vanagon::Driver).to receive(:configdir).exactly(branches.length).times.and_return(configdir)
+      proj = Vanagon::Project::DSL.new('test-fixture', {})
+      proj.instance_eval(project_block)
+
+      branches.each do |branch|
+        repo = double("repo")
+        expect(::Git)
+          .to receive(:open)
+          .and_return(repo)
+
+        allow(repo)
+          .to receive(:current_branch)
+          .and_return(branch)
+
+        expect(proj).to receive(:fail)
+        proj.version_from_branch
+      end
+    end
+  end
+
   describe '#directory' do
     it 'adds a directory to the list of directories' do
       proj = Vanagon::Project::DSL.new('test-fixture', {})
@@ -231,6 +285,35 @@ end" }
     end
   end
 
+  describe "#package_override" do
+    let(:project_block) {
+"project 'test-fixture' do |proj|
+  proj.package_override \"TEST_VAR='foo'\"
+end"
+    }
+
+    before do
+      allow_any_instance_of(Vanagon::Project::DSL).to receive(:puts)
+      allow(Vanagon::Driver).to receive(:configdir).and_return(configdir)
+      @el_plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      @el_plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      @osx_plat = Vanagon::Platform::DSL.new('osx-10.10-x86_64')
+      @osx_plat.instance_eval("platform 'osx-10.10-x86_64' do |plat| end")
+
+    end
+
+    it 'adds package_overrides on supported platforms' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @el_plat._platform, [])
+      proj.instance_eval(project_block)
+      expect(proj._project.package_overrides).to include("TEST_VAR='foo'")
+    end
+
+    it 'fails on usupported platforms' do
+      proj = Vanagon::Project::DSL.new('test-fixture', @osx_plat._platform, [])
+      expect{ proj.instance_eval(project_block) }.to raise_error(RuntimeError)
+    end
+  end
+
   describe "#component" do
     let(:project_block) {
 "project 'test-fixture' do |proj|