omnibus 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.2.0 (July 12, 2013)
+
+FEATURES:
+
+* Add `whitelist_file` to software DSL. This allows an individual software 
+  definition to declare files that should be ignored during health checking.
+
+IMPROVEMENTS:
+
+* Raise an exception if a project's dependency is not found.
+
+BUG FIXES:
+
+* Properly load a project's transitive dependencies.
+* Ensure a component is only added to a library one time.
+
 ## 1.1.1 (July 2, 2013)
 
 BUG FIXES:

data/lib/omnibus.rb

@@ -26,6 +26,7 @@ OHAI = o
 require 'omnibus/library'
 require 'omnibus/reports'
 require 'omnibus/config'
+require 'omnibus/exceptions'
 require 'omnibus/software'
 require 'omnibus/project'
 require 'omnibus/fetchers'
@@ -183,15 +184,14 @@ module Omnibus
   # @return [void]
   #
   # @see Omnibus::Overrides#overrides
-  def self.expand_software(overrides, software_files)
+  def self.expand_software(overrides, software_map)
     unless overrides.is_a? Hash
       raise ArgumentError, "Overrides argument must be a hash!  You passed #{overrides.inspect}."
     end
 
-    Omnibus.projects.each do |p|
-      software_files.each do |f|
-        s = Omnibus::Software.load(f, p, overrides)
-        p.library.component_added(s) if p.dependency?(s.name)
+    Omnibus.projects.each do |project|
+      project.dependencies.each do |dependency|
+        recursively_load_dependency(dependency, project, overrides, software_map)
       end
     end
   end
@@ -205,12 +205,12 @@ module Omnibus
     expand_projects
 
     # Then do software
