omnibus 5.2.0 → 5.3.0

data/lib/omnibus/packagers/deb.rb

@@ -105,7 +105,7 @@ module Omnibus
     #
     def license(val = NULL)
       if null?(val)
-        @license || 'unknown'
+        @license || project.license
       else
         unless val.is_a?(String)
           raise InvalidValue.new(:license, 'be a String')
@@ -397,29 +397,7 @@ module Omnibus
     # @return [String]
     #
     def safe_architecture
-      case Ohai['kernel']['machine']
-      when 'x86_64'
-        'amd64'
-      when 'i686'
-        'i386'
-      when /armv\dl/
-        if Ohai['platform'] == 'raspbian' || Ohai['platform'] == 'ubuntu'
-          'armhf'
-        else
-          Ohai['kernel']['machine']
-        end
-      when 'aarch64'
-        # Debian prefers amd64 on ARMv8/AArch64 (64bit ARM) platforms
-        # see https://wiki.debian.org/Arm64Port
-        'arm64'
-      when 'ppc64le'
-        # Debian prefers to use ppc64el for little endian architecture name
-        # where as others like gnutools/rhel use ppc64le( note the last 2 chars)
-        # see http://linux.debian.ports.powerpc.narkive.com/8eeWSBtZ/switching-ppc64el-port-name-to-ppc64le
-        'ppc64el'  #dpkg --print-architecture = ppc64el
-      else
-        Ohai['kernel']['machine']
-      end
+      @safe_architecture ||= shellout!("dpkg --print-architecture").stdout.split("\n").first || "noarch"
     end
   end
 end

data/lib/omnibus/packagers/rpm.rb

@@ -141,7 +141,7 @@ module Omnibus
     #
     def license(val = NULL)
       if null?(val)
-        @license || 'unknown'
+        @license || project.license
       else
         unless val.is_a?(String)
           raise InvalidValue.new(:license, 'be a String')

data/lib/omnibus/project.rb

@@ -49,6 +49,13 @@ module Omnibus
         end
       end
 
+      #
+      # Reset cached project information.
+      #
+      def reset!
+        @loaded_projects = nil
+      end
+
       private
 
       #

data/lib/omnibus/software.rb

@@ -52,6 +52,13 @@ module Omnibus
         end
       end
 
+      #
+      # Reset cached software information.
+      #
+      def reset!
+        @loaded_softwares = nil
+      end
+
       private
 
       #
@@ -237,6 +244,8 @@ module Omnibus
     #
     # @option val [String] :git (nil)
     #   a git URL
+    # @option val [String] :github (nil)
+    #   a github ORG/REPO pair (e.g. chef/chef) that will be transformed to https://github.com/ORG/REPO.git
     # @option val [String] :url (nil)
     #   general URL
     # @option val [String] :path (nil)
@@ -280,6 +289,8 @@ module Omnibus
             "be a kind of `Hash', but was `#{val.class.inspect}'")
         end
 
+        val = canonicalize_source(val)
+
         extra_keys = val.keys - [
           :git, :path, :url, # fetcher types
           :md5, :sha1, :sha256, :sha512, # hash type - common to all fetchers
@@ -302,7 +313,8 @@ module Omnibus
         @source.merge!(val)
       end
 
-      apply_overrides(:source)
+      override = canonicalize_source(overrides[:source])
+      apply_overrides(:source, override)
     end
     expose :source
 
@@ -589,18 +601,34 @@ module Omnibus
             "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
           }
         when "solaris2"
-          {
-            # this override is due to a bug in libtool documented here:
-            # http://lists.gnu.org/archive/html/bug-libtool/2005-10/msg00004.html
-            "CC" => "gcc -static-libgcc",
-            "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
-            "CFLAGS" => "-I#{install_dir}/embedded/include",
-          }
+          if platform_version.satisfies?('<= 5.10')
+            solaris_flags = {
+              # this override is due to a bug in libtool documented here:
+              # http://lists.gnu.org/archive/html/bug-libtool/2005-10/msg00004.html
+              "CC" => "gcc -static-libgcc",
+              "LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
+              "CFLAGS" => "-I#{install_dir}/embedded/include",
+            }
+          elsif platform_version.satisfies?('>= 5.11')
+            solaris_flags = {
+              "CC" => "gcc -m64 -static-libgcc",
+              "LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -static-libgcc",
+              "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
+            }
+          end
+          solaris_flags
         when "freebsd"
           freebsd_flags = {
             "LDFLAGS" => "-L#{install_dir}/embedded/lib",
             "CFLAGS" => "-I#{install_dir}/embedded/include -O2",
           }
