omnibus 5.0.0 → 5.1.0

data/spec/unit/packagers/solaris_spec.rb

@@ -116,6 +116,12 @@ module Omnibus
 
       before do
         allow(subject).to receive(:shellout!)
+        File.open("#{staging_dir}/files", "w+") do |f|
+          f.write <<-EOF
+/foo/bar/baz
+/a file with spaces
+          EOF
+        end
       end
 
       it 'creates the prototype file' do
@@ -135,11 +141,17 @@ module Omnibus
         expect(subject).to receive(:shellout!)
           .with("cd /opt && find project -print > #{File.join(staging_dir, 'files')}")
         expect(subject).to receive(:shellout!)
-          .with("cd /opt && pkgproto < #{File.join(staging_dir, 'files')} > #{File.join(staging_dir, 'Prototype.files')}")
+          .with("cd /opt && pkgproto < #{File.join(staging_dir, 'files.clean')} > #{File.join(staging_dir, 'Prototype.files')}")
         expect(subject).to receive(:shellout!)
           .with("awk '{ $5 = \"root\"; $6 = \"root\"; print }' < #{File.join(staging_dir, 'Prototype.files')} >> #{File.join(staging_dir, 'Prototype')}")
+        subject.write_prototype_file
+      end
 
+      it 'strips out the file with spaces from files.clean' do
         subject.write_prototype_file
+        contents = File.read(File.join(staging_dir, 'files.clean'))
+        expect(contents).not_to include("a file with spaces")
+        expect(contents).to include("/foo/bar/baz")
       end
     end
 

data/spec/unit/software_spec.rb

@@ -9,19 +9,32 @@ module Omnibus
       end
     end
 
+    let(:source) do
+      {
+        url: 'http://example.com/',
+        md5: 'abcd1234'
+      }
+    end
+
+    let(:rel_path) { 'software' }
+
     subject do
+      local_source = source
+      local_rel_path = rel_path
+
       described_class.new(project).evaluate do
         name 'software'
         default_version '1.2.3'
 
-        source url: 'http://example.com/',
-               md5: 'abcd1234'
+        source local_source
+        relative_path local_rel_path
       end
     end
 
     it_behaves_like 'a cleanroom getter', :project
     it_behaves_like 'a cleanroom setter', :name, %|name 'libxml2'|
     it_behaves_like 'a cleanroom setter', :description, %|description 'The XML magician'|
+    it_behaves_like 'a cleanroom setter', :maintainer, %|maintainer 'Captain Jack <sparrow@chef.io>'|
     it_behaves_like 'a cleanroom setter', :dependency, %|dependency 'libxslt'|
     it_behaves_like 'a cleanroom setter', :source, %|source url: 'https://source.example.com'|
     it_behaves_like 'a cleanroom setter', :default_version, %|default_version '1.2.3'|
