omnibus 5.5.0 → 5.6.0

data/spec/unit/library_spec.rb

@@ -55,7 +55,7 @@ module Omnibus
     let(:yajl)        { generate_software("yajl", "1.1.0", %w{rubygems}) }
     let(:zlib)        { generate_software("zlib", "1.2.6", %w{libgcc}) }
 
-    describe '#component_added' do
+    describe "#component_added" do
       it "adds the software to the component list" do
         library.component_added(erchef)
         expect(library.components).to eql([erchef])
@@ -68,7 +68,7 @@ module Omnibus
       end
     end
 
-    describe '#build_order' do
+    describe "#build_order" do
       let(:library) do
         library = Library.new(project)
         library.component_added(preparation)

data/spec/unit/manifest_spec.rb

@@ -78,7 +78,7 @@ module Omnibus
     end
 
     describe "#from_hash" do
-      let(:manifest) {
+      let(:manifest) do
         { manifest_format: 1,
           build_version: "12.4.0+20150629082811",
           build_git_revision: "2e763ac957b308ba95cef256c2491a5a55a163cc",
@@ -93,7 +93,7 @@ module Omnibus
             },
           },
         }
-      }
+      end
 
       it "has a build_version" do
         expect(Manifest.from_hash(manifest).build_version).to eq("12.4.0+20150629082811")
@@ -112,7 +112,7 @@ module Omnibus
       end
 
       context "v2 manifest" do
-        let(:manifest) {
+        let(:manifest) do
           { manifest_format: 2,
             build_version: "12.4.0+20150629082811",
             build_git_revision: "2e763ac957b308ba95cef256c2491a5a55a163cc",
@@ -129,7 +129,7 @@ module Omnibus
               },
             },
           }
-        }
+        end
 
         it "has a license" do
           expect(Manifest.from_hash(manifest).license).to eq("Unspecified")
@@ -137,11 +137,11 @@ module Omnibus
       end
 
       context "unsupported manifest" do
-        let(:manifest) {
+        let(:manifest) do
           {
             manifest_format: 99,
           }
-        }
+        end
 
         it "raises an error if it doesn't recognize the manifest version" do
           expect { Manifest.from_hash(manifest) }.to raise_error Manifest::InvalidManifestFormat

data/spec/unit/metadata_spec.rb

@@ -329,20 +329,20 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       end
     end
 
-    describe '#name' do
+    describe "#name" do
       it "returns the basename of the package" do
         expect(subject.name).to eq("package.deb.metadata.json")
       end
     end
 
-    describe '#path' do
+    describe "#path" do
       it "delegates to .path_for" do
         expect(described_class).to receive(:path_for).once
         subject.path
       end
     end
 
-    describe '#save' do
+    describe "#save" do
       let(:file) { double(File) }
 
       before { allow(File).to receive(:open).and_yield(file) }
@@ -353,7 +353,7 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
       end
     end
 
