omnibus 3.0.0 → 3.1.0

data/spec/unit/library_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'omnibus/library'
-require 'omnibus/project'
 
 describe Omnibus::Library do
   let(:project) { Omnibus::Project.load(project_path('chefdk')) }
@@ -8,6 +6,15 @@ describe Omnibus::Library do
   let(:erchef) { Omnibus::Software.load(software_path('erchef'), project) }
   let(:zlib) { Omnibus::Software.load(software_path('zlib'), project) }
 
+  def gen_software(name, deps)
+    software = Omnibus::Software.new('', "#{name}.rb", 'chef-server')
+    software.name(name.to_s)
+    deps.each do |dep|
+      software.dependency(dep)
+    end
+    software
+  end
+
   describe '#component_added' do
     it 'adds the software to the component list' do
       library.component_added(erchef)
@@ -31,6 +38,7 @@ maintainer 'Chef Software, Inc'
 homepage 'http://getchef.com'
 dependency 'preparation'
 dependency 'erchef'
+dependency 'postgresql'
 dependency 'chef'
 EOH
       Omnibus::Project.new(raw_project, 'chef-server.rb')
@@ -40,6 +48,7 @@ EOH
       library = Omnibus::Library.new(project)
       library.component_added(preparation)
       library.component_added(erlang)
+      library.component_added(postgresql) # as a skitch trans dep
       library.component_added(skitch)
       library.component_added(erchef)
       library.component_added(ruby)
@@ -47,7 +56,7 @@ EOH
       library
     end
 
-    project_deps = [:preparation, :erchef, :chef]
+    project_deps = [:preparation, :erchef, :postgresql, :chef]
     erchef_deps = [:erlang, :skitch]
     chef_deps = [:ruby]
 
@@ -55,12 +64,123 @@ EOH
       let(dep) do
         software = Omnibus::Software.new('', "#{dep}.rb", 'chef-server')
         software.name(dep.to_s)
+        software.dependency('postgresql') if dep == :skitch
         software
       end
     end
 
-    it 'returns an array of software descriptions, with all non top level deps first' do
-      expect(library.build_order).to eql([preparation, erlang, skitch, ruby, erchef, chef])
+    it 'returns an array of software descriptions, with all top level deps first, assuming they are not themselves transitive deps' do
+      library.build_order.map { |m| m.name.to_s }
+      expect(library.build_order).to eql([preparation, erlang, postgresql, skitch, ruby, erchef, chef])
+    end
+
+    context 'with a complex dep tree' do
+      # rubocop:disable all
+      [
+        ['preparation', []],
+        ['erchef', ['erlang', 'skitch']],
+        ['postgresql', []],
+        ['erlang', []],
+        ['skitch', ['postgresql']],
+        ['chef', ['ruby', 'bundler', 'ohai']],
+        ['ohai', ['ruby']],
+        ['bundler', ['ruby']],
+        ['ruby', []],
+        ['chefdk', ['ruby', 'bundler']],
+      ].each do |item|
+        name = item[0]
+        deps = item[1]
+        let(name) do
+          gen_software(name, deps)
+        end
+      end
+
+      let(:project) do
+        raw_project = <<-EOH
+name "chef-dk"
+install_path "/opt/chefdk"
+build_version "1.0.0"
+maintainer 'Chef Software, Inc'
+homepage 'http://getchef.com'
+dependency 'preparation'
+dependency 'erchef'
+dependency 'postgresql'
+dependency 'ruby'
+dependency 'chef'
+dependency 'chefdk'
+        EOH
+        Omnibus::Project.new(raw_project, 'chefdk.rb')
+      end
+
+      let(:library) do
+      # This is the LOAD ORDER
+        library = Omnibus::Library.new(project)
+        library.component_added(preparation) # via project
+        library.component_added(erlang) # via erchef
+        library.component_added(postgresql) # via skitch
+        library.component_added(skitch) # via erchef
+        library.component_added(erchef) # erchef
+        library.component_added(ruby) # via project
+        library.component_added(bundler) # via chef
+        library.component_added(ohai) # via chef
+        library.component_added(chef) # via project
+        library.component_added(chefdk) # via project
+        library
+      end
+
+      it 'returns an array of software descriptions, with all top level deps first, assuming they are not themselves transitive deps' do
+        expect(library.build_order).to eql(
+          [
+            preparation, # first
+            erlang, # via erchef project
+            postgresql, # via skitch transitive
+            skitch, # via erchef project
+            ruby, # via bundler transitive
+            bundler, # via chef
+            ohai, # via chef
+            erchef, # project dep
+            chef, # project dep
+            chefdk, # project dep
+           ])
+      end
+    end
+
+    context 'with real data' do
+      before do
+        Omnibus.stub(:project_root).and_return(complicated_path)
+
+        # Ohai stuff
+        stub_const('File::ALT_SEPARATOR', '\\')
+        stub_ohai(platform: 'windows')
+
+        Omnibus.process_dsl_files
+      end
+
+      after { Omnibus.reset! }
+
+      let(:chefdk_windows) do
+        Omnibus.projects.find { |p| p.name.to_s == 'chefdk-windows' }
+      end
+
+      it 'has the right build order for chefdk-windows on windows' do
+        names = chefdk_windows.library.build_order.map { |m| m.name.to_s }
+        expect(names).to eql([
+          'preparation', # via project dep
+          'ruby-windows', # via libyaml-windows trans dep
+          'libyaml-windows', # via ruby-windows trans
+          'ruby-windows-devkit', # via trans dep from chef-windows
+          'bundler', # via trans dep from chef-windows
+          'cacerts', # via chef-windows
+          'chef-windows', # via transitive dep from chefdk
+          'nokogiri', # via test-kitchen
+          'test-kitchen', # via chefdk
+          'appbundler', # via chefdk
+          'berkshelf', # via chefdk
+          'chef-vault', # via chefdk
+          'chefdk', # via project dep
+          'chef-client-msi', # via top level dep
+        ])
+      end
     end
   end
 

