vanagon 0.5.0 → 0.5.1

data/lib/vanagon/project.rb

@@ -232,6 +232,11 @@ class Vanagon
       files = ['file-list', 'bill-of-materials']
       files.push get_files.map(&:path)
       files.push get_configfiles.map(&:path)
+      if @platform.is_windows?
+        files.flatten.map { |f| "$$(cygpath --mixed --long-name '#{f}')" }
+      else
+        files.flatten
+      end
     end
 
     # Generate a bill-of-materials: a listing of the components and their
@@ -248,7 +253,7 @@ class Vanagon
     def pack_tarball_command
       tar_root = "#{@name}-#{@version}"
       ["mkdir -p '#{tar_root}'",
-       %('#{@platform.tar}' -cf - -T #{get_tarball_files.join(" ")} | ( cd '#{tar_root}/'; '#{@platform.tar}' xfp -)),
+       %('#{@platform.tar}' -cf - -T "#{get_tarball_files.join('" "')}" | ( cd '#{tar_root}/'; '#{@platform.tar}' xfp -)),
        %('#{@platform.tar}' -cf - #{tar_root}/ | gzip -9c > #{tar_root}.tar.gz)].join("\n\t")
     end
 
@@ -258,7 +263,7 @@ class Vanagon
     # @param workdir [String] full path to the workdir to send the evaluated template
     # @return [String] full path to the generated Makefile
     def make_makefile(workdir)
-      erb_file(File.join(VANAGON_ROOT, "templates/Makefile.erb"), File.join(workdir, "Makefile"))
+      erb_file(File.join(VANAGON_ROOT, "resources/Makefile.erb"), File.join(workdir, "Makefile"))
     end
 
     # Generates a bill-of-materials and writes the contents to the workdir for use in

data/lib/vanagon/utilities.rb

@@ -146,11 +146,19 @@ class Vanagon
     # Simple wrapper around git command line executes the given commands and
     # returns the results.
     #
-    # @param commands [String] The commands to be run
+    # @param command_string [String] The commands to be run
+    # @param raise_error [boolean] if this function should raise an error
+    #                              on a git failure
     # @return [String] The output of the command
-    def git(*commands)
+    def git(command_string, raise_error = false)
       git_bin = find_program_on_path('git')
-      %x(#{git_bin} #{commands.join(' ')})
+      output = %x(#{git_bin} #{command_string})
+      if raise_error
+        unless $?.success?
+          raise %(git #{command_string} failed)
+        end
+      end
+      return output
     end
 
     # Determines if the given directory is a git repo or not
@@ -159,7 +167,7 @@ class Vanagon
     # @return [true, false] True if the directory is a git repo, false otherwise
     def is_git_repo?(directory = Dir.pwd)
       Dir.chdir(directory) do
-        git('rev-parse', '--git-dir', '> /dev/null 2>&1')
+        git('rev-parse --git-dir > /dev/null 2>&1')
         $?.success?
       end
     end
@@ -173,7 +181,7 @@ class Vanagon
     def git_version(directory = Dir.pwd)
       if is_git_repo?(directory)
         Dir.chdir(directory) do
-          version = git('describe', '--tags', '2> /dev/null').chomp
+          version = git('describe --tags 2> /dev/null').chomp
           if version.empty?
             warn "Directory '#{directory}' cannot be versioned by git. Maybe it hasn't been tagged yet?"
           end
@@ -211,6 +219,7 @@ class Vanagon
       args << " -p #{port} "
       args << " -o UserKnownHostsFile=/dev/null"
       args << " -o StrictHostKeyChecking=no"
+      args << " -o ForwardAgent=yes" if ENV['VANAGON_SSH_AGENT']
       return ssh + args
     end
 

data/{templates → resources}/Makefile.erb

@@ -13,14 +13,14 @@ file-list-before-build:
 <%- if dirnames.empty? -%>
 	touch file-list-before-build
 <%- else -%>
-	(find -L <%= dirnames.join(' ') %> 2>/dev/null || find <%= dirnames.join(' ') %> -follow 2>/dev/null) | sort | uniq > file-list-before-build
+	(<%= @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
 <%- end -%>
 
 file-list-after-build: <%= @components.map {|comp| comp.name }.join(" ") %>
 <%- if dirnames.empty? -%>
 	touch file-list-after-build
 <%- else -%>
-	(find -L <%= dirnames.join(' ') %>  2>/dev/null || find <%= dirnames.join(' ') %> -follow 2>/dev/null) | sort | uniq > file-list-after-build
+	(<%= @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
 <%- end -%>
 
 <%= @name %>-<%= @version %>.tar.gz: file-list <%= @cleanup ? 'cleanup-components' : '' %>
@@ -43,7 +43,7 @@ file-list: file-list-before-build <%= @name %>-project
 
 <%- dirnames.each do |dir| -%>
 <%= dir %>: file-list-before-build
-	mkdir -p <%= dir %>
+	mkdir -p '<%= dir %>'
 <%- end %>
 
 <%- if @cleanup -%>

data/{templates → resources}/deb/rules.erb

@@ -21,5 +21,7 @@ override_dh_auto_install:
 
 override_dh_shlibdeps:
 
+override_dh_usrlocal:
+
 %:
 	dh $@

data/{templates → resources}/rpm/project.spec.erb

@@ -253,7 +253,8 @@ if [ -e %{_localstatedir}/lib/rpm-state/%{name}/upgrade ] ; then
 fi
 <%- end -%>
 
-%files -f %{SOURCE1}
+%files <%- unless get_directories.empty? -%>-f %{SOURCE1}<%- end -%>
+
 <%- unless @bill_of_materials -%>
 %doc bill-of-materials
 <%- end -%>

data/resources/windows/nuget/chocolateyInstall.ps1

@@ -0,0 +1,28 @@
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$fileList = Join-Path -path $toolsDir -childpath "file-list.txt"
+
+if (!(Test-Path -path "$fileList")) {
+  Throw "Unable to find file '$fileList', cannot proceed with install"
+}
+
+$lines = Get-Content "$fileList"
+foreach ($destination in $lines) {
+  $originFile = "$destination" -replace '^[a-zA-Z]:/',''
+  $origin = Join-Path -path "$toolsDir" -childpath "$originFile"
+  if (Test-Path -path "$origin") {
+    $parent = Split-Path -path "$destination" -parent
+    if (!(Test-Path -path "$parent")) {
+      New-Item -ItemType directory -Path "$parent"
+    }
+    if (Test-Path -path "$destination") {
+      Write-Debug "Overwriting '$destination'"
+    }
+    Copy-Item -path "$origin" -destination "$destination" -Force
+  } else {
+    # If the item we are trying to copy over does not exist in our source directory,
+    # we assume it is an empty directory and simply create one in its place. There is
+    # a possibility that this will hide an error where there is actually a missing
+    # file. However, this is such a slim possibity, this action was deemed safe.
+    New-Item -ItemType directory -Path "$destination"
+  }
+}

data/resources/windows/nuget/chocolateyUninstall.ps1

@@ -0,0 +1,24 @@
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$fileList = Join-Path -path $toolsDir -childpath "file-list.txt"
+
+if (!(Test-Path -path "$fileList")) {
+  Throw "Unable to find file '$fileList', cannot proceed with uninstall"
+}
+
+$lines = Get-Content "$fileList"
+foreach ($file in $lines) {
+  if (Test-Path -path "$file") {
+    # We cannot guarentee a directory is only populated with files from
+    # this package, so we cannot whole-sale remove directories. We could
+    # check to see if a directory is empty after we remove all the files,
+    # but that would still end up with some reminantes of our skeletal
+    # directory structure. It doesn't seem worth it ATM. As is, only remove
+    # things that are files, and do not remove any directories.
+    if (!((Get-Item "$file") -is [System.IO.DirectoryInfo])) {
+      Write-Debug "Removing '$file'"
+      remove-item -Path "$file" -Force
+    }
+  } else {
+    Write-Debug "Skipping missing file '$file'"
+  }
+}

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

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id><%= "#{@name}-#{@platform.architecture}" %></id>
+    <version><%= @platform.nuget_package_version(@version, @release) %></version>
+    <title><%= @name %></title>
+    <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>
+    <docsUrl><%= @homepage %></docsUrl>
+    <mailingListUrl><%= @homepage %></mailingListUrl>
+    <bugTrackerUrl><%= @homepage %></bugTrackerUrl>
+    <licenseUrl><%= @homepage %></licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>
+<%= @description %>
+    </description>
+    <summary><%= @description.lines.first.chomp %></summary>
+    <releaseNotes><%= @homepage %></releaseNotes>
+    <copyright><%= @vendor.match(/^(.*) <.*>$/)[1] %></copyright>
+    <tags>puppet configuration management infrastructure automation facter hiera mco mcollective marionette collective</tags>
+    <provides><%= get_replaces.map { |replace| "#{replace.replacement}" }.join(" ") %></provides>
+    <replaces><%= get_replaces.map { |replace| "#{replace.replacement}" }.join(" ") %></replaces>
+  </metadata>
+  <files>
+  <file src="tools\**" target="tools" />
+  </files>
+</package>
+<!-- character encoding: “UTF-8” -->

data/resources/windows/wix/service.component.wxs.erb

@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='windows-1252'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Fragment>
+  <%- get_services.each do |service| -%>
+    <%- service.options.each do |component| -%>
+    <DirectoryRef Id="<%= component[:directory_ref] %>">
+      <Component Id='<%= component[:id] %>' Guid="<%= component[:guid] %>" <%= "Win64=\"#{component[:win64]}\"" unless component[:win64].nil? %>>
+        <%- unless component[:conditions].nil? -%>
+          <%- component[:conditions].each do |condition| -%>
+        <Condition>
+          <%= condition %>
+        </Condition>
+          <%- end -%>
+        <%- end -%>
+        <File Id="<%= component[:file][:id] %>" KeyPath="yes" Source="<%= component[:file][:source] %>" />
+        <ServiceInstall Id="<%= component[:serviceinstall][:id] %>"
+          Account="[PUPPET_AGENT_ACCOUNT_DOMAIN]\[PUPPET_AGENT_ACCOUNT_USER]"
+          Password="[PUPPET_AGENT_ACCOUNT_PASSWORD]"
+          Description="<%= component[:serviceinstall][:description] %>"
+          DisplayName="<%= component[:serviceinstall][:displayname] %>"
+          Interactive="no"
+          Name="<%= component[:serviceinstall][:name] %>"
+          Start="<%= component[:serviceinstall][:start] %>"
+          Type="ownProcess"
+          ErrorControl="normal"
+          Vital="yes"
+          <%- unless component[:serviceinstall][:arguments].nil? -%>
+          Arguments="<%= component[:serviceinstall][:arguments] %>"
+          <%- end -%>
+        />
+        <%- unless component[:registries].nil? -%>
+        <RegistryKey Root="<%= component[:registries][:root] %>" Key="<%= component[:registries][:key] %>">
+        <%- unless component[:registries][:values].nil? -%>
+          <%- component[:registries][:values].each do |value|  -%>
+          <RegistryValue Name="<%= value[:name] %>" Value="<%= value[:value] %>" Type="<%= value[:type] %>" <%= "Action=\"#{value[:action]}\"" unless value[:action].nil? %> />
+          <%- end -%>
+        <%- end -%>
+        <%- unless component[:registries][:keys].nil? -%>
+          <%- component[:registries][:keys].each do |key| -%>
+          <RegistryKey Key="<%= key[:name] %>">
+            <%- key[:values].each do |value| -%>
+            <RegistryValue <%= "Name=\"#{value[:name]}\"" unless value[:name].nil? %> Value="<%= value[:value] %>" Type="<%= value[:type] %>" />
+            <%- end -%>
+          </RegistryKey>
+          <%- end -%>
+        <%- end -%>
+        </RegistryKey>
+        <%- end -%>
+        <ServiceControl Id="<%= component[:servicecontrol][:id] %>" <%= "Start=\"#{component[:servicecontrol][:start]}\"" unless component[:servicecontrol][:start].nil? %> Stop="both" Remove="uninstall" Name="<%= component[:servicecontrol][:name] %>" Wait="yes" />
+      </Component>
+    </DirectoryRef>
+    <%- end -%>
+  <%- end -%>
+  </Fragment>
+</Wix>

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

@@ -59,6 +59,7 @@ end" }
 
   before do
     allow(platform).to receive(:install).and_return('install')
+    allow(platform).to receive(:copy).and_return('cp')
   end
 
   describe '#load_from_json' do
@@ -183,6 +184,35 @@ end" }
       comp = Vanagon::Component::DSL.new('patch-test', {}, {})
       expect { comp.apply_patch('patch_file1', after: 'delivery') }.to raise_error(Vanagon::Error)
     end
+
+    it 'can specify a directory where the patch should be applied' do
+      comp = Vanagon::Component::DSL.new('patch-test', {}, {})
+      comp.apply_patch('patch_file1', destination: 'random/install/directory')
+      expect(comp._component.patches.count).to eq 1
+      expect(comp._component.patches.first.path).to eq 'patch_file1'
+      expect(comp._component.patches.first.destination).to eq 'random/install/directory'
+    end
+
+    it 'can specify when to try to apply the patch' do
+      comp = Vanagon::Component::DSL.new('patch-test', {}, {})
+      comp.apply_patch('patch_file1', after: 'install')
+      expect(comp._component.patches.count).to eq 1
+      expect(comp._component.patches.first.path).to eq 'patch_file1'
+      expect(comp._component.patches.first.after).to eq 'install'
+    end
+
+    it 'will default the patch timing to after the source is unpacked' do
+      comp = Vanagon::Component::DSL.new('patch-test', {}, {})
+      comp.apply_patch('patch_file1')
+      expect(comp._component.patches.count).to eq 1
+      expect(comp._component.patches.first.path).to eq 'patch_file1'
+      expect(comp._component.patches.first.after).to eq 'unpack'
+    end
+
+    it 'will fail if the user wants to install the patch at an unsupported step' do
+      comp = Vanagon::Component::DSL.new('patch-test', {}, {})
+      expect { comp.apply_patch('patch_file1', after: 'delivery') }.to raise_error(Vanagon::Error)
+    end
   end
 
   describe '#build_requires' do
@@ -548,7 +578,7 @@ end" }
       comp = Vanagon::Component::DSL.new('link-test', {}, platform)
       comp.link('link-source', '/place/to/put/things')
       expect(comp._component.install).to include("install -d '/place/to/put'")
-      expect(comp._component.install).to include("ln -s 'link-source' '/place/to/put/things'")
+      expect(comp._component.install).to include("([[ '/place/to/put/things' -ef 'link-source' ]] || ln -s 'link-source' '/place/to/put/things')")
     end
   end
 

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

@@ -6,6 +6,7 @@ describe "Vanagon::Component::Source::Git" do
   let (:workdir) { "/tmp" }
 
   describe "#dirname" do
+    after(:each) { %x(rm -rf #{workdir}/facter) }
     it "returns the name of the repo" do
       git_source = Vanagon::Component::Source::Git.new(url, ref, workdir)
       expect(git_source.dirname).to eq('facter')
@@ -16,4 +17,17 @@ describe "Vanagon::Component::Source::Git" do
       expect(git_source.dirname).to eq('facter')
     end
   end
+
+  describe "#fetch" do
+    after(:each) { %x(rm -rf #{workdir}/facter) }
+    it "raises error on clone failure" do
+      #this test has a spelling error for the git repo        V      this is on purpose
+      git_source = Vanagon::Component::Source::Git.new("#{url}l.git", ref, workdir)
+      expect { git_source.fetch }.to raise_error(RuntimeError, "git clone #{url}l.git failed")
+    end
+    it "raises error on checkout failure" do
+      git_source = Vanagon::Component::Source::Git.new("#{url}", "999.9.9", workdir)
+      expect { git_source.fetch }.to raise_error(RuntimeError, "git checkout 999.9.9 failed")
+    end
+  end
 end

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

@@ -30,7 +30,7 @@ describe "Vanagon::Component::Source::Http" do
 
   describe "#get_extension" do
     it "returns the extension for valid extensions" do
-      (Vanagon::Component::Source::Http::ARCHIVE_EXTENSIONS + Vanagon::Component::Source::Http::NON_ARCHIVE_EXTENSIONS).each do |ext|
+      Vanagon::Component::Source::Http::ARCHIVE_EXTENSIONS.each do |ext|
         filename = "#{file_base}#{ext}"
         url = File.join(base_url, filename)
         http_source = Vanagon::Component::Source::Http.new(url, md5sum, workdir)
@@ -39,5 +39,14 @@ describe "Vanagon::Component::Source::Http" do
         expect(http_source.get_extension).to eq(ext)
       end
     end
+
+    it "is able to download non archive extensions" do
+      ["gpg.txt", "foo.service", "configi.json", "config.repo.txt", "noextensionfile"].each do |filename|
+        url = File.join(base_url, filename)
+        http_source = Vanagon::Component::Source::Http.new(url, md5sum, workdir)
+        expect(http_source).to receive(:download).and_return(filename)
+        http_source.fetch
+      end
+    end
   end
 end

data/spec/lib/vanagon/engine/pooler_spec.rb

@@ -1,7 +1,7 @@
 require 'vanagon/engine/pooler'
 
 describe 'Vanagon::Engine::Pooler' do
-  let (:platform) { double(Vanagon::Platform) }
+  let (:platform) { double(Vanagon::Platform, :target_user => 'root') }
   let (:platform_with_vcloud_name) {
     plat = Vanagon::Platform::DSL.new('debian-6-i386')
     plat.instance_eval("platform 'debian-6-i386' do |plat|

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

@@ -0,0 +1,43 @@
+require 'vanagon/platform'
+
+describe "Vanagon::Platform::Windows" do
+  platforms =[
+    {
+      :name                   => "windows-2012r2-x64",
+      :os_name                => "windows",
+      :os_version             => "2012r2",
+      :architecture           => "x64",
+      :output_dir             => "windows/x64",
+      :output_dir_with_target => "windows/thing/x64",
+      :target_user            => "Administrator",
+      :block                  => %Q[ platform "windows-2012r2-x64" do |plat| end ]
+    },
+  ]
+
+  platforms.each do |plat|
+    context "on #{plat[:name]} we should behave ourselves" do
+      let(:platform) { plat }
+      let(:cur_plat) { Vanagon::Platform::DSL.new(plat[:name]) }
+
+      before do
+        cur_plat.instance_eval(plat[:block])
+      end
+
+      describe "#output_dir" do
+        it "returns an output dir consistent with the packaging repo" do
+          expect(cur_plat._platform.output_dir).to eq(plat[:output_dir])
+        end
+
+        it "adds the target repo in the right way" do
+          expect(cur_plat._platform.output_dir('thing')).to eq(plat[:output_dir_with_target])
+        end
+      end
+
+      describe '#target_user' do
+        it "sets the target_user to 'Administrator'" do
+          expect(cur_plat._platform.target_user).to eq(plat[:target_user])
+        end
+      end
+    end
+  end
+end