omnibus 3.1.1 → 3.2.0.rc.1

data/lib/omnibus/{sugar.rb → sugarable.rb}

@@ -29,8 +29,17 @@ require 'chef/sugar/shell'
 require 'chef/sugar/vagrant'
 
 module Omnibus
-  class Project
-    private
+  module Sugarable
+    def self.included(base)
+      base.send(:include, Chef::Sugar::DSL)
+
+      if base < Cleanroom
+        # Make all the "sugars" available in the cleanroom (DSL)
+        Chef::Sugar::DSL.instance_methods.each do |instance_method|
+          base.send(:expose, instance_method)
+        end
+      end
+    end
 
     # This method is used by Chef Sugar to easily add the DSL. By mimicing
     # Chef's +node+ object, we can easily include the existing DSL into
@@ -41,7 +50,3 @@ module Omnibus
     end
   end
 end
-
-# Include everything in Omnibus
-Omnibus::Project.send(:include, Chef::Sugar::DSL)
-Omnibus::Software.send(:include, Chef::Sugar::DSL)

data/lib/omnibus/version.rb

@@ -15,5 +15,5 @@
 #
 
 module Omnibus
-  VERSION = '3.1.1'
+  VERSION = '3.2.0.rc.1'
 end

data/omnibus.gemspec

@@ -22,17 +22,17 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'chef-sugar',      '~> 1.2'
-  gem.add_dependency 'mixlib-shellout', '~> 1.3'
-  gem.add_dependency 'mixlib-config',   '~> 2.1'
-  gem.add_dependency 'ohai',            '~> 6.12'
-  gem.add_dependency 'fpm',             '~> 1.0.0'
+  gem.add_dependency 'mixlib-shellout', '~> 1.4'
+  gem.add_dependency 'ohai',            '~> 7.2.0.rc'
+  gem.add_dependency 'fpm',             '~> 0.4'
   gem.add_dependency 'uber-s3'
   gem.add_dependency 'thor',            '~> 0.18'
 
-  gem.add_development_dependency 'aruba',   '~> 0.5'
-  gem.add_development_dependency 'fauxhai', '~> 2.1'
-  gem.add_development_dependency 'rspec',   '~> 2.14'
-  gem.add_development_dependency 'rubocop', '0.21.0'
+  gem.add_development_dependency 'artifactory', '~> 1.2'
+  gem.add_development_dependency 'aruba',       '~> 0.5'
+  gem.add_development_dependency 'fauxhai',     '~> 2.1'
+  gem.add_development_dependency 'rspec',       '~> 2.14'
+  gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rake'
 
   gem.add_development_dependency 'bundler'

data/spec/data/complicated/config/projects/angrychef.rb

@@ -23,7 +23,7 @@ maintainer "Opscode, Inc."
 homepage "http://www.opscode.com"
 
 replaces        "angrychef"
-install_path    "/opt/angrychef"
+install_dir     "/opt/angrychef"
 build_version   '1.0.0'
 build_iteration 4
 

data/spec/data/complicated/config/projects/chef-windows.rb

@@ -22,7 +22,7 @@ homepage "http://www.opscode.com"
 # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
 #       Native gems will use gcc which will barf on files with spaces,
 #       which is only fixable if everyone in the world fixes their Makefiles
-install_path    "c:\\opscode\\chef"
+install_dir    "c:\\opscode\\chef"
 build_version   '1.0.0'
 build_iteration 4
 package_name    "chef-client"

data/spec/data/complicated/config/projects/chef.rb

@@ -21,7 +21,7 @@ maintainer "Opscode, Inc."
 homepage "http://www.opscode.com"
 
 replaces        "chef-full"
-install_path    "/opt/chef"
+install_dir     "/opt/chef"
 build_version   '1.0.0'
 build_iteration 4
 mac_pkg_identifier "com.getchef.pkg.chef"

data/spec/data/complicated/config/projects/chefdk-windows.rb

