vanagon 0.6.1 → 0.6.2

data/resources/rpm/project.spec.erb

@@ -2,6 +2,10 @@
 
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+# Disable brp-strip-static-archive, which on EL platforms causes
+# cross-compiled static libs to end up with "no machine" as their
+# architure, breaking builds:
+%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-strip-static-archive[[:space:]].*$!!g')
 #
 
 Name:           <%= @name %>
@@ -119,6 +123,7 @@ done
 
 
 %pre
+<%- unless @platform.is_aix? || (@platform.is_el? && @platform.os_version.to_i == 4) -%>
 # Save state so we know later if this is an upgrade or an install
 mkdir -p %{_localstatedir}/lib/rpm-state/%{name}
 if [ "$1" -eq 1 ] ; then
@@ -127,6 +132,7 @@ fi
 if [ "$1" -gt 1 ] ; then
   touch %{_localstatedir}/lib/rpm-state/%{name}/upgrade
 fi
+<%- end -%>
 
 <%- if @user -%>
 # Add our user and group

data/spec/lib/vanagon/driver_spec.rb

@@ -0,0 +1,88 @@
+require 'vanagon/driver'
+require 'vanagon/project'
+require 'vanagon/platform'
+
+describe 'Vanagon::Driver' do
+  let (:project) { double(:project, :settings => {} ) }
+
+  let (:redhat) do
+    eval_platform('el-7-x86_64', <<-END)
+      platform 'el-7-x86_64' do |plat|
+        plat.vmpooler_template 'centos-7-x86_64'
+      end
+    END
+  end
+
+  def eval_platform(name, definition)
+    plat = Vanagon::Platform::DSL.new(name)
+    plat.instance_eval(definition)
+    plat._platform
+  end
+
+  def create_driver(platform, options = {})
+    allow(Vanagon::Project).to receive(:load_project).and_return(project)
+    allow(Vanagon::Platform).to receive(:load_platform).and_return(platform)
+
+    Vanagon::Driver.new(platform, project, options)
+  end
+
+  describe 'when resolving build host info' do
+    it 'returns the vmpooler_template using the pooler engine' do
+      info = create_driver(redhat).build_host_info
+
+      expect(info).to match({ 'name'   => 'centos-7-x86_64',
+                              'engine' => 'pooler' })
+    end
+
+    it 'returns the vmpooler template with an explicit engine' do
+      info = create_driver(redhat, :engine => 'pooler').build_host_info
+
+      expect(info).to match({ 'name'   => 'centos-7-x86_64',
+                              'engine' => 'pooler' })
+    end
+
+    it 'returns the first build_host using the hardware engine' do
+      platform = eval_platform('aix-7.1-ppc', <<-END)
+        platform 'aix-7.1-ppc' do |plat|
+          plat.build_host ["pe-aix-71-01", "pe-aix-71-02"]
+        end
+      END
+
+      info = create_driver(platform).build_host_info
+
+      expect(info).to match({ 'name'   => 'pe-aix-71-01',
+                              'engine' => 'hardware' })
+    end
+
+    it 'returns the docker_image using the docker engine' do
+      platform = eval_platform('el-7-x86_64', <<-END)
+        platform 'el-7-x86_64' do |plat|
+          plat.docker_image 'centos7'
+        end
+      END
+
+      expect(Vanagon::Utilities).to receive(:find_program_on_path).with('docker').and_return('/usr/bin/docker')
+      info = create_driver(platform, :engine => 'docker').build_host_info
+
+      expect(info).to match({ 'name'   => 'centos7',
+                              'engine' => 'docker' })
+    end
+
+    it 'returns "local machine" using the local engine' do
+      info = create_driver(redhat, :engine => 'local').build_host_info
+
+      expect(info).to match({ 'name'   => 'local machine',
+                              'engine' => 'local' })
+    end
+
+    it 'raises when using the base engine' do
+      driver = create_driver(redhat, :engine => 'base')
+
+      expect {
+        driver.build_host_info
+      }.to raise_error(Vanagon::Error,
+                       /build_host_name has not been implemented for your engine/)
+    end
+  end
+end
+

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

