omnibus 5.2.0 → 5.3.0

data/spec/unit/packagers/deb_spec.rb

@@ -10,11 +10,13 @@ module Omnibus
         project.build_version('1.2.3')
         project.build_iteration('2')
         project.maintainer('Chef Software')
+        project.license(project_license) if project_license
       end
     end
 
     subject { described_class.new(project) }
 
+    let(:project_license) { nil }
     let(:project_root) { File.join(tmp_path, 'project/root') }
     let(:package_dir)  { File.join(tmp_path, 'package/dir') }
     let(:staging_dir)  { File.join(tmp_path, 'staging/dir') }
@@ -48,12 +50,20 @@ module Omnibus
       end
 
       it 'has a default value' do
-        expect(subject.license).to eq('unknown')
+        expect(subject.license).to eq('Unspecified')
       end
 
       it 'must be a string' do
         expect { subject.license(Object.new) }.to raise_error(InvalidValue)
       end
+
+      context 'with project license' do
+        let(:project_license) { 'custom-license' }
+
+        it 'uses project license' do
+          expect(subject.license).to eq('custom-license')
+        end
+      end
     end
 
     describe '#priority' do
@@ -107,6 +117,10 @@ module Omnibus
     end
 
     describe '#write_control_file' do
+      before do
+        allow(subject).to receive(:safe_architecture).and_return("amd64")
+      end
+
       it 'generates the file' do
         subject.write_control_file
         expect("#{staging_dir}/DEBIAN/control").to be_a_file
@@ -118,7 +132,7 @@ module Omnibus
 
         expect(contents).to include("Package: project")
         expect(contents).to include("Version: 1.2.3")
-        expect(contents).to include("License: unknown")
+        expect(contents).to include("License: Unspecified")
         expect(contents).to include("Vendor: Omnibus <omnibus@getchef.com>")
         expect(contents).to include("Architecture: amd64")
         expect(contents).to include("Maintainer: Chef Software")
@@ -224,6 +238,7 @@ module Omnibus
       before do
         allow(subject).to receive(:shellout!)
         allow(Dir).to receive(:chdir) { |_, &b| b.call }
+        allow(subject).to receive(:safe_architecture).and_return("amd64")
       end
 
       it 'logs a message' do
@@ -318,94 +333,20 @@ module Omnibus
     end
 
     describe '#safe_architecture' do
-      context 'when 64-bit' do
-        before do
-          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
-            data['kernel']['machine'] = 'x86_64'
-          end
-        end
-
-        it 'returns amd64' do
-          expect(subject.safe_architecture).to eq('amd64')
-        end
-      end
-
-      context 'when not 64-bit' do
-        before do
-          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
-            data['kernel']['machine'] = 'i386'
-          end
-        end
-
-        it 'returns the value' do
-          expect(subject.safe_architecture).to eq('i386')
-        end
-      end
-
-      context 'when i686' do
-        before do
-          stub_ohai(platform: 'ubuntu', version: '12.04') do |data|
-            data['kernel']['machine'] = 'i686'
-          end
-        end
+      let(:shellout) { double("Mixlib::ShellOut", :run_command => true, :error! => nil) }
 
-        it 'returns i386' do
-          expect(subject.safe_architecture).to eq('i386')
-        end
+      before do
+        allow(Mixlib::ShellOut).to receive(:new).and_return(shellout)
       end
 
-      context 'when ppc64le' do
-        before do
-          stub_ohai(platform: 'ubuntu', version: '14.04') do |data|
-            data['kernel']['machine'] = 'ppc64le'
-          end
-        end
-
-        it 'returns ppc64el' do
-          expect(subject.safe_architecture).to eq('ppc64el')
-        end
+      it "shells out to dpkg and returns the output" do
+        allow(shellout).to receive(:stdout).and_return("test_arch\n")
+        expect(subject.safe_architecture).to eq("test_arch")
       end
 
