omnibus 1.0.4 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmE1YTFhZDlhZTEyOGJlMzFiNTc2YzY0OWU2NTYxODVlOGVkNWZkMg==
+    NmUyOTcwNzFiYmJmNDE5YmM5Y2RhMDBkNzE2ZjVlOTEwNzMzOTFhMg==
   data.tar.gz: !binary |-
-    OWVkZDk0ZTg4OTNiODU4OWQwYzU5ZDRkMmMxMzM1ODM5OGZiYWRjZA==
+    MDU0ZjEwNDhiZjJkYjliYzY1NzM3NzI2ZjE3YjQxNzYxMGRhZDBhZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWEyOWQyZDNkMWNjZDNmNmExODE5OWNhNDRiZDVkOTQyYzg4NjZhZWNkZDVl
-    MGY2OWMxMWFlNzljMWJkZDY2ODExYjIwZjEwN2NmODM1ZDkxZjJjN2FhMDQx
-    ZjliZDA0MWQzYzExNmY4ZmI0MmE4NjA4ZGZmZDU4ZmE5MzA3OTE=
+    ODY2MDNhOTQ1YzAzYWJjZTI2OTQwZDBkZjIwMWYyMmRhNTZkOTFjN2Q2MmE4
+    ZjMxZDY5NGZkZmJmMjkzZWNiNjQxZDU4MGExYjRkNmI0ZmFhNjYwYjM3NDlh
+    NjJhMjVkZmU1YmU5NTA0OGNmY2NlOWMzYTg2OGM0NjNkMzkwMTQ=
   data.tar.gz: !binary |-
-    MWQ4Yjg1Mjc3ZTMxNDBjNjk1MGRiZWZlNDk5NWUxOGU0OTQ4Y2NkNTQ2OTVj
-    MjIxZmNhMjY0ZTFhNGVlYzIxOTYwNmNjZTY4MjczODhkYmUyMWFmZGYwOTI1
-    ZGY2ZGExN2ZlODRlNWE2YzBlMjUxYjY1NmZmOWY1YTU0MjNiNmU=
+    ZTUxMmFiM2M0ZGNiNjMxODkwNGE2OTBlOGQ3MjYzMDE3NTA5NTIzOWExZWI3
+    MzA4NmVhZTAzNDY1MGI4MTE1MTdiMTdkOWQ1MTViNzBiZmY1YWZjZjMyMjRm
+    YWE4NzcwNTdiZTRiNWI3MTlmYjA1Yjg4ZTFiNTY0MjQ5MWEyZGI=

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 1.1.0 (June 12, 2013)
+
+FEATURES:
+
+* AIX health check whitelist support
+* AIX Backup-File Format (BFF) package support
+
+IMPROVEMENTS:
+
+* Add libstdc++ to SmartOS whitelist libs - this allows the health check pass when 
+  depending on C++ libs.
+
+BUG FIXES:
+
+* [CHEF-4246] - omnibus cache populate failing
+
 ## 1.0.4 (May 23, 2013)
 
 FEATURES:
@@ -16,7 +32,6 @@ BUG FIXES:
 
 * [CHEF-4214] - projects in multi-project omnibus repositories share dependency scope
 
-
 ## 1.0.3 (May 2, 2013)
 
 FEATURES:

data/lib/omnibus/build_version.rb

@@ -45,8 +45,11 @@ module Omnibus
       Omnibus::BuildVersion.new.git_describe
     end
 
-    # @todo Remove this... it does nothing
-    def initialize
+    # Create a new BuildVersion
+    #
+    # @param [String] path      Path from which to read git version information
+    def initialize(path=Omnibus.root)
+      @path = path
     end
 
     # @!group Version Generator Methods
@@ -130,7 +133,7 @@ module Omnibus
                           git_cmd = "git describe"
                           cmd = shellout(git_cmd,
                                          :live_stream => nil,
-                                         :cwd => Omnibus.project_root)
+                                         :cwd => @path)
                           if cmd.exitstatus == 0
                             cmd.stdout.chomp
                           else

data/lib/omnibus/health_check.rb

@@ -49,6 +49,16 @@ module Omnibus
                            /libutil\.so/
                           ]
 
+    AIX_WHITELIST_LIBS = [
+      /libpthread\.a/,
+      /libpthreads\.a/,
+      /libdl.a/,
+      /librtl\.a/,
+      /libc\.a/,
+      /libcrypt\.a/,
+      /unix$/,
+    ]
+
     SOLARIS_WHITELIST_LIBS = [
                               /libaio\.so/,
                               /libavl\.so/,
@@ -94,6 +104,7 @@ module Omnibus
                               /libmd.so/,
                               /libc.so/,
                               /libgcc_s.so/,
+                              /libstdc\+\+\.so/,
                               /libcrypt.so/
                              ]
 