@@ -1,4 +1,5 @@
 require 'vanagon/engine/docker'
+require 'vanagon/platform'
 
 describe 'Vanagon::Engine::Docker' do
   let (:platform_with_docker_image) {
@@ -37,4 +38,9 @@ describe 'Vanagon::Engine::Docker' do
       expect(Vanagon::Engine::Docker.new(platform_with_docker_image).validate_platform).to be(true)
     end
   end
+
+  it 'returns "docker" name' do
+    expect(Vanagon::Utilities).to receive(:find_program_on_path).with('docker').and_return('/usr/bin/docker')
+    expect(Vanagon::Engine::Docker.new(platform_with_docker_image).name).to eq('docker')
+  end
 end

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

@@ -0,0 +1,33 @@
+begin
+  require 'aws-sdk'
+rescue LoadError
+  $stderr.puts "Unable to load AWS SDK; skipping optional EC2 engine spec tests"
+end
+
+if defined? ::Aws
+  require 'vanagon/engine/ec2'
+  require 'vanagon/platform'
+
+  describe 'Vanagon::Engine::Ec2' do
+    let(:platform_ec2) do
+      plat = Vanagon::Platform::DSL.new('el-7-x86_64')
+      plat.instance_eval(<<-END)
+        platform 'el-7-x86_64' do |plat|
+          plat.aws_ami 'ami'
+          plat.target_user 'root'
+          plat.aws_subnet_id 'subnet_id'
+          plat.aws_user_data 'user_data'
+          plat.aws_region 'us-west-1'
+          plat.aws_key_name 'vanagon'
+          plat.aws_instance_type 't1.micro'
+          plat.ssh_port '22'
+        end
+      END
+      plat._platform
+    end
+
+    it 'returns "ec2" name' do
+      expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
+    end
+  end
+end

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

@@ -49,4 +49,8 @@ describe 'Vanagon::Engine::Hardware' do
       expect(Vanagon::Engine::Hardware.new(platform, nil).validate_platform).to be(true)
     end
   end
+
+  it 'returns "hardware" name' do
+    expect(Vanagon::Engine::Hardware.new(platform, nil).name).to eq('hardware')
+  end
 end

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

@@ -1,4 +1,5 @@
 require 'vanagon/engine/local'
+require 'vanagon/platform'
 
 describe 'Vanagon::Engine::Local' do
   let (:platform) {
@@ -24,4 +25,8 @@ describe 'Vanagon::Engine::Local' do
       expect(engine.dispatch('true', true)).to eq('')
     end
   end
+
+  it 'returns "local" name' do
+    expect(Vanagon::Engine::Local.new(platform).name).to eq('local')
+  end
 end

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

@@ -1,4 +1,5 @@
 require 'vanagon/engine/pooler'
+require 'vanagon/platform'
 
 describe 'Vanagon::Engine::Pooler' do
   let (:platform) { double(Vanagon::Platform, :target_user => 'root') }
@@ -53,4 +54,8 @@ describe 'Vanagon::Engine::Pooler' do
       expect(Vanagon::Engine::Pooler.new(platform_with_vcloud_name).validate_platform).to be(true)
     end
   end
+
+  it 'returns "pooler" name' do
+    expect(Vanagon::Engine::Pooler.new(platform_with_vcloud_name).name).to eq('pooler')
+  end
 end

data/spec/lib/vanagon/extensions/ostruct/json_spec.rb

@@ -0,0 +1,16 @@
+require 'vanagon/extensions/ostruct/json'
+
+describe "OpenStruct" do
+  describe "with JSON mixins" do
+    let(:test_ostruct) { OpenStruct.new(size: "big", shape: "spherical", name: "rover") }
+    let(:json_ostruct) { %({"size":"big","shape":"spherical","name":"rover"}) }
+
+    it "responds to #to_json" do
+      expect(OpenStruct.new.respond_to?(:to_json)).to eq(true)
+    end
+
+    it "can be converted to a valid JSON object" do
+      expect(JSON.parse(test_ostruct.to_json)).to eq(JSON.parse(json_ostruct))
+    end
+  end
+end

data/spec/lib/vanagon/extensions/set/json_spec.rb

@@ -0,0 +1,17 @@
+require 'vanagon/extensions/set/json'
+
+describe "Set" do
+  describe "with JSON mixins" do
+    let(:test_set) { Set['a', 'a', 'b', 'c'] }
+    let(:json_set) { %(["a","b","c"]) }
+
+    it "responds to #to_json" do
+      expect(Set.new.respond_to?(:to_json)).to eq(true)
+    end
+
+    it "can be converted to a valid JSON object" do
+      expect(JSON.parse(test_set.to_json)).to eq(JSON.parse(json_set))
+    end
+  end
+end
+

data/spec/lib/vanagon/extensions/string_spec.rb

@@ -0,0 +1,30 @@
+require 'vanagon/extensions/string'
+
+describe "String" do
+  it "responds to #undent" do
+    expect(String.new.respond_to?(:undent)).to eq(true)
+  end
+end
+
+describe "Vanagon::Extensions::String" do
+  let (:basic_indented_string) { "\s\sa string" }
+  let (:basic_string) { "a string" }
+  let (:fancy_indented_string) { "\s\sleading line\n\s\s\s\s\s\strailing line\n\s\s\s\slast line" }
+  let (:fancy_string) { "leading line\n    trailing line\n  last line" }
+  let (:tab_indented_string) { "\t\t\ttab string" }
+  let (:tab_string) { "tab string" }
+
+  describe "#undent" do
+    it "trims trivial leading whitespace" do
+      expect(basic_indented_string.undent).to eq(basic_string)
+    end
+
+    it "trims more complex whitespace" do
+      expect(fancy_indented_string.undent).to eq(fancy_string)
+    end
+
+    it "trims leading tabs" do
+      expect(tab_indented_string.undent).to eq(tab_string)
+    end
+  end
+end

data/spec/lib/vanagon/utilities_spec.rb

@@ -146,7 +146,7 @@ describe "Vanagon::Utilities" do
 
     it 'raises a Vanagon::Error if the command fails n times' do
       expect(Vanagon::Utilities).to receive(:remote_ssh_command).with(host, command, port).exactly(tries).times.and_raise(RuntimeError)
-      expect{ Vanagon::Utilities.retry_with_timeout(tries, timeout) { Vanagon::Utilities.remote_ssh_command(host, command, port) } }.to raise_error(Vanagon::Error)
+      expect{ Vanagon::Utilities.retry_with_timeout(tries, timeout) { Vanagon::Utilities.remote_ssh_command(host, command, port) } }.to raise_error(RuntimeError)
     end
 
     it 'returns true if the command succeeds within n times' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,19 +54,23 @@ dependencies:
         version: '0'
 description: Vanagon is a tool to build a single package out of a project, which can
   itself contain one or more components.
-email: info@puppetlabs.com
+email: info@puppet.com
 executables:
 - build
+- inspect
 - ship
 - repo
 - devkit
+- build_host_info
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
 - bin/build
+- bin/build_host_info
 - bin/devkit
+- bin/inspect
 - bin/repo
 - bin/ship
 - lib/makefile.rb
@@ -84,10 +88,14 @@ files:
 - lib/vanagon/driver.rb
 - lib/vanagon/engine/base.rb
 - lib/vanagon/engine/docker.rb
+- lib/vanagon/engine/ec2.rb
 - lib/vanagon/engine/hardware.rb
 - lib/vanagon/engine/local.rb
 - lib/vanagon/engine/pooler.rb
 - lib/vanagon/errors.rb
+- lib/vanagon/extensions/hashable.rb
+- lib/vanagon/extensions/ostruct/json.rb
+- lib/vanagon/extensions/set/json.rb
 - lib/vanagon/extensions/string.rb
 - lib/vanagon/optparse.rb
 - lib/vanagon/patch.rb
@@ -122,6 +130,7 @@ files:
 - resources/osx/postinstall.erb
 - resources/osx/preinstall.erb
 - resources/osx/project-installer.xml.erb
+- resources/osx/uninstaller.tool.erb
 - resources/rpm/project.spec.erb
 - resources/solaris/10/depend.erb
 - resources/solaris/10/pkginfo.erb
@@ -133,11 +142,8 @@ files:
 - resources/windows/nuget/chocolateyInstall.ps1
 - resources/windows/nuget/chocolateyUninstall.ps1
 - resources/windows/nuget/project.nuspec.erb
-- resources/windows/wix/componentgroup.wxs.erb
 - resources/windows/wix/directorylist.wxs.erb
 - resources/windows/wix/filter.xslt.erb
-- resources/windows/wix/project.wxs.erb
-- resources/windows/wix/registryEntries.wxs.erb
 - spec/fixtures/component/invalid-test-fixture.json
 - spec/fixtures/component/mcollective.service
 - spec/fixtures/component/test-fixture.json
@@ -165,11 +171,16 @@ files:
 - spec/lib/vanagon/component/source/localsource_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
@@ -218,11 +229,16 @@ test_files:
 - spec/lib/vanagon/component/source/localsource_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
 - spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb

data/resources/windows/wix/componentgroup.wxs.erb

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <!-- Default component groups that are to be included in this project.
-       This can be copied in the project specific area to add additional component groups.
-
-       Note that a number of the groups below are "pseudo-groups" that are necessary to
-       force the Wix Linker (light) to include fragments (e.g. FragmentProperties).
-
-       A UI reference is can also be included in the project specific area if required.
-       Otherwise, the project will default here to using the minimal UI (WixUI_Minimal). -->
-
-  <Fragment>
-    <ComponentGroup Id="MainComponentGroup">
-      <!-- We can add all components by referencing this one thing -->
-      <ComponentGroupRef Id="AppComponentGroup" />
-      <ComponentGroupRef Id="AppDataComponentGroup" />
-      <ComponentGroupRef Id="RegistryComponentGroup" />
-      <%- get_services.each do |service| -%>
-      <ComponentGroupRef Id="<%= service.component_group_id %>" />
-      <%- end -%>
-      <!-- All of these Include refs are expected to be present -->
-      <ComponentGroupRef Id="FragmentProperties" />
-      <ComponentGroupRef Id="FragmentSequences" />
-      <ComponentGroupRef Id="FragmentCustomActions" />
-    </ComponentGroup>
-
-    <UI>
-      <UIRef Id="WixUI_Minimal"/>
-    </UI>
-
-  </Fragment>
-</Wix>

data/resources/windows/wix/project.wxs.erb

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="windows-1252"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-  <Product
-    Id="*"
-    UpgradeCode="<%= settings[:upgrade_code] %>"
-    Name="<%= settings[:product_name] %>"
-    Language="1033"
-    Codepage="1252"
-    Version="<%= @platform.wix_product_version(@version) %>"
-    Manufacturer="<%= settings[:company_name] %>" >
-
-    <Package
-      InstallerVersion="300"
-      InstallScope="perMachine"
-      Description="<%= "#{settings[:product_id]}#{@platform.architecture == "x64" ? " (64-bit)" : ""}" %> Installer"
-      Comments="<%= @homepage %>"
-      Compressed="yes"
-      Platform="<%= @platform.architecture %>" />
-
-    <!-- We will use DirectoryRef at the project level to hook in the project directory structure -->
-    <Directory Id='TARGETDIR' Name='SourceDir' />
-
-    <MajorUpgrade AllowDowngrades="yes" />
-    <Media Id="1" Cabinet="<%= settings[:product_id] %>.cab" EmbedCab="yes" CompressionLevel="high" />
-
-    <Feature
-      Id="<%= settings[:product_id] %>Runtime"
-      Title="<%= settings[:product_id] %> Runtime"
-      Level="1">
-      <ComponentGroupRef Id="MainComponentGroup" />
-    </Feature>
-
-  </Product>
-</Wix>