data/spec/unit/omnibus_spec.rb

@@ -3,15 +3,8 @@ require 'spec_helper'
 
 describe Omnibus do
   # evil class variables
-  before :each do
-    Omnibus.class_eval { @omnibus_software_root = nil }
-    Omnibus.class_eval { @software_dirs = nil }
-  end
-
-  after :each do
-    Omnibus.class_eval { @omnibus_software_root = nil }
-    Omnibus.class_eval { @software_dirs = nil }
-  end
+  before { Omnibus.reset! }
+  after  { Omnibus.reset! }
 
   describe '::omnibus_software_root' do
     it 'reads the software_gem out of Omnibus::Config.software_gem' do
@@ -56,4 +49,27 @@ describe Omnibus do
       end
     end
   end
+
+  describe '#process_dsl_files' do
+    before do
+      Omnibus.stub(:project_root).and_return(complicated_path)
+      stub_ohai(platform: 'linux')
+    end
+
+    after { Omnibus.reset! }
+
+    it 'populates the 5 projects' do
+      Omnibus.process_dsl_files
+
+      expect(Omnibus.projects.size).to eq(5)
+
+      names = Omnibus.projects.map(&:name)
+      expect(names).to include('angrychef')
+      expect(names).to include('chef-windows')
+      expect(names).to include('chef')
+      expect(names).to include('chefdk-windows')
+      expect(names).to include('chefdk')
+    end
+
+  end
 end

data/spec/unit/overrides_spec.rb

@@ -1,4 +1,3 @@
-require 'omnibus/overrides'
 require 'spec_helper'
 
 describe Omnibus::Overrides do
@@ -41,20 +40,9 @@ describe Omnibus::Overrides do
   end # parse_file
 
   describe '#resolve_override_file' do
-    before :each do
-      @original = ENV['OMNIBUS_OVERRIDE_FILE']
-      ENV['OMNIBUS_OVERRIDE_FILE'] = env_override_file
-    end
-
-    after :each do
-      ENV['OMNIBUS_OVERRIDE_FILE'] = @original
-    end
-
     subject { Omnibus::Overrides.resolve_override_file }
 
     context 'with no environment variable set' do