-      context 'Raspberry Pi' do
-        context 'Raspbian on Pi v1' do
-          before do
-            # There's no Raspbian in Fauxhai :(
-            stub_ohai(platform: 'debian', version: '7.6') do |data|
-              data['platform'] = 'raspbian'
-              data['platform_version'] = '7.6'
-              data['kernel']['machine'] = 'armv6l'
-            end
-          end
-
-          it 'returns armhf' do
-            expect(subject.safe_architecture).to eq('armhf')
-          end
-        end
-
-        context 'Ubuntu on Pi v2' do
-          before do
-            # There's no Raspbian in Fauxhai :(
-            stub_ohai(platform: 'ubuntu', version: '14.04') do |data|
-              data['kernel']['machine'] = 'armv7l'
-            end
-          end
-
-          it 'returns armhf' do
-            expect(subject.safe_architecture).to eq('armhf')
-          end
-        end
-      end
-
-      context '64bit ARM platform' do
-        before do
-          stub_ohai(platform: 'ubuntu', version: '14.04') do |data|
-            data['kernel']['machine'] = 'aarch64'
-          end
-        end
-
-        it 'returns arm64' do
-          expect(subject.safe_architecture).to eq('arm64')
-        end
+      it "returns noarch if no architecture is returned by dpkg" do
+        allow(shellout).to receive(:stdout).and_return("")
+        expect(subject.safe_architecture).to eq("noarch")
       end
     end
   end

data/spec/unit/packagers/rpm_spec.rb

@@ -11,11 +11,13 @@ module Omnibus
         project.build_iteration('2')
         project.maintainer('Chef Software')
         project.replace('old-project')
+        project.license(project_license) if project_license
       end
     end
 
     subject { described_class.new(project) }
 
+    let(:project_license) { nil }
     let(:project_root) { File.join(tmp_path, 'project/root') }
     let(:package_dir)  { File.join(tmp_path, 'package/dir') }
     let(:staging_dir)  { File.join(tmp_path, 'staging/dir') }
@@ -69,12 +71,20 @@ module Omnibus
       end
 
       it 'has a default value' do
-        expect(subject.license).to eq('unknown')
+        expect(subject.license).to eq('Unspecified')
       end
 
       it 'must be a string' do
         expect { subject.license(Object.new) }.to raise_error(InvalidValue)
       end
+
+      context 'with project license' do
+        let(:project_license) { 'custom-license' }
+
+        it 'uses project license' do
+          expect(subject.license).to eq('custom-license')
+        end
+      end
     end
 
     describe '#priority' do
@@ -173,7 +183,7 @@ module Omnibus
         expect(contents).to include("BuildRoot: %buildroot")
         expect(contents).to include("Prefix: /")
         expect(contents).to include("Group: default")
-        expect(contents).to include("License: unknown")
+        expect(contents).to include("License: Unspecified")
         expect(contents).to include("Vendor: Omnibus <omnibus@getchef.com>")
         expect(contents).to include("URL: https://example.com")
         expect(contents).to include("Packager: Chef Software")

data/spec/unit/software_spec.rb

@@ -131,9 +131,58 @@ module Omnibus
         end
       end
 
