omnibus 5.6.8 → 6.0.1

data/spec/unit/semantic_version_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2015 Chef Software, Inc.
+# Copyright 2015-2018 Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/spec/unit/software_spec.rb

@@ -242,7 +242,7 @@ module Omnibus
       end
 
       context "on mac_os_x" do
-        before { stub_ohai(platform: "mac_os_x", version: "10.12") }
+        before { stub_ohai(platform: "mac_os_x", version: "10.13") }
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
@@ -283,16 +283,18 @@ module Omnibus
         end
       end
 
-      context "on freebsd 9" do
+      context "on freebsd 10" do
         before do
-          stub_ohai(platform: "freebsd", version: "9.3")
+          stub_ohai(platform: "freebsd", version: "10.4")
         end
 
         it "sets the defaults" do
           expect(subject.with_standard_compiler_flags).to eq(
+            "CC" => "clang",
             "CFLAGS" => "-I/opt/project/embedded/include -O2",
             "CXXFLAGS"  => "-I/opt/project/embedded/include -O2",
             "CPPFLAGS"  => "-I/opt/project/embedded/include -O2",
+            "CXX" => "clang++",
             "LDFLAGS" => "-L/opt/project/embedded/lib",
             "LD_RUN_PATH" => "/opt/project/embedded/lib",
             "PKG_CONFIG_PATH" => "/opt/project/embedded/lib/pkgconfig",
@@ -304,26 +306,12 @@ module Omnibus
           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",
-              "OMNIBUS_INSTALL_DIR" => "/opt/project"
-            )
-          end
         end
       end
 
       context "on freebsd 10" do
         before do
-          stub_ohai(platform: "freebsd", version: "10.3")
+          stub_ohai(platform: "freebsd", version: "10.4")
         end
 
         it "Clang as the default compiler" do
@@ -824,6 +812,40 @@ module Omnibus
           end
         end
       end
+
+      context "when given source is a local file path" do
+        let(:source) do
+          {
+            file: "../foo.tar.gz",
+          }
+        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 "#canonicalize_source" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 5.6.8
+  version: 6.0.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -28,14 +28,14 @@ dependencies:
   name: chef-sugar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
@@ -84,16 +84,22 @@ dependencies:
   name: ohai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '13'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -210,28 +216,28 @@ dependencies:
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: fauxhai
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency
@@ -318,20 +324,6 @@ 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@chef.io
@@ -559,7 +551,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -567,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Omnibus is a framework for building self-installing, full-stack software