-    describe '#to_json' do
+    describe "#to_json" do
       it "generates pretty JSON" do
         expect(subject.to_json.strip).to eq <<-EOH.gsub(/^ {10}/, "").strip
           {

data/spec/unit/omnibus_spec.rb

@@ -18,7 +18,7 @@ describe Omnibus do
     Omnibus::Config.software_gems(["omnibus-software", "custom-omnibus-software"])
   end
 
-  describe '#which' do
+  describe "#which" do
     it "returns nil when the file does not exist" do
       stub_env("PATH", nil)
       expect(subject.which("not_a_real_executable")).to be nil
@@ -33,7 +33,7 @@ describe Omnibus do
     end
   end
 
-  describe '#project_path' do
+  describe "#project_path" do
     before do
       allow(Omnibus).to receive(:project_map)
         .and_return("chef" => "/projects/chef")
@@ -52,7 +52,7 @@ describe Omnibus do
     end
   end
 
-  describe '#software_path' do
+  describe "#software_path" do
     before do
       allow(Omnibus).to receive(:software_map)
         .and_return("chef" => "/software/chef")
@@ -71,7 +71,7 @@ describe Omnibus do
     end
   end
 
-  describe '#possible_paths_for' do
+  describe "#possible_paths_for" do
     it "searches all paths" do
       expect(subject.possible_paths_for("file")).to eq(%w{
         /foo/bar/file

data/spec/unit/package_spec.rb

@@ -12,13 +12,13 @@ module Omnibus
       end
     end
 
-    describe '#name' do
+    describe "#name" do
       it "returns the basename of the file" do
         expect(subject.name).to eq("thing.deb")
       end
     end
 
-    describe '#md5' do
+    describe "#md5" do
       let(:md5) { "abcdef123456" }
 
       before { allow(subject).to receive(:digest).with(path, :md5).and_return(md5) }
@@ -28,7 +28,7 @@ module Omnibus
       end
     end
 
-    describe '#sha256' do
+    describe "#sha256" do
       let(:sha256) { "abcdef123456" }
 
       before { allow(subject).to receive(:digest).with(path, :sha256).and_return(sha256) }
@@ -38,7 +38,7 @@ module Omnibus
       end
     end
 
-    describe '#sha512' do
+    describe "#sha512" do
       let(:sha512) { "abcdef123456" }
 
       before { allow(subject).to receive(:digest).with(path, :sha512).and_return(sha512) }
@@ -48,7 +48,7 @@ module Omnibus
       end
     end
 
-    describe '#content' do
+    describe "#content" do
       context "when the file exists" do
         let(:content) { "BINARY" }
 
@@ -68,7 +68,7 @@ module Omnibus
       end
     end
 
-    describe '#metadata' do
+    describe "#metadata" do
       let(:content) { '{ "platform": "ubuntu" }' }
 
       before { allow(IO).to receive(:read).and_return(content) }

data/spec/unit/packagers/appx_spec.rb

@@ -34,21 +34,25 @@ module Omnibus
       end
     end
 
-    describe '#id' do
+    describe "#id" do
       it "is :pkg" do
         expect(subject.id).to eq(:appx)
       end
     end
 
-    describe '#package_name' do
+    describe "#package_name" do
+      before do
+        allow(Config).to receive(:windows_arch).and_return(:foo_arch)
+      end
+
       it "includes the name, version, and build iteration" do
-        expect(subject.package_name).to eq("project-1.2.3-2.appx")
+        expect(subject.package_name).to eq("project-1.2.3-2-foo_arch.appx")
       end
     end
 
-    describe '#write_manifest_file' do
+    describe "#write_manifest_file" do
       before do
-        allow(subject).to receive(:shellout!).and_return(double("output", stdout: "CN=Chef "))
+        allow(subject).to receive(:shellout!).and_return(double("output", stdout: 'CN="Chef", O="Chef"'))
         allow(subject).to receive(:signing_identity).and_return({})
       end
 
@@ -63,7 +67,7 @@ module Omnibus
 
         expect(contents).to include('Name="project"')
         expect(contents).to include('Version="1.2.3.2"')
-        expect(contents).to include('Publisher="CN=Chef"')
+        expect(contents).to include('Publisher="CN="Chef", O="Chef""')
         expect(contents).to include("<DisplayName>Project</DisplayName>")
         expect(contents).to include(
           '<PublisherDisplayName>"Chef Software &lt;maintainers@chef.io&gt;"</PublisherDisplayName>'
@@ -71,7 +75,7 @@ module Omnibus
       end
     end
 
-    describe '#windows_package_version' do
+    describe "#windows_package_version" do
       context "when the project build_version semver" do
         it "returns the right value" do
           expect(subject.windows_package_version).to eq("1.2.3.2")
@@ -87,7 +91,7 @@ module Omnibus
       end
     end
 
-    describe '#pack_command' do
+    describe "#pack_command" do
       it "returns a String" do
         expect(subject.pack_command("foo")).to be_a(String)
       end
@@ -125,7 +129,7 @@ module Omnibus
           allow(subject).to receive(:shellout!)
         end
 
-        describe '#timestamp_servers' do
+        describe "#timestamp_servers" do
           it "defaults to using ['http://timestamp.digicert.com','http://timestamp.verisign.com/scripts/timestamp.dll']" do
             subject.signing_identity("foo")
             expect(subject).to receive(:try_sign).with(appx, "http://timestamp.digicert.com").and_return(false)
@@ -133,20 +137,20 @@ module Omnibus
             subject.sign_package(appx)
           end
 
-          it 'uses the timestamp server if provided through the #timestamp_server dsl' do
+          it "uses the timestamp server if provided through the #timestamp_server dsl" do
             subject.signing_identity("foo", timestamp_servers: "http://fooserver")
             expect(subject).to receive(:try_sign).with(appx, "http://fooserver").and_return(true)
             subject.sign_package(appx)
           end
 
-          it 'tries all timestamp server if provided through the #timestamp_server dsl' do
+          it "tries all timestamp server if provided through the #timestamp_server dsl" do
             subject.signing_identity("foo", timestamp_servers: ["http://fooserver", "http://barserver"])
             expect(subject).to receive(:try_sign).with(appx, "http://fooserver").and_return(false)
             expect(subject).to receive(:try_sign).with(appx, "http://barserver").and_return(true)
             subject.sign_package(appx)
           end
 
-          it 'tries all timestamp server if provided through the #timestamp_servers dsl and stops at the first available' do
+          it "tries all timestamp server if provided through the #timestamp_servers dsl and stops at the first available" do
             subject.signing_identity("foo", timestamp_servers: ["http://fooserver", "http://barserver"])
             expect(subject).to receive(:try_sign).with(appx, "http://fooserver").and_return(true)
             expect(subject).not_to receive(:try_sign).with(appx, "http://barserver")

data/spec/unit/packagers/base_spec.rb

@@ -71,7 +71,7 @@ module Omnibus
       end
     end
 
-    describe '#install_dir' do
+    describe "#install_dir" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:install_dir)
       end
@@ -81,13 +81,13 @@ module Omnibus
       end
     end
 
-    describe '#windows_safe_path' do
+    describe "#windows_safe_path" do
       it "is a DSL method" do
         expect(subject).to have_exposed_method(:windows_safe_path)
       end
     end
 
-    describe '#run!' do
+    describe "#run!" do
       before do
         allow(subject).to receive(:remove_directory)
         allow(Metadata).to receive(:generate)
@@ -105,14 +105,14 @@ module Omnibus
       end
     end
 
-    describe '#staging_dir' do
+    describe "#staging_dir" do
       it "creates a temporary directory" do
         expect(Dir).to receive(:mktmpdir)
         subject.send(:staging_dir)
       end
     end
 
-    describe '#resource_path' do
+    describe "#resource_path" do
       let(:id) { :base }
       before { allow(subject).to receive(:id).and_return(id) }
 

data/spec/unit/packagers/bff_spec.rb

@@ -32,13 +32,13 @@ module Omnibus
       create_directory(subject.scripts_staging_dir)
     end
 
-    describe '#id' do
+    describe "#id" do
       it "is :bff" do
         expect(subject.id).to eq(:bff)
       end
     end
 
-    describe '#package_name' do
+    describe "#package_name" do
       before do
         allow(subject).to receive(:safe_architecture).and_return("x86_64")
       end
@@ -48,19 +48,19 @@ module Omnibus
       end
     end
 
-    describe '#scripts_install_dir' do
+    describe "#scripts_install_dir" do
       it "is nested inside the project install_dir" do
         expect(subject.scripts_install_dir).to start_with(project.install_dir)
       end
     end
 
-    describe '#scripts_staging_dir' do
+    describe "#scripts_staging_dir" do
       it "is nested inside the staging_dir" do
         expect(subject.scripts_staging_dir).to start_with(staging_dir)
       end
     end
 
-    describe '#write_scripts' do
+    describe "#write_scripts" do
       context "when scripts are given" do
         let(:scripts) { %w{ preinst postinst prerm postrm } }
         before do
@@ -83,7 +83,7 @@ module Omnibus
       end
     end
 
-    describe '#write_gen_template' do
+    describe "#write_gen_template" do
       before do
         allow(subject).to receive(:safe_architecture).and_return("x86_64")
       end
@@ -191,6 +191,36 @@ module Omnibus
         end
       end
 
+      context "when paths with invalid characters are present", if: !windows? do
+        let(:contents) do
+          subject.write_gen_template
+          File.read(gen_file)
+        end
+
+        before do
+          create_file("#{staging_dir}/file with_a_space")
+          create_file("#{staging_dir}/file_with_{left_brace")
+          create_file("#{staging_dir}/file_with_}right_brace")
+          create_file("#{staging_dir}/file_that_meets_expectations")
+        end
+
+        it "includes a file that does not include invalid characters" do
+          expect(contents).to include("/file_that_meets_expectations")
+        end
+
+        it "does not include a file with spaces in the path" do
+          expect(contents).to_not include("/file with_a_space")
+        end
+
+        it "does not include a file with left braces in the path" do
+          expect(contents).to_not include("/file_with_{left_brace")
+        end
+
+        it "does not include a file with right braces in the path" do
+          expect(contents).to_not include("/file_with_}right_brace")
+        end
+      end
+
       context "when script files are present" do
         before do
           create_file("#{subject.scripts_staging_dir}/preinst")
@@ -224,13 +254,13 @@ module Omnibus
       end
     end
 
-    describe '#create_bff_file' do
+    describe "#create_bff_file" do
       # Need to mock out the id calls
-      let(:id_shellout) {
+      let(:id_shellout) do
         shellout_mock = double("shellout_mock")
         allow(shellout_mock).to receive(:stdout).and_return("300")
         shellout_mock
-      }
+      end
 
       before do
         allow(subject).to receive(:shellout!)
@@ -240,7 +270,7 @@ module Omnibus
         allow(subject).to receive(:shellout!)
           .with("id -g").and_return(id_shellout)
 
-        create_file(File.join(staging_dir, ".info", "#{project.name}.inventory")) {
+        create_file(File.join(staging_dir, ".info", "#{project.name}.inventory")) do
           <<-INVENTORY.gsub(/^\s{12}/, "")
             /opt/project/version-manifest.txt:
                       owner = root
@@ -251,7 +281,7 @@ module Omnibus
                       size = 1906
                       checksum = "02776    2 "
           INVENTORY
-        }
+        end
         create_file("#{staging_dir}/file") { "http://goo.gl/TbkO01" }
       end
 
@@ -307,7 +337,7 @@ module Omnibus
       end
     end
 
-    describe '#safe_base_package_name' do
+    describe "#safe_base_package_name" do
       context 'when the project name is "safe"' do
         it "returns the value without logging a message" do
           expect(subject.safe_base_package_name).to eq("project")
@@ -328,20 +358,20 @@ module Omnibus
       end
     end
 
-    describe '#create_bff_file_name' do
+    describe "#create_bff_file_name" do
       it "constructs the proper package name" do
         expect(subject.create_bff_file_name).to eq("project-1.2.3-2.x86_64.bff")
       end
 
     end
 
-    describe '#bff_version' do
+    describe "#bff_version" do
       it "returns the build version up with the build iteration" do
         expect(subject.bff_version).to eq("1.2.3.2")
       end
     end
 
-    describe '#safe_architecture' do
+    describe "#safe_architecture" do
       before do
         stub_ohai(platform: "ubuntu", version: "12.04") do |data|
           data["kernel"]["machine"] = "i386"