@@ -134,8 +145,11 @@ module Omnibus
     end
 
     def self.run(install_dir)
-      if OHAI.platform == "mac_os_x"
+      case OHAI.platform
+      when "mac_os_x"
         bad_libs = health_check_otool(install_dir)
+      when "aix"
+        bad_libs = health_check_aix(install_dir)
       else
         bad_libs = health_check_ldd(install_dir)
       end
@@ -226,6 +240,8 @@ module Omnibus
                          SMARTOS_WHITELIST_LIBS
                        when 'freebsd'
                          FREEBSD_WHITELIST_LIBS
+                       when 'aix'
+                         AIX_WHITELIST_LIBS
                        else
                          WHITELIST_LIBS
                        end
@@ -255,6 +271,43 @@ module Omnibus
       bad_libs
     end
 
+    def self.health_check_aix(install_dir)
+      #
+      # ShellOut has GC turned off during execution, so when we're
+      # executing extremely long commands with lots of output, we
+      # should be mindful that the string concatentation for building
+      # #stdout will hurt memory usage drastically
+      #
+      ldd_cmd = "find #{install_dir}/ -type f | xargs file | grep \"RISC System\" | awk -F: '{print $1}' | xargs -n 1 ldd > ldd.out 2>/dev/null"
+
+      log "Executing `#{ldd_cmd}`"
+      shell = Mixlib::ShellOut.new(ldd_cmd, :timeout => 3600)
+      shell.run_command
+
+      ldd_output = File.read('ldd.out')
+
+      current_library = nil
+      bad_libs = {}
+
+      ldd_output.each_line do |line|
+        case line
+        when /^(.+) needs:$/
+          current_library = $1
+	  log "*** Analysing dependencies for #{current_library}" if ARGV[0] == "verbose"
+        when /^\s+(.+)$/
+          name = $1
+          linked = $1
+          bad_libs = check_for_bad_library(install_dir, bad_libs, 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}"
+        end
+      end
+
+      File.delete('ldd.out')
+      bad_libs
+    end
+
     def self.health_check_ldd(install_dir)
       #
       # ShellOut has GC turned off during execution, so when we're
@@ -263,6 +316,7 @@ module Omnibus
       # #stdout will hurt memory usage drastically
       #
       ldd_cmd = "find #{install_dir}/ -type f | xargs ldd > ldd.out 2>/dev/null"
+
       log "Executing `#{ldd_cmd}`"
       shell = Mixlib::ShellOut.new(ldd_cmd, :timeout => 3600)
       shell.run_command

data/lib/omnibus/project.rb

@@ -168,6 +168,8 @@ module Omnibus
         "#{build_iteration}.#{platform}.#{maj}.#{machine}"
       when 'windows'
         "#{build_iteration}.windows"
+      when 'aix'
+        "#{build_iteration}"
       else
         "#{build_iteration}.#{platform}.#{platform_version}"
       end
@@ -376,6 +378,8 @@ module Omnibus
         [ "deb" ]
       when 'fedora', 'rhel'
         [ "rpm" ]
+      when 'aix'
+        [ "bff" ]
       when 'solaris2'
         [ "solaris" ]
       when 'windows'
@@ -455,6 +459,8 @@ module Omnibus
         "#{package_name}-#{build_version}_#{iteration}.sh"
       when "msi"
         "#{package_name}-#{build_version}-#{iteration}.msi"
+      when "bff"
+        "#{package_name}.#{bff_version}.bff"
       else # fpm
         require "fpm/package/#{pkg_type}"
         pkg = FPM::Package.types[pkg_type].new
@@ -492,6 +498,11 @@ module Omnibus
       [msi_command.join(" "), {:returns => [0, 204]}]
     end
 
+    def bff_command
+      bff_command = ["mkinstallp -d / -T /tmp/bff/gen.template"]
+      [bff_command.join(" "), {:returns => [0]}]
+    end
+
     # The {https://github.com/jordansissel/fpm fpm} command to
     # generate a package for RedHat, Ubuntu, Solaris, etc. platforms.
     #
@@ -582,6 +593,30 @@ module Omnibus
       run_package_command(msi_command)
     end
 