@@ -22,7 +22,7 @@ homepage "http://www.opscode.com"
 # NOTE: Ruby DevKit fundamentally CANNOT be installed into "Program Files"
 #       Native gems will use gcc which will barf on files with spaces,
 #       which is only fixable if everyone in the world fixes their Makefiles
-install_path    "c:\\opscode\\chefdk"
+install_dir     "c:\\opscode\\chefdk"
 build_version   '1.0.0'
 build_iteration 1
 

data/spec/data/complicated/config/projects/chefdk.rb

@@ -20,7 +20,7 @@ friendly_name "Chef DK"
 maintainer "Opscode, Inc."
 homepage   "http://www.opscode.com"
 
-install_path    "/opt/chefdk"
+install_dir     "/opt/chefdk"
 build_version   '1.0.0'
 build_iteration 1
 mac_pkg_identifier "com.getchef.pkg.chefdk"

data/spec/data/complicated/config/software/cacerts.rb

@@ -34,7 +34,7 @@ build do
     # fix worked. Rather than trying to fix this now, we're filing a bug and copying the cacert.pem
     # directly from the cache instead.
 
-    FileUtils.cp(File.expand_path("cacert.pem", Omnibus.config.cache_dir),
+    FileUtils.cp(File.expand_path("cacert.pem", Config.cache_dir),
                  File.expand_path("embedded/ssl/certs/cacert.pem", install_dir))
   end
 

data/spec/data/complicated/config/software/chef-client-msi.rb

@@ -17,7 +17,7 @@
 
 name "chef-client-msi"
 
-source :path => File.expand_path("files/msi", Omnibus.project_root)
+source :path => File.expand_path("files/msi", Config.project_root)
 
 build do
   # harvest with heat.exe

data/spec/data/complicated/config/software/libgcc.rb

@@ -18,7 +18,7 @@
 name "libgcc"
 description "On UNIX systems where we bootstrap a compiler, copy the libgcc"
 
-if (platform == "solaris2" && Omnibus.config.solaris_compiler == "gcc")
+if (platform == "solaris2" && Config.solaris_compiler == "gcc")
   build do
     if File.exists?("/opt/csw/lib/libgcc_s.so.1")
       command "cp /opt/csw/lib/libgcc_s.so.1 #{install_dir}/embedded/lib/"

data/spec/data/complicated/config/software/libiconv.rb

@@ -48,18 +48,7 @@ if platform == "solaris2"
   env.merge!({"LDFLAGS" => "-R#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include -static-libgcc", "LD_OPTIONS" => "-R#{install_dir}/embedded/lib"})
 end
 
-def glibc_dropped_gets?
-  return false unless Ohai["os"] == "linux"
-
-  output = `/usr/bin/env getconf GNU_LIBC_VERSION`
-
-  return false unless output =~ /^glibc/
-
-  output.sub(/glibc /, "").to_f >= 2.16
-end
-
 build do
-  patch :source => 'libiconv-1.14_srclib_stdio.in.h-remove-gets-declarations.patch' if glibc_dropped_gets?
   command "./configure --prefix=#{install_dir}/embedded", :env => env
   command "make -j #{max_build_jobs}", :env => env
   command "make -j #{max_build_jobs} install-lib libdir=#{install_dir}/embedded/lib includedir=#{install_dir}/embedded/include", :env => env

data/spec/data/complicated/config/software/libpng.rb

@@ -16,12 +16,12 @@
 #
 
 name "libpng"
-default_version "1.5.17"
+default_version "1.5.18"
 
 dependency "zlib"
 
 source :url => "ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng15/libpng-#{version}.tar.gz",
-       :md5 => "d2e27dbd8c6579d1582b3f128fd284b4"
+       :md5 => "5266905cef49d1224437465ad4d67fd9"
 
 relative_path "libpng-#{version}"
 

data/spec/data/complicated/config/software/openssl.rb

@@ -105,7 +105,7 @@ build do
                          "-R#{install_dir}/embedded/lib",
                         "-static-libgcc"].join(" ")
                       when "solaris2"