@@ -50,9 +63,9 @@ module Omnibus
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -60,9 +73,9 @@ module Omnibus
         it 'overrides LDFLAGS' do
           expect(subject.with_standard_compiler_flags('LDFLAGS'        => 'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -70,9 +83,9 @@ module Omnibus
         it 'overrides CFLAGS' do
           expect(subject.with_standard_compiler_flags('CFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -80,9 +93,9 @@ module Omnibus
         it 'overrides CXXFLAGS' do
           expect(subject.with_standard_compiler_flags('CXXFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -90,9 +103,9 @@ module Omnibus
         it 'overrides CPPFLAGS' do
           expect(subject.with_standard_compiler_flags('CPPFLAGS'=>'foo')).to eq(
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -101,9 +114,9 @@ module Omnibus
           expect(subject.with_standard_compiler_flags('numberwang'=>4)).to eq(
             'numberwang'      => 4,
             'LDFLAGS'         => '-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            'CXXFLAGS'        => '-I/opt/project/embedded/include',
-            'CPPFLAGS'        => '-I/opt/project/embedded/include',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -165,9 +178,9 @@ module Omnibus
         it 'sets the defaults' do
           expect(subject.with_standard_compiler_flags).to eq(
             'LDFLAGS'         => '-L/opt/project/embedded/lib',
-            'CFLAGS'          => '-I/opt/project/embedded/include',
-            "CXXFLAGS"        => "-I/opt/project/embedded/include",
-            "CPPFLAGS"        => "-I/opt/project/embedded/include",
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
+            "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
             'LD_RUN_PATH'     => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
           )
@@ -199,37 +212,100 @@ module Omnibus
         end
       end
 
-      context 'on freebsd' do
+      context 'on freebsd 9' do
         before do
           stub_ohai(platform: 'freebsd', version: '9.2')
         end
 
         it 'sets the defaults' do
           expect(subject.with_standard_compiler_flags).to eq(
-            'CFLAGS'  => '-I/opt/project/embedded/include',
-            'CXXFLAGS'  => '-I/opt/project/embedded/include',
-            'CPPFLAGS'  => '-I/opt/project/embedded/include',
+            'CFLAGS'  => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'  => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'  => '-I/opt/project/embedded/include -O2',
             'LDFLAGS' => '-L/opt/project/embedded/lib',
             'LD_RUN_PATH' => '/opt/project/embedded/lib',
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
           )
         end
+      end
+
+      context 'on freebsd 10' do
+        before do
+          stub_ohai(platform: 'freebsd', version: '10.0')
+        end
+
+        it 'Clang as the default compiler' do
+          expect(subject.with_standard_compiler_flags).to eq(
+            'CC'              => 'clang',
+            'CXX'             => 'clang++',
+            'CFLAGS'          => '-I/opt/project/embedded/include -O2',
+            'CXXFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'CPPFLAGS'        => '-I/opt/project/embedded/include -O2',
+            'LDFLAGS'         => '-L/opt/project/embedded/lib',
+            'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+            'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
+          )
+        end
+      end
 
-        context 'on freebsd' do
-          before do
-            stub_ohai(platform: 'freebsd', version: '10.0')
+      context 'on Windows' do
+        let(:win_arch_i386) { true }
+
+        before do
+          stub_ohai(platform: 'windows', version: '2012')
+          allow(subject).to receive(:windows_arch_i386?).and_return(win_arch_i386)
+        end
+
+        context 'in 32-bit mode' do
+          it 'sets the default' do
+            expect(subject.with_standard_compiler_flags).to eq(
+              'CFLAGS'          => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'LDFLAGS'         => '-L/opt/project/embedded/lib -m32',
+              'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+            )
           end
 
-          it 'Clang as the default compiler' do
+          it 'sets BFD flags if requested' do
+            expect(subject.with_standard_compiler_flags({}, bfd_flags: true)).to eq(
+              'CFLAGS'          => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -mfpmath=sse -msse2 -march=i686',
+              'LDFLAGS'         => '-L/opt/project/embedded/lib -m32',
+              'RCFLAGS'         => '--target=pe-i386',
+              'ARFLAGS'         => '--target=pe-i386',
+              'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+            )
+          end
+        end
+
+        context 'in 64-bit mode' do
+          let(:win_arch_i386) { false }
+
+          it 'sets the default' do
             expect(subject.with_standard_compiler_flags).to eq(
-              'CC'              => 'clang',
-              'CXX'             => 'clang++',
-              'CFLAGS'          => '-I/opt/project/embedded/include',
-              'CXXFLAGS'        => '-I/opt/project/embedded/include',
-              'CPPFLAGS'        => '-I/opt/project/embedded/include',
-              'LDFLAGS'         => '-L/opt/project/embedded/lib',
+              'CFLAGS'          => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'LDFLAGS'         => '-L/opt/project/embedded/lib -m64',
               'LD_RUN_PATH'     => '/opt/project/embedded/lib',
-              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
+              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
+            )
+          end
+
+          it 'sets BFD flags if requested' do
+            expect(subject.with_standard_compiler_flags({}, bfd_flags: true)).to eq(
+              'CFLAGS'          => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -mfpmath=sse -msse2 -march=x86-64',
+              'LDFLAGS'         => '-L/opt/project/embedded/lib -m64',
+              'RCFLAGS'         => '--target=pe-x86-64',
+              'ARFLAGS'         => '--target=pe-x86-64',
+              'LD_RUN_PATH'     => '/opt/project/embedded/lib',
+              'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
             )
           end
         end
@@ -273,6 +349,12 @@ module Omnibus
           )
         end
 
+        it 'with_embedded_path ignores option to add msys to path' do
+          expect(subject.with_embedded_path({}, msys: true)).to eq(
+            'PATH' => prepended_path
+          )
+        end
+
         it 'prepends multiple paths to PATH' do
           expect(subject.prepend_path('/foo/bar', '/foo/baz')).to eq(
             ['/foo/bar', separator, '/foo/baz', separator, path].join
@@ -288,6 +370,10 @@ module Omnibus
         let(:separator) { ';' }
         let(:path) { 'c:/Ruby193/bin;c:/Windows/system32;c:/Windows;c:/Windows/System32/Wbem' }
         let(:install_dir) { 'c:/opt/project' }
+        let(:prepended_path_msys) do
+          [ "#{install_dir}/bin", separator, "#{install_dir}/embedded/bin", separator,
+            "#{install_dir}/embedded/msys/1.0/bin", separator, path].join
+        end
 
         context '`Path` exists in the environment' do
           before do
@@ -306,11 +392,19 @@ module Omnibus
           before do
             allow(ENV).to receive(:keys).and_return(['PATH'])
           end
+
           it 'returns a path key of `PATH`' do
             expect(subject.with_embedded_path).to eq(
               'PATH' => prepended_path
             )
           end
+
+          it 'with_embedded_path accepts option to add msys to path' do
+            expect(subject.with_embedded_path({}, msys: true)).to eq(
+              'PATH' => prepended_path_msys
+            )
+          end
+
         end
       end
     end
@@ -447,6 +541,116 @@ module Omnibus
       end
     end
 
+    describe '#fetcher' do
+      before do
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", source).and_return("1.2.8")
+      end
+
+      context 'when given a source url to an archive' do
+        let(:source) do
+          {
+            url: 'http://example.com/foo.tar.gz',
+            md5: 'abcd1234'
+          }
+        end
+
+        context 'when relative_path is the same as name' do
+          let(:rel_path) { 'software' }
+
+          it 'ignores back-compat and leaves fetch_dir alone' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/software"))
+          end
+
+          it 'sets the fetcher project_dir to fetch_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software"))
+          end
+        end
+
+        context 'when relative_path is different from name' do
+          let(:rel_path) { 'foo' }
+
+          it 'ignores back-compat and leaves fetch_dir alone' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/foo"))
+          end
+
+          it 'sets the fetcher project_dir to fetch_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software"))
+          end
+        end
+      end
+
+      context 'when given source url is not an archive' do
+        let(:source) do
+          {
+            url: 'http://example.com/foo.txt',
+            md5: 'abcd1234'
+          }
+        end
+
+        context 'when relative_path is the same as name' do
+          let(:rel_path) { 'software' }
+
+          it 'for back-compat, changes fetch_dir' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/software"))
+          end
+
+          it 'sets the fetcher project_dir to project_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software/software"))
+          end
+        end
+
+        context 'when relative_path is different from name' do
+          let(:rel_path) { 'foo' }
+
+          it 'ignores back-compat and leaves fetch_dir alone' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/foo"))
+          end
+
+          it 'sets the fetcher project_dir to project_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software/foo"))
+          end
+        end
+      end
+
+      context 'when given source is a git repo' do
+        let(:source) do
+          {
+            git: 'http://example.com/my/git/repo',
+          }
+        end
+
+        context 'when relative_path is the same as name' do
+          let(:rel_path) { 'software' }
+
+          it 'for back-compat, changes fetch_dir' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/software"))
+          end
+
+          it 'sets the fetcher project_dir to project_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software/software"))
+          end
+        end
+
+        context 'when relative_path is different from name' do
+          let(:rel_path) { 'foo' }
+
+          it 'ignores back-compat and leaves fetch_dir alone' do
+            subject.send(:fetcher)
+            expect(subject.project_dir).to eq(File.expand_path("#{Config.source_dir}/software/foo"))
+          end
+
+          it 'sets the fetcher project_dir to project_dir' do
+            expect(subject.send(:fetcher).project_dir).to eq(File.expand_path("#{Config.source_dir}/software/foo"))
+          end
+        end
+      end
+    end
+
     describe '#shasum' do
       context 'when a filepath is given' do
         let(:path) { '/software.rb' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: cleanroom
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +257,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
@@ -320,7 +321,6 @@ files:
 - lib/omnibus/generator_files/config/software/zlib.rb.erb
 - lib/omnibus/generator_files/gitignore.erb
 - lib/omnibus/generator_files/omnibus.rb.erb
-- lib/omnibus/generator_files/package_scripts/makeselfinst.erb
 - lib/omnibus/generator_files/package_scripts/postinst.erb
 - lib/omnibus/generator_files/package_scripts/postrm.erb
 - lib/omnibus/generator_files/package_scripts/preinst.erb
@@ -364,6 +364,7 @@ files:
 - lib/omnibus/util.rb
 - lib/omnibus/version.rb
 - omnibus.gemspec
+- resources/bff/config.erb
 - resources/bff/gen.template.erb
 - resources/deb/conffiles.erb
 - resources/deb/control.erb
@@ -476,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software