+    def bff_version
+      build_version.split(/[^\d]/)[0..2].join(".") + ".#{iteration}"
+    end
+
+    def run_bff
+      FileUtils.rm_rf "/.info"
+      FileUtils.rm_rf "/tmp/bff"
+      FileUtils.mkdir "/tmp/bff"
+
+      system "find #{install_path} -print > /tmp/bff/file.list"
+
+      system "cat #{package_scripts_path}/aix/opscode.chef.client.template | sed -e 's/TBS/#{bff_version}/' > /tmp/bff/gen.preamble"
+
+      # @todo can we just use an erb template here?
+      system "cat /tmp/bff/gen.preamble /tmp/bff/file.list #{package_scripts_path}/aix/opscode.chef.client.template.last > /tmp/bff/gen.template"
+
+      FileUtils.cp "#{package_scripts_path}/aix/unpostinstall.sh", "#{install_path}/bin"
+      FileUtils.cp "#{package_scripts_path}/aix/postinstall.sh", "#{install_path}/bin"
+
+      run_package_command(bff_command)
+
+      FileUtils.cp "/tmp/chef.#{bff_version}.bff", "/var/cache/omnibus/pkg/chef.#{bff_version}.bff"
+    end
+
     # Runs the necessary command to make a package with fpm. As a side-effect,
     # sets `output_package`
     # @return void
@@ -631,6 +666,8 @@ module Omnibus
                 run_makeself
               elsif pkg_type == "msi"
                 run_msi
+              elsif pkg_type == "bff"
+                run_bff
               else # pkg_type == "fpm"
                 run_fpm(pkg_type)
               end
@@ -643,6 +680,8 @@ module Omnibus
           task "copy" => package_types do
             if OHAI.platform == "windows"
               cp_cmd = "xcopy #{config.package_dir}\\*.msi pkg\\ /Y"
+            elsif OHAI.platform == "aix"
+              cp_cmd = "cp #{config.package_dir}/*.bff pkg/"
             else
               cp_cmd = "cp #{config.package_dir}/* pkg/"
             end

data/lib/omnibus/s3_cacher.rb

@@ -85,7 +85,9 @@ module Omnibus
     end
 
     def tarball_software
-      Omnibus.library.select {|s| s.source && s.source.key?(:url)}
+      Omnibus.projects.map do |project|
+        project.library.select {|s| s.source && s.source.key?(:url)}
+      end.flatten
     end
 
     def populate

data/lib/omnibus/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Omnibus
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/spec/build_version_spec.rb

@@ -247,4 +247,20 @@ Try --always, or create some tags.
       build_version.git_describe.should eq("0.0.0")
     end
   end
+
+  describe "#initialize `path` parameter" do
+    let(:path) { "/some/fake/path" }
+    subject(:build_version){ Omnibus::BuildVersion.new(path) }
+
+    it "runs `git describe` at an alternate path" do
+      build_version.should_receive(:shellout)
+                   .with("git describe",
+                         {:live_stream => nil,
+                         :cwd => path})
+                    .and_return(mock("ouput",
+                                :stdout => git_describe,
+                                :exitstatus => 0))
+      build_version.git_describe
+    end
+  end
 end

data/spec/s3_cacher_spec.rb

@@ -0,0 +1,47 @@
+#
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'omnibus/s3_cacher'
+
+describe Omnibus::S3Cache do
+
+  describe '#tarball_software' do
+    subject(:tarball_software) { described_class.new.tarball_software }
+
+    let(:source_a) { stub(source: { url: 'a' }) }
+    let(:source_b) { stub(source: { url: 'b' }) }
+    let(:source_c) { stub(source: {}) }
+    let(:projects) { [
+      stub({ library: [source_a, source_c] }),
+      stub({ library: [source_c, source_b] })
+    ] }
+    let(:software_with_urls) { [source_a, source_b] }
+
+    before do
+      Omnibus.stub(config: stub({
+        s3_bucket: 'test', s3_access_key: 'test', s3_secret_key: 'test'
+      }))
+
+      Omnibus.stub(projects: projects)
+    end
+
+    it 'lists all software with urls' do
+      tarball_software.should == software_with_urls
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibus
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Opscode
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -208,6 +208,7 @@ files:
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
+- spec/s3_cacher_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opscode/omnibus-ruby
@@ -244,6 +245,7 @@ test_files:
 - spec/fetchers/net_fetcher_spec.rb
 - spec/overrides_spec.rb
 - spec/package_release_spec.rb
+- spec/s3_cacher_spec.rb
 - spec/software_spec.rb
 - spec/spec_helper.rb
 has_rdoc: