From 856279a392c56f5dbc486e655a265b4281164392 Mon Sep 17 00:00:00 2001 From: Jaymala Sinha Date: Mon, 3 Oct 2016 12:17:09 -0400 Subject: [PATCH] BEN-121- P5P package naming does not append timestamp or git describe data Use fixed package_name while creating p5p archive Update unit test with git build_version --- lib/omnibus/packagers/ips.rb | 3 +-- spec/unit/packagers/ips_spec.rb | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/omnibus/packagers/ips.rb b/lib/omnibus/packagers/ips.rb index 7336609eb..e8358d85c 100644 --- a/lib/omnibus/packagers/ips.rb +++ b/lib/omnibus/packagers/ips.rb @@ -81,8 +81,7 @@ def publisher_prefix(val = NULL) # @see Base#package_name # def package_name - version = project.build_version.split(/[^\d]/)[0..2].join(".") - "#{safe_base_package_name}-#{version}-#{project.build_iteration}.#{safe_architecture}.p5p" + "#{safe_base_package_name}-#{project.build_version}-#{project.build_iteration}.#{safe_architecture}.p5p" end # diff --git a/spec/unit/packagers/ips_spec.rb b/spec/unit/packagers/ips_spec.rb index aa4268962..15a07b2fc 100644 --- a/spec/unit/packagers/ips_spec.rb +++ b/spec/unit/packagers/ips_spec.rb @@ -8,7 +8,7 @@ module Omnibus project.name("project") project.homepage("https://example.com") project.install_dir("/opt/project") - project.build_version("1.2.3") + project.build_version("1.2.3+20161003185500.git.37.089ab3f") project.build_iteration("2") project.maintainer("Chef Software") end @@ -55,7 +55,7 @@ module Omnibus describe "#package_name" do it "should create correct package name" do - expect(subject.package_name).to eq("project-1.2.3-2.i386.p5p") + expect(subject.package_name).to eq("project-1.2.3+20161003185500.git.37.089ab3f-2.i386.p5p") end end @@ -211,7 +211,7 @@ module Omnibus describe "#export_pkg_archive_file" do it "uses the correct commands" do expect(subject).to receive(:shellout!) - .with("pkgrecv -s #{staging_dir}/publish/repo -a -d #{package_dir}/project-1.2.3-2.i386.p5p project") + .with("pkgrecv -s #{staging_dir}/publish/repo -a -d #{package_dir}/project-1.2.3+20161003185500.git.37.089ab3f-2.i386.p5p project") expect(shellout).to receive(:stdout) subject.export_pkg_archive_file