+          # Enable gcc version 4.9 if it is available
+          if (Ohai['os_version'].to_i <= 903000) && which('gcc49')
+            freebsd_flags.merge!(
+              "CC" => "gcc49",
+              "CXX" => "g++49",
+            )
+          end
           # Clang became the default compiler in FreeBSD 10+
           if Ohai['os_version'].to_i >= 1000024
             freebsd_flags.merge!(
@@ -614,8 +642,16 @@ module Omnibus
           opt_flag = windows_arch_i386? ? "-march=i686" : "-march=x86-64"
           {
             "LDFLAGS" => "-L#{install_dir}/embedded/lib #{arch_flag}",
-            # If we're happy with these flags, enable SSE for other platforms running x86 too.
-            "CFLAGS" => "-I#{install_dir}/embedded/include #{arch_flag} -O3 -mfpmath=sse -msse2 #{opt_flag}"
+            # We do not wish to enable SSE even though we target i686 because
+            # of a stack alignment issue with some libraries. We have not
+            # exactly ascertained the cause but some compiled library/binary
+            # violates gcc's assumption that the stack is going to be 16-byte
+            # aligned which is just fine as long as one is pushing 32-bit
+            # values from general purpose registers but stuff hits the fan as
+            # soon as gcc emits aligned SSE xmm register spills which generate
+            # GPEs and terminate the application very rudely with very little
+            # to debug with.
+            "CFLAGS" => "-I#{install_dir}/embedded/include #{arch_flag} -O3 #{opt_flag}"
           }
         else
           {
@@ -648,14 +684,17 @@ module Omnibus
       }
 
       if solaris2?
-        # in order to provide compatibility for earlier versions of libc on solaris 10,
-        # we need to specify a mapfile that restricts the version of system libraries
-        # used. See http://docs.oracle.com/cd/E23824_01/html/819-0690/chapter5-1.html
-        # for more information
-        # use the mapfile if it exists, otherwise ignore it
         ld_options = "-R#{install_dir}/embedded/lib"
-        mapfile_path = File.expand_path(Config.solaris_linker_mapfile, Config.project_root)
-        ld_options  << " -M #{mapfile_path}" if File.exist?(mapfile_path)
+
+        if platform_version.satisfies?('<= 5.10')
+          # in order to provide compatibility for earlier versions of libc on solaris 10,
+          # we need to specify a mapfile that restricts the version of system libraries
+          # used. See http://docs.oracle.com/cd/E23824_01/html/819-0690/chapter5-1.html
+          # for more information
+          # use the mapfile if it exists, otherwise ignore it
+          mapfile_path = File.expand_path(Config.solaris_linker_mapfile, Config.project_root)
+          ld_options  << " -M #{mapfile_path}" if File.exist?(mapfile_path)
+        end
 
         # solaris linker can also use LD_OPTIONS, so we throw the kitchen sink against
         # the linker, to find every way to make it use our rpath. This is also required
@@ -1069,15 +1108,27 @@ module Omnibus
     # Apply overrides in the @overrides hash that mask instance variables
     # that are set by parsing the DSL
     #
-    def apply_overrides(attr)
+    def apply_overrides(attr, override=overrides[attr])
       val = instance_variable_get(:"@#{attr}")
-      if val.is_a?(Hash) || overrides[attr].is_a?(Hash)
+      if val.is_a?(Hash) || override.is_a?(Hash)
         val ||= {}
-        override = overrides[attr] || {}
+        override ||= {}
         val.merge(override)
       else
-        overrides[attr] || val
+        override || val
+      end
+    end
+
+    #
+    # Transform github -> git in source
+    #
+    def canonicalize_source(source)
+      if source.is_a?(Hash) && source[:github]
+        source = source.dup
+        source[:git] = "https://github.com/#{source[:github]}.git"
+        source.delete(:github)
       end
+      source
     end
 
     #

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '5.2.0'
+  VERSION = '5.3.0'
 end

data/omnibus.gemspec

@@ -36,10 +36,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'artifactory', '~> 2.0'
   gem.add_development_dependency 'aruba',       '~> 0.5'
-  gem.add_development_dependency 'fauxhai',     '~> 2.3'
+  gem.add_development_dependency 'fauxhai',     '~> 3.2'
   gem.add_development_dependency 'rspec',       '~> 3.0'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'appbundler'
+  gem.add_development_dependency 'pry'
 end

data/spec/functional/licensing_spec.rb

@@ -9,11 +9,16 @@ module Omnibus
     let(:install_dir) { File.join(tmp_path, "install_dir")}
     let(:software_project_dir) { File.join(tmp_path, "software_project_dir")}
 
+    let(:expected_project_license_path) { "LICENSE" }
+    let(:expected_project_license) { "Unspecified" }
+    let(:expected_project_license_content) { "" }
+
     before do
       FileUtils.mkdir_p(install_dir)
       FileUtils.mkdir_p(software_project_dir)
+
       allow_any_instance_of(Software).to receive(:project_dir).and_return(software_project_dir)
-      %w{README LICENSE NOTICE}.each do |file|
+      %w{LICENSE NOTICE}.each do |file|
         File.open(File.join(software_project_dir, file), "w+") do |f|
           f.puts "This file is #{file}."
         end
@@ -22,6 +27,7 @@ module Omnibus
 
     shared_examples "correctly created licenses" do
       it "creates the main license file for the project correctly" do
+        create_licenses
         project_license = File.join(install_dir, expected_project_license_path)
         expect(File.exist?(project_license)).to be(true)
         project_license = File.read(project_license)
@@ -31,20 +37,36 @@ module Omnibus
         expect(project_license).to match /This product bundles snoopy 1.0.0,\nwhich is available under a "GPL v2"/
         expect(project_license).to match /This product bundles zlib 1.7.2,\nwhich is available under a "Zlib"/
         expect(project_license).not_to match /preparation/
-        expect(project_license).to match /LICENSES\/snoopy-README/
+        expect(project_license).to match /LICENSES\/snoopy-artistic.html/
         expect(project_license).to match /LICENSES\/snoopy-NOTICE/
         expect(project_license).to match /LICENSES\/zlib-LICENSE/
       end
 
       it "creates the license files of software components correctly" do
+        create_licenses
         license_dir = File.join(install_dir, "LICENSES")
         expect(Dir.glob("#{license_dir}/**/*").length).to be(3)
 
-        %w{snoopy-NOTICE snoopy-README zlib-LICENSE}.each do |software_license|
+        %w{snoopy-NOTICE zlib-LICENSE}.each do |software_license|
           license_path = File.join(license_dir, software_license)
           expect(File.exist?(license_path)).to be(true)
           expect(File.read(license_path)).to match /#{software_license.split("-").last}/
         end
+
+        remote_license_file = File.join(license_dir, "snoopy-artistic.html")
+        remote_license_file_contents = File.read(remote_license_file)
+        expect(File.exist?(remote_license_file)).to be(true)
+        expect(remote_license_file_contents).to match /The "Artistic License" - dev.perl.org/
+      end
+
+      it "warns for non-standard software license info" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Software 'snoopy' uses license 'GPL v2' which is not one of the standard licenses")
+      end
+
+      it "warns for missing software license info" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Software 'private_code' does not contain licensing information.")
       end
     end
 
@@ -80,7 +102,7 @@ module Omnibus
         name 'snoopy'
         default_version '1.0.0'
         license "GPL v2"
-        license_file "README"
+        license_file "http://dev.perl.org/licenses/artistic.html"
         license_file "NOTICE"
       end
     end
@@ -93,25 +115,25 @@ module Omnibus
       end
     end
 
+    let(:software_with_warnings) { nil }
+
     def create_licenses
       project.library.component_added(preparation)
       project.library.component_added(snoopy)
       project.library.component_added(zlib)
       project.library.component_added(private_code)
+      project.library.component_added(software_with_warnings) if software_with_warnings
 
       Licensing.create!(project)
     end
 
     describe "without license definitions in the project" do
-      let(:expected_project_license_path) { "LICENSE" }
-      let(:expected_project_license) { "Unspecified" }
-      let(:expected_project_license_content) { "" }
+      it_behaves_like "correctly created licenses"
 
-      before do
-        create_licenses
+      it "warns for missing project license" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Project 'test-project' does not contain licensing information.")
       end
-
-      it_behaves_like "correctly created licenses"
     end
 
     describe "with license definitions in the project" do
@@ -127,8 +149,6 @@ module Omnibus
         File.open(File.join(Config.project_root, license_file), "w+") do |f|
           f.puts "Chef Custom License is awesome."
         end
-
-        create_licenses
       end
 
       after do
@@ -136,6 +156,82 @@ module Omnibus
       end
 
       it_behaves_like "correctly created licenses"
+
+      it "warns for non-standard project license" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Project 'test-project' is using 'Custom Chef' which is not one of the standard licenses")
+      end
+    end
+
+    describe "with a local license file that does not exist" do
+      let(:software_with_warnings) do
+        Software.new(project, 'problematic.rb').evaluate do
+          name 'problematic'
+          default_version '0.10.2'
+          license_file "NOT_EXISTS"
+        end
+      end
+
+      it_behaves_like "correctly created licenses"
+
+      it "should log a warning for the missing file" do
+        output = capture_logging { create_licenses }
+        expect(output).to match /License file (.*)NOT_EXISTS' does not exist for software 'problematic'./
+      end
+    end
+
+    describe "with a remote license file that does not exist" do
+      before do
+        Omnibus::Config.fetcher_retries(1)
+      end
+
+      let(:software_with_warnings) do
+        Software.new(project, 'problematic.rb').evaluate do
+          name 'problematic'
+          default_version '0.10.2'
+          license_file "https://downloads.chef.io/LICENSE"
+        end
+      end
+
+      it_behaves_like "correctly created licenses"
+
+      it "should log a warning for the missing file" do
+        output = capture_logging { create_licenses }
+        expect(output).to match(/Retrying failed download/)
+        expect(output).to match(/Can not download license file 'https:\/\/downloads.chef.io\/LICENSE' for software 'problematic'./)
+      end
+    end
+
+    describe "with a software with no license files" do
+      let(:software_with_warnings) do
+        Software.new(project, 'problematic.rb').evaluate do
+          name 'problematic'
+          default_version '0.10.2'
+          license "Zlib"
+        end
+      end
+
+      it_behaves_like "correctly created licenses"
+
+      it "should log a warning for the missing file pointers" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Software 'problematic' does not point to any license files.")
+      end
+    end
+
+    describe "with a project with no license files" do
+      let(:license) { "Zlib" }
+
+      let(:expected_project_license_path) { "LICENSE" }
+      let(:expected_project_license) { license }
+      let(:expected_project_license_content) { "" }
+
+      it_behaves_like "correctly created licenses"
+
+      it "warns for missing license files" do
+        output = capture_logging { create_licenses }
+        expect(output).to include("Project 'test-project' does not point to a license file.")
+      end
     end
   end
 end

data/spec/unit/health_check_spec.rb

@@ -139,9 +139,11 @@ module Omnibus
         )
       end
 