-                        if Omnibus.config.solaris_compiler == "gcc"
+                        if Config.solaris_compiler == "gcc"
                           if architecture == "sparc"
                             ["/bin/sh ./Configure",
                              "solaris-sparcv9-gcc",

data/spec/data/complicated/config/software/ruby.rb

@@ -25,7 +25,7 @@ dependency "openssl"
 dependency "libyaml"
 dependency "libiconv"
 dependency "gdbm"
-dependency "libgcc" if (platform == "solaris2" and Omnibus.config.solaris_compiler == "gcc")
+dependency "libgcc" if (platform == "solaris2" and Config.solaris_compiler == "gcc")
 
 version "1.9.3-p484" do
   source md5: '8ac0dee72fe12d75c8b2d0ef5d0c2968'

data/spec/data/complicated/config/software/runit.rb

@@ -27,7 +27,7 @@ working_dir = "#{project_dir}/runit-2.1.1"
 
 build do
   # put runit where we want it, not where they tell us to
-  command 'sed -i -e "s/^char\ \*varservice\ \=\"\/service\/\";$/char\ \*varservice\ \=\"' + project.install_path.gsub("/", "\\/") + '\/service\/\";/" src/sv.c', :cwd => working_dir
+  command 'sed -i -e "s/^char\ \*varservice\ \=\"\/service\/\";$/char\ \*varservice\ \=\"' + project.install_dir.gsub("/", "\\/") + '\/service\/\";/" src/sv.c', :cwd => working_dir
   # TODO: the following is not idempotent
   command "sed -i -e s:-static:: src/Makefile", :cwd => working_dir
 
@@ -50,7 +50,7 @@ build do
   end
 
   block do
-    install_path = self.project.install_path
+    install_dir = self.project.install_dir
     open("#{install_dir}/embedded/bin/runsvdir-start", "w") do |file|
       file.print <<-EOH
 #!/bin/bash
@@ -71,7 +71,7 @@ build do
 # limitations under the License.
 #
 
-PATH=#{install_path}/bin:#{install_path}/embedded/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
+PATH=#{install_dir}/bin:#{install_dir}/embedded/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin
 
 # enforce our own ulimits
 
@@ -98,7 +98,7 @@ echo "1000000" > /proc/sys/fs/file-max
 umask 022
 
 exec env - PATH=$PATH \
-runsvdir -P #{install_path}/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
+runsvdir -P #{install_dir}/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
        EOH
     end
   end

data/spec/data/projects/chefdk.rb

@@ -19,7 +19,7 @@ name 'chefdk'
 maintainer 'Chef Software, Inc.'
 homepage 'http://www.getchef.com'
 
-install_path '/opt/chefdk'
+install_dir '/opt/chefdk'
 build_version Omnibus::BuildVersion.new.git_describe
 build_iteration 4
 

data/spec/data/projects/sample.rb

@@ -1,5 +1,5 @@
 name 'sample'
-install_path '/sample'
+install_dir '/sample'
 maintainer 'Sample Devs'
 homepage 'http://example.com/'
 

data/spec/data/software/erchef.rb

@@ -18,7 +18,9 @@
 name 'erchef'
 default_version '4b19a96d57bff9bbf4764d7323b92a0944009b9e'
 
-dependencies %w(erlang rsync curl)
+dependency 'erlang'
+dependency 'rsync'
+dependency 'curl'
 
 source git: 'git://github.com/opscode/erchef'
 

data/spec/functional/packagers/mac_spec.rb

@@ -6,39 +6,40 @@ module Omnibus
     let(:version) { '12.4.0' }
 
     let(:project) do
-      Project.new(<<-EOH, __FILE__)
-        name               '#{name}'
-        maintainer         'Chef'
-        homepage           'https://getchef.com'
-        build_version      '#{version}'
-        install_path       '#{tmp_path}/opt/#{name}'
-        mac_pkg_identifier 'test.pkg.#{name}'
-      EOH
+      allow(IO).to receive(:read)
+        .with('/project.rb')
+        .and_return <<-EOH.gsub(/^ {10}/, '')
+          name               '#{name}'
+          maintainer         'Chef'
+          homepage           'https://getchef.com'
+          build_version      '#{version}'
+          install_dir        '#{tmp_path}/opt/#{name}'
+          mac_pkg_identifier 'test.pkg.#{name}'
+        EOH
+
+      Project.load('/project.rb')
     end
 
     let(:mac_packager) { Packager::MacPkg.new(project) }
 
     before do
-      # Reset stale configuration
-      Omnibus.config.reset!
-
       # Tell things to install into the cache directory
       root = "#{tmp_path}/var/omnibus"
-      Omnibus.config.cache_dir "#{root}/cache"
-      Omnibus.config.install_path_cache_dir "#{root}/cache/install_path"
-      Omnibus.config.source_dir "#{root}/src"
-      Omnibus.config.build_dir "#{root}/build"
-      Omnibus.config.package_dir "#{root}/pkg"
-      Omnibus.config.package_tmp "#{root}/pkg-tmp"
+      Config.cache_dir "#{root}/cache"
+      Config.git_cache_dir "#{root}/cache/git_cache"
+      Config.source_dir "#{root}/src"
+      Config.build_dir "#{root}/build"
+      Config.package_dir "#{root}/pkg"
+      Config.package_tmp "#{root}/pkg-tmp"
 
       # Enable DMG create
-      Omnibus.config.build_dmg true
+      Config.build_dmg true
 
       # Point at our sample project fixture
-      Omnibus.config.project_root "#{fixtures_path}/sample"
+      Config.project_root "#{fixtures_path}/sample"
 
       # Create the target directory
-      FileUtils.mkdir_p(project.install_path)
+      FileUtils.mkdir_p(project.install_dir)
     end
 
     it 'builds a pkg and a dmg' do
@@ -47,11 +48,11 @@ module Omnibus
 
       # There is a tiny bit of hard-coding here, but I don't see a better
       # solution for generating the package name
-      pkg = "#{project.package_dir}/#{name}-#{version}-1.pkg"
-      dmg = "#{project.package_dir}/#{name}-#{version}-1.dmg"
+      pkg = "#{Config.package_dir}/#{name}-#{version}-1.pkg"
+      dmg = "#{Config.package_dir}/#{name}-#{version}-1.dmg"
 
-      expect(File.exist?(pkg)).to be_true
-      expect(File.exist?(dmg)).to be_true
+      expect(File.exist?(pkg)).to be_truthy
+      expect(File.exist?(dmg)).to be_truthy
     end
   end
 end

data/spec/functional/packagers/windows_spec.rb

@@ -23,38 +23,39 @@ module Omnibus
     let(:version) { '12.4.0' }
 
     let(:project) do
-      Project.new(<<-EOH, __FILE__)
-        name               '#{name}'
-        maintainer         'Chef'
-        homepage           'https://getchef.com'
-        build_version      '#{version}'
-        install_path       '#{tmp_path}\\opt\\#{name}'
-      EOH
+      allow(IO).to receive(:read)
+        .with('/project.rb')
+        .and_return <<-EOH.gsub(/^ {10}/, '')
+          name               '#{name}'
+          maintainer         'Chef'
+          homepage           'https://getchef.com'
+          build_version      '#{version}'
+          install_dir        '#{tmp_path}\\opt\\#{name}'
+        EOH
+
+      Project.load('/project.rb')
     end
 
     let(:windows_packager) { Packager::WindowsMsi.new(project) }
 
     before do
-      # Reset stale configuration
-      Omnibus.config.reset!
-
       # Tell things to install into the cache directory
       root = "#{tmp_path}/var/omnibus"
-      Omnibus.config.cache_dir "#{root}/cache"
-      Omnibus.config.install_path_cache_dir "#{root}/cache/install_path"
-      Omnibus.config.source_dir "#{root}/src"
-      Omnibus.config.build_dir "#{root}/build"
-      Omnibus.config.package_dir "#{root}/pkg"
-      Omnibus.config.package_tmp "#{root}/pkg-tmp"
+      Config.cache_dir "#{root}/cache"
+      Config.git_cache_dir "#{root}/cache/git_cache"
+      Config.source_dir "#{root}/src"
+      Config.build_dir "#{root}/build"
+      Config.package_dir "#{root}/pkg"
+      Config.package_tmp "#{root}/pkg-tmp"
 
       # Point at our sample project fixture
-      Omnibus.config.project_root "#{fixtures_path}/sample"
+      Config.project_root "#{fixtures_path}/sample"
 
       # Create the target directory
-      FileUtils.mkdir_p(project.install_path)
+      FileUtils.mkdir_p(project.install_dir)
 
       # Create a file to be included in the MSI
-      FileUtils.touch(File.join(project.install_path, 'golden_file'))
+      FileUtils.touch(File.join(project.install_dir, 'golden_file'))
     end
 
     it 'builds a pkg and a dmg' do
@@ -63,7 +64,7 @@ module Omnibus
 
       # There is a tiny bit of hard-coding here, but I don't see a better
       # solution for generating the package name
-      expect(File.exist?("#{project.package_dir}/#{name}-#{version}-1.windows.msi")).to be_true
+      expect(File.exist?("#{Config.package_dir}/#{name}-#{version}-1.windows.msi")).to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'rspec'
+require 'rspec/its'
+
 require 'omnibus'
 require 'fauxhai'
 
@@ -49,11 +52,11 @@ module Omnibus
     #
     # @param [Hash] data
     #
-    def stub_ohai(data = {})
-      system = ::Ohai::System.new
-      system.data = Mash.new(data)
+    def stub_ohai(options = {}, &block)
+      require 'ohai' unless defined?(Mash)
 
-      Ohai.stub(:ohai).and_return(system)
+      ohai = Mash.from_hash(Fauxhai.mock(options, &block).data)
+      Ohai.stub(:ohai).and_return(ohai)
     end
 
     #
@@ -109,9 +112,20 @@ RSpec.configure do |config|
     # Suppress logging
     Omnibus.logger.level = :unknown
 
+    # Reset config
+    Omnibus.reset!
+
     # Clear the tmp_path on each run
     FileUtils.rm_rf(tmp_path)
     FileUtils.mkdir_p(tmp_path)
+
+    # Don't run Ohai - tests can still override this
+    stub_ohai(platform: 'ubuntu', version: '12.04')
+  end
+
+  config.after(:each) do
+    # Reset config
+    Omnibus.reset!
   end
 
   # Force the expect syntax
@@ -122,3 +136,28 @@ RSpec.configure do |config|
   # Run specs in a random order
   config.order = 'random'
 end
+
+#
+# Shard example group for asserting a DSL method
+#
+# @example
+#   it_behaves_like 'a cleanroom setter', :name, 'chef'
+#
+RSpec.shared_examples 'a cleanroom setter' do |id, value|
+  it "for `#{id}'" do
+    expect { subject.evaluate("#{id}(#{value.inspect})") }
+      .to_not raise_error
+  end
+end
+
+#
+# Shard example group for asserting a DSL method
+#
+# @example
+#   it_behaves_like 'a cleanroom getter', :name
+#
+RSpec.shared_examples 'a cleanroom getter' do |id|
+  it "for `#{id}'" do
+    expect { subject.evaluate("#{id}") }.to_not raise_error
+  end
+end