-      context 'on solaris2' do
+      context 'on solaris_11' do
+              before do
+                stub_ohai(platform: 'solaris2', version: '5.11') do |data|
+                  # For some reason, this isn't set in Fauxhai
+                  data['platform'] = 'solaris2'
+                end
+              end
+
+              it 'sets the defaults' do
+                expect(subject.with_standard_compiler_flags).to eq(
+                  "CC"              => "gcc -m64 -static-libgcc",
+                  "CFLAGS"          => "-I/opt/project/embedded/include -O2",
+                  "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+                  "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
+                  "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
+                  "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
+                  "LD_RUN_PATH"     => "/opt/project/embedded/lib",
+                  "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+                )
+              end
+
+              context 'when loader mapping file is specified' do
+                # Let the unit tests run on windows where auto-path translation occurs.
+                let(:project_root) { File.join(tmp_path, '/root/project') }
+                before do
+                  stub_ohai(platform: 'solaris2', version: '5.11') do |data|
+                    # For some reason, this isn't set in Fauxhai
+                    data['platform'] = 'solaris2'
+                  end
+                  Config.project_root(project_root)
+                  Config.solaris_linker_mapfile('files/mapfile/solaris')
+                  allow(File).to receive(:exist?).and_return(true)
+                end
+
+                it 'sets LD_OPTIONS correctly' do
+                  expect(subject.with_standard_compiler_flags).to eq(
+                    "CC"              => "gcc -m64 -static-libgcc",
+                    "CFLAGS"          => "-I/opt/project/embedded/include -O2",
+                    "CPPFLAGS"        => "-I/opt/project/embedded/include -O2",
+                    "CXXFLAGS"        => "-I/opt/project/embedded/include -O2",
+                    "LDFLAGS"         => "-Wl,-rpath,/opt/project/embedded/lib -L/opt/project/embedded/lib -static-libgcc",
+                    "LD_OPTIONS"      => "-R/opt/project/embedded/lib",
+                    "LD_RUN_PATH"     => "/opt/project/embedded/lib",
+                    "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig"
+                  )
+                end
+              end
+            end
+
+      context 'on solaris_10' do
         before do
-          stub_ohai(platform: 'solaris2', version: '5.11') do |data|
+          stub_ohai(platform: 'solaris2', version: '5.10') do |data|
             # For some reason, this isn't set in Fauxhai
             data['platform'] = 'solaris2'
           end
@@ -156,7 +205,7 @@ module Omnibus
           # Let the unit tests run on windows where auto-path translation occurs.
           let(:project_root) { File.join(tmp_path, '/root/project') }
           before do
-            stub_ohai(platform: 'solaris2', version: '5.11') do |data|
+            stub_ohai(platform: 'solaris2', version: '5.10') do |data|
               # For some reason, this isn't set in Fauxhai
               data['platform'] = 'solaris2'
             end
@@ -235,6 +284,24 @@ module Omnibus
             'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig',
           )
         end