+      let(:regexp) {".*(\\.[ch]|\\.e*rb|\\.gemspec|\\.gitignore|\\.h*h|\\.java|\\.js|\\.json|\\.lock|\\.log|\\.lua|\\.md|\\.mkd|\\.out|\\.pl|\\.pm|\\.png|\\.py[oc]*|\\.r*html|\\.rdoc|\\.ri|\\.sh|\\.sql|\\.toml|\\.ttf|\\.txt|\\.xml|\\.yml|Gemfile|LICENSE|README|Rakefile|VERSION)$|.*\\/share\\/doc\\/.*|.*\\/share\\/postgresql\\/.*|.*\\/share\\/terminfo\\/.*|.*\\/terminfo\\/.*"}
+
       it 'raises an exception when there are external dependencies' do
         allow(subject).to receive(:shellout)
-          .with("find #{project.install_dir}/ -type f | xargs ldd")
+          .with("find #{project.install_dir}/ -type f -regextype posix-extended ! -regex '#{regexp}' | xargs ldd")
           .and_return(bad_healthcheck)
 
         expect { subject.run! }.to raise_error(HealthCheckFailed)
@@ -149,7 +151,7 @@ module Omnibus
 
       it 'does not raise an exception when the healthcheck passes' do
         allow(subject).to receive(:shellout)
-          .with("find #{project.install_dir}/ -type f | xargs ldd")
+          .with("find #{project.install_dir}/ -type f -regextype posix-extended ! -regex '#{regexp}' | xargs ldd")
           .and_return(good_healthcheck)
 
         expect { subject.run! }.to_not raise_error