vanagon 0.15.18 → 0.15.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98826d92d0eb55918c4a5db6ef30e6216785cb567560ecf34e0254e72ae45336
-  data.tar.gz: aec8e9bd65afafc3dd1b83bb5045e9159357d0d5c7c18037217bb61ac71730af
+  metadata.gz: b71ba52fd3a026248d25a3a10a0570960d552585a8cc3e114c2bb366583c2bbb
+  data.tar.gz: 726ddf77c6137b9f09adf974dd981eae1f654f063a32f56181c1ca630f3fd04b
 SHA512:
-  metadata.gz: 8b52b708b61e3361fb37e085f11e5dcb4ce2426fac0ce1435b21a8872fba3772df72c1146c74cafe6f1bbb89bf92f6aafd1d3f71c2a4926e7d77a8762dc4a5e1
-  data.tar.gz: 318ec2188ac994dd0c1086fd736d25a6d3dc3474111d7b33127e8fba43bb87e5f0bc6e88cec6cd1d63f6179dd9a8197a87e7362e9d27961d396fcb076ae70cd9
+  metadata.gz: 4afb19e20c1e81500c9ed9cde575ed93679dd2fca0407d86a9b67aa4bf0cbcadb65b3a74d0dc9e9439a5686e285792c571b6e2fa1faecb1a646409edbc527b48
+  data.tar.gz: 53b39a73763a1c30cde5cd75ff17356ace19390518cd4bb9d490a00316d72d91d7ecea9565ebf50c36f0cd48ebbc61c6e645922d0574e4b77b9c6d6bddd12fd2

data/lib/vanagon/project.rb

@@ -6,6 +6,9 @@ require 'vanagon/utilities'
 require 'digest'
 require 'ostruct'
 
+# Used to parse the vendor field into name and email
+VENDOR_REGEX = /^(.*) <(.*)>$/
+
 class Vanagon
   class Project
     include Vanagon::Utilities
@@ -17,7 +20,7 @@ class Vanagon
     attr_accessor :release
     attr_accessor :license
     attr_accessor :homepage
-    attr_accessor :vendor
+    attr_reader :vendor
     attr_accessor :description
     attr_accessor :components
     attr_accessor :conflicts
@@ -177,6 +180,31 @@ class Vanagon
       environment.merge(@platform.environment)
     end
 
+    # Setter for the vendor field.
+    #
+    # @param vend [String] name and email address of vendor
+    # @raise [Vanagon::Error] when `vend` does not include email address
+    def vendor=(vend)
+      raise Vanagon::Error, 'Project vendor field must include email address in angle brackets, e.g. "Puppet Inc. <release@puppet.com>"' unless vend.match(VENDOR_REGEX)
+      @vendor = vend
+    end
+
+    # Parses the vendor for the project by cutting off the email address
+    # field (e.g. `<email@example.com>`).
+    #
+    # @return [String] Vendor name without email address
+    def vendor_name_only
+      return @vendor.match(VENDOR_REGEX)[1]
+    end
+
+    # Parses the vendor for the project by taking only the email address field
+    # (e.g. `<email@example.com>`).
+    #
+    # @return [String] Vendor email address
+    def vendor_email_only
+      return @vendor.match(VENDOR_REGEX)[2]
+    end
+
     # Collects all sources and patches into the provided workdir
     #
     # @param workdir [String] directory to stage sources into

data/resources/rpm/project.spec.erb

@@ -21,6 +21,11 @@
 %global __debug_package %{nil}
 # to resolve: "ERROR: No build ID note found"
 %undefine _missing_build_ids_terminate_build
+
+<% @package_overrides.each do |var| %>
+<%= var %>
+<% end -%>
+
 # To avoid files installed but not packaged errors
 %global __os_install_post %{__os_install_post} \
     rm -rf %{buildroot}/usr/lib/debug
@@ -35,15 +40,11 @@
 %global __os_install_post %(echo '%{__os_install_post}' | <%= @platform.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}
 Summary:        <%= @description.lines.first.chomp %>
-Vendor:         <%= @vendor.match(/^(.*) <.*>$/)[1] %>
+Vendor:         <%= vendor_name_only %>
 License:        <%= @license %>
 Group:          System Environment/Base
 URL:            <%= @homepage %>

data/resources/solaris/10/pkginfo.erb

@@ -6,7 +6,7 @@ CLASSES=none
 CATEGORY=application
 VENDOR=<%= @vendor %>
 PSTAMP=<%= Time.now.strftime('%Y-%m-%d.%H%M%S') %>
-EMAIL=<%= @vendor.match(/<([^>]*)>/)[1] %>
+EMAIL=<%= vendor_email_only %>
 ISTATES=S s 1 2 3
 RSTATES=S s 1 2 3
 BASEDIR=/

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

@@ -4,8 +4,8 @@
     <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>
+    <authors><%= vendor_name_only %></authors>
+    <owners><%= vendor_name_only %></owners>
     <projectUrl><%= @homepage %></projectUrl>
     <packageSourceUrl><%= @homepage %></packageSourceUrl>
     <projectSourceUrl><%= @homepage %></projectSourceUrl>
@@ -19,7 +19,7 @@
     </description>
     <summary><%= @description.lines.first.chomp %></summary>
     <releaseNotes><%= @homepage %></releaseNotes>
-    <copyright><%= @vendor.match(/^(.*) <.*>$/)[1] %></copyright>
+    <copyright><%= vendor_name_only %></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>

data/spec/lib/vanagon/project_spec.rb

@@ -55,6 +55,39 @@ describe 'Vanagon::Project' do
     plat._platform
   }
 
+  describe '#vendor=' do
+    dummy_platform = Vanagon::Platform.new('el-7-x86_64')
+    good_vendor = 'Puppet Inc. <release@puppet.com>'
+    bad_vendor = 'Puppet Inc.'
+
+    it 'fails if vendor field does not include email address' do
+      project = Vanagon::Project.new('vendor-test', dummy_platform)
+      expect { project.vendor = bad_vendor }.to raise_error(Vanagon::Error, /Project vendor field must include email address/)
+    end
+
+    it 'sets project vendor to the supplied value' do
+      project = Vanagon::Project.new('vendor-test', dummy_platform)
+      project.vendor = good_vendor
+      expect(project.vendor).to eq(good_vendor)
+    end
+  end
+
+  describe '#vendor_name_only' do
+    it 'returns just the name of the vendor' do
+      project = Vanagon::Project.new('vendor-test', Vanagon::Platform.new('el-7-x86_64'))
+      project.vendor = 'Puppet Inc. <release@puppet.com>'
+      expect(project.vendor_name_only).to eq('Puppet Inc.')
+    end
+  end
+
+  describe '#vendor_email_only' do
+    it 'returns just the email address of the vendor' do
+      project = Vanagon::Project.new('vendor-test', Vanagon::Platform.new('el-7-x86_64'))
+      project.vendor = 'Puppet Inc. <release@puppet.com>'
+      expect(project.vendor_email_only).to eq('release@puppet.com')
+    end
+  end
+
   describe '#get_root_directories' do
 
     before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.18
+  version: 0.15.19
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -266,41 +266,41 @@ signing_key:
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/git/rev_list_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
 - spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/driver_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/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/environment_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/windows_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
 - spec/lib/vanagon/platform/dsl_spec.rb
 - spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
 - spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/http_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/project_spec.rb
 - spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_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/base_spec.rb
+- spec/lib/vanagon/engine/pooler_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/git/rev_list_spec.rb