+
+        context 'with gcc 4.9 installed' do
+          before do
+            allow(subject).to receive(:which).and_return('/usr/local/bin/gcc49')
+          end
+
+          it 'sets the compiler args' do
+            expect(subject.with_standard_compiler_flags).to eq(
+              'CC'              => 'gcc49',
+              'CXX'             => 'g++49',
+              '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
       end
 
       context 'on freebsd 10' do
@@ -267,9 +334,9 @@ module Omnibus
         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',
+              'CFLAGS'          => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
               'LDFLAGS'         => '-L/opt/project/embedded/lib -m32',
               'LD_RUN_PATH'     => '/opt/project/embedded/lib',
               'PKG_CONFIG_PATH' => '/opt/project/embedded/lib/pkgconfig'
@@ -278,9 +345,9 @@ module Omnibus
 
           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',
+              'CFLAGS'          => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m32 -O3 -march=i686',
               'LDFLAGS'         => '-L/opt/project/embedded/lib -m32',
               'RCFLAGS'         => '--target=pe-i386',
               'ARFLAGS'         => '--target=pe-i386',
@@ -295,9 +362,9 @@ module Omnibus
 
           it 'sets the default' do
             expect(subject.with_standard_compiler_flags).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',
+              'CFLAGS'          => '-I/opt/project/embedded/include -m64 -O3 -march=x86-64',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -march=x86-64',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -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'
@@ -306,9 +373,9 @@ module Omnibus
 
           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',
+              'CFLAGS'          => '-I/opt/project/embedded/include -m64 -O3 -march=x86-64',
+              'CXXFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -march=x86-64',
+              'CPPFLAGS'        => '-I/opt/project/embedded/include -m64 -O3 -march=x86-64',
               'LDFLAGS'         => '-L/opt/project/embedded/lib -m64',
               'RCFLAGS'         => '--target=pe-x86-64',
               'ARFLAGS'         => '--target=pe-x86-64',
@@ -549,6 +616,64 @@ module Omnibus
       end
     end
 
+    context 'when software source is a github spec' do
+      let(:source) do
+        {
+          github: 'chef/ohai'
+        }
+      end
+
+      it 'fetches from a fully expanded git path' do
+        expect(subject.source).to eq(git: "https://github.com/chef/ohai.git")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/chef/ohai.git").and_return("1.2.8")
+        subject.send(:fetcher)
+      end
+
+      context 'and override source is a git spec' do
+        before { project.override(:software, source: { git: "https://blah.com/git.git" }) }
+
+        it 'fetches from the override path' do
+          expect(subject.source).to eq(git: "https://blah.com/git.git")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+          subject.send(:fetcher)
+        end
+      end
+
+      context 'and override source is a github spec' do
+        before { project.override(:software, source: { github: "a/b" }) }
+
+        it 'fetches from the override path' do
+          expect(subject.source).to eq(git: "https://github.com/a/b.git")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          subject.send(:fetcher)
+        end
+      end
+    end
+
+    context 'when software source is a git spec' do
+      let(:source) do
+        {
+          git: "https://blah.com/git.git"
+        }
+      end
+
+      it 'fetches from the git spec' do
+        expect(subject.source).to eq(git: "https://blah.com/git.git")
+        expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://blah.com/git.git").and_return("1.2.8")
+        subject.send(:fetcher)
+      end
+
+      context 'and override source is a github spec' do
+        before { project.override(:software, source: { github: "a/b" }) }
+
+        it 'fetches from the override path' do
+          expect(subject.source).to eq(git: "https://github.com/a/b.git")
+          expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", git: "https://github.com/a/b.git").and_return("1.2.8")
+          subject.send(:fetcher)
+        end
+      end
+    end
+
     describe '#fetcher' do
       before do
         expect(Omnibus::Fetcher).to receive(:resolve_version).with("1.2.3", source).and_return("1.2.8")
@@ -659,6 +784,20 @@ module Omnibus
       end
     end
 
+    describe "#canonicalize_source" do
+      it 'canonicalize_source(github: "chef/chef") yields git: "https://github.com/chef/chef.git"' do
+        expect(subject.send(:canonicalize_source, github: "chef/chef")).to eq(git: "https://github.com/chef/chef.git")
+      end
+      it 'canonicalize_source(github: "chef/chef", submodules: true) yields git: "https://github.com/chef/chef.git", submodules: true' do
+        expect(subject.send(:canonicalize_source, github: "chef/chef", submodules: true)).to eq(git: "https://github.com/chef/chef.git", submodules: true)
+      end
+      it 'canonicalize_source does not overwrite the original' do
+        original = { github: "chef/chef", submodules: true }
+        expect(subject.send(:canonicalize_source, original)).to eq(git: "https://github.com/chef/chef.git", submodules: true)
+        expect(original).to eq(github: "chef/chef", submodules: true)
+      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.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Omnibus is a framework for building self-installing, full-stack software
   builds.
 email: releng@getchef.com
@@ -256,6 +270,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -276,6 +292,7 @@ files:
 - features/commands/build.feature
 - features/commands/clean.feature
 - features/commands/list.feature
+- features/commands/manifest.feature
 - features/commands/new.feature
 - features/commands/publish.feature
 - features/commands/version.feature
@@ -304,6 +321,7 @@ files:
 - lib/omnibus/core_extensions.rb
 - lib/omnibus/core_extensions/open_uri.rb
 - lib/omnibus/digestable.rb
+- lib/omnibus/download_helpers.rb
 - lib/omnibus/exceptions.rb
 - lib/omnibus/fetcher.rb
 - lib/omnibus/fetchers/git_fetcher.rb
@@ -479,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software
@@ -488,6 +506,7 @@ test_files:
 - features/commands/build.feature
 - features/commands/clean.feature
 - features/commands/list.feature
+- features/commands/manifest.feature
 - features/commands/new.feature
 - features/commands/publish.feature
 - features/commands/version.feature