-    final_software_files = prefer_local_software(omnibus_software_files,
+    final_software_map = prefer_local_software(omnibus_software_files,
                                            software_files)
 
     overrides = Config.override_file ? Omnibus::Overrides.overrides : {}
 
-    expand_software(overrides, final_software_files)
+    expand_software(overrides, final_software_map)
   end
 
   # Creates some additional Rake tasks beyond those generated in the
@@ -260,7 +260,7 @@ module Omnibus
   def self.prefer_local_software(omnibus_files, local_files)
     base = software_map(omnibus_files)
     local = software_map(local_files)
-    base.merge(local).values
+    base.merge(local)
   end
 
   # Given a list of file paths, create a map of the basename (without
@@ -274,4 +274,31 @@ module Omnibus
       collection[software_name] = file
     end
   end
+
+  # Loads a project's dependency recursively, ensuring all transitive dependencies
+  # are also loaded.
+  #
+  # @param dependency_name [String]
+  # @param project [Omnibus::Project]
+  # @param overrides [Hash] a hash of version override information.
+  # @param software_map [Hash<String, String>]
+  #
+  # @return [void]
+  def self.recursively_load_dependency(dependency_name, project, overrides, software_map)
+    dep_file = software_map[dependency_name]
+
+    unless dep_file
+      raise MissingProjectDependency.new(dependency_name,
+                                         [File.join(project_root, Config.software_dir),
+                                          File.join(omnibus_software_root, 'config', 'software')])
+    end
+
+    dep_software = Omnibus::Software.load(dep_file, project, overrides)
+    project.library.component_added(dep_software)
+
+    # load any transitive deps for the component into the library also
+    dep_software.dependencies.each do |dep|
+      recursively_load_dependency(dep, project, overrides, software_map)
+    end
+  end
 end

data/lib/omnibus/exceptions.rb

@@ -125,4 +125,19 @@ module Omnibus
       """
     end
   end
+
+  class MissingProjectDependency < RuntimeError
+    def initialize(dep_name, search_paths)
+      @dep_name, @search_paths = dep_name, search_paths
+    end
+
+    def to_s
+      """
+      Attempting to load the project dependency '#{@dep_name}', but it was
+      not found at any of the following locations:
+
+      #{@search_paths.join("\n      ")}
+      """
+    end
+  end
 end

data/lib/omnibus/health_check.rb

@@ -133,25 +133,18 @@ module Omnibus
                                /libutil\.so/
                               ]
 
-    WHITELIST_FILES = [
-                       /jre\/bin\/javaws/,
-                       /jre\/bin\/policytool/,
-                       /jre\/lib/,
-                       /jre\/plugin/
-                      ]
-
     def self.log(msg)
       puts "[health_check] #{msg}"
     end
 
-    def self.run(install_dir)
+    def self.run(install_dir, whitelist_files = [])
       case OHAI.platform
       when "mac_os_x"
-        bad_libs = health_check_otool(install_dir)
+        bad_libs = health_check_otool(install_dir, whitelist_files)
       when "aix"
-        bad_libs = health_check_aix(install_dir)
+        bad_libs = health_check_aix(install_dir, whitelist_files)
       else
-        bad_libs = health_check_ldd(install_dir)
+        bad_libs = health_check_ldd(install_dir, whitelist_files)
       end
 
       unresolved = []
@@ -199,7 +192,7 @@ module Omnibus
       end
     end
 
-    def self.health_check_otool(install_dir)
+    def self.health_check_otool(install_dir, whitelist_files)
       otool_cmd = "find #{install_dir}/ -type f | egrep '\.(dylib|bundle)$' | xargs otool -L > otool.out 2>/dev/null"
       log "Executing `#{otool_cmd}`"
       shell = Mixlib::ShellOut.new(otool_cmd, :timeout => 3600)
@@ -217,7 +210,7 @@ module Omnibus
         when /^\s+(.+) \(.+\)$/
           linked = $1
           name = File.basename(linked)
-          bad_libs = check_for_bad_library(install_dir, bad_libs, current_library, name, linked)
+          bad_libs = check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
         end
       end
 
@@ -226,7 +219,7 @@ module Omnibus
       bad_libs
     end
 
-    def self.check_for_bad_library(install_dir, bad_libs, current_library, name, linked)
+    def self.check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
       safe = nil
 
       whitelist_libs = case OHAI.platform
@@ -248,7 +241,7 @@ module Omnibus
       whitelist_libs.each do |reg|
         safe ||= true if reg.match(name)
       end
-      WHITELIST_FILES.each do |reg|
+      whitelist_files.each do |reg|
         safe ||= true if reg.match(current_library)
       end
 
@@ -271,7 +264,7 @@ module Omnibus
       bad_libs
     end
 
-    def self.health_check_aix(install_dir)
+    def self.health_check_aix(install_dir, whitelist_files)
       #
       # ShellOut has GC turned off during execution, so when we're
       # executing extremely long commands with lots of output, we
@@ -297,7 +290,7 @@ module Omnibus
         when /^\s+(.+)$/
           name = $1
           linked = $1
-          bad_libs = check_for_bad_library(install_dir, bad_libs, current_library, name, linked)
+          bad_libs = check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
         when /File is not an executable XCOFF file/ # ignore non-executable files
         else
           log "*** Line did not match for #{current_library}\n#{line}"
@@ -308,7 +301,7 @@ module Omnibus
       bad_libs
     end
 
-    def self.health_check_ldd(install_dir)
+    def self.health_check_ldd(install_dir, whitelist_files)
       #
       # ShellOut has GC turned off during execution, so when we're
       # executing extremely long commands with lots of output, we
@@ -334,7 +327,7 @@ module Omnibus
         when /^\s+(.+) \=\>\s+(.+)( \(.+\))?$/
           name = $1
           linked = $2
-          bad_libs = check_for_bad_library(install_dir, bad_libs, current_library, name, linked)
+          bad_libs = check_for_bad_library(install_dir, bad_libs, whitelist_files, current_library, name, linked)
         when /^\s+(.+) \(.+\)$/
           next
         when /^\s+statically linked$/

data/lib/omnibus/library.rb

@@ -28,7 +28,7 @@ module Omnibus
     end
 
     def component_added(component)
-      @components << component
+      @components << component unless @components.include?(component)
     end
 
     def version_map

data/lib/omnibus/project.rb

@@ -700,7 +700,9 @@ module Omnibus
             if OHAI.platform == "windows"
               puts "Skipping health check on windows..."
             else
-              Omnibus::HealthCheck.run(install_path)
+              # build a list of all whitelist files from all project dependencies
+              whitelist_files = library.components.map{|component| component.whitelist_files }.flatten
+              Omnibus::HealthCheck.run(install_path, whitelist_files)
             end
           end
         end

data/lib/omnibus/software.rb

@@ -51,6 +51,7 @@ module Omnibus
 
     attr_reader :given_version
     attr_reader :override_version
+    attr_reader :whitelist_files
 
     def self.load(filename, project, overrides={})
       new(IO.read(filename), filename, project, overrides)
@@ -85,6 +86,7 @@ module Omnibus
       @builder = NullBuilder.new(self)
 
       @dependencies = Array.new
+      @whitelist_files = Array.new
       instance_eval(io, filename, 0)
 
       # Set override information after the DSL file has been consumed
@@ -153,6 +155,15 @@ module Omnibus
       @override_version || @given_version
     end
 
+    # Add an Omnibus software dependency.
+    #
+    # @param file [String, Regexp] the name of a file to ignore in the healthcheck
+    # @return [void]
+    def whitelist_file(file)
+      file = Regexp.new(file) unless file.kind_of?(Regexp)
+      @whitelist_files << file
+    end
+
     # Was this software version overridden externally, relative to the
     # version declared within the software DSL file?
     #

data/lib/omnibus/templates/Gemfile.erb

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'omnibus', '~> 1.0.0'
+gem 'omnibus', '~> 1.2.0'
 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/software_spec.rb

@@ -5,33 +5,47 @@ require 'spec_helper'
 
 describe Omnibus::Software do
 
-  let(:project) do 
+  let(:project) do
     p = mock(Omnibus::Project)
     p.should_receive(:install_path).any_number_of_times.and_return("monkeys")
     p
   end
 
-  let(:software_name) {"erchef"}
+  let(:software_name) { "erchef" }
   let(:software_file){ software_path(software_name) }
-  let(:version_from_file){"4b19a96d57bff9bbf4764d7323b92a0944009b9e"}
+  let(:version_from_file){ "4b19a96d57bff9bbf4764d7323b92a0944009b9e" }
+  let(:software){ Omnibus::Software.load(software_file, project) }
 
-  context "testing version overrides" do
+  before :each do
+    # We don't want to mess with any of this stuff for these
+    # tests... we're just looking at version info right now
+    Omnibus::Software.any_instance.stub(:render_tasks)
+  end
+
+  subject { software }
+
+  describe "#whitelist_file" do
+
+    it "appends to the whitelist_files array" do
+      software.whitelist_files.size.should equal 0
+      software.whitelist_file(/foo\/bar/)
+      software.whitelist_files.size.should equal 1
+    end
 
-    before :each do
-      # We don't want to mess with any of this stuff for these
-      # tests... we're just looking at version info right now
-      Omnibus::Software.any_instance.stub(:render_tasks)
+    it "converts Strings to Regexp instances" do
+      software.whitelist_file "foo/bar"
+      software.whitelist_files.size.should equal 1
+      software.whitelist_files.first.should be_kind_of(Regexp)
     end
+  end
+
+  context "testing version overrides" do
 
-    subject{software}
-    
     context "without overrides" do
-      let(:software){Omnibus::Software.load(software_file, project)}
-        
       its(:name){should eq(software_name)}
       its(:version){should eq(version_from_file)}
       its(:given_version){should eq(software.version)}
-      its(:override_version){should be_nil}      
+      its(:override_version){should be_nil}
     end
 
     context "with overrides" do
@@ -43,11 +57,11 @@ describe Omnibus::Software do
 
       context "but not for this software" do
         let(:override_software_name){"chaos_monkey"}
-        
+
         it "really should not have any overrides for this software" do
           overrides.should_not have_key(software_name)
         end
-        
+
         its(:version){should eq(version_from_file)}
         its(:given_version){should eq(software.version)}
         its(:override_version){should be_nil}
@@ -59,7 +73,7 @@ describe Omnibus::Software do
         it "really should have an override for this software" do
           overrides.should have_key(software_name)
         end
-      
+
         its(:version){should eq(override_software_version)}
         its(:override_version){should eq(software.version)}
         its(:version){should_not eq(software.given_version)}

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ohai
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fpm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uber-s3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,26 +233,30 @@ files:
 homepage: https://github.com/opscode/omnibus-ruby
 licenses:
 - Apache 2.0
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2339140264674066912
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Omnibus helps you build self-installing, full-stack software builds.
 test_files:
 - spec/artifact_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjM0YzUxNDMyZDFmNGRhYjJkMmY5YmQ4OGNjMWRkZjg0ODYwOTcxYw==
-  data.tar.gz: !binary |-
-    ZGYwZDEzMzNmYmU0ZjU2MmQzNTFmNTlkMGNkOTBiMjM5MDljYWU5ZQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YjRlYzQ0MDM1NzI5YmEyZWYxMWE4MDNmNmY4NTNlMmI2MDA3YTcyNWI1ZjEw
-    ZmE0OTFjODAyMWZmMWNmNDYxMWI4N2VlNDE3ODc3NWJmNDNkYTFkMDI1YTM1
-    ZjAzOWY2YzZjNGFhOTliZjk0M2RiYzkwZjVjMDhlZGI5OGQyYzk=
-  data.tar.gz: !binary |-
-    ZjRkNTY3YmJhOTE2NzE4MmIwZTFiOWRmNjgwMzViNDVlNmRjMjY5NGYwOGZk
-    MDE3NmQ1Njk1Mjk4NDQ2MmU2Nzk5N2ZjMjYxZDI0YWQ1ZGIwMjgyM2ViOWM2
-    MDYwZWRhZjNmOTQwYzEyMTQ0NzI0ZTI4NDNhMGExZDhlZmNjYmI=