-      let(:env_override_file) { nil }
-
       before :each do
         stub_const('Omnibus::Overrides::DEFAULT_OVERRIDE_FILE_NAME', new_default_file)
       end
@@ -72,6 +60,8 @@ describe Omnibus::Overrides do
     end # no environment variable
 
     context 'with OMNIBUS_OVERRIDE_FILE environment variable set' do
+      before { stub_env('OMNIBUS_OVERRIDE_FILE', env_override_file) }
+
       context 'to an existing file' do
         let(:path) { overrides_path('good') }
         let(:env_override_file) { path  }
@@ -91,8 +81,6 @@ describe Omnibus::Overrides do
           stub_const('Omnibus::Overrides::DEFAULT_OVERRIDE_FILE_NAME', new_default_file)
 
           expect(File.exist?(Omnibus::Overrides::DEFAULT_OVERRIDE_FILE_NAME)).to be_true
-          expect(ENV['OMNIBUS_OVERRIDE_FILE']).to_not be_nil
-
           expect(subject).to be_nil
         end
       end

data/spec/unit/package_release_spec.rb

@@ -1,21 +1,3 @@
-#
-# Copyright:: Copyright (c) 2012-2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'omnibus/package_release'
 require 'spec_helper'
 
 describe Omnibus::PackageRelease do

data/spec/unit/packagers/base_spec.rb

@@ -1,19 +1,4 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+require 'stringio'
 
 module Omnibus
   describe Packager::Base do
@@ -28,6 +13,8 @@ module Omnibus
              files_path: 'files',
              package_dir: 'pkg',
              package_tmp: 'pkg-tmp',
+             resources_path: nil,
+             friendly_name: 'HAMLET',
       )
     end
 
@@ -41,6 +28,10 @@ module Omnibus
       expect(subject.name).to eq(project.name)
     end
 
+    it 'delegates #friendly_name to @project' do
+      expect(subject.friendly_name).to eq(project.friendly_name)
+    end
+
     it 'delegates #version to @project' do
       expect(subject.version).to eq(project.build_version)
     end
@@ -154,6 +145,61 @@ module Omnibus
       end
     end
 
+    describe '#copy_directory' do
+      before do
+        FileUtils.stub(:cp_r)
+        Dir.stub(:[]).and_return(['baz/file'])
+      end
+
+      it 'copies the directory' do
+        expect(FileUtils).to receive(:cp_r).with(['baz/file'], 'bar')
+        subject.copy_directory('baz', 'bar')
+      end
+    end
+
+    describe '#render_template' do
+      it 'return when source is not an erb template' do
+        expect(File).not_to receive(:open)
+        subject.render_template('source.txt')
+      end
+
+      shared_examples_for 'render_template' do
+        let(:output) { StringIO.new }
+
+        before do
+          input = StringIO.new
+          input.write('<%= friendly_name %>')
+          input.rewind
+
+          File.stub(:open).with(source_path).and_yield(input)
+          File.stub(:open).with(expected_destination_path, 'w').and_yield(output)
+
+          expect(subject).to receive(:remove_file).with(source_path)
+        end
+
+        it 'should render correctly' do
+          subject.render_template(source_path, destination_path)
+          expect(output.string).to eq('HAMLET')
+        end
+      end
+
+      context 'when destination is specified' do
+        let(:source_path) { 'source.txt.erb' }
+        let(:destination_path) { 'destination.txt' }
+        let(:expected_destination_path) { destination_path }
+
+        include_examples 'render_template'
+      end
+
+      context 'when destination is not specified' do
+        let(:source_path) { 'source.txt.erb' }
+        let(:destination_path) { nil }
+        let(:expected_destination_path) { 'source.txt' }
+
+        include_examples 'render_template'
+      end
+    end
+
     describe '#remove_file' do
       before { FileUtils.stub(:rm_f) }
 
@@ -189,8 +235,8 @@ module Omnibus
       end
 
       it 'calls the methods in order' do
-        expect(described_class).to receive(:validate).ordered
         expect(described_class).to receive(:setup).ordered
+        expect(described_class).to receive(:validate).ordered
         expect(described_class).to receive(:build).ordered
         expect(described_class).to receive(:clean).ordered
         subject.run!
@@ -204,17 +250,34 @@ module Omnibus
       end
     end
 
+    describe '#staging_resources_path' do
+      it 'is base/Resources under package temp' do
+        name = "#{project.package_tmp}/base/Resources"
+        expect(subject.send(:staging_resources_path)).to eq(File.expand_path(name))
+      end
+    end
+
     describe '#resource' do
       it 'prefixes to the resources_path' do
-        path = 'files/base/Resources/icon.png'
+        path = 'pkg-tmp/base/Resources/icon.png'
         expect(subject.send(:resource, 'icon.png')).to eq(File.expand_path(path))
       end
     end
 
     describe '#resoures_path' do
-      it 'is the files_path, underscored_name, and Resources' do
-        path = "#{project.files_path}/base/Resources"
-        expect(subject.send(:resources_path)).to eq(File.expand_path(path))
+      context 'when project does not define resources_path' do
+        it 'is the files_path, underscored_name, and Resources' do
+          path = "#{project.files_path}/base/Resources"
+          expect(subject.send(:resources_path)).to eq(File.expand_path(path))
+        end
+      end
+
+      context 'when project defines resources_path' do
+        before { project.stub(:resources_path).and_return('project/specific') }
+        it 'is the project resources_path, underscored_name, and Resources' do
+          path = 'project/specific/base/Resources'
+          expect(subject.send(:resources_path)).to eq(File.expand_path(path))
+        end
       end
     end
   end

data/spec/unit/packagers/mac_pkg_spec.rb

@@ -1,20 +1,3 @@
-#
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 require 'stringio'
 require 'spec_helper'
 
@@ -62,6 +45,13 @@ EOH
 
   let(:expected_distribution_path) { '/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution' }
 
+  let(:pkg_signing_config) do
+    {
+      sign_pkg: false,
+      signing_identity: nil,
+    }
+  end
+
   let(:project) do
     double Omnibus::Project,
            name: project_name,
@@ -73,7 +63,9 @@ EOH
            files_path: files_path,
            package_dir: package_dir,
            package_tmp: package_tmp,
-           mac_pkg_identifier: mac_pkg_identifier
+           mac_pkg_identifier: mac_pkg_identifier,
+           config: pkg_signing_config,
+           friendly_name: 'Myproject'
   end
 
   let(:packager) do
@@ -142,12 +134,30 @@ EOH
 
   describe 'building the product package' do
     it 'generates the distribution and runs productbuild' do
-      expect(packager).to receive(:execute).with <<-EOH.gsub(/^ {8}/, '')
-        productbuild \\
-          --distribution "/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution" \\
-          --resources "/omnibus/project/root/files/mac_pkg/Resources" \\
-          "/home/someuser/omnibus-myproject/pkg/myproject-23.4.2-4.pkg"
-      EOH
+      expect(packager).to receive(:execute).with ['productbuild',
+                                                  %Q(--distribution "/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution"),
+                                                  %Q(--resources "/var/cache/omnibus/pkg-tmp/mac_pkg/Resources"),
+                                                  '/home/someuser/omnibus-myproject/pkg/myproject-23.4.2-4.pkg',
+      ].join(' ')
+      packager.build_product_pkg
+    end
+  end
+
+  context 'when pkg signing is enabled' do
+    let(:pkg_signing_config) do
+      {
+        sign_pkg: true,
+        signing_identity: 'My Special Identity',
+      }
+    end
+
+    it 'includes the signing parameters in the product build command' do
+      expect(packager).to receive(:execute).with ['productbuild',
+                                                  %Q(--distribution "/var/cache/omnibus/pkg-tmp/mac_pkg/Distribution"),
+                                                  %Q(--resources "/var/cache/omnibus/pkg-tmp/mac_pkg/Resources"),
+                                                  %Q(--sign "My Special Identity"),
+                                                  '/home/someuser/omnibus-myproject/pkg/myproject-23.4.2-4.pkg',
+      ].join(' ')
       packager.build_product_